2
# -*- mode: python; coding: utf-8 -*-
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 -*-
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-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
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
19
21
# the Free Software Foundation, either version 3 of the License, or
20
22
# (at your option) any later version.
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
24
26
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25
27
# GNU General Public License for more details.
27
29
# You should have received a copy of the GNU General Public License
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
31
32
# Contact the authors at <mandos@recompile.se>.
34
35
from __future__ import (division, absolute_import, print_function,
37
from future_builtins import *
39
from future_builtins import *
39
import SocketServer as socketserver
44
import SocketServer as socketserver
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
52
import ConfigParser as configparser
65
import cPickle as pickle
70
import cPickle as pickle
66
73
import multiprocessing
74
84
import dbus.service
86
from gi.repository import GLib
77
87
from dbus.mainloop.glib import DBusGMainLoop
80
90
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:
84
115
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
116
except AttributeError:
118
# This is where SO_BINDTODEVICE was up to and including Python
87
120
from IN import SO_BINDTODEVICE
88
121
except ImportError:
89
SO_BINDTODEVICE = None
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
92
140
stored_state_file = "clients.pickle"
94
142
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
143
logging.captureWarnings(True) # Show warnings via the logging system
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
147
if_nametoindex = ctypes.cdll.LoadLibrary(
148
ctypes.util.find_library("c")).if_nametoindex
103
149
except (OSError, AttributeError):
104
151
def if_nametoindex(interface):
105
152
"Get an interface index the hard way, i.e. using fcntl()"
106
153
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
154
with contextlib.closing(socket.socket()) as s:
108
155
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
156
struct.pack(b"16s16x", interface))
157
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
158
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__,
116
177
def initlogger(debug, level=logging.WARNING):
117
178
"""init logger and add loglevel"""
181
syslogger = (logging.handlers.SysLogHandler(
182
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
119
184
syslogger.setFormatter(logging.Formatter
120
185
('Mandos [%(process)d]: %(levelname)s:'
122
187
logger.addHandler(syslogger)
125
190
console = logging.StreamHandler()
126
191
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
169
248
os.rmdir(self.tempdir)
170
249
self.tempdir = None
172
251
def password_encode(self, password):
173
252
# Passphrase can not be empty and can not contain newlines or
174
253
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
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"))
177
262
def encrypt(self, data, password):
178
263
passphrase = self.password_encode(password)
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
264
with tempfile.NamedTemporaryFile(
265
dir=self.tempdir) as passfile:
181
266
passfile.write(passphrase)
183
proc = subprocess.Popen(['gpg', '--symmetric',
268
proc = subprocess.Popen([self.gpg, '--symmetric',
184
269
'--passphrase-file',
186
271
+ self.gnupgargs,
187
stdin = subprocess.PIPE,
188
stdout = subprocess.PIPE,
189
stderr = subprocess.PIPE)
190
ciphertext, err = proc.communicate(input = data)
272
stdin=subprocess.PIPE,
273
stdout=subprocess.PIPE,
274
stderr=subprocess.PIPE)
275
ciphertext, err = proc.communicate(input=data)
191
276
if proc.returncode != 0:
192
277
raise PGPError(err)
193
278
return ciphertext
195
280
def decrypt(self, data, password):
196
281
passphrase = self.password_encode(password)
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
282
with tempfile.NamedTemporaryFile(
283
dir=self.tempdir) as passfile:
199
284
passfile.write(passphrase)
201
proc = subprocess.Popen(['gpg', '--decrypt',
286
proc = subprocess.Popen([self.gpg, '--decrypt',
202
287
'--passphrase-file',
204
289
+ self.gnupgargs,
205
stdin = subprocess.PIPE,
206
stdout = subprocess.PIPE,
207
stderr = subprocess.PIPE)
208
decrypted_plaintext, err = proc.communicate(input
290
stdin=subprocess.PIPE,
291
stdout=subprocess.PIPE,
292
stderr=subprocess.PIPE)
293
decrypted_plaintext, err = proc.communicate(input=data)
210
294
if proc.returncode != 0:
211
295
raise PGPError(err)
212
296
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
215
325
class AvahiError(Exception):
216
326
def __init__(self, value, *args, **kwargs):
217
327
self.value = value
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
328
return super(AvahiError, self).__init__(value, *args,
222
332
class AvahiServiceError(AvahiError):
225
336
class AvahiGroupError(AvahiError):
229
class AvahiService(object):
230
341
"""An Avahi (Zeroconf) service.
233
344
interface: integer; avahi.IF_UNSPEC or an interface index.
234
345
Used to optionally bind to the specified interface.
377
510
follow_name_owner_changes=True),
378
511
avahi.DBUS_INTERFACE_SERVER)
379
512
self.server.connect_to_signal("StateChanged",
380
self.server_state_changed)
513
self.server_state_changed)
381
514
self.server_state_changed(self.server.GetState())
384
517
class AvahiServiceToSyslog(AvahiService):
518
def rename(self, *args, **kwargs):
386
519
"""Add the new name to the syslog messages"""
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
520
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
521
syslogger.setFormatter(logging.Formatter(
522
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
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):
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))
403
840
"""A representation of a client host served by this server.
406
843
approved: bool(); 'None' if not yet approved/disapproved
407
844
approval_delay: datetime.timedelta(); Time to wait for approval
408
845
approval_duration: datetime.timedelta(); Duration of one approval
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
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
413
850
checker_command: string; External command which is run to check
414
851
if client lives. %() expansions are done at
415
852
runtime with vars(self) as dict, so that for
416
853
instance %(name)s can be used in the command.
417
checker_initiator_tag: a gobject event source tag, or None
854
checker_initiator_tag: a GLib event source tag, or None
418
855
created: datetime.datetime(); (UTC) object creation
419
856
client_structure: Object describing what attributes a client has
420
857
and is used for storing the client at exit
421
858
current_checker_command: string; current running checker_command
422
disable_initiator_tag: a gobject event source tag, or None
859
disable_initiator_tag: a GLib event source tag, or None
424
861
fingerprint: string (40 or 32 hexadecimal digits); used to
425
uniquely identify the client
862
uniquely identify an OpenPGP client
863
key_id: string (64 hexadecimal digits); used to uniquely identify
864
a client using raw public keys
426
865
host: string; available for use by the checker command
427
866
interval: datetime.timedelta(); How often to start a new checker
428
867
last_approval_request: datetime.datetime(); (UTC) or None
595
1024
logger.info("Disabling client %s", self.name)
596
1025
if getattr(self, "disable_initiator_tag", None) is not None:
597
gobject.source_remove(self.disable_initiator_tag)
1026
GLib.source_remove(self.disable_initiator_tag)
598
1027
self.disable_initiator_tag = None
599
1028
self.expires = None
600
1029
if getattr(self, "checker_initiator_tag", None) is not None:
601
gobject.source_remove(self.checker_initiator_tag)
1030
GLib.source_remove(self.checker_initiator_tag)
602
1031
self.checker_initiator_tag = None
603
1032
self.stop_checker()
604
1033
self.enabled = False
606
1035
self.send_changedstate()
607
# Do not run this again if called by a gobject.timeout_add
1036
# Do not run this again if called by a GLib.timeout_add
610
1039
def __del__(self):
613
1042
def init_checker(self):
614
1043
# Schedule a new checker to be started an 'interval' from now,
615
1044
# and every interval from then on.
616
1045
if self.checker_initiator_tag is not None:
617
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
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
621
1051
# Schedule a disable() when 'timeout' has passed
622
1052
if self.disable_initiator_tag is not None:
623
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
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)
627
1056
# Also start a new checker *right now*.
628
1057
self.start_checker()
630
def checker_callback(self, pid, condition, command):
1059
def checker_callback(self, source, condition, connection,
631
1061
"""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:
632
1067
self.checker_callback_tag = None
633
1068
self.checker = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
1071
self.last_checker_status = returncode
1072
self.last_checker_signal = None
636
1073
if self.last_checker_status == 0:
637
1074
logger.info("Checker for %(name)s succeeded",
639
1076
self.checked_ok()
641
logger.info("Checker for %(name)s failed",
1078
logger.info("Checker for %(name)s failed", vars(self))
644
1080
self.last_checker_status = -1
1081
self.last_checker_signal = -returncode
645
1082
logger.warning("Checker for %(name)s crashed?",
648
1086
def checked_ok(self):
649
1087
"""Assert that the client has been seen, alive and well."""
650
1088
self.last_checked_ok = datetime.datetime.utcnow()
651
1089
self.last_checker_status = 0
1090
self.last_checker_signal = None
652
1091
self.bump_timeout()
654
1093
def bump_timeout(self, timeout=None):
655
1094
"""Bump up the timeout for this client."""
656
1095
if timeout is None:
657
1096
timeout = self.timeout
658
1097
if self.disable_initiator_tag is not None:
659
gobject.source_remove(self.disable_initiator_tag)
1098
GLib.source_remove(self.disable_initiator_tag)
660
1099
self.disable_initiator_tag = None
661
1100
if getattr(self, "enabled", False):
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
1101
self.disable_initiator_tag = GLib.timeout_add(
1102
int(timeout.total_seconds() * 1000), self.disable)
665
1103
self.expires = datetime.datetime.utcnow() + timeout
667
1105
def need_approval(self):
668
1106
self.last_approval_request = datetime.datetime.utcnow()
670
1108
def start_checker(self):
671
1109
"""Start a new checker subprocess if one is not running.
673
1111
If a checker already exists, leave it running and do
675
1113
# The reason for not killing a running checker is that if we
680
1118
# checkers alone, the checker would have to take more time
681
1119
# than 'timeout' for the client to be disabled, which is as it
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)
1122
if self.checker is not None and not self.checker.is_alive():
1123
logger.warning("Checker was not alive; joining")
697
1126
# Start a new checker if needed
698
1127
if self.checker is None:
699
1128
# Escape attributes for the shell
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
1130
attr: re.escape(str(getattr(self, attr)))
1131
for attr in self.runtime_expansions}
705
1133
command = self.checker_command % escaped_attrs
706
1134
except TypeError as error:
707
1135
logger.error('Could not format string "%s"',
708
self.checker_command, exc_info=error)
709
return True # Try again later
1136
self.checker_command,
1138
return True # Try again later
710
1139
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",
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
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
755
1169
def stop_checker(self):
756
1170
"""Force the checker process, if any, to stop."""
757
1171
if self.checker_callback_tag:
758
gobject.source_remove(self.checker_callback_tag)
1172
GLib.source_remove(self.checker_callback_tag)
759
1173
self.checker_callback_tag = None
760
1174
if getattr(self, "checker", None) is None:
762
1176
logger.debug("Stopping checker for %(name)s", vars(self))
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
1177
self.checker.terminate()
771
1178
self.checker = None
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
1181
def dbus_service_property(dbus_interface,
776
1185
"""Decorators for marking methods of a DBusObjectWithProperties to
777
1186
become properties on the D-Bus.
779
1188
The decorated method will be called with no arguments by "Get"
780
1189
and with one argument by "Set".
782
1191
The parameters, where they are supported, are the same as
783
1192
dbus.service.method, except there is only "signature", since the
784
1193
type from Get() and the type sent to Set() is the same.
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.
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.
869
1284
def _is_dbus_thing(thing):
870
1285
"""Returns a function testing if an attribute is a D-Bus thing
872
1287
If called like _is_dbus_thing("method") it returns a function
873
1288
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1290
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
878
1293
def _get_all_dbus_things(self, thing):
879
1294
"""Returns a generator of (name, attribute) pairs
881
return ((getattr(athing.__get__(self), "_dbus_name",
1296
return ((getattr(athing.__get__(self), "_dbus_name", name),
883
1297
athing.__get__(self))
884
1298
for cls in self.__class__.__mro__
885
1299
for name, athing in
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
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.
889
1373
def _get_dbus_property(self, interface_name, property_name):
890
1374
"""Returns a bound method if one exists which is a D-Bus
891
1375
property with the specified name and interface.
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
self._is_dbus_thing("property"))):
1377
for cls in self.__class__.__mro__:
1378
for name, value in inspect.getmembers(
1379
cls, self._is_dbus_thing("property")):
897
1380
if (value._dbus_name == property_name
898
1381
and value._dbus_interface == interface_name):
899
1382
return value.__get__(self)
901
1384
# No such property
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
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,
907
1399
out_signature="v")
908
1400
def Get(self, interface_name, property_name):
909
1401
"""Standard D-Bus property Get() method, see D-Bus standard.
1039
1529
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",
1042
1603
def datetime_to_dbus(dt, variant_level=0):
1043
1604
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1045
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1606
return dbus.String("", variant_level=variant_level)
1607
return dbus.String(dt.isoformat(), variant_level=variant_level)
1050
1610
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1403
1971
server to mandos-client
1407
1975
# Rejected - signal
1408
1976
@dbus.service.signal(_interface, signature="s")
1409
1977
def Rejected(self, reason):
1413
1981
# NeedApproval - signal
1414
1982
@dbus.service.signal(_interface, signature="tb")
1415
1983
def NeedApproval(self, timeout, default):
1417
1985
return self.need_approval()
1421
1989
# Approve - method
1422
1990
@dbus.service.method(_interface, in_signature="b")
1423
1991
def Approve(self, value):
1424
1992
self.approve(value)
1426
1994
# CheckedOK - method
1427
1995
@dbus.service.method(_interface)
1428
1996
def CheckedOK(self):
1429
1997
self.checked_ok()
1431
1999
# Enable - method
2000
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1432
2001
@dbus.service.method(_interface)
1433
2002
def Enable(self):
1437
2006
# StartChecker - method
2007
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1438
2008
@dbus.service.method(_interface)
1439
2009
def StartChecker(self):
1441
2011
self.start_checker()
1443
2013
# Disable - method
2014
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1444
2015
@dbus.service.method(_interface)
1445
2016
def Disable(self):
1449
2020
# StopChecker - method
2021
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1450
2022
@dbus.service.method(_interface)
1451
2023
def StopChecker(self):
1452
2024
self.stop_checker()
1456
2028
# ApprovalPending - property
1457
2029
@dbus_service_property(_interface, signature="b", access="read")
1458
2030
def ApprovalPending_dbus_property(self):
1459
2031
return dbus.Boolean(bool(self.approvals_pending))
1461
2033
# ApprovedByDefault - property
1462
@dbus_service_property(_interface, signature="b",
2034
@dbus_service_property(_interface,
1463
2036
access="readwrite")
1464
2037
def ApprovedByDefault_dbus_property(self, value=None):
1465
2038
if value is None: # get
1466
2039
return dbus.Boolean(self.approved_by_default)
1467
2040
self.approved_by_default = bool(value)
1469
2042
# ApprovalDelay - property
1470
@dbus_service_property(_interface, signature="t",
2043
@dbus_service_property(_interface,
1471
2045
access="readwrite")
1472
2046
def ApprovalDelay_dbus_property(self, value=None):
1473
2047
if value is None: # get
1474
return dbus.UInt64(self.approval_delay_milliseconds())
2048
return dbus.UInt64(self.approval_delay.total_seconds()
1475
2050
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1477
2052
# ApprovalDuration - property
1478
@dbus_service_property(_interface, signature="t",
2053
@dbus_service_property(_interface,
1479
2055
access="readwrite")
1480
2056
def ApprovalDuration_dbus_property(self, value=None):
1481
2057
if value is None: # get
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
2058
return dbus.UInt64(self.approval_duration.total_seconds()
1484
2060
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1486
2062
# Name - property
2064
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1487
2065
@dbus_service_property(_interface, signature="s", access="read")
1488
2066
def Name_dbus_property(self):
1489
2067
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)
1491
2076
# Fingerprint - property
2078
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1492
2079
@dbus_service_property(_interface, signature="s", access="read")
1493
2080
def Fingerprint_dbus_property(self):
1494
2081
return dbus.String(self.fingerprint)
1496
2083
# Host - property
1497
@dbus_service_property(_interface, signature="s",
2084
@dbus_service_property(_interface,
1498
2086
access="readwrite")
1499
2087
def Host_dbus_property(self, value=None):
1500
2088
if value is None: # get
1501
2089
return dbus.String(self.host)
1502
self.host = unicode(value)
2090
self.host = str(value)
1504
2092
# Created - property
2094
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1505
2095
@dbus_service_property(_interface, signature="s", access="read")
1506
2096
def Created_dbus_property(self):
1507
2097
return datetime_to_dbus(self.created)
1509
2099
# LastEnabled - property
1510
2100
@dbus_service_property(_interface, signature="s", access="read")
1511
2101
def LastEnabled_dbus_property(self):
1512
2102
return datetime_to_dbus(self.last_enabled)
1514
2104
# Enabled - property
1515
@dbus_service_property(_interface, signature="b",
2105
@dbus_service_property(_interface,
1516
2107
access="readwrite")
1517
2108
def Enabled_dbus_property(self, value=None):
1518
2109
if value is None: # get
1566
2158
if (getattr(self, "disable_initiator_tag", None)
1569
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
2161
GLib.source_remove(self.disable_initiator_tag)
2162
self.disable_initiator_tag = GLib.timeout_add(
2163
int((self.expires - now).total_seconds() * 1000),
1575
2166
# ExtendedTimeout - property
1576
@dbus_service_property(_interface, signature="t",
2167
@dbus_service_property(_interface,
1577
2169
access="readwrite")
1578
2170
def ExtendedTimeout_dbus_property(self, value=None):
1579
2171
if value is None: # get
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
2172
return dbus.UInt64(self.extended_timeout.total_seconds()
1581
2174
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1583
2176
# Interval - property
1584
@dbus_service_property(_interface, signature="t",
2177
@dbus_service_property(_interface,
1585
2179
access="readwrite")
1586
2180
def Interval_dbus_property(self, value=None):
1587
2181
if value is None: # get
1588
return dbus.UInt64(self.interval_milliseconds())
2182
return dbus.UInt64(self.interval.total_seconds() * 1000)
1589
2183
self.interval = datetime.timedelta(0, 0, 0, value)
1590
2184
if getattr(self, "checker_initiator_tag", None) is None:
1592
2186
if self.enabled:
1593
2187
# Reschedule checker run
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
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
1599
2193
# Checker - property
1600
@dbus_service_property(_interface, signature="s",
2194
@dbus_service_property(_interface,
1601
2196
access="readwrite")
1602
2197
def Checker_dbus_property(self, value=None):
1603
2198
if value is None: # get
1604
2199
return dbus.String(self.checker_command)
1605
self.checker_command = unicode(value)
2200
self.checker_command = str(value)
1607
2202
# CheckerRunning - property
1608
@dbus_service_property(_interface, signature="b",
2203
@dbus_service_property(_interface,
1609
2205
access="readwrite")
1610
2206
def CheckerRunning_dbus_property(self, value=None):
1611
2207
if value is None: # get
1658
2264
class ClientHandler(socketserver.BaseRequestHandler, object):
1659
2265
"""A class to handle client connections.
1661
2267
Instantiated once for each connection to handle it.
1662
2268
Note: This will run in its own forked process."""
1664
2270
def handle(self):
1665
2271
with contextlib.closing(self.server.child_pipe) as child_pipe:
1666
2272
logger.info("TCP connection from: %s",
1667
unicode(self.client_address))
2273
str(self.client_address))
1668
2274
logger.debug("Pipe FD: %d",
1669
2275
self.server.child_pipe.fileno())
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",
2277
session = gnutls.ClientSession(self.request)
2279
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2280
# "+AES-256-CBC", "+SHA1",
2281
# "+COMP-NULL", "+CTYPE-OPENPGP",
1685
2283
# Use a fallback default, since this MUST be set.
1686
2284
priority = self.server.gnutls_priority
1687
2285
if priority is None:
1688
2286
priority = "NORMAL"
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
2287
gnutls.priority_set_direct(session._c_object,
2288
priority.encode("utf-8"),
1693
2291
# Start communication using the Mandos protocol
1694
2292
# Get protocol number
1695
2293
line = self.request.makefile().readline()
1696
2294
logger.debug("Protocol version: %r", line)
1698
2296
if int(line.strip().split()[0]) > 1:
2297
raise RuntimeError(line)
1700
2298
except (ValueError, IndexError, RuntimeError) as error:
1701
2299
logger.error("Unknown protocol version: %s", error)
1704
2302
# Start GnuTLS connection
1706
2304
session.handshake()
1707
except gnutls.errors.GNUTLSError as error:
2305
except gnutls.Error as error:
1708
2306
logger.warning("Handshake failed: %s", error)
1709
2307
# Do not run session.bye() here: the session is not
1710
2308
# established. Just abandon the request.
1712
2310
logger.debug("Handshake succeeded")
1714
2312
approval_required = False
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,
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,
1727
2336
self.client_address)
1728
2337
except KeyError:
1731
2340
if client.approval_delay:
1732
2341
delay = client.approval_delay
1733
2342
client.approvals_pending += 1
1734
2343
approval_required = True
1737
2346
if not client.enabled:
1738
2347
logger.info("Client %s is disabled",
1740
2349
if self.server.use_dbus:
1741
2350
# Emit D-Bus signal
1742
2351
client.Rejected("Disabled")
1745
2354
if client.approved or not client.approval_delay:
1746
#We are approved or approval is disabled
2355
# We are approved or approval is disabled
1748
2357
elif client.approved is None:
1749
2358
logger.info("Client %s needs approval",
1784
2391
delay -= time2 - time
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))
2394
session.send(client.secret)
2395
except gnutls.Error as error:
2396
logger.warning("gnutls send failed",
1799
2400
logger.info("Sending secret to %s", client.name)
1800
2401
# bump the timeout using extended_timeout
1801
2402
client.bump_timeout(client.extended_timeout)
1802
2403
if self.server.use_dbus:
1803
2404
# Emit D-Bus signal
1804
2405
client.GotSecret()
1807
2408
if approval_required:
1808
2409
client.approvals_pending -= 1
1811
except gnutls.errors.GNUTLSError as error:
2412
except gnutls.Error as error:
1812
2413
logger.warning("GnuTLS bye failed",
1813
2414
exc_info=error)
1816
2417
def peer_certificate(session):
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
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
1824
2434
list_size = ctypes.c_uint(1)
1825
cert_list = (gnutls.library.functions
1826
.gnutls_certificate_get_peers
2435
cert_list = (gnutls.certificate_get_peers
1827
2436
(session._c_object, ctypes.byref(list_size)))
1828
2437
if not bool(cert_list) and list_size.value != 0:
1829
raise gnutls.errors.GNUTLSError("error getting peer"
2438
raise gnutls.Error("error getting peer certificate")
1831
2439
if list_size.value == 0:
1833
2441
cert = cert_list[0]
1834
2442
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()
1837
2479
def fingerprint(openpgp):
1838
2480
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1839
2481
# New GnuTLS "datum" with the OpenPGP public key
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
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)))
1845
2486
# New empty GnuTLS certificate
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2487
crt = gnutls.openpgp_crt_t()
2488
gnutls.openpgp_crt_init(ctypes.byref(crt))
1849
2489
# Import the OpenPGP public key into the certificate
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
2490
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2491
gnutls.OPENPGP_FMT_RAW)
1854
2492
# Verify the self signature in the key
1855
2493
crtverify = ctypes.c_uint()
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2494
gnutls.openpgp_crt_verify_self(crt, 0,
2495
ctypes.byref(crtverify))
1859
2496
if crtverify.value != 0:
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2497
gnutls.openpgp_crt_deinit(crt)
2498
raise gnutls.CertificateSecurityError(code
1863
2500
# New buffer for the fingerprint
1864
2501
buf = ctypes.create_string_buffer(20)
1865
2502
buf_len = ctypes.c_size_t()
1866
2503
# Get the fingerprint from the certificate into the buffer
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2504
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2505
ctypes.byref(buf_len))
1870
2506
# Deinit the certificate
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2507
gnutls.openpgp_crt_deinit(crt)
1872
2508
# Convert the buffer to a Python bytestring
1873
2509
fpr = ctypes.string_at(buf, buf_len.value)
1874
2510
# Convert the bytestring to hexadecimal notation
1957
2599
# socket_wrapper(), if socketfd was set.
1958
2600
socketserver.TCPServer.__init__(self, server_address,
1959
2601
RequestHandlerClass)
1961
2603
def server_bind(self):
1962
2604
"""This overrides the normal server_bind() function
1963
2605
to bind to an interface if one was specified, and also NOT to
1964
2606
bind to an address or port if they were not specified."""
2607
global SO_BINDTODEVICE
1965
2608
if self.interface is not None:
1966
2609
if SO_BINDTODEVICE is None:
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)
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)
1988
2631
# Only bind(2) the socket if we really need to.
1989
2632
if self.server_address[0] or self.server_address[1]:
2633
if self.server_address[1]:
2634
self.allow_reuse_address = True
1990
2635
if not self.server_address[0]:
1991
2636
if self.address_family == socket.AF_INET6:
1992
any_address = "::" # in6addr_any
2637
any_address = "::" # in6addr_any
1994
any_address = "0.0.0.0" # INADDR_ANY
2639
any_address = "0.0.0.0" # INADDR_ANY
1995
2640
self.server_address = (any_address,
1996
2641
self.server_address[1])
1997
2642
elif not self.server_address[1]:
1998
self.server_address = (self.server_address[0],
2643
self.server_address = (self.server_address[0], 0)
2000
2644
# if self.interface:
2001
2645
# self.server_address = (self.server_address[0],
2027
2676
self.gnutls_priority = gnutls_priority
2028
2677
IPv6_TCPServer.__init__(self, server_address,
2029
2678
RequestHandlerClass,
2030
interface = interface,
2031
use_ipv6 = use_ipv6,
2032
socketfd = socketfd)
2679
interface=interface,
2033
2683
def server_activate(self):
2034
2684
if self.enabled:
2035
2685
return socketserver.TCPServer.server_activate(self)
2037
2687
def enable(self):
2038
2688
self.enabled = True
2040
2690
def add_pipe(self, parent_pipe, proc):
2041
2691
# Call "handle_ipc" for both data and EOF events
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):
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):
2051
2703
# error, or the other end of multiprocessing.Pipe has closed
2052
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2704
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2053
2705
# Wait for other process to exit
2057
2709
# Read a request from the child
2058
2710
request = parent_pipe.recv()
2059
2711
command = request[0]
2061
2713
if command == 'init':
2063
address = request[2]
2065
for c in self.clients.itervalues():
2066
if c.fingerprint == fpr:
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:
2070
logger.info("Client not found for fingerprint: %s, ad"
2071
"dress: %s", fpr, address)
2728
logger.info("Client not found for key ID: %s, address"
2729
": %s", key_id or fpr, address)
2072
2730
if self.use_dbus:
2073
2731
# Emit D-Bus signal
2074
mandos_dbus_service.ClientNotFound(fpr,
2732
mandos_dbus_service.ClientNotFound(key_id or fpr,
2076
2734
parent_pipe.send(False)
2079
gobject.io_add_watch(parent_pipe.fileno(),
2080
gobject.IO_IN | gobject.IO_HUP,
2081
functools.partial(self.handle_ipc,
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))
2087
2744
parent_pipe.send(True)
2088
2745
# remove the old hook in favor of the new above hook on
2092
2749
funcname = request[1]
2093
2750
args = request[2]
2094
2751
kwargs = request[3]
2096
2753
parent_pipe.send(('data', getattr(client_object,
2097
2754
funcname)(*args,
2100
2757
if command == 'getattr':
2101
2758
attrname = request[1]
2102
if callable(client_object.__getattribute__(attrname)):
2103
parent_pipe.send(('function',))
2759
if isinstance(client_object.__getattribute__(attrname),
2760
collections.abc.Callable):
2761
parent_pipe.send(('function', ))
2105
parent_pipe.send(('data', client_object
2106
.__getattribute__(attrname)))
2764
'data', client_object.__getattribute__(attrname)))
2108
2766
if command == 'setattr':
2109
2767
attrname = request[1]
2110
2768
value = request[2]
2111
2769
setattr(client_object, attrname, value)
2116
2774
def rfc3339_duration_to_delta(duration):
2117
2775
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
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)
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)
2135
2793
# Parsing an RFC 3339 duration with regular expressions is not
2136
2794
# possible - there would have to be multiple places for the same
2137
2795
# values, like seconds. The current code, while more esoteric, is
2138
2796
# cleaner without depending on a parsing library. If Python had a
2139
2797
# built-in library for parsing we would use it, but we'd like to
2140
2798
# avoid excessive use of external libraries.
2142
2800
# New type for defining tokens, syntax, and semantics all-in-one
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
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
2152
2806
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2153
2807
# the "duration" ABNF definition in RFC 3339, Appendix A.
2154
2808
token_end = Token(re.compile(r"$"), None, frozenset())
2155
2809
token_second = Token(re.compile(r"(\d+)S"),
2156
2810
datetime.timedelta(seconds=1),
2157
frozenset((token_end,)))
2811
frozenset((token_end, )))
2158
2812
token_minute = Token(re.compile(r"(\d+)M"),
2159
2813
datetime.timedelta(minutes=1),
2160
2814
frozenset((token_second, token_end)))
3146
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2474
3148
except OSError as error:
3149
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3150
.format(uid, gid, os.strerror(error.errno)))
2475
3151
if error.errno != errno.EPERM:
2479
3155
# Enable all possible GnuTLS debugging
2481
3157
# "Use a log level over 10 to enable all debugging options."
2482
3158
# - GnuTLS manual
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
2485
@gnutls.library.types.gnutls_log_func
3159
gnutls.global_set_log_level(11)
2486
3162
def debug_gnutls(level, string):
2487
3163
logger.debug("GnuTLS: %s", string[:-1])
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
3165
gnutls.global_set_log_function(debug_gnutls)
2492
3167
# Redirect stdin so all checkers get /dev/null
2493
3168
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2494
3169
os.dup2(null, sys.stdin.fileno())
2498
3173
# Need to fork before connecting to D-Bus
2499
3174
if not foreground:
2500
3175
# Close all input and output, do double fork, etc.
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()
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.
2507
3183
global main_loop
2508
3184
# From the Avahi example code
2509
3185
DBusGMainLoop(set_as_default=True)
2510
main_loop = gobject.MainLoop()
3186
main_loop = GLib.MainLoop()
2511
3187
bus = dbus.SystemBus()
2512
3188
# End of Avahi example code
2515
3191
bus_name = dbus.service.BusName("se.recompile.Mandos",
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:
3194
old_bus_name = dbus.service.BusName(
3195
"se.bsnet.fukt.Mandos", bus,
3197
except dbus.exceptions.DBusException as e:
2521
3198
logger.error("Disabling D-Bus:", exc_info=e)
2522
3199
use_dbus = False
2523
3200
server_settings["use_dbus"] = False
2524
3201
tcp_server.use_dbus = False
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"])))
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"))
2534
3213
global multiprocessing_manager
2535
3214
multiprocessing_manager = multiprocessing.Manager()
2537
3216
client_class = Client
2539
client_class = functools.partial(ClientDBus, bus = bus)
3218
client_class = functools.partial(ClientDBus, bus=bus)
2541
3220
client_settings = Client.config_parser(client_config)
2542
3221
old_client_settings = {}
2543
3222
clients_data = {}
2545
3224
# This is used to redirect stdout and stderr for checker processes
2547
wnull = open(os.devnull, "w") # A writable /dev/null
3226
wnull = open(os.devnull, "w") # A writable /dev/null
2548
3227
# Only used if server is running in foreground but not in debug
2550
3229
if debug or not foreground:
2553
3232
# Get client data and settings from last running state.
2554
3233
if server_settings["restore"]:
2556
3235
with open(stored_state_path, "rb") as stored_state:
2557
clients_data, old_client_settings = (pickle.load
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]
2559
3286
os.remove(stored_state_path)
2560
3287
except IOError as e:
2561
3288
if e.errno == errno.ENOENT:
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
3289
logger.warning("Could not load persistent state:"
3290
" {}".format(os.strerror(e.errno)))
2565
3292
logger.critical("Could not load persistent state:",
2568
3295
except EOFError as e:
2569
3296
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
2572
3300
with PGPEngine() as pgp:
2573
for client_name, client in clients_data.iteritems():
3301
for client_name, client in clients_data.items():
2574
3302
# Skip removed clients
2575
3303
if client_name not in client_settings:
2578
3306
# Decide which value to use after restoring saved state.
2579
3307
# We have three different values: Old config file,
2580
3308
# new config file, and saved state.
2638
3366
for client_name in (set(client_settings)
2639
3367
- set(old_client_settings)):
2640
3368
clients_data[client_name] = client_settings[client_name]
2642
3370
# Create all client objects
2643
for client_name, client in clients_data.iteritems():
3371
for client_name, client in clients_data.items():
2644
3372
tcp_server.clients[client_name] = client_class(
2645
name = client_name, settings = client,
2646
server_settings = server_settings)
3375
server_settings=server_settings)
2648
3377
if not tcp_server.clients:
2649
3378
logger.warning("No clients defined")
2651
3380
if not foreground:
2652
3381
if pidfile is not None:
2656
pidfile.write(str(pid) + "\n".encode("utf-8"))
3385
print(pid, file=pidfile)
2657
3386
except IOError:
2658
3387
logger.error("Could not write to file %r with PID %d",
2659
3388
pidfilename, pid)
2661
3390
del pidfilename
2663
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3392
for termsig in (signal.SIGHUP, signal.SIGTERM):
3393
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3394
lambda: main_loop.quit() and False)
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2669
class MandosDBusService(DBusObjectWithProperties):
3398
@alternate_dbus_interfaces(
3399
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3400
class MandosDBusService(DBusObjectWithObjectManager):
2670
3401
"""A D-Bus proxy object"""
2671
3403
def __init__(self):
2672
3404
dbus.service.Object.__init__(self, bus, "/")
2673
3406
_interface = "se.recompile.Mandos"
2675
@dbus_interface_annotations(_interface)
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
2681
3408
@dbus.service.signal(_interface, signature="o")
2682
3409
def ClientAdded(self, objpath):
2686
3413
@dbus.service.signal(_interface, signature="ss")
2687
def ClientNotFound(self, fingerprint, address):
3414
def ClientNotFound(self, key_id, address):
3418
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2691
3420
@dbus.service.signal(_interface, signature="os")
2692
3421
def ClientRemoved(self, objpath, name):
3425
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2696
3427
@dbus.service.method(_interface, out_signature="ao")
2697
3428
def GetAllClients(self):
2699
return dbus.Array(c.dbus_object_path
2701
tcp_server.clients.itervalues())
3430
return dbus.Array(c.dbus_object_path for c in
3431
tcp_server.clients.values())
3433
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2703
3435
@dbus.service.method(_interface,
2704
3436
out_signature="a{oa{sv}}")
2705
3437
def GetAllClientsWithProperties(self):
2707
3439
return dbus.Dictionary(
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
3440
{c.dbus_object_path: c.GetAll(
3441
"se.recompile.Mandos.Client")
3442
for c in tcp_server.clients.values()},
2710
3443
signature="oa{sv}")
2712
3445
@dbus.service.method(_interface, in_signature="o")
2713
3446
def RemoveClient(self, object_path):
2715
for c in tcp_server.clients.itervalues():
3448
for c in tcp_server.clients.values():
2716
3449
if c.dbus_object_path == object_path:
2717
3450
del tcp_server.clients[c.name]
2718
3451
c.remove_from_connection()
2719
# Don't signal anything except ClientRemoved
3452
# Don't signal the disabling
2720
3453
c.disable(quiet=True)
2722
self.ClientRemoved(object_path, c.name)
3454
# Emit D-Bus signal for removal
3455
self.client_removed_signal(c)
2724
3457
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,
2728
3497
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
2731
3505
"Cleanup function; run on exit"
2734
multiprocessing.active_children()
3509
mp.active_children()
2736
3511
if not (tcp_server.clients or client_settings):
2739
3514
# Store client before exiting. Secrets are encrypted with key
2740
3515
# based on what config file has. If config file is
2741
3516
# removed/edited, old secret will thus be unrecovable.
2743
3518
with PGPEngine() as pgp:
2744
for client in tcp_server.clients.itervalues():
3519
for client in tcp_server.clients.values():
2745
3520
key = client_settings[client.name]["secret"]
2746
3521
client.encrypted_secret = pgp.encrypt(client.secret,
2748
3523
client_dict = {}
2750
3525
# A list of attributes that can not be pickled
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
3527
exclude = {"bus", "changedstate", "secret",
3528
"checker", "server_settings"}
3529
for name, typ in inspect.getmembers(dbus.service
2756
3531
exclude.add(name)
2758
3533
client_dict["encrypted_secret"] = (client
2759
3534
.encrypted_secret)
2760
3535
for attr in client.client_structure:
2761
3536
if attr not in exclude:
2762
3537
client_dict[attr] = getattr(client, attr)
2764
3539
clients[client.name] = client_dict
2765
3540
del client_settings[client.name]["secret"]
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
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
2774
3552
os.rename(tempname, stored_state_path)
2775
3553
except (IOError, OSError) as e: