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-2013 Teddy Hogeborn
15
# Copyright © 2008-2013 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'
179
258
.replace(b"\n", b"\\n")
180
259
.replace(b"\0", b"\\x00"))
183
262
def encrypt(self, data, password):
184
263
passphrase = self.password_encode(password)
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
264
with tempfile.NamedTemporaryFile(
265
dir=self.tempdir) as passfile:
187
266
passfile.write(passphrase)
189
proc = subprocess.Popen(['gpg', '--symmetric',
268
proc = subprocess.Popen([self.gpg, '--symmetric',
190
269
'--passphrase-file',
192
271
+ self.gnupgargs,
193
stdin = subprocess.PIPE,
194
stdout = subprocess.PIPE,
195
stderr = subprocess.PIPE)
196
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)
197
276
if proc.returncode != 0:
198
277
raise PGPError(err)
199
278
return ciphertext
201
280
def decrypt(self, data, password):
202
281
passphrase = self.password_encode(password)
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
282
with tempfile.NamedTemporaryFile(
283
dir=self.tempdir) as passfile:
205
284
passfile.write(passphrase)
207
proc = subprocess.Popen(['gpg', '--decrypt',
286
proc = subprocess.Popen([self.gpg, '--decrypt',
208
287
'--passphrase-file',
210
289
+ self.gnupgargs,
211
stdin = subprocess.PIPE,
212
stdout = subprocess.PIPE,
213
stderr = subprocess.PIPE)
214
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)
216
294
if proc.returncode != 0:
217
295
raise PGPError(err)
218
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
221
325
class AvahiError(Exception):
222
326
def __init__(self, value, *args, **kwargs):
223
327
self.value = value
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
328
return super(AvahiError, self).__init__(value, *args,
228
332
class AvahiServiceError(AvahiError):
231
336
class AvahiGroupError(AvahiError):
235
class AvahiService(object):
236
341
"""An Avahi (Zeroconf) service.
239
344
interface: integer; avahi.IF_UNSPEC or an interface index.
240
345
Used to optionally bind to the specified interface.
383
510
follow_name_owner_changes=True),
384
511
avahi.DBUS_INTERFACE_SERVER)
385
512
self.server.connect_to_signal("StateChanged",
386
self.server_state_changed)
513
self.server_state_changed)
387
514
self.server_state_changed(self.server.GetState())
390
517
class AvahiServiceToSyslog(AvahiService):
518
def rename(self, *args, **kwargs):
392
519
"""Add the new name to the syslog messages"""
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(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'
401
def timedelta_to_milliseconds(td):
402
"Convert a datetime.timedelta() to milliseconds"
403
return ((td.days * 24 * 60 * 60 * 1000)
404
+ (td.seconds * 1000)
405
+ (td.microseconds // 1000))
408
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))
409
840
"""A representation of a client host served by this server.
412
843
approved: bool(); 'None' if not yet approved/disapproved
413
844
approval_delay: datetime.timedelta(); Time to wait for approval
414
845
approval_duration: datetime.timedelta(); Duration of one approval
415
checker: subprocess.Popen(); a running checker process used
416
to see if the client lives.
417
'None' if no process is running.
418
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
419
850
checker_command: string; External command which is run to check
420
851
if client lives. %() expansions are done at
421
852
runtime with vars(self) as dict, so that for
422
853
instance %(name)s can be used in the command.
423
checker_initiator_tag: a gobject event source tag, or None
854
checker_initiator_tag: a GLib event source tag, or None
424
855
created: datetime.datetime(); (UTC) object creation
425
856
client_structure: Object describing what attributes a client has
426
857
and is used for storing the client at exit
427
858
current_checker_command: string; current running checker_command
428
disable_initiator_tag: a gobject event source tag, or None
859
disable_initiator_tag: a GLib event source tag, or None
430
861
fingerprint: string (40 or 32 hexadecimal digits); used to
431
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
432
865
host: string; available for use by the checker command
433
866
interval: datetime.timedelta(); How often to start a new checker
434
867
last_approval_request: datetime.datetime(); (UTC) or None
601
1024
logger.info("Disabling client %s", self.name)
602
1025
if getattr(self, "disable_initiator_tag", None) is not None:
603
gobject.source_remove(self.disable_initiator_tag)
1026
GLib.source_remove(self.disable_initiator_tag)
604
1027
self.disable_initiator_tag = None
605
1028
self.expires = None
606
1029
if getattr(self, "checker_initiator_tag", None) is not None:
607
gobject.source_remove(self.checker_initiator_tag)
1030
GLib.source_remove(self.checker_initiator_tag)
608
1031
self.checker_initiator_tag = None
609
1032
self.stop_checker()
610
1033
self.enabled = False
612
1035
self.send_changedstate()
613
# 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
616
1039
def __del__(self):
619
1042
def init_checker(self):
620
1043
# Schedule a new checker to be started an 'interval' from now,
621
1044
# and every interval from then on.
622
1045
if self.checker_initiator_tag is not None:
623
gobject.source_remove(self.checker_initiator_tag)
624
self.checker_initiator_tag = (gobject.timeout_add
625
(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
627
1051
# Schedule a disable() when 'timeout' has passed
628
1052
if self.disable_initiator_tag is not None:
629
gobject.source_remove(self.disable_initiator_tag)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(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)
633
1056
# Also start a new checker *right now*.
634
1057
self.start_checker()
636
def checker_callback(self, pid, condition, command):
1059
def checker_callback(self, source, condition, connection,
637
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:
638
1067
self.checker_callback_tag = None
639
1068
self.checker = None
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
1071
self.last_checker_status = returncode
1072
self.last_checker_signal = None
642
1073
if self.last_checker_status == 0:
643
1074
logger.info("Checker for %(name)s succeeded",
645
1076
self.checked_ok()
647
logger.info("Checker for %(name)s failed",
1078
logger.info("Checker for %(name)s failed", vars(self))
650
1080
self.last_checker_status = -1
1081
self.last_checker_signal = -returncode
651
1082
logger.warning("Checker for %(name)s crashed?",
654
1086
def checked_ok(self):
655
1087
"""Assert that the client has been seen, alive and well."""
656
1088
self.last_checked_ok = datetime.datetime.utcnow()
657
1089
self.last_checker_status = 0
1090
self.last_checker_signal = None
658
1091
self.bump_timeout()
660
1093
def bump_timeout(self, timeout=None):
661
1094
"""Bump up the timeout for this client."""
662
1095
if timeout is None:
663
1096
timeout = self.timeout
664
1097
if self.disable_initiator_tag is not None:
665
gobject.source_remove(self.disable_initiator_tag)
1098
GLib.source_remove(self.disable_initiator_tag)
666
1099
self.disable_initiator_tag = None
667
1100
if getattr(self, "enabled", False):
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
1101
self.disable_initiator_tag = GLib.timeout_add(
1102
int(timeout.total_seconds() * 1000), self.disable)
671
1103
self.expires = datetime.datetime.utcnow() + timeout
673
1105
def need_approval(self):
674
1106
self.last_approval_request = datetime.datetime.utcnow()
676
1108
def start_checker(self):
677
1109
"""Start a new checker subprocess if one is not running.
679
1111
If a checker already exists, leave it running and do
681
1113
# The reason for not killing a running checker is that if we
686
1118
# checkers alone, the checker would have to take more time
687
1119
# than 'timeout' for the client to be disabled, which is as it
690
# If a checker exists, make sure it is not a zombie
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
except (AttributeError, OSError) as error:
694
if (isinstance(error, OSError)
695
and error.errno != errno.ECHILD):
699
logger.warning("Checker was a zombie")
700
gobject.source_remove(self.checker_callback_tag)
701
self.checker_callback(pid, status,
702
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")
703
1126
# Start a new checker if needed
704
1127
if self.checker is None:
705
1128
# Escape attributes for the shell
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
709
self.runtime_expansions)
1130
attr: re.escape(str(getattr(self, attr)))
1131
for attr in self.runtime_expansions}
711
1133
command = self.checker_command % escaped_attrs
712
1134
except TypeError as error:
713
1135
logger.error('Could not format string "%s"',
714
self.checker_command, exc_info=error)
715
return True # Try again later
1136
self.checker_command,
1138
return True # Try again later
716
1139
self.current_checker_command = command
718
logger.info("Starting checker %r for %s",
720
# We don't need to redirect stdout and stderr, since
721
# in normal mode, that is already done by daemon(),
722
# and in debug mode we don't want to. (Stdin is
723
# always replaced by /dev/null.)
724
# The exception is when not debugging but nevertheless
725
# running in the foreground; use the previously
728
if (not self.server_settings["debug"]
729
and self.server_settings["foreground"]):
730
popen_args.update({"stdout": wnull,
732
self.checker = subprocess.Popen(command,
736
except OSError as error:
737
logger.error("Failed to start subprocess",
740
self.checker_callback_tag = (gobject.child_watch_add
742
self.checker_callback,
744
# The checker may have completed before the gobject
745
# watch was added. Check for this.
747
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
748
except OSError as error:
749
if error.errno == errno.ECHILD:
750
# This should never happen
751
logger.error("Child process vanished",
756
gobject.source_remove(self.checker_callback_tag)
757
self.checker_callback(pid, status, command)
758
# 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
761
1169
def stop_checker(self):
762
1170
"""Force the checker process, if any, to stop."""
763
1171
if self.checker_callback_tag:
764
gobject.source_remove(self.checker_callback_tag)
1172
GLib.source_remove(self.checker_callback_tag)
765
1173
self.checker_callback_tag = None
766
1174
if getattr(self, "checker", None) is None:
768
1176
logger.debug("Stopping checker for %(name)s", vars(self))
770
self.checker.terminate()
772
#if self.checker.poll() is None:
773
# self.checker.kill()
774
except OSError as error:
775
if error.errno != errno.ESRCH: # No such process
1177
self.checker.terminate()
777
1178
self.checker = None
780
def dbus_service_property(dbus_interface, signature="v",
781
access="readwrite", byte_arrays=False):
1181
def dbus_service_property(dbus_interface,
782
1185
"""Decorators for marking methods of a DBusObjectWithProperties to
783
1186
become properties on the D-Bus.
785
1188
The decorated method will be called with no arguments by "Get"
786
1189
and with one argument by "Set".
788
1191
The parameters, where they are supported, are the same as
789
1192
dbus.service.method, except there is only "signature", since the
790
1193
type from Get() and the type sent to Set() is the same.
866
class DBusObjectWithProperties(dbus.service.Object):
867
"""A D-Bus object with properties.
869
Classes inheriting from this can use the dbus_service_property
870
decorator to expose methods as D-Bus properties. It exposes the
871
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.
875
1284
def _is_dbus_thing(thing):
876
1285
"""Returns a function testing if an attribute is a D-Bus thing
878
1287
If called like _is_dbus_thing("method") it returns a function
879
1288
suitable for use as predicate to inspect.getmembers().
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1290
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
884
1293
def _get_all_dbus_things(self, thing):
885
1294
"""Returns a generator of (name, attribute) pairs
887
return ((getattr(athing.__get__(self), "_dbus_name",
1296
return ((getattr(athing.__get__(self), "_dbus_name", name),
889
1297
athing.__get__(self))
890
1298
for cls in self.__class__.__mro__
891
1299
for name, athing in
892
inspect.getmembers(cls,
893
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.
895
1373
def _get_dbus_property(self, interface_name, property_name):
896
1374
"""Returns a bound method if one exists which is a D-Bus
897
1375
property with the specified name and interface.
899
for cls in self.__class__.__mro__:
900
for name, value in (inspect.getmembers
902
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")):
903
1380
if (value._dbus_name == property_name
904
1381
and value._dbus_interface == interface_name):
905
1382
return value.__get__(self)
907
1384
# No such property
908
raise DBusPropertyNotFound(self.dbus_object_path + ":"
909
+ interface_name + "."
912
@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,
913
1399
out_signature="v")
914
1400
def Get(self, interface_name, property_name):
915
1401
"""Standard D-Bus property Get() method, see D-Bus standard.
1045
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",
1048
1603
def datetime_to_dbus(dt, variant_level=0):
1049
1604
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1051
return dbus.String("", variant_level = variant_level)
1052
return dbus.String(dt.isoformat(),
1053
variant_level=variant_level)
1606
return dbus.String("", variant_level=variant_level)
1607
return dbus.String(dt.isoformat(), variant_level=variant_level)
1056
1610
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1409
1971
server to mandos-client
1413
1975
# Rejected - signal
1414
1976
@dbus.service.signal(_interface, signature="s")
1415
1977
def Rejected(self, reason):
1419
1981
# NeedApproval - signal
1420
1982
@dbus.service.signal(_interface, signature="tb")
1421
1983
def NeedApproval(self, timeout, default):
1423
1985
return self.need_approval()
1427
1989
# Approve - method
1428
1990
@dbus.service.method(_interface, in_signature="b")
1429
1991
def Approve(self, value):
1430
1992
self.approve(value)
1432
1994
# CheckedOK - method
1433
1995
@dbus.service.method(_interface)
1434
1996
def CheckedOK(self):
1435
1997
self.checked_ok()
1437
1999
# Enable - method
2000
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1438
2001
@dbus.service.method(_interface)
1439
2002
def Enable(self):
1443
2006
# StartChecker - method
2007
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1444
2008
@dbus.service.method(_interface)
1445
2009
def StartChecker(self):
1447
2011
self.start_checker()
1449
2013
# Disable - method
2014
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1450
2015
@dbus.service.method(_interface)
1451
2016
def Disable(self):
1455
2020
# StopChecker - method
2021
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1456
2022
@dbus.service.method(_interface)
1457
2023
def StopChecker(self):
1458
2024
self.stop_checker()
1462
2028
# ApprovalPending - property
1463
2029
@dbus_service_property(_interface, signature="b", access="read")
1464
2030
def ApprovalPending_dbus_property(self):
1465
2031
return dbus.Boolean(bool(self.approvals_pending))
1467
2033
# ApprovedByDefault - property
1468
@dbus_service_property(_interface, signature="b",
2034
@dbus_service_property(_interface,
1469
2036
access="readwrite")
1470
2037
def ApprovedByDefault_dbus_property(self, value=None):
1471
2038
if value is None: # get
1472
2039
return dbus.Boolean(self.approved_by_default)
1473
2040
self.approved_by_default = bool(value)
1475
2042
# ApprovalDelay - property
1476
@dbus_service_property(_interface, signature="t",
2043
@dbus_service_property(_interface,
1477
2045
access="readwrite")
1478
2046
def ApprovalDelay_dbus_property(self, value=None):
1479
2047
if value is None: # get
1480
return dbus.UInt64(self.approval_delay_milliseconds())
2048
return dbus.UInt64(self.approval_delay.total_seconds()
1481
2050
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1483
2052
# ApprovalDuration - property
1484
@dbus_service_property(_interface, signature="t",
2053
@dbus_service_property(_interface,
1485
2055
access="readwrite")
1486
2056
def ApprovalDuration_dbus_property(self, value=None):
1487
2057
if value is None: # get
1488
return dbus.UInt64(timedelta_to_milliseconds(
1489
self.approval_duration))
2058
return dbus.UInt64(self.approval_duration.total_seconds()
1490
2060
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1492
2062
# Name - property
2064
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1493
2065
@dbus_service_property(_interface, signature="s", access="read")
1494
2066
def Name_dbus_property(self):
1495
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)
1497
2076
# Fingerprint - property
2078
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1498
2079
@dbus_service_property(_interface, signature="s", access="read")
1499
2080
def Fingerprint_dbus_property(self):
1500
2081
return dbus.String(self.fingerprint)
1502
2083
# Host - property
1503
@dbus_service_property(_interface, signature="s",
2084
@dbus_service_property(_interface,
1504
2086
access="readwrite")
1505
2087
def Host_dbus_property(self, value=None):
1506
2088
if value is None: # get
1507
2089
return dbus.String(self.host)
1508
self.host = unicode(value)
2090
self.host = str(value)
1510
2092
# Created - property
2094
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1511
2095
@dbus_service_property(_interface, signature="s", access="read")
1512
2096
def Created_dbus_property(self):
1513
2097
return datetime_to_dbus(self.created)
1515
2099
# LastEnabled - property
1516
2100
@dbus_service_property(_interface, signature="s", access="read")
1517
2101
def LastEnabled_dbus_property(self):
1518
2102
return datetime_to_dbus(self.last_enabled)
1520
2104
# Enabled - property
1521
@dbus_service_property(_interface, signature="b",
2105
@dbus_service_property(_interface,
1522
2107
access="readwrite")
1523
2108
def Enabled_dbus_property(self, value=None):
1524
2109
if value is None: # get
1572
2158
if (getattr(self, "disable_initiator_tag", None)
1575
gobject.source_remove(self.disable_initiator_tag)
1576
self.disable_initiator_tag = (
1577
gobject.timeout_add(
1578
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),
1581
2166
# ExtendedTimeout - property
1582
@dbus_service_property(_interface, signature="t",
2167
@dbus_service_property(_interface,
1583
2169
access="readwrite")
1584
2170
def ExtendedTimeout_dbus_property(self, value=None):
1585
2171
if value is None: # get
1586
return dbus.UInt64(self.extended_timeout_milliseconds())
2172
return dbus.UInt64(self.extended_timeout.total_seconds()
1587
2174
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1589
2176
# Interval - property
1590
@dbus_service_property(_interface, signature="t",
2177
@dbus_service_property(_interface,
1591
2179
access="readwrite")
1592
2180
def Interval_dbus_property(self, value=None):
1593
2181
if value is None: # get
1594
return dbus.UInt64(self.interval_milliseconds())
2182
return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
2183
self.interval = datetime.timedelta(0, 0, 0, value)
1596
2184
if getattr(self, "checker_initiator_tag", None) is None:
1598
2186
if self.enabled:
1599
2187
# Reschedule checker run
1600
gobject.source_remove(self.checker_initiator_tag)
1601
self.checker_initiator_tag = (gobject.timeout_add
1602
(value, self.start_checker))
1603
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
1605
2193
# Checker - property
1606
@dbus_service_property(_interface, signature="s",
2194
@dbus_service_property(_interface,
1607
2196
access="readwrite")
1608
2197
def Checker_dbus_property(self, value=None):
1609
2198
if value is None: # get
1610
2199
return dbus.String(self.checker_command)
1611
self.checker_command = unicode(value)
2200
self.checker_command = str(value)
1613
2202
# CheckerRunning - property
1614
@dbus_service_property(_interface, signature="b",
2203
@dbus_service_property(_interface,
1615
2205
access="readwrite")
1616
2206
def CheckerRunning_dbus_property(self, value=None):
1617
2207
if value is None: # get
1664
2264
class ClientHandler(socketserver.BaseRequestHandler, object):
1665
2265
"""A class to handle client connections.
1667
2267
Instantiated once for each connection to handle it.
1668
2268
Note: This will run in its own forked process."""
1670
2270
def handle(self):
1671
2271
with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
2272
logger.info("TCP connection from: %s",
1673
unicode(self.client_address))
2273
str(self.client_address))
1674
2274
logger.debug("Pipe FD: %d",
1675
2275
self.server.child_pipe.fileno())
1677
session = (gnutls.connection
1678
.ClientSession(self.request,
1680
.X509Credentials()))
1682
# Note: gnutls.connection.X509Credentials is really a
1683
# generic GnuTLS certificate credentials object so long as
1684
# no X.509 keys are added to it. Therefore, we can use it
1685
# here despite using OpenPGP certificates.
1687
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1688
# "+AES-256-CBC", "+SHA1",
1689
# "+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",
1691
2283
# Use a fallback default, since this MUST be set.
1692
2284
priority = self.server.gnutls_priority
1693
2285
if priority is None:
1694
2286
priority = "NORMAL"
1695
(gnutls.library.functions
1696
.gnutls_priority_set_direct(session._c_object,
2287
gnutls.priority_set_direct(session._c_object,
2288
priority.encode("utf-8"),
1699
2291
# Start communication using the Mandos protocol
1700
2292
# Get protocol number
1701
2293
line = self.request.makefile().readline()
1702
2294
logger.debug("Protocol version: %r", line)
1704
2296
if int(line.strip().split()[0]) > 1:
2297
raise RuntimeError(line)
1706
2298
except (ValueError, IndexError, RuntimeError) as error:
1707
2299
logger.error("Unknown protocol version: %s", error)
1710
2302
# Start GnuTLS connection
1712
2304
session.handshake()
1713
except gnutls.errors.GNUTLSError as error:
2305
except gnutls.Error as error:
1714
2306
logger.warning("Handshake failed: %s", error)
1715
2307
# Do not run session.bye() here: the session is not
1716
2308
# established. Just abandon the request.
1718
2310
logger.debug("Handshake succeeded")
1720
2312
approval_required = False
1723
fpr = self.fingerprint(self.peer_certificate
1726
gnutls.errors.GNUTLSError) as error:
1727
logger.warning("Bad certificate: %s", error)
1729
logger.debug("Fingerprint: %s", fpr)
1732
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,
1733
2336
self.client_address)
1734
2337
except KeyError:
1737
2340
if client.approval_delay:
1738
2341
delay = client.approval_delay
1739
2342
client.approvals_pending += 1
1740
2343
approval_required = True
1743
2346
if not client.enabled:
1744
2347
logger.info("Client %s is disabled",
1746
2349
if self.server.use_dbus:
1747
2350
# Emit D-Bus signal
1748
2351
client.Rejected("Disabled")
1751
2354
if client.approved or not client.approval_delay:
1752
#We are approved or approval is disabled
2355
# We are approved or approval is disabled
1754
2357
elif client.approved is None:
1755
2358
logger.info("Client %s needs approval",
1790
2391
delay -= time2 - time
1793
while sent_size < len(client.secret):
1795
sent = session.send(client.secret[sent_size:])
1796
except gnutls.errors.GNUTLSError as error:
1797
logger.warning("gnutls send failed",
1800
logger.debug("Sent: %d, remaining: %d",
1801
sent, len(client.secret)
1802
- (sent_size + sent))
2394
session.send(client.secret)
2395
except gnutls.Error as error:
2396
logger.warning("gnutls send failed",
1805
2400
logger.info("Sending secret to %s", client.name)
1806
2401
# bump the timeout using extended_timeout
1807
2402
client.bump_timeout(client.extended_timeout)
1808
2403
if self.server.use_dbus:
1809
2404
# Emit D-Bus signal
1810
2405
client.GotSecret()
1813
2408
if approval_required:
1814
2409
client.approvals_pending -= 1
1817
except gnutls.errors.GNUTLSError as error:
2412
except gnutls.Error as error:
1818
2413
logger.warning("GnuTLS bye failed",
1819
2414
exc_info=error)
1822
2417
def peer_certificate(session):
1823
"Return the peer's OpenPGP certificate as a bytestring"
1824
# If not an OpenPGP certificate...
1825
if (gnutls.library.functions
1826
.gnutls_certificate_type_get(session._c_object)
1827
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1828
# ...do the normal thing
1829
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
1830
2434
list_size = ctypes.c_uint(1)
1831
cert_list = (gnutls.library.functions
1832
.gnutls_certificate_get_peers
2435
cert_list = (gnutls.certificate_get_peers
1833
2436
(session._c_object, ctypes.byref(list_size)))
1834
2437
if not bool(cert_list) and list_size.value != 0:
1835
raise gnutls.errors.GNUTLSError("error getting peer"
2438
raise gnutls.Error("error getting peer certificate")
1837
2439
if list_size.value == 0:
1839
2441
cert = cert_list[0]
1840
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()
1843
2479
def fingerprint(openpgp):
1844
2480
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1845
2481
# New GnuTLS "datum" with the OpenPGP public key
1846
datum = (gnutls.library.types
1847
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1850
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)))
1851
2486
# New empty GnuTLS certificate
1852
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1853
(gnutls.library.functions
1854
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2487
crt = gnutls.openpgp_crt_t()
2488
gnutls.openpgp_crt_init(ctypes.byref(crt))
1855
2489
# Import the OpenPGP public key into the certificate
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1858
gnutls.library.constants
1859
.GNUTLS_OPENPGP_FMT_RAW))
2490
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2491
gnutls.OPENPGP_FMT_RAW)
1860
2492
# Verify the self signature in the key
1861
2493
crtverify = ctypes.c_uint()
1862
(gnutls.library.functions
1863
.gnutls_openpgp_crt_verify_self(crt, 0,
1864
ctypes.byref(crtverify)))
2494
gnutls.openpgp_crt_verify_self(crt, 0,
2495
ctypes.byref(crtverify))
1865
2496
if crtverify.value != 0:
1866
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1867
raise (gnutls.errors.CertificateSecurityError
2497
gnutls.openpgp_crt_deinit(crt)
2498
raise gnutls.CertificateSecurityError(code
1869
2500
# New buffer for the fingerprint
1870
2501
buf = ctypes.create_string_buffer(20)
1871
2502
buf_len = ctypes.c_size_t()
1872
2503
# Get the fingerprint from the certificate into the buffer
1873
(gnutls.library.functions
1874
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1875
ctypes.byref(buf_len)))
2504
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2505
ctypes.byref(buf_len))
1876
2506
# Deinit the certificate
1877
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2507
gnutls.openpgp_crt_deinit(crt)
1878
2508
# Convert the buffer to a Python bytestring
1879
2509
fpr = ctypes.string_at(buf, buf_len.value)
1880
2510
# Convert the bytestring to hexadecimal notation
1963
2599
# socket_wrapper(), if socketfd was set.
1964
2600
socketserver.TCPServer.__init__(self, server_address,
1965
2601
RequestHandlerClass)
1967
2603
def server_bind(self):
1968
2604
"""This overrides the normal server_bind() function
1969
2605
to bind to an interface if one was specified, and also NOT to
1970
2606
bind to an address or port if they were not specified."""
2607
global SO_BINDTODEVICE
1971
2608
if self.interface is not None:
1972
2609
if SO_BINDTODEVICE is None:
1973
logger.error("SO_BINDTODEVICE does not exist;"
1974
" cannot bind to interface %s",
1978
self.socket.setsockopt(socket.SOL_SOCKET,
1980
str(self.interface + '\0'))
1981
except socket.error as error:
1982
if error.errno == errno.EPERM:
1983
logger.error("No permission to bind to"
1984
" interface %s", self.interface)
1985
elif error.errno == errno.ENOPROTOOPT:
1986
logger.error("SO_BINDTODEVICE not available;"
1987
" cannot bind to interface %s",
1989
elif error.errno == errno.ENODEV:
1990
logger.error("Interface %s does not exist,"
1991
" 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)
1994
2631
# Only bind(2) the socket if we really need to.
1995
2632
if self.server_address[0] or self.server_address[1]:
2633
if self.server_address[1]:
2634
self.allow_reuse_address = True
1996
2635
if not self.server_address[0]:
1997
2636
if self.address_family == socket.AF_INET6:
1998
any_address = "::" # in6addr_any
2637
any_address = "::" # in6addr_any
2000
any_address = "0.0.0.0" # INADDR_ANY
2639
any_address = "0.0.0.0" # INADDR_ANY
2001
2640
self.server_address = (any_address,
2002
2641
self.server_address[1])
2003
2642
elif not self.server_address[1]:
2004
self.server_address = (self.server_address[0],
2643
self.server_address = (self.server_address[0], 0)
2006
2644
# if self.interface:
2007
2645
# self.server_address = (self.server_address[0],
2033
2676
self.gnutls_priority = gnutls_priority
2034
2677
IPv6_TCPServer.__init__(self, server_address,
2035
2678
RequestHandlerClass,
2036
interface = interface,
2037
use_ipv6 = use_ipv6,
2038
socketfd = socketfd)
2679
interface=interface,
2039
2683
def server_activate(self):
2040
2684
if self.enabled:
2041
2685
return socketserver.TCPServer.server_activate(self)
2043
2687
def enable(self):
2044
2688
self.enabled = True
2046
2690
def add_pipe(self, parent_pipe, proc):
2047
2691
# Call "handle_ipc" for both data and EOF events
2048
gobject.io_add_watch(parent_pipe.fileno(),
2049
gobject.IO_IN | gobject.IO_HUP,
2050
functools.partial(self.handle_ipc,
2055
def handle_ipc(self, source, condition, parent_pipe=None,
2056
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):
2057
2703
# error, or the other end of multiprocessing.Pipe has closed
2058
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2704
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2059
2705
# Wait for other process to exit
2063
2709
# Read a request from the child
2064
2710
request = parent_pipe.recv()
2065
2711
command = request[0]
2067
2713
if command == 'init':
2069
address = request[2]
2071
for c in self.clients.itervalues():
2072
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:
2076
logger.info("Client not found for fingerprint: %s, ad"
2077
"dress: %s", fpr, address)
2728
logger.info("Client not found for key ID: %s, address"
2729
": %s", key_id or fpr, address)
2078
2730
if self.use_dbus:
2079
2731
# Emit D-Bus signal
2080
mandos_dbus_service.ClientNotFound(fpr,
2732
mandos_dbus_service.ClientNotFound(key_id or fpr,
2082
2734
parent_pipe.send(False)
2085
gobject.io_add_watch(parent_pipe.fileno(),
2086
gobject.IO_IN | gobject.IO_HUP,
2087
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))
2093
2744
parent_pipe.send(True)
2094
2745
# remove the old hook in favor of the new above hook on
2098
2749
funcname = request[1]
2099
2750
args = request[2]
2100
2751
kwargs = request[3]
2102
2753
parent_pipe.send(('data', getattr(client_object,
2103
2754
funcname)(*args,
2106
2757
if command == 'getattr':
2107
2758
attrname = request[1]
2108
if callable(client_object.__getattribute__(attrname)):
2109
parent_pipe.send(('function',))
2759
if isinstance(client_object.__getattribute__(attrname),
2760
collections.abc.Callable):
2761
parent_pipe.send(('function', ))
2111
parent_pipe.send(('data', client_object
2112
.__getattribute__(attrname)))
2764
'data', client_object.__getattribute__(attrname)))
2114
2766
if command == 'setattr':
2115
2767
attrname = request[1]
2116
2768
value = request[2]
2117
2769
setattr(client_object, attrname, value)
2122
2774
def rfc3339_duration_to_delta(duration):
2123
2775
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2125
>>> rfc3339_duration_to_delta("P7D")
2126
datetime.timedelta(7)
2127
>>> rfc3339_duration_to_delta("PT60S")
2128
datetime.timedelta(0, 60)
2129
>>> rfc3339_duration_to_delta("PT60M")
2130
datetime.timedelta(0, 3600)
2131
>>> rfc3339_duration_to_delta("PT24H")
2132
datetime.timedelta(1)
2133
>>> rfc3339_duration_to_delta("P1W")
2134
datetime.timedelta(7)
2135
>>> rfc3339_duration_to_delta("PT5M30S")
2136
datetime.timedelta(0, 330)
2137
>>> rfc3339_duration_to_delta("P1DT3M20S")
2138
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)
2141
2793
# Parsing an RFC 3339 duration with regular expressions is not
2142
2794
# possible - there would have to be multiple places for the same
2143
2795
# values, like seconds. The current code, while more esoteric, is
2144
2796
# cleaner without depending on a parsing library. If Python had a
2145
2797
# built-in library for parsing we would use it, but we'd like to
2146
2798
# avoid excessive use of external libraries.
2148
2800
# New type for defining tokens, syntax, and semantics all-in-one
2149
Token = collections.namedtuple("Token",
2150
("regexp", # To match token; if
2151
# "value" is not None,
2152
# must have a "group"
2154
"value", # datetime.timedelta or
2156
"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
2158
2806
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2159
2807
# the "duration" ABNF definition in RFC 3339, Appendix A.
2160
2808
token_end = Token(re.compile(r"$"), None, frozenset())
2161
2809
token_second = Token(re.compile(r"(\d+)S"),
2162
2810
datetime.timedelta(seconds=1),
2163
frozenset((token_end,)))
2811
frozenset((token_end, )))
2164
2812
token_minute = Token(re.compile(r"(\d+)M"),
2165
2813
datetime.timedelta(minutes=1),
2166
2814
frozenset((token_second, token_end)))
3146
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2482
3148
except OSError as error:
3149
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3150
.format(uid, gid, os.strerror(error.errno)))
2483
3151
if error.errno != errno.EPERM:
2487
3155
# Enable all possible GnuTLS debugging
2489
3157
# "Use a log level over 10 to enable all debugging options."
2490
3158
# - GnuTLS manual
2491
gnutls.library.functions.gnutls_global_set_log_level(11)
2493
@gnutls.library.types.gnutls_log_func
3159
gnutls.global_set_log_level(11)
2494
3162
def debug_gnutls(level, string):
2495
3163
logger.debug("GnuTLS: %s", string[:-1])
2497
(gnutls.library.functions
2498
.gnutls_global_set_log_function(debug_gnutls))
3165
gnutls.global_set_log_function(debug_gnutls)
2500
3167
# Redirect stdin so all checkers get /dev/null
2501
3168
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2502
3169
os.dup2(null, sys.stdin.fileno())
2506
3173
# Need to fork before connecting to D-Bus
2507
3174
if not foreground:
2508
3175
# Close all input and output, do double fork, etc.
2511
# multiprocessing will use threads, so before we use gobject we
2512
# need to inform gobject that threads will be used.
2513
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.
2515
3183
global main_loop
2516
3184
# From the Avahi example code
2517
3185
DBusGMainLoop(set_as_default=True)
2518
main_loop = gobject.MainLoop()
3186
main_loop = GLib.MainLoop()
2519
3187
bus = dbus.SystemBus()
2520
3188
# End of Avahi example code
2523
3191
bus_name = dbus.service.BusName("se.recompile.Mandos",
2524
bus, do_not_queue=True)
2525
old_bus_name = (dbus.service.BusName
2526
("se.bsnet.fukt.Mandos", bus,
2528
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:
2529
3198
logger.error("Disabling D-Bus:", exc_info=e)
2530
3199
use_dbus = False
2531
3200
server_settings["use_dbus"] = False
2532
3201
tcp_server.use_dbus = False
2533
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2534
service = AvahiServiceToSyslog(name =
2535
server_settings["servicename"],
2536
servicetype = "_mandos._tcp",
2537
protocol = protocol, bus = bus)
2538
if server_settings["interface"]:
2539
service.interface = (if_nametoindex
2540
(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"))
2542
3213
global multiprocessing_manager
2543
3214
multiprocessing_manager = multiprocessing.Manager()
2545
3216
client_class = Client
2547
client_class = functools.partial(ClientDBus, bus = bus)
3218
client_class = functools.partial(ClientDBus, bus=bus)
2549
3220
client_settings = Client.config_parser(client_config)
2550
3221
old_client_settings = {}
2551
3222
clients_data = {}
2553
3224
# This is used to redirect stdout and stderr for checker processes
2555
wnull = open(os.devnull, "w") # A writable /dev/null
3226
wnull = open(os.devnull, "w") # A writable /dev/null
2556
3227
# Only used if server is running in foreground but not in debug
2558
3229
if debug or not foreground:
2561
3232
# Get client data and settings from last running state.
2562
3233
if server_settings["restore"]:
2564
3235
with open(stored_state_path, "rb") as stored_state:
2565
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]
2567
3286
os.remove(stored_state_path)
2568
3287
except IOError as e:
2569
3288
if e.errno == errno.ENOENT:
2570
logger.warning("Could not load persistent state: {0}"
2571
.format(os.strerror(e.errno)))
3289
logger.warning("Could not load persistent state:"
3290
" {}".format(os.strerror(e.errno)))
2573
3292
logger.critical("Could not load persistent state:",
2576
3295
except EOFError as e:
2577
3296
logger.warning("Could not load persistent state: "
2578
"EOFError:", exc_info=e)
2580
3300
with PGPEngine() as pgp:
2581
for client_name, client in clients_data.iteritems():
3301
for client_name, client in clients_data.items():
2582
3302
# Skip removed clients
2583
3303
if client_name not in client_settings:
2586
3306
# Decide which value to use after restoring saved state.
2587
3307
# We have three different values: Old config file,
2588
3308
# new config file, and saved state.
2646
3366
for client_name in (set(client_settings)
2647
3367
- set(old_client_settings)):
2648
3368
clients_data[client_name] = client_settings[client_name]
2650
3370
# Create all client objects
2651
for client_name, client in clients_data.iteritems():
3371
for client_name, client in clients_data.items():
2652
3372
tcp_server.clients[client_name] = client_class(
2653
name = client_name, settings = client,
2654
server_settings = server_settings)
3375
server_settings=server_settings)
2656
3377
if not tcp_server.clients:
2657
3378
logger.warning("No clients defined")
2659
3380
if not foreground:
2660
3381
if pidfile is not None:
2664
pidfile.write(str(pid) + "\n".encode("utf-8"))
3385
print(pid, file=pidfile)
2665
3386
except IOError:
2666
3387
logger.error("Could not write to file %r with PID %d",
2667
3388
pidfilename, pid)
2669
3390
del pidfilename
2671
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2672
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)
2675
@alternate_dbus_interfaces({"se.recompile.Mandos":
2676
"se.bsnet.fukt.Mandos"})
2677
class MandosDBusService(DBusObjectWithProperties):
3398
@alternate_dbus_interfaces(
3399
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3400
class MandosDBusService(DBusObjectWithObjectManager):
2678
3401
"""A D-Bus proxy object"""
2679
3403
def __init__(self):
2680
3404
dbus.service.Object.__init__(self, bus, "/")
2681
3406
_interface = "se.recompile.Mandos"
2683
@dbus_interface_annotations(_interface)
2685
return { "org.freedesktop.DBus.Property"
2686
".EmitsChangedSignal":
2689
3408
@dbus.service.signal(_interface, signature="o")
2690
3409
def ClientAdded(self, objpath):
2694
3413
@dbus.service.signal(_interface, signature="ss")
2695
def ClientNotFound(self, fingerprint, address):
3414
def ClientNotFound(self, key_id, address):
3418
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2699
3420
@dbus.service.signal(_interface, signature="os")
2700
3421
def ClientRemoved(self, objpath, name):
3425
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2704
3427
@dbus.service.method(_interface, out_signature="ao")
2705
3428
def GetAllClients(self):
2707
return dbus.Array(c.dbus_object_path
2709
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":
2711
3435
@dbus.service.method(_interface,
2712
3436
out_signature="a{oa{sv}}")
2713
3437
def GetAllClientsWithProperties(self):
2715
3439
return dbus.Dictionary(
2716
((c.dbus_object_path, c.GetAll(""))
2717
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()},
2718
3443
signature="oa{sv}")
2720
3445
@dbus.service.method(_interface, in_signature="o")
2721
3446
def RemoveClient(self, object_path):
2723
for c in tcp_server.clients.itervalues():
3448
for c in tcp_server.clients.values():
2724
3449
if c.dbus_object_path == object_path:
2725
3450
del tcp_server.clients[c.name]
2726
3451
c.remove_from_connection()
2727
# Don't signal anything except ClientRemoved
3452
# Don't signal the disabling
2728
3453
c.disable(quiet=True)
2730
self.ClientRemoved(object_path, c.name)
3454
# Emit D-Bus signal for removal
3455
self.client_removed_signal(c)
2732
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,
2736
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
2739
3505
"Cleanup function; run on exit"
2742
multiprocessing.active_children()
3509
mp.active_children()
2744
3511
if not (tcp_server.clients or client_settings):
2747
3514
# Store client before exiting. Secrets are encrypted with key
2748
3515
# based on what config file has. If config file is
2749
3516
# removed/edited, old secret will thus be unrecovable.
2751
3518
with PGPEngine() as pgp:
2752
for client in tcp_server.clients.itervalues():
3519
for client in tcp_server.clients.values():
2753
3520
key = client_settings[client.name]["secret"]
2754
3521
client.encrypted_secret = pgp.encrypt(client.secret,
2756
3523
client_dict = {}
2758
3525
# A list of attributes that can not be pickled
2760
exclude = set(("bus", "changedstate", "secret",
2761
"checker", "server_settings"))
2762
for name, typ in (inspect.getmembers
2763
(dbus.service.Object)):
3527
exclude = {"bus", "changedstate", "secret",
3528
"checker", "server_settings"}
3529
for name, typ in inspect.getmembers(dbus.service
2764
3531
exclude.add(name)
2766
3533
client_dict["encrypted_secret"] = (client
2767
3534
.encrypted_secret)
2768
3535
for attr in client.client_structure:
2769
3536
if attr not in exclude:
2770
3537
client_dict[attr] = getattr(client, attr)
2772
3539
clients[client.name] = client_dict
2773
3540
del client_settings[client.name]["secret"]
2776
with (tempfile.NamedTemporaryFile
2777
(mode='wb', suffix=".pickle", prefix='clients-',
2778
dir=os.path.dirname(stored_state_path),
2779
delete=False)) as stored_state:
2780
pickle.dump((clients, client_settings), stored_state)
2781
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
2782
3552
os.rename(tempname, stored_state_path)
2783
3553
except (IOError, OSError) as e: