2
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
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 *
37
from future_builtins import *
44
import SocketServer as socketserver
39
import SocketServer as socketserver
52
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
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:
97
# Add collections.abc.Callable if it does not exist
99
collections.abc.Callable
100
except AttributeError:
102
Callable = collections.Callable
103
collections.abc = abc
106
# Show warnings by default
107
if not sys.warnoptions:
109
warnings.simplefilter("default")
111
# Try to find the value of SO_BINDTODEVICE:
113
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
114
# newer, and it is also the most natural place for it:
115
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
116
85
except AttributeError:
118
# This is where SO_BINDTODEVICE was up to and including Python
120
87
from IN import SO_BINDTODEVICE
121
88
except ImportError:
122
# In Python 2.7 it seems to have been removed entirely.
123
# Try running the C preprocessor:
125
cc = subprocess.Popen(["cc", "--language=c", "-E",
127
stdin=subprocess.PIPE,
128
stdout=subprocess.PIPE)
129
stdout = cc.communicate(
130
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
131
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
132
except (OSError, ValueError, IndexError):
134
SO_BINDTODEVICE = None
136
if sys.version_info < (3, 2):
137
configparser.Configparser = configparser.SafeConfigParser
89
SO_BINDTODEVICE = None
140
92
stored_state_file = "clients.pickle"
142
94
logger = logging.getLogger()
143
logging.captureWarnings(True) # Show warnings via the logging system
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
147
if_nametoindex = ctypes.cdll.LoadLibrary(
148
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
149
103
except (OSError, AttributeError):
151
104
def if_nametoindex(interface):
152
105
"Get an interface index the hard way, i.e. using fcntl()"
153
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
154
107
with contextlib.closing(socket.socket()) as s:
155
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
156
struct.pack(b"16s16x", interface))
157
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
158
113
return interface_index
161
def copy_function(func):
162
"""Make a copy of a function"""
163
if sys.version_info.major == 2:
164
return types.FunctionType(func.func_code,
170
return types.FunctionType(func.__code__,
177
116
def initlogger(debug, level=logging.WARNING):
178
117
"""init logger and add loglevel"""
181
syslogger = (logging.handlers.SysLogHandler(
182
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
184
119
syslogger.setFormatter(logging.Formatter
185
120
('Mandos [%(process)d]: %(levelname)s:'
187
122
logger.addHandler(syslogger)
190
125
console = logging.StreamHandler()
191
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
248
169
os.rmdir(self.tempdir)
249
170
self.tempdir = None
251
172
def password_encode(self, password):
252
173
# Passphrase can not be empty and can not contain newlines or
253
174
# NUL bytes. So we prefix it and hex encode it.
254
encoded = b"mandos" + binascii.hexlify(password)
255
if len(encoded) > 2048:
256
# GnuPG can't handle long passwords, so encode differently
257
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
258
.replace(b"\n", b"\\n")
259
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
262
177
def encrypt(self, data, password):
263
178
passphrase = self.password_encode(password)
264
with tempfile.NamedTemporaryFile(
265
dir=self.tempdir) as passfile:
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
266
181
passfile.write(passphrase)
268
proc = subprocess.Popen([self.gpg, '--symmetric',
183
proc = subprocess.Popen(['gpg', '--symmetric',
269
184
'--passphrase-file',
271
186
+ self.gnupgargs,
272
stdin=subprocess.PIPE,
273
stdout=subprocess.PIPE,
274
stderr=subprocess.PIPE)
275
ciphertext, err = proc.communicate(input=data)
187
stdin = subprocess.PIPE,
188
stdout = subprocess.PIPE,
189
stderr = subprocess.PIPE)
190
ciphertext, err = proc.communicate(input = data)
276
191
if proc.returncode != 0:
277
192
raise PGPError(err)
278
193
return ciphertext
280
195
def decrypt(self, data, password):
281
196
passphrase = self.password_encode(password)
282
with tempfile.NamedTemporaryFile(
283
dir=self.tempdir) as passfile:
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
284
199
passfile.write(passphrase)
286
proc = subprocess.Popen([self.gpg, '--decrypt',
201
proc = subprocess.Popen(['gpg', '--decrypt',
287
202
'--passphrase-file',
289
204
+ self.gnupgargs,
290
stdin=subprocess.PIPE,
291
stdout=subprocess.PIPE,
292
stderr=subprocess.PIPE)
293
decrypted_plaintext, err = proc.communicate(input=data)
205
stdin = subprocess.PIPE,
206
stdout = subprocess.PIPE,
207
stderr = subprocess.PIPE)
208
decrypted_plaintext, err = proc.communicate(input
294
210
if proc.returncode != 0:
295
211
raise PGPError(err)
296
212
return decrypted_plaintext
299
# Pretend that we have an Avahi module
301
"""This isn't so much a class as it is a module-like namespace."""
302
IF_UNSPEC = -1 # avahi-common/address.h
303
PROTO_UNSPEC = -1 # avahi-common/address.h
304
PROTO_INET = 0 # avahi-common/address.h
305
PROTO_INET6 = 1 # avahi-common/address.h
306
DBUS_NAME = "org.freedesktop.Avahi"
307
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
308
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
309
DBUS_PATH_SERVER = "/"
312
def string_array_to_txt_array(t):
313
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
314
for s in t), signature="ay")
315
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
316
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
317
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
318
SERVER_INVALID = 0 # avahi-common/defs.h
319
SERVER_REGISTERING = 1 # avahi-common/defs.h
320
SERVER_RUNNING = 2 # avahi-common/defs.h
321
SERVER_COLLISION = 3 # avahi-common/defs.h
322
SERVER_FAILURE = 4 # avahi-common/defs.h
325
215
class AvahiError(Exception):
326
216
def __init__(self, value, *args, **kwargs):
327
217
self.value = value
328
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))
332
222
class AvahiServiceError(AvahiError):
336
225
class AvahiGroupError(AvahiError):
229
class AvahiService(object):
341
230
"""An Avahi (Zeroconf) service.
344
233
interface: integer; avahi.IF_UNSPEC or an interface index.
345
234
Used to optionally bind to the specified interface.
510
377
follow_name_owner_changes=True),
511
378
avahi.DBUS_INTERFACE_SERVER)
512
379
self.server.connect_to_signal("StateChanged",
513
self.server_state_changed)
380
self.server_state_changed)
514
381
self.server_state_changed(self.server.GetState())
517
384
class AvahiServiceToSyslog(AvahiService):
518
def rename(self, *args, **kwargs):
519
386
"""Add the new name to the syslog messages"""
520
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
521
syslogger.setFormatter(logging.Formatter(
522
'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'
527
# Pretend that we have a GnuTLS module
529
"""This isn't so much a class as it is a module-like namespace."""
531
library = ctypes.util.find_library("gnutls")
533
library = ctypes.util.find_library("gnutls-deb0")
534
_library = ctypes.cdll.LoadLibrary(library)
537
# Unless otherwise indicated, the constants and types below are
538
# all from the gnutls/gnutls.h C header file.
549
E_NO_CERTIFICATE_FOUND = -49
554
KEYID_USE_SHA256 = 1 # gnutls/x509.h
555
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
558
class session_int(ctypes.Structure):
560
session_t = ctypes.POINTER(session_int)
562
class certificate_credentials_st(ctypes.Structure):
564
certificate_credentials_t = ctypes.POINTER(
565
certificate_credentials_st)
566
certificate_type_t = ctypes.c_int
568
class datum_t(ctypes.Structure):
569
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
570
('size', ctypes.c_uint)]
572
class openpgp_crt_int(ctypes.Structure):
574
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
575
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
576
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
577
credentials_type_t = ctypes.c_int
578
transport_ptr_t = ctypes.c_void_p
579
close_request_t = ctypes.c_int
582
class Error(Exception):
583
def __init__(self, message=None, code=None, args=()):
584
# Default usage is by a message string, but if a return
585
# code is passed, convert it to a string with
588
if message is None and code is not None:
589
message = gnutls.strerror(code)
590
return super(gnutls.Error, self).__init__(
593
class CertificateSecurityError(Error):
599
self._c_object = gnutls.certificate_credentials_t()
600
gnutls.certificate_allocate_credentials(
601
ctypes.byref(self._c_object))
602
self.type = gnutls.CRD_CERTIFICATE
605
gnutls.certificate_free_credentials(self._c_object)
608
def __init__(self, socket, credentials=None):
609
self._c_object = gnutls.session_t()
610
gnutls_flags = gnutls.CLIENT
611
if gnutls.check_version(b"3.5.6"):
612
gnutls_flags |= gnutls.NO_TICKETS
614
gnutls_flags |= gnutls.ENABLE_RAWPK
615
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
617
gnutls.set_default_priority(self._c_object)
618
gnutls.transport_set_ptr(self._c_object, socket.fileno())
619
gnutls.handshake_set_private_extensions(self._c_object,
622
if credentials is None:
623
credentials = gnutls.Credentials()
624
gnutls.credentials_set(self._c_object, credentials.type,
625
ctypes.cast(credentials._c_object,
627
self.credentials = credentials
630
gnutls.deinit(self._c_object)
633
return gnutls.handshake(self._c_object)
635
def send(self, data):
639
data_len -= gnutls.record_send(self._c_object,
644
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
646
# Error handling functions
647
def _error_code(result):
648
"""A function to raise exceptions on errors, suitable
649
for the 'restype' attribute on ctypes functions"""
652
if result == gnutls.E_NO_CERTIFICATE_FOUND:
653
raise gnutls.CertificateSecurityError(code=result)
654
raise gnutls.Error(code=result)
656
def _retry_on_error(result, func, arguments):
657
"""A function to retry on some errors, suitable
658
for the 'errcheck' attribute on ctypes functions"""
660
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
661
return _error_code(result)
662
result = func(*arguments)
665
# Unless otherwise indicated, the function declarations below are
666
# all from the gnutls/gnutls.h C header file.
669
priority_set_direct = _library.gnutls_priority_set_direct
670
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
671
ctypes.POINTER(ctypes.c_char_p)]
672
priority_set_direct.restype = _error_code
674
init = _library.gnutls_init
675
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
676
init.restype = _error_code
678
set_default_priority = _library.gnutls_set_default_priority
679
set_default_priority.argtypes = [session_t]
680
set_default_priority.restype = _error_code
682
record_send = _library.gnutls_record_send
683
record_send.argtypes = [session_t, ctypes.c_void_p,
685
record_send.restype = ctypes.c_ssize_t
686
record_send.errcheck = _retry_on_error
688
certificate_allocate_credentials = (
689
_library.gnutls_certificate_allocate_credentials)
690
certificate_allocate_credentials.argtypes = [
691
ctypes.POINTER(certificate_credentials_t)]
692
certificate_allocate_credentials.restype = _error_code
694
certificate_free_credentials = (
695
_library.gnutls_certificate_free_credentials)
696
certificate_free_credentials.argtypes = [
697
certificate_credentials_t]
698
certificate_free_credentials.restype = None
700
handshake_set_private_extensions = (
701
_library.gnutls_handshake_set_private_extensions)
702
handshake_set_private_extensions.argtypes = [session_t,
704
handshake_set_private_extensions.restype = None
706
credentials_set = _library.gnutls_credentials_set
707
credentials_set.argtypes = [session_t, credentials_type_t,
709
credentials_set.restype = _error_code
711
strerror = _library.gnutls_strerror
712
strerror.argtypes = [ctypes.c_int]
713
strerror.restype = ctypes.c_char_p
715
certificate_type_get = _library.gnutls_certificate_type_get
716
certificate_type_get.argtypes = [session_t]
717
certificate_type_get.restype = _error_code
719
certificate_get_peers = _library.gnutls_certificate_get_peers
720
certificate_get_peers.argtypes = [session_t,
721
ctypes.POINTER(ctypes.c_uint)]
722
certificate_get_peers.restype = ctypes.POINTER(datum_t)
724
global_set_log_level = _library.gnutls_global_set_log_level
725
global_set_log_level.argtypes = [ctypes.c_int]
726
global_set_log_level.restype = None
728
global_set_log_function = _library.gnutls_global_set_log_function
729
global_set_log_function.argtypes = [log_func]
730
global_set_log_function.restype = None
732
deinit = _library.gnutls_deinit
733
deinit.argtypes = [session_t]
734
deinit.restype = None
736
handshake = _library.gnutls_handshake
737
handshake.argtypes = [session_t]
738
handshake.restype = _error_code
739
handshake.errcheck = _retry_on_error
741
transport_set_ptr = _library.gnutls_transport_set_ptr
742
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
743
transport_set_ptr.restype = None
745
bye = _library.gnutls_bye
746
bye.argtypes = [session_t, close_request_t]
747
bye.restype = _error_code
748
bye.errcheck = _retry_on_error
750
check_version = _library.gnutls_check_version
751
check_version.argtypes = [ctypes.c_char_p]
752
check_version.restype = ctypes.c_char_p
754
_need_version = b"3.3.0"
755
if check_version(_need_version) is None:
756
raise self.Error("Needs GnuTLS {} or later"
757
.format(_need_version))
759
_tls_rawpk_version = b"3.6.6"
760
has_rawpk = bool(check_version(_tls_rawpk_version))
764
class pubkey_st(ctypes.Structure):
766
pubkey_t = ctypes.POINTER(pubkey_st)
768
x509_crt_fmt_t = ctypes.c_int
770
# All the function declarations below are from gnutls/abstract.h
771
pubkey_init = _library.gnutls_pubkey_init
772
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
773
pubkey_init.restype = _error_code
775
pubkey_import = _library.gnutls_pubkey_import
776
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
778
pubkey_import.restype = _error_code
780
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
781
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
782
ctypes.POINTER(ctypes.c_ubyte),
783
ctypes.POINTER(ctypes.c_size_t)]
784
pubkey_get_key_id.restype = _error_code
786
pubkey_deinit = _library.gnutls_pubkey_deinit
787
pubkey_deinit.argtypes = [pubkey_t]
788
pubkey_deinit.restype = None
790
# All the function declarations below are from gnutls/openpgp.h
792
openpgp_crt_init = _library.gnutls_openpgp_crt_init
793
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
794
openpgp_crt_init.restype = _error_code
796
openpgp_crt_import = _library.gnutls_openpgp_crt_import
797
openpgp_crt_import.argtypes = [openpgp_crt_t,
798
ctypes.POINTER(datum_t),
800
openpgp_crt_import.restype = _error_code
802
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
803
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
804
ctypes.POINTER(ctypes.c_uint)]
805
openpgp_crt_verify_self.restype = _error_code
807
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
808
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
809
openpgp_crt_deinit.restype = None
811
openpgp_crt_get_fingerprint = (
812
_library.gnutls_openpgp_crt_get_fingerprint)
813
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
817
openpgp_crt_get_fingerprint.restype = _error_code
819
if check_version(b"3.6.4"):
820
certificate_type_get2 = _library.gnutls_certificate_type_get2
821
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
822
certificate_type_get2.restype = _error_code
824
# Remove non-public functions
825
del _error_code, _retry_on_error
828
def call_pipe(connection, # : multiprocessing.Connection
829
func, *args, **kwargs):
830
"""This function is meant to be called by multiprocessing.Process
832
This function runs func(*args, **kwargs), and writes the resulting
833
return value on the provided multiprocessing.Connection.
835
connection.send(func(*args, **kwargs))
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):
840
403
"""A representation of a client host served by this server.
843
406
approved: bool(); 'None' if not yet approved/disapproved
844
407
approval_delay: datetime.timedelta(); Time to wait for approval
845
408
approval_duration: datetime.timedelta(); Duration of one approval
846
checker: multiprocessing.Process(); a running checker process used
847
to see if the client lives. 'None' if no process is
849
checker_callback_tag: a GLib event source tag, or None
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
850
413
checker_command: string; External command which is run to check
851
414
if client lives. %() expansions are done at
852
415
runtime with vars(self) as dict, so that for
853
416
instance %(name)s can be used in the command.
854
checker_initiator_tag: a GLib event source tag, or None
417
checker_initiator_tag: a gobject event source tag, or None
855
418
created: datetime.datetime(); (UTC) object creation
856
419
client_structure: Object describing what attributes a client has
857
420
and is used for storing the client at exit
858
421
current_checker_command: string; current running checker_command
859
disable_initiator_tag: a GLib event source tag, or None
422
disable_initiator_tag: a gobject event source tag, or None
861
424
fingerprint: string (40 or 32 hexadecimal digits); used to
862
uniquely identify an OpenPGP client
863
key_id: string (64 hexadecimal digits); used to uniquely identify
864
a client using raw public keys
425
uniquely identify the client
865
426
host: string; available for use by the checker command
866
427
interval: datetime.timedelta(); How often to start a new checker
867
428
last_approval_request: datetime.datetime(); (UTC) or None
1024
595
logger.info("Disabling client %s", self.name)
1025
596
if getattr(self, "disable_initiator_tag", None) is not None:
1026
GLib.source_remove(self.disable_initiator_tag)
597
gobject.source_remove(self.disable_initiator_tag)
1027
598
self.disable_initiator_tag = None
1028
599
self.expires = None
1029
600
if getattr(self, "checker_initiator_tag", None) is not None:
1030
GLib.source_remove(self.checker_initiator_tag)
601
gobject.source_remove(self.checker_initiator_tag)
1031
602
self.checker_initiator_tag = None
1032
603
self.stop_checker()
1033
604
self.enabled = False
1035
606
self.send_changedstate()
1036
# Do not run this again if called by a GLib.timeout_add
607
# Do not run this again if called by a gobject.timeout_add
1039
610
def __del__(self):
1042
613
def init_checker(self):
1043
614
# Schedule a new checker to be started an 'interval' from now,
1044
615
# and every interval from then on.
1045
616
if self.checker_initiator_tag is not None:
1046
GLib.source_remove(self.checker_initiator_tag)
1047
self.checker_initiator_tag = GLib.timeout_add(
1048
random.randrange(int(self.interval.total_seconds() * 1000
617
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
1051
621
# Schedule a disable() when 'timeout' has passed
1052
622
if self.disable_initiator_tag is not None:
1053
GLib.source_remove(self.disable_initiator_tag)
1054
self.disable_initiator_tag = GLib.timeout_add(
1055
int(self.timeout.total_seconds() * 1000), self.disable)
623
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
1056
627
# Also start a new checker *right now*.
1057
628
self.start_checker()
1059
def checker_callback(self, source, condition, connection,
630
def checker_callback(self, pid, condition, command):
1061
631
"""The checker has completed, so take appropriate actions."""
1062
# Read return code from connection (see call_pipe)
1063
returncode = connection.recv()
1065
if self.checker is not None:
1067
632
self.checker_callback_tag = None
1068
633
self.checker = None
1071
self.last_checker_status = returncode
1072
self.last_checker_signal = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
1073
636
if self.last_checker_status == 0:
1074
637
logger.info("Checker for %(name)s succeeded",
1076
639
self.checked_ok()
1078
logger.info("Checker for %(name)s failed", vars(self))
641
logger.info("Checker for %(name)s failed",
1080
644
self.last_checker_status = -1
1081
self.last_checker_signal = -returncode
1082
645
logger.warning("Checker for %(name)s crashed?",
1086
648
def checked_ok(self):
1087
649
"""Assert that the client has been seen, alive and well."""
1088
650
self.last_checked_ok = datetime.datetime.utcnow()
1089
651
self.last_checker_status = 0
1090
self.last_checker_signal = None
1091
652
self.bump_timeout()
1093
654
def bump_timeout(self, timeout=None):
1094
655
"""Bump up the timeout for this client."""
1095
656
if timeout is None:
1096
657
timeout = self.timeout
1097
658
if self.disable_initiator_tag is not None:
1098
GLib.source_remove(self.disable_initiator_tag)
659
gobject.source_remove(self.disable_initiator_tag)
1099
660
self.disable_initiator_tag = None
1100
661
if getattr(self, "enabled", False):
1101
self.disable_initiator_tag = GLib.timeout_add(
1102
int(timeout.total_seconds() * 1000), self.disable)
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
1103
665
self.expires = datetime.datetime.utcnow() + timeout
1105
667
def need_approval(self):
1106
668
self.last_approval_request = datetime.datetime.utcnow()
1108
670
def start_checker(self):
1109
671
"""Start a new checker subprocess if one is not running.
1111
673
If a checker already exists, leave it running and do
1113
675
# The reason for not killing a running checker is that if we
1118
680
# checkers alone, the checker would have to take more time
1119
681
# than 'timeout' for the client to be disabled, which is as it
1122
if self.checker is not None and not self.checker.is_alive():
1123
logger.warning("Checker was not alive; joining")
684
# If a checker exists, make sure it is not a zombie
686
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
693
logger.warning("Checker was a zombie")
694
gobject.source_remove(self.checker_callback_tag)
695
self.checker_callback(pid, status,
696
self.current_checker_command)
1126
697
# Start a new checker if needed
1127
698
if self.checker is None:
1128
699
# Escape attributes for the shell
1130
attr: re.escape(str(getattr(self, attr)))
1131
for attr in self.runtime_expansions}
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
1133
705
command = self.checker_command % escaped_attrs
1134
706
except TypeError as error:
1135
707
logger.error('Could not format string "%s"',
1136
self.checker_command,
708
self.checker_command, exc_info=error)
709
return True # Try again later
710
self.current_checker_command = command
712
logger.info("Starting checker %r for %s",
714
# We don't need to redirect stdout and stderr, since
715
# in normal mode, that is already done by daemon(),
716
# and in debug mode we don't want to. (Stdin is
717
# always replaced by /dev/null.)
718
# The exception is when not debugging but nevertheless
719
# running in the foreground; use the previously
722
if (not self.server_settings["debug"]
723
and self.server_settings["foreground"]):
724
popen_args.update({"stdout": wnull,
726
self.checker = subprocess.Popen(command,
730
except OSError as error:
731
logger.error("Failed to start subprocess",
1138
return True # Try again later
1139
self.current_checker_command = command
1140
logger.info("Starting checker %r for %s", command,
1142
# We don't need to redirect stdout and stderr, since
1143
# in normal mode, that is already done by daemon(),
1144
# and in debug mode we don't want to. (Stdin is
1145
# always replaced by /dev/null.)
1146
# The exception is when not debugging but nevertheless
1147
# running in the foreground; use the previously
1149
popen_args = {"close_fds": True,
1152
if (not self.server_settings["debug"]
1153
and self.server_settings["foreground"]):
1154
popen_args.update({"stdout": wnull,
1156
pipe = multiprocessing.Pipe(duplex=False)
1157
self.checker = multiprocessing.Process(
1159
args=(pipe[1], subprocess.call, command),
1161
self.checker.start()
1162
self.checker_callback_tag = GLib.io_add_watch(
1163
GLib.IOChannel.unix_new(pipe[0].fileno()),
1164
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1165
self.checker_callback, pipe[0], command)
1166
# Re-run this periodically if run by GLib.timeout_add
734
self.checker_callback_tag = (gobject.child_watch_add
736
self.checker_callback,
738
# The checker may have completed before the gobject
739
# watch was added. Check for this.
741
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
742
except OSError as error:
743
if error.errno == errno.ECHILD:
744
# This should never happen
745
logger.error("Child process vanished",
750
gobject.source_remove(self.checker_callback_tag)
751
self.checker_callback(pid, status, command)
752
# Re-run this periodically if run by gobject.timeout_add
1169
755
def stop_checker(self):
1170
756
"""Force the checker process, if any, to stop."""
1171
757
if self.checker_callback_tag:
1172
GLib.source_remove(self.checker_callback_tag)
758
gobject.source_remove(self.checker_callback_tag)
1173
759
self.checker_callback_tag = None
1174
760
if getattr(self, "checker", None) is None:
1176
762
logger.debug("Stopping checker for %(name)s", vars(self))
1177
self.checker.terminate()
764
self.checker.terminate()
766
#if self.checker.poll() is None:
767
# self.checker.kill()
768
except OSError as error:
769
if error.errno != errno.ESRCH: # No such process
1178
771
self.checker = None
1181
def dbus_service_property(dbus_interface,
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
1185
776
"""Decorators for marking methods of a DBusObjectWithProperties to
1186
777
become properties on the D-Bus.
1188
779
The decorated method will be called with no arguments by "Get"
1189
780
and with one argument by "Set".
1191
782
The parameters, where they are supported, are the same as
1192
783
dbus.service.method, except there is only "signature", since the
1193
784
type from Get() and the type sent to Set() is the same.
1276
class DBusObjectWithAnnotations(dbus.service.Object):
1277
"""A D-Bus object with annotations.
1279
Classes inheriting from this can use the dbus_annotations
1280
decorator to add annotations to methods or signals.
860
class DBusObjectWithProperties(dbus.service.Object):
861
"""A D-Bus object with properties.
863
Classes inheriting from this can use the dbus_service_property
864
decorator to expose methods as D-Bus properties. It exposes the
865
standard Get(), Set(), and GetAll() methods on the D-Bus.
1284
869
def _is_dbus_thing(thing):
1285
870
"""Returns a function testing if an attribute is a D-Bus thing
1287
872
If called like _is_dbus_thing("method") it returns a function
1288
873
suitable for use as predicate to inspect.getmembers().
1290
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1293
878
def _get_all_dbus_things(self, thing):
1294
879
"""Returns a generator of (name, attribute) pairs
1296
return ((getattr(athing.__get__(self), "_dbus_name", name),
881
return ((getattr(athing.__get__(self), "_dbus_name",
1297
883
athing.__get__(self))
1298
884
for cls in self.__class__.__mro__
1299
885
for name, athing in
1300
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1302
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1304
path_keyword='object_path',
1305
connection_keyword='connection')
1306
def Introspect(self, object_path, connection):
1307
"""Overloading of standard D-Bus method.
1309
Inserts annotation tags on methods and signals.
1311
xmlstring = dbus.service.Object.Introspect(self, object_path,
1314
document = xml.dom.minidom.parseString(xmlstring)
1316
for if_tag in document.getElementsByTagName("interface"):
1317
# Add annotation tags
1318
for typ in ("method", "signal"):
1319
for tag in if_tag.getElementsByTagName(typ):
1321
for name, prop in (self.
1322
_get_all_dbus_things(typ)):
1323
if (name == tag.getAttribute("name")
1324
and prop._dbus_interface
1325
== if_tag.getAttribute("name")):
1326
annots.update(getattr(
1327
prop, "_dbus_annotations", {}))
1328
for name, value in annots.items():
1329
ann_tag = document.createElement(
1331
ann_tag.setAttribute("name", name)
1332
ann_tag.setAttribute("value", value)
1333
tag.appendChild(ann_tag)
1334
# Add interface annotation tags
1335
for annotation, value in dict(
1336
itertools.chain.from_iterable(
1337
annotations().items()
1338
for name, annotations
1339
in self._get_all_dbus_things("interface")
1340
if name == if_tag.getAttribute("name")
1342
ann_tag = document.createElement("annotation")
1343
ann_tag.setAttribute("name", annotation)
1344
ann_tag.setAttribute("value", value)
1345
if_tag.appendChild(ann_tag)
1346
# Fix argument name for the Introspect method itself
1347
if (if_tag.getAttribute("name")
1348
== dbus.INTROSPECTABLE_IFACE):
1349
for cn in if_tag.getElementsByTagName("method"):
1350
if cn.getAttribute("name") == "Introspect":
1351
for arg in cn.getElementsByTagName("arg"):
1352
if (arg.getAttribute("direction")
1354
arg.setAttribute("name",
1356
xmlstring = document.toxml("utf-8")
1358
except (AttributeError, xml.dom.DOMException,
1359
xml.parsers.expat.ExpatError) as error:
1360
logger.error("Failed to override Introspection method",
1365
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1366
"""A D-Bus object with properties.
1368
Classes inheriting from this can use the dbus_service_property
1369
decorator to expose methods as D-Bus properties. It exposes the
1370
standard Get(), Set(), and GetAll() methods on the D-Bus.
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
1373
889
def _get_dbus_property(self, interface_name, property_name):
1374
890
"""Returns a bound method if one exists which is a D-Bus
1375
891
property with the specified name and interface.
1377
for cls in self.__class__.__mro__:
1378
for name, value in inspect.getmembers(
1379
cls, self._is_dbus_thing("property")):
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
self._is_dbus_thing("property"))):
1380
897
if (value._dbus_name == property_name
1381
898
and value._dbus_interface == interface_name):
1382
899
return value.__get__(self)
1384
901
# No such property
1385
raise DBusPropertyNotFound("{}:{}.{}".format(
1386
self.dbus_object_path, interface_name, property_name))
1389
def _get_all_interface_names(cls):
1390
"""Get a sequence of all interfaces supported by an object"""
1391
return (name for name in set(getattr(getattr(x, attr),
1392
"_dbus_interface", None)
1393
for x in (inspect.getmro(cls))
1395
if name is not None)
1397
@dbus.service.method(dbus.PROPERTIES_IFACE,
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1399
907
out_signature="v")
1400
908
def Get(self, interface_name, property_name):
1401
909
"""Standard D-Bus property Get() method, see D-Bus standard.
1529
1039
return xmlstring
1533
dbus.OBJECT_MANAGER_IFACE
1534
except AttributeError:
1535
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1538
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1539
"""A D-Bus object with an ObjectManager.
1541
Classes inheriting from this exposes the standard
1542
GetManagedObjects call and the InterfacesAdded and
1543
InterfacesRemoved signals on the standard
1544
"org.freedesktop.DBus.ObjectManager" interface.
1546
Note: No signals are sent automatically; they must be sent
1549
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1550
out_signature="a{oa{sa{sv}}}")
1551
def GetManagedObjects(self):
1552
"""This function must be overridden"""
1553
raise NotImplementedError()
1555
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1556
signature="oa{sa{sv}}")
1557
def InterfacesAdded(self, object_path, interfaces_and_properties):
1560
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1561
def InterfacesRemoved(self, object_path, interfaces):
1564
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1566
path_keyword='object_path',
1567
connection_keyword='connection')
1568
def Introspect(self, object_path, connection):
1569
"""Overloading of standard D-Bus method.
1571
Override return argument name of GetManagedObjects to be
1572
"objpath_interfaces_and_properties"
1574
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1578
document = xml.dom.minidom.parseString(xmlstring)
1580
for if_tag in document.getElementsByTagName("interface"):
1581
# Fix argument name for the GetManagedObjects method
1582
if (if_tag.getAttribute("name")
1583
== dbus.OBJECT_MANAGER_IFACE):
1584
for cn in if_tag.getElementsByTagName("method"):
1585
if (cn.getAttribute("name")
1586
== "GetManagedObjects"):
1587
for arg in cn.getElementsByTagName("arg"):
1588
if (arg.getAttribute("direction")
1592
"objpath_interfaces"
1594
xmlstring = document.toxml("utf-8")
1596
except (AttributeError, xml.dom.DOMException,
1597
xml.parsers.expat.ExpatError) as error:
1598
logger.error("Failed to override Introspection method",
1603
1042
def datetime_to_dbus(dt, variant_level=0):
1604
1043
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1606
return dbus.String("", variant_level=variant_level)
1607
return dbus.String(dt.isoformat(), variant_level=variant_level)
1045
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1610
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1971
1403
server to mandos-client
1975
1407
# Rejected - signal
1976
1408
@dbus.service.signal(_interface, signature="s")
1977
1409
def Rejected(self, reason):
1981
1413
# NeedApproval - signal
1982
1414
@dbus.service.signal(_interface, signature="tb")
1983
1415
def NeedApproval(self, timeout, default):
1985
1417
return self.need_approval()
1989
1421
# Approve - method
1990
1422
@dbus.service.method(_interface, in_signature="b")
1991
1423
def Approve(self, value):
1992
1424
self.approve(value)
1994
1426
# CheckedOK - method
1995
1427
@dbus.service.method(_interface)
1996
1428
def CheckedOK(self):
1997
1429
self.checked_ok()
1999
1431
# Enable - method
2000
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2001
1432
@dbus.service.method(_interface)
2002
1433
def Enable(self):
2006
1437
# StartChecker - method
2007
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2008
1438
@dbus.service.method(_interface)
2009
1439
def StartChecker(self):
2011
1441
self.start_checker()
2013
1443
# Disable - method
2014
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2015
1444
@dbus.service.method(_interface)
2016
1445
def Disable(self):
2020
1449
# StopChecker - method
2021
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2022
1450
@dbus.service.method(_interface)
2023
1451
def StopChecker(self):
2024
1452
self.stop_checker()
2028
1456
# ApprovalPending - property
2029
1457
@dbus_service_property(_interface, signature="b", access="read")
2030
1458
def ApprovalPending_dbus_property(self):
2031
1459
return dbus.Boolean(bool(self.approvals_pending))
2033
1461
# ApprovedByDefault - property
2034
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="b",
2036
1463
access="readwrite")
2037
1464
def ApprovedByDefault_dbus_property(self, value=None):
2038
1465
if value is None: # get
2039
1466
return dbus.Boolean(self.approved_by_default)
2040
1467
self.approved_by_default = bool(value)
2042
1469
# ApprovalDelay - property
2043
@dbus_service_property(_interface,
1470
@dbus_service_property(_interface, signature="t",
2045
1471
access="readwrite")
2046
1472
def ApprovalDelay_dbus_property(self, value=None):
2047
1473
if value is None: # get
2048
return dbus.UInt64(self.approval_delay.total_seconds()
1474
return dbus.UInt64(self.approval_delay_milliseconds())
2050
1475
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2052
1477
# ApprovalDuration - property
2053
@dbus_service_property(_interface,
1478
@dbus_service_property(_interface, signature="t",
2055
1479
access="readwrite")
2056
1480
def ApprovalDuration_dbus_property(self, value=None):
2057
1481
if value is None: # get
2058
return dbus.UInt64(self.approval_duration.total_seconds()
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
2060
1484
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2062
1486
# Name - property
2064
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2065
1487
@dbus_service_property(_interface, signature="s", access="read")
2066
1488
def Name_dbus_property(self):
2067
1489
return dbus.String(self.name)
2071
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2072
@dbus_service_property(_interface, signature="s", access="read")
2073
def KeyID_dbus_property(self):
2074
return dbus.String(self.key_id)
2076
1491
# Fingerprint - property
2078
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2079
1492
@dbus_service_property(_interface, signature="s", access="read")
2080
1493
def Fingerprint_dbus_property(self):
2081
1494
return dbus.String(self.fingerprint)
2083
1496
# Host - property
2084
@dbus_service_property(_interface,
1497
@dbus_service_property(_interface, signature="s",
2086
1498
access="readwrite")
2087
1499
def Host_dbus_property(self, value=None):
2088
1500
if value is None: # get
2089
1501
return dbus.String(self.host)
2090
self.host = str(value)
1502
self.host = unicode(value)
2092
1504
# Created - property
2094
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2095
1505
@dbus_service_property(_interface, signature="s", access="read")
2096
1506
def Created_dbus_property(self):
2097
1507
return datetime_to_dbus(self.created)
2099
1509
# LastEnabled - property
2100
1510
@dbus_service_property(_interface, signature="s", access="read")
2101
1511
def LastEnabled_dbus_property(self):
2102
1512
return datetime_to_dbus(self.last_enabled)
2104
1514
# Enabled - property
2105
@dbus_service_property(_interface,
1515
@dbus_service_property(_interface, signature="b",
2107
1516
access="readwrite")
2108
1517
def Enabled_dbus_property(self, value=None):
2109
1518
if value is None: # get
2158
1566
if (getattr(self, "disable_initiator_tag", None)
2161
GLib.source_remove(self.disable_initiator_tag)
2162
self.disable_initiator_tag = GLib.timeout_add(
2163
int((self.expires - now).total_seconds() * 1000),
1569
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
2166
1575
# ExtendedTimeout - property
2167
@dbus_service_property(_interface,
1576
@dbus_service_property(_interface, signature="t",
2169
1577
access="readwrite")
2170
1578
def ExtendedTimeout_dbus_property(self, value=None):
2171
1579
if value is None: # get
2172
return dbus.UInt64(self.extended_timeout.total_seconds()
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
2174
1581
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2176
1583
# Interval - property
2177
@dbus_service_property(_interface,
1584
@dbus_service_property(_interface, signature="t",
2179
1585
access="readwrite")
2180
1586
def Interval_dbus_property(self, value=None):
2181
1587
if value is None: # get
2182
return dbus.UInt64(self.interval.total_seconds() * 1000)
1588
return dbus.UInt64(self.interval_milliseconds())
2183
1589
self.interval = datetime.timedelta(0, 0, 0, value)
2184
1590
if getattr(self, "checker_initiator_tag", None) is None:
2186
1592
if self.enabled:
2187
1593
# Reschedule checker run
2188
GLib.source_remove(self.checker_initiator_tag)
2189
self.checker_initiator_tag = GLib.timeout_add(
2190
value, self.start_checker)
2191
self.start_checker() # Start one now, too
1594
gobject.source_remove(self.checker_initiator_tag)
1595
self.checker_initiator_tag = (gobject.timeout_add
1596
(value, self.start_checker))
1597
self.start_checker() # Start one now, too
2193
1599
# Checker - property
2194
@dbus_service_property(_interface,
1600
@dbus_service_property(_interface, signature="s",
2196
1601
access="readwrite")
2197
1602
def Checker_dbus_property(self, value=None):
2198
1603
if value is None: # get
2199
1604
return dbus.String(self.checker_command)
2200
self.checker_command = str(value)
1605
self.checker_command = unicode(value)
2202
1607
# CheckerRunning - property
2203
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="b",
2205
1609
access="readwrite")
2206
1610
def CheckerRunning_dbus_property(self, value=None):
2207
1611
if value is None: # get
2264
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
2265
1659
"""A class to handle client connections.
2267
1661
Instantiated once for each connection to handle it.
2268
1662
Note: This will run in its own forked process."""
2270
1664
def handle(self):
2271
1665
with contextlib.closing(self.server.child_pipe) as child_pipe:
2272
1666
logger.info("TCP connection from: %s",
2273
str(self.client_address))
1667
unicode(self.client_address))
2274
1668
logger.debug("Pipe FD: %d",
2275
1669
self.server.child_pipe.fileno())
2277
session = gnutls.ClientSession(self.request)
2279
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2280
# "+AES-256-CBC", "+SHA1",
2281
# "+COMP-NULL", "+CTYPE-OPENPGP",
1671
session = (gnutls.connection
1672
.ClientSession(self.request,
1674
.X509Credentials()))
1676
# Note: gnutls.connection.X509Credentials is really a
1677
# generic GnuTLS certificate credentials object so long as
1678
# no X.509 keys are added to it. Therefore, we can use it
1679
# here despite using OpenPGP certificates.
1681
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1682
# "+AES-256-CBC", "+SHA1",
1683
# "+COMP-NULL", "+CTYPE-OPENPGP",
2283
1685
# Use a fallback default, since this MUST be set.
2284
1686
priority = self.server.gnutls_priority
2285
1687
if priority is None:
2286
1688
priority = "NORMAL"
2287
gnutls.priority_set_direct(session._c_object,
2288
priority.encode("utf-8"),
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
2291
1693
# Start communication using the Mandos protocol
2292
1694
# Get protocol number
2293
1695
line = self.request.makefile().readline()
2294
1696
logger.debug("Protocol version: %r", line)
2296
1698
if int(line.strip().split()[0]) > 1:
2297
raise RuntimeError(line)
2298
1700
except (ValueError, IndexError, RuntimeError) as error:
2299
1701
logger.error("Unknown protocol version: %s", error)
2302
1704
# Start GnuTLS connection
2304
1706
session.handshake()
2305
except gnutls.Error as error:
1707
except gnutls.errors.GNUTLSError as error:
2306
1708
logger.warning("Handshake failed: %s", error)
2307
1709
# Do not run session.bye() here: the session is not
2308
1710
# established. Just abandon the request.
2310
1712
logger.debug("Handshake succeeded")
2312
1714
approval_required = False
2314
if gnutls.has_rawpk:
2317
key_id = self.key_id(
2318
self.peer_certificate(session))
2319
except (TypeError, gnutls.Error) as error:
2320
logger.warning("Bad certificate: %s", error)
2322
logger.debug("Key ID: %s", key_id)
2327
fpr = self.fingerprint(
2328
self.peer_certificate(session))
2329
except (TypeError, gnutls.Error) as error:
2330
logger.warning("Bad certificate: %s", error)
2332
logger.debug("Fingerprint: %s", fpr)
2335
client = ProxyClient(child_pipe, key_id, fpr,
1717
fpr = self.fingerprint(self.peer_certificate
1720
gnutls.errors.GNUTLSError) as error:
1721
logger.warning("Bad certificate: %s", error)
1723
logger.debug("Fingerprint: %s", fpr)
1726
client = ProxyClient(child_pipe, fpr,
2336
1727
self.client_address)
2337
1728
except KeyError:
2340
1731
if client.approval_delay:
2341
1732
delay = client.approval_delay
2342
1733
client.approvals_pending += 1
2343
1734
approval_required = True
2346
1737
if not client.enabled:
2347
1738
logger.info("Client %s is disabled",
2349
1740
if self.server.use_dbus:
2350
1741
# Emit D-Bus signal
2351
1742
client.Rejected("Disabled")
2354
1745
if client.approved or not client.approval_delay:
2355
# We are approved or approval is disabled
1746
#We are approved or approval is disabled
2357
1748
elif client.approved is None:
2358
1749
logger.info("Client %s needs approval",
2391
1784
delay -= time2 - time
2394
session.send(client.secret)
2395
except gnutls.Error as error:
2396
logger.warning("gnutls send failed",
1787
while sent_size < len(client.secret):
1789
sent = session.send(client.secret[sent_size:])
1790
except gnutls.errors.GNUTLSError as error:
1791
logger.warning("gnutls send failed",
1794
logger.debug("Sent: %d, remaining: %d",
1795
sent, len(client.secret)
1796
- (sent_size + sent))
2400
1799
logger.info("Sending secret to %s", client.name)
2401
1800
# bump the timeout using extended_timeout
2402
1801
client.bump_timeout(client.extended_timeout)
2403
1802
if self.server.use_dbus:
2404
1803
# Emit D-Bus signal
2405
1804
client.GotSecret()
2408
1807
if approval_required:
2409
1808
client.approvals_pending -= 1
2412
except gnutls.Error as error:
1811
except gnutls.errors.GNUTLSError as error:
2413
1812
logger.warning("GnuTLS bye failed",
2414
1813
exc_info=error)
2417
1816
def peer_certificate(session):
2418
"Return the peer's certificate as a bytestring"
2420
cert_type = gnutls.certificate_type_get2(session._c_object,
2422
except AttributeError:
2423
cert_type = gnutls.certificate_type_get(session._c_object)
2424
if gnutls.has_rawpk:
2425
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2427
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2428
# If not a valid certificate type...
2429
if cert_type not in valid_cert_types:
2430
logger.info("Cert type %r not in %r", cert_type,
2432
# ...return invalid data
1817
"Return the peer's OpenPGP certificate as a bytestring"
1818
# If not an OpenPGP certificate...
1819
if (gnutls.library.functions
1820
.gnutls_certificate_type_get(session._c_object)
1821
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1822
# ...do the normal thing
1823
return session.peer_certificate
2434
1824
list_size = ctypes.c_uint(1)
2435
cert_list = (gnutls.certificate_get_peers
1825
cert_list = (gnutls.library.functions
1826
.gnutls_certificate_get_peers
2436
1827
(session._c_object, ctypes.byref(list_size)))
2437
1828
if not bool(cert_list) and list_size.value != 0:
2438
raise gnutls.Error("error getting peer certificate")
1829
raise gnutls.errors.GNUTLSError("error getting peer"
2439
1831
if list_size.value == 0:
2441
1833
cert = cert_list[0]
2442
1834
return ctypes.string_at(cert.data, cert.size)
2445
def key_id(certificate):
2446
"Convert a certificate bytestring to a hexdigit key ID"
2447
# New GnuTLS "datum" with the public key
2448
datum = gnutls.datum_t(
2449
ctypes.cast(ctypes.c_char_p(certificate),
2450
ctypes.POINTER(ctypes.c_ubyte)),
2451
ctypes.c_uint(len(certificate)))
2452
# XXX all these need to be created in the gnutls "module"
2453
# New empty GnuTLS certificate
2454
pubkey = gnutls.pubkey_t()
2455
gnutls.pubkey_init(ctypes.byref(pubkey))
2456
# Import the raw public key into the certificate
2457
gnutls.pubkey_import(pubkey,
2458
ctypes.byref(datum),
2459
gnutls.X509_FMT_DER)
2460
# New buffer for the key ID
2461
buf = ctypes.create_string_buffer(32)
2462
buf_len = ctypes.c_size_t(len(buf))
2463
# Get the key ID from the raw public key into the buffer
2464
gnutls.pubkey_get_key_id(pubkey,
2465
gnutls.KEYID_USE_SHA256,
2466
ctypes.cast(ctypes.byref(buf),
2467
ctypes.POINTER(ctypes.c_ubyte)),
2468
ctypes.byref(buf_len))
2469
# Deinit the certificate
2470
gnutls.pubkey_deinit(pubkey)
2472
# Convert the buffer to a Python bytestring
2473
key_id = ctypes.string_at(buf, buf_len.value)
2474
# Convert the bytestring to hexadecimal notation
2475
hex_key_id = binascii.hexlify(key_id).upper()
2479
1837
def fingerprint(openpgp):
2480
1838
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2481
1839
# New GnuTLS "datum" with the OpenPGP public key
2482
datum = gnutls.datum_t(
2483
ctypes.cast(ctypes.c_char_p(openpgp),
2484
ctypes.POINTER(ctypes.c_ubyte)),
2485
ctypes.c_uint(len(openpgp)))
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
2486
1845
# New empty GnuTLS certificate
2487
crt = gnutls.openpgp_crt_t()
2488
gnutls.openpgp_crt_init(ctypes.byref(crt))
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2489
1849
# Import the OpenPGP public key into the certificate
2490
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2491
gnutls.OPENPGP_FMT_RAW)
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
2492
1854
# Verify the self signature in the key
2493
1855
crtverify = ctypes.c_uint()
2494
gnutls.openpgp_crt_verify_self(crt, 0,
2495
ctypes.byref(crtverify))
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2496
1859
if crtverify.value != 0:
2497
gnutls.openpgp_crt_deinit(crt)
2498
raise gnutls.CertificateSecurityError(code
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2500
1863
# New buffer for the fingerprint
2501
1864
buf = ctypes.create_string_buffer(20)
2502
1865
buf_len = ctypes.c_size_t()
2503
1866
# Get the fingerprint from the certificate into the buffer
2504
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2505
ctypes.byref(buf_len))
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2506
1870
# Deinit the certificate
2507
gnutls.openpgp_crt_deinit(crt)
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2508
1872
# Convert the buffer to a Python bytestring
2509
1873
fpr = ctypes.string_at(buf, buf_len.value)
2510
1874
# Convert the bytestring to hexadecimal notation
2599
1957
# socket_wrapper(), if socketfd was set.
2600
1958
socketserver.TCPServer.__init__(self, server_address,
2601
1959
RequestHandlerClass)
2603
1961
def server_bind(self):
2604
1962
"""This overrides the normal server_bind() function
2605
1963
to bind to an interface if one was specified, and also NOT to
2606
1964
bind to an address or port if they were not specified."""
2607
global SO_BINDTODEVICE
2608
1965
if self.interface is not None:
2609
1966
if SO_BINDTODEVICE is None:
2610
# Fall back to a hard-coded value which seems to be
2612
logger.warning("SO_BINDTODEVICE not found, trying 25")
2613
SO_BINDTODEVICE = 25
2615
self.socket.setsockopt(
2616
socket.SOL_SOCKET, SO_BINDTODEVICE,
2617
(self.interface + "\0").encode("utf-8"))
2618
except socket.error as error:
2619
if error.errno == errno.EPERM:
2620
logger.error("No permission to bind to"
2621
" interface %s", self.interface)
2622
elif error.errno == errno.ENOPROTOOPT:
2623
logger.error("SO_BINDTODEVICE not available;"
2624
" cannot bind to interface %s",
2626
elif error.errno == errno.ENODEV:
2627
logger.error("Interface %s does not exist,"
2628
" cannot bind", self.interface)
1967
logger.error("SO_BINDTODEVICE does not exist;"
1968
" cannot bind to interface %s",
1972
self.socket.setsockopt(socket.SOL_SOCKET,
1974
str(self.interface + '\0'))
1975
except socket.error as error:
1976
if error.errno == errno.EPERM:
1977
logger.error("No permission to bind to"
1978
" interface %s", self.interface)
1979
elif error.errno == errno.ENOPROTOOPT:
1980
logger.error("SO_BINDTODEVICE not available;"
1981
" cannot bind to interface %s",
1983
elif error.errno == errno.ENODEV:
1984
logger.error("Interface %s does not exist,"
1985
" cannot bind", self.interface)
2631
1988
# Only bind(2) the socket if we really need to.
2632
1989
if self.server_address[0] or self.server_address[1]:
2633
if self.server_address[1]:
2634
self.allow_reuse_address = True
2635
1990
if not self.server_address[0]:
2636
1991
if self.address_family == socket.AF_INET6:
2637
any_address = "::" # in6addr_any
1992
any_address = "::" # in6addr_any
2639
any_address = "0.0.0.0" # INADDR_ANY
1994
any_address = "0.0.0.0" # INADDR_ANY
2640
1995
self.server_address = (any_address,
2641
1996
self.server_address[1])
2642
1997
elif not self.server_address[1]:
2643
self.server_address = (self.server_address[0], 0)
1998
self.server_address = (self.server_address[0],
2644
2000
# if self.interface:
2645
2001
# self.server_address = (self.server_address[0],
2676
2027
self.gnutls_priority = gnutls_priority
2677
2028
IPv6_TCPServer.__init__(self, server_address,
2678
2029
RequestHandlerClass,
2679
interface=interface,
2030
interface = interface,
2031
use_ipv6 = use_ipv6,
2032
socketfd = socketfd)
2683
2033
def server_activate(self):
2684
2034
if self.enabled:
2685
2035
return socketserver.TCPServer.server_activate(self)
2687
2037
def enable(self):
2688
2038
self.enabled = True
2690
2040
def add_pipe(self, parent_pipe, proc):
2691
2041
# Call "handle_ipc" for both data and EOF events
2693
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2694
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2695
functools.partial(self.handle_ipc,
2696
parent_pipe=parent_pipe,
2699
def handle_ipc(self, source, condition,
2702
client_object=None):
2042
gobject.io_add_watch(parent_pipe.fileno(),
2043
gobject.IO_IN | gobject.IO_HUP,
2044
functools.partial(self.handle_ipc,
2049
def handle_ipc(self, source, condition, parent_pipe=None,
2050
proc = None, client_object=None):
2703
2051
# error, or the other end of multiprocessing.Pipe has closed
2704
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2052
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2705
2053
# Wait for other process to exit
2709
2057
# Read a request from the child
2710
2058
request = parent_pipe.recv()
2711
2059
command = request[0]
2713
2061
if command == 'init':
2714
key_id = request[1].decode("ascii")
2715
fpr = request[2].decode("ascii")
2716
address = request[3]
2718
for c in self.clients.values():
2719
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2721
if key_id and c.key_id == key_id:
2724
if fpr and c.fingerprint == fpr:
2063
address = request[2]
2065
for c in self.clients.itervalues():
2066
if c.fingerprint == fpr:
2728
logger.info("Client not found for key ID: %s, address"
2729
": %s", key_id or fpr, address)
2070
logger.info("Client not found for fingerprint: %s, ad"
2071
"dress: %s", fpr, address)
2730
2072
if self.use_dbus:
2731
2073
# Emit D-Bus signal
2732
mandos_dbus_service.ClientNotFound(key_id or fpr,
2074
mandos_dbus_service.ClientNotFound(fpr,
2734
2076
parent_pipe.send(False)
2738
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2739
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2740
functools.partial(self.handle_ipc,
2741
parent_pipe=parent_pipe,
2743
client_object=client))
2079
gobject.io_add_watch(parent_pipe.fileno(),
2080
gobject.IO_IN | gobject.IO_HUP,
2081
functools.partial(self.handle_ipc,
2744
2087
parent_pipe.send(True)
2745
2088
# remove the old hook in favor of the new above hook on
2749
2092
funcname = request[1]
2750
2093
args = request[2]
2751
2094
kwargs = request[3]
2753
2096
parent_pipe.send(('data', getattr(client_object,
2754
2097
funcname)(*args,
2757
2100
if command == 'getattr':
2758
2101
attrname = request[1]
2759
if isinstance(client_object.__getattribute__(attrname),
2760
collections.abc.Callable):
2761
parent_pipe.send(('function', ))
2102
if callable(client_object.__getattribute__(attrname)):
2103
parent_pipe.send(('function',))
2764
'data', client_object.__getattribute__(attrname)))
2105
parent_pipe.send(('data', client_object
2106
.__getattribute__(attrname)))
2766
2108
if command == 'setattr':
2767
2109
attrname = request[1]
2768
2110
value = request[2]
2769
2111
setattr(client_object, attrname, value)
2774
2116
def rfc3339_duration_to_delta(duration):
2775
2117
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2777
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2779
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2781
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2783
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2785
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2787
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2789
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2119
>>> rfc3339_duration_to_delta("P7D")
2120
datetime.timedelta(7)
2121
>>> rfc3339_duration_to_delta("PT60S")
2122
datetime.timedelta(0, 60)
2123
>>> rfc3339_duration_to_delta("PT60M")
2124
datetime.timedelta(0, 3600)
2125
>>> rfc3339_duration_to_delta("PT24H")
2126
datetime.timedelta(1)
2127
>>> rfc3339_duration_to_delta("P1W")
2128
datetime.timedelta(7)
2129
>>> rfc3339_duration_to_delta("PT5M30S")
2130
datetime.timedelta(0, 330)
2131
>>> rfc3339_duration_to_delta("P1DT3M20S")
2132
datetime.timedelta(1, 200)
2793
2135
# Parsing an RFC 3339 duration with regular expressions is not
2794
2136
# possible - there would have to be multiple places for the same
2795
2137
# values, like seconds. The current code, while more esoteric, is
2796
2138
# cleaner without depending on a parsing library. If Python had a
2797
2139
# built-in library for parsing we would use it, but we'd like to
2798
2140
# avoid excessive use of external libraries.
2800
2142
# New type for defining tokens, syntax, and semantics all-in-one
2801
Token = collections.namedtuple("Token", (
2802
"regexp", # To match token; if "value" is not None, must have
2803
# a "group" containing digits
2804
"value", # datetime.timedelta or None
2805
"followers")) # Tokens valid after this token
2143
Token = collections.namedtuple("Token",
2144
("regexp", # To match token; if
2145
# "value" is not None,
2146
# must have a "group"
2148
"value", # datetime.timedelta or
2150
"followers")) # Tokens valid after
2806
2152
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2807
2153
# the "duration" ABNF definition in RFC 3339, Appendix A.
2808
2154
token_end = Token(re.compile(r"$"), None, frozenset())
2809
2155
token_second = Token(re.compile(r"(\d+)S"),
2810
2156
datetime.timedelta(seconds=1),
2811
frozenset((token_end, )))
2157
frozenset((token_end,)))
2812
2158
token_minute = Token(re.compile(r"(\d+)M"),
2813
2159
datetime.timedelta(minutes=1),
2814
2160
frozenset((token_second, token_end)))
3146
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3148
2474
except OSError as error:
3149
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3150
.format(uid, gid, os.strerror(error.errno)))
3151
2475
if error.errno != errno.EPERM:
3155
2479
# Enable all possible GnuTLS debugging
3157
2481
# "Use a log level over 10 to enable all debugging options."
3158
2482
# - GnuTLS manual
3159
gnutls.global_set_log_level(11)
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
2485
@gnutls.library.types.gnutls_log_func
3162
2486
def debug_gnutls(level, string):
3163
2487
logger.debug("GnuTLS: %s", string[:-1])
3165
gnutls.global_set_log_function(debug_gnutls)
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
3167
2492
# Redirect stdin so all checkers get /dev/null
3168
2493
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3169
2494
os.dup2(null, sys.stdin.fileno())
3173
2498
# Need to fork before connecting to D-Bus
3174
2499
if not foreground:
3175
2500
# Close all input and output, do double fork, etc.
3178
if gi.version_info < (3, 10, 2):
3179
# multiprocessing will use threads, so before we use GLib we
3180
# need to inform GLib that threads will be used.
2503
# multiprocessing will use threads, so before we use gobject we
2504
# need to inform gobject that threads will be used.
2505
gobject.threads_init()
3183
2507
global main_loop
3184
2508
# From the Avahi example code
3185
2509
DBusGMainLoop(set_as_default=True)
3186
main_loop = GLib.MainLoop()
2510
main_loop = gobject.MainLoop()
3187
2511
bus = dbus.SystemBus()
3188
2512
# End of Avahi example code
3191
2515
bus_name = dbus.service.BusName("se.recompile.Mandos",
3194
old_bus_name = dbus.service.BusName(
3195
"se.bsnet.fukt.Mandos", bus,
3197
except dbus.exceptions.DBusException as e:
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2520
except dbus.exceptions.NameExistsException as e:
3198
2521
logger.error("Disabling D-Bus:", exc_info=e)
3199
2522
use_dbus = False
3200
2523
server_settings["use_dbus"] = False
3201
2524
tcp_server.use_dbus = False
3203
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3204
service = AvahiServiceToSyslog(
3205
name=server_settings["servicename"],
3206
servicetype="_mandos._tcp",
3209
if server_settings["interface"]:
3210
service.interface = if_nametoindex(
3211
server_settings["interface"].encode("utf-8"))
2525
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2526
service = AvahiServiceToSyslog(name =
2527
server_settings["servicename"],
2528
servicetype = "_mandos._tcp",
2529
protocol = protocol, bus = bus)
2530
if server_settings["interface"]:
2531
service.interface = (if_nametoindex
2532
(str(server_settings["interface"])))
3213
2534
global multiprocessing_manager
3214
2535
multiprocessing_manager = multiprocessing.Manager()
3216
2537
client_class = Client
3218
client_class = functools.partial(ClientDBus, bus=bus)
2539
client_class = functools.partial(ClientDBus, bus = bus)
3220
2541
client_settings = Client.config_parser(client_config)
3221
2542
old_client_settings = {}
3222
2543
clients_data = {}
3224
2545
# This is used to redirect stdout and stderr for checker processes
3226
wnull = open(os.devnull, "w") # A writable /dev/null
2547
wnull = open(os.devnull, "w") # A writable /dev/null
3227
2548
# Only used if server is running in foreground but not in debug
3229
2550
if debug or not foreground:
3232
2553
# Get client data and settings from last running state.
3233
2554
if server_settings["restore"]:
3235
2556
with open(stored_state_path, "rb") as stored_state:
3236
if sys.version_info.major == 2:
3237
clients_data, old_client_settings = pickle.load(
3240
bytes_clients_data, bytes_old_client_settings = (
3241
pickle.load(stored_state, encoding="bytes"))
3242
# Fix bytes to strings
3245
clients_data = {(key.decode("utf-8")
3246
if isinstance(key, bytes)
3249
bytes_clients_data.items()}
3250
del bytes_clients_data
3251
for key in clients_data:
3252
value = {(k.decode("utf-8")
3253
if isinstance(k, bytes) else k): v
3255
clients_data[key].items()}
3256
clients_data[key] = value
3258
value["client_structure"] = [
3260
if isinstance(s, bytes)
3262
value["client_structure"]]
3263
# .name, .host, and .checker_command
3264
for k in ("name", "host", "checker_command"):
3265
if isinstance(value[k], bytes):
3266
value[k] = value[k].decode("utf-8")
3267
if "key_id" not in value:
3268
value["key_id"] = ""
3269
elif "fingerprint" not in value:
3270
value["fingerprint"] = ""
3271
# old_client_settings
3273
old_client_settings = {
3274
(key.decode("utf-8")
3275
if isinstance(key, bytes)
3278
bytes_old_client_settings.items()}
3279
del bytes_old_client_settings
3280
# .host and .checker_command
3281
for value in old_client_settings.values():
3282
for attribute in ("host", "checker_command"):
3283
if isinstance(value[attribute], bytes):
3284
value[attribute] = (value[attribute]
2557
clients_data, old_client_settings = (pickle.load
3286
2559
os.remove(stored_state_path)
3287
2560
except IOError as e:
3288
2561
if e.errno == errno.ENOENT:
3289
logger.warning("Could not load persistent state:"
3290
" {}".format(os.strerror(e.errno)))
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
3292
2565
logger.critical("Could not load persistent state:",
3295
2568
except EOFError as e:
3296
2569
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
3300
2572
with PGPEngine() as pgp:
3301
for client_name, client in clients_data.items():
2573
for client_name, client in clients_data.iteritems():
3302
2574
# Skip removed clients
3303
2575
if client_name not in client_settings:
3306
2578
# Decide which value to use after restoring saved state.
3307
2579
# We have three different values: Old config file,
3308
2580
# new config file, and saved state.
3366
2638
for client_name in (set(client_settings)
3367
2639
- set(old_client_settings)):
3368
2640
clients_data[client_name] = client_settings[client_name]
3370
2642
# Create all client objects
3371
for client_name, client in clients_data.items():
2643
for client_name, client in clients_data.iteritems():
3372
2644
tcp_server.clients[client_name] = client_class(
3375
server_settings=server_settings)
2645
name = client_name, settings = client,
2646
server_settings = server_settings)
3377
2648
if not tcp_server.clients:
3378
2649
logger.warning("No clients defined")
3380
2651
if not foreground:
3381
2652
if pidfile is not None:
3385
print(pid, file=pidfile)
2656
pidfile.write(str(pid) + "\n".encode("utf-8"))
3386
2657
except IOError:
3387
2658
logger.error("Could not write to file %r with PID %d",
3388
2659
pidfilename, pid)
3390
2661
del pidfilename
3392
for termsig in (signal.SIGHUP, signal.SIGTERM):
3393
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3394
lambda: main_loop.quit() and False)
2663
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3398
@alternate_dbus_interfaces(
3399
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3400
class MandosDBusService(DBusObjectWithObjectManager):
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2669
class MandosDBusService(DBusObjectWithProperties):
3401
2670
"""A D-Bus proxy object"""
3403
2671
def __init__(self):
3404
2672
dbus.service.Object.__init__(self, bus, "/")
3406
2673
_interface = "se.recompile.Mandos"
2675
@dbus_interface_annotations(_interface)
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
3408
2681
@dbus.service.signal(_interface, signature="o")
3409
2682
def ClientAdded(self, objpath):
3413
2686
@dbus.service.signal(_interface, signature="ss")
3414
def ClientNotFound(self, key_id, address):
2687
def ClientNotFound(self, fingerprint, address):
3418
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3420
2691
@dbus.service.signal(_interface, signature="os")
3421
2692
def ClientRemoved(self, objpath, name):
3425
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3427
2696
@dbus.service.method(_interface, out_signature="ao")
3428
2697
def GetAllClients(self):
3430
return dbus.Array(c.dbus_object_path for c in
3431
tcp_server.clients.values())
3433
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2699
return dbus.Array(c.dbus_object_path
2701
tcp_server.clients.itervalues())
3435
2703
@dbus.service.method(_interface,
3436
2704
out_signature="a{oa{sv}}")
3437
2705
def GetAllClientsWithProperties(self):
3439
2707
return dbus.Dictionary(
3440
{c.dbus_object_path: c.GetAll(
3441
"se.recompile.Mandos.Client")
3442
for c in tcp_server.clients.values()},
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
3443
2710
signature="oa{sv}")
3445
2712
@dbus.service.method(_interface, in_signature="o")
3446
2713
def RemoveClient(self, object_path):
3448
for c in tcp_server.clients.values():
2715
for c in tcp_server.clients.itervalues():
3449
2716
if c.dbus_object_path == object_path:
3450
2717
del tcp_server.clients[c.name]
3451
2718
c.remove_from_connection()
3452
# Don't signal the disabling
2719
# Don't signal anything except ClientRemoved
3453
2720
c.disable(quiet=True)
3454
# Emit D-Bus signal for removal
3455
self.client_removed_signal(c)
2722
self.ClientRemoved(object_path, c.name)
3457
2724
raise KeyError(object_path)
3461
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3462
out_signature="a{oa{sa{sv}}}")
3463
def GetManagedObjects(self):
3465
return dbus.Dictionary(
3466
{client.dbus_object_path:
3468
{interface: client.GetAll(interface)
3470
client._get_all_interface_names()})
3471
for client in tcp_server.clients.values()})
3473
def client_added_signal(self, client):
3474
"""Send the new standard signal and the old signal"""
3476
# New standard signal
3477
self.InterfacesAdded(
3478
client.dbus_object_path,
3480
{interface: client.GetAll(interface)
3482
client._get_all_interface_names()}))
3484
self.ClientAdded(client.dbus_object_path)
3486
def client_removed_signal(self, client):
3487
"""Send the new standard signal and the old signal"""
3489
# New standard signal
3490
self.InterfacesRemoved(
3491
client.dbus_object_path,
3492
client._get_all_interface_names())
3494
self.ClientRemoved(client.dbus_object_path,
3497
2728
mandos_dbus_service = MandosDBusService()
3499
# Save modules to variables to exempt the modules from being
3500
# unloaded before the function registered with atexit() is run.
3501
mp = multiprocessing
3505
2731
"Cleanup function; run on exit"
3509
mp.active_children()
2734
multiprocessing.active_children()
3511
2736
if not (tcp_server.clients or client_settings):
3514
2739
# Store client before exiting. Secrets are encrypted with key
3515
2740
# based on what config file has. If config file is
3516
2741
# removed/edited, old secret will thus be unrecovable.
3518
2743
with PGPEngine() as pgp:
3519
for client in tcp_server.clients.values():
2744
for client in tcp_server.clients.itervalues():
3520
2745
key = client_settings[client.name]["secret"]
3521
2746
client.encrypted_secret = pgp.encrypt(client.secret,
3523
2748
client_dict = {}
3525
2750
# A list of attributes that can not be pickled
3527
exclude = {"bus", "changedstate", "secret",
3528
"checker", "server_settings"}
3529
for name, typ in inspect.getmembers(dbus.service
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
3531
2756
exclude.add(name)
3533
2758
client_dict["encrypted_secret"] = (client
3534
2759
.encrypted_secret)
3535
2760
for attr in client.client_structure:
3536
2761
if attr not in exclude:
3537
2762
client_dict[attr] = getattr(client, attr)
3539
2764
clients[client.name] = client_dict
3540
2765
del client_settings[client.name]["secret"]
3543
with tempfile.NamedTemporaryFile(
3547
dir=os.path.dirname(stored_state_path),
3548
delete=False) as stored_state:
3549
pickle.dump((clients, client_settings), stored_state,
3551
tempname = stored_state.name
2768
with (tempfile.NamedTemporaryFile
2769
(mode='wb', suffix=".pickle", prefix='clients-',
2770
dir=os.path.dirname(stored_state_path),
2771
delete=False)) as stored_state:
2772
pickle.dump((clients, client_settings), stored_state)
2773
tempname=stored_state.name
3552
2774
os.rename(tempname, stored_state_path)
3553
2775
except (IOError, OSError) as e: