2
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-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
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
35
34
from __future__ import (division, absolute_import, print_function,
39
from future_builtins import *
37
from future_builtins import *
44
import SocketServer as socketserver
39
import SocketServer as socketserver
52
import ConfigParser as configparser
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
83
74
import dbus.service
85
from gi.repository import GLib
86
77
from dbus.mainloop.glib import DBusGMainLoop
89
80
import xml.dom.minidom
92
if sys.version_info.major == 2:
96
# Show warnings by default
97
if not sys.warnoptions:
99
warnings.simplefilter("default")
101
# Try to find the value of SO_BINDTODEVICE:
103
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
104
# newer, and it is also the most natural place for it:
105
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
106
85
except AttributeError:
108
# This is where SO_BINDTODEVICE was up to and including Python
110
87
from IN import SO_BINDTODEVICE
111
88
except ImportError:
112
# In Python 2.7 it seems to have been removed entirely.
113
# Try running the C preprocessor:
115
cc = subprocess.Popen(["cc", "--language=c", "-E",
117
stdin=subprocess.PIPE,
118
stdout=subprocess.PIPE)
119
stdout = cc.communicate(
120
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
121
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
122
except (OSError, ValueError, IndexError):
124
SO_BINDTODEVICE = None
126
if sys.version_info < (3, 2):
127
configparser.Configparser = configparser.SafeConfigParser
89
SO_BINDTODEVICE = None
130
92
stored_state_file = "clients.pickle"
132
94
logger = logging.getLogger()
133
logging.captureWarnings(True) # Show warnings via the logging system
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
137
if_nametoindex = ctypes.cdll.LoadLibrary(
138
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
139
103
except (OSError, AttributeError):
141
104
def if_nametoindex(interface):
142
105
"Get an interface index the hard way, i.e. using fcntl()"
143
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
144
107
with contextlib.closing(socket.socket()) as s:
145
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
146
struct.pack(b"16s16x", interface))
147
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
148
113
return interface_index
151
def copy_function(func):
152
"""Make a copy of a function"""
153
if sys.version_info.major == 2:
154
return types.FunctionType(func.func_code,
160
return types.FunctionType(func.__code__,
167
116
def initlogger(debug, level=logging.WARNING):
168
117
"""init logger and add loglevel"""
171
syslogger = (logging.handlers.SysLogHandler(
172
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
174
119
syslogger.setFormatter(logging.Formatter
175
120
('Mandos [%(process)d]: %(levelname)s:'
177
122
logger.addHandler(syslogger)
180
125
console = logging.StreamHandler()
181
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
248
179
.replace(b"\n", b"\\n")
249
180
.replace(b"\0", b"\\x00"))
252
183
def encrypt(self, data, password):
253
184
passphrase = self.password_encode(password)
254
with tempfile.NamedTemporaryFile(
255
dir=self.tempdir) as passfile:
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
256
187
passfile.write(passphrase)
258
proc = subprocess.Popen([self.gpg, '--symmetric',
189
proc = subprocess.Popen(['gpg', '--symmetric',
259
190
'--passphrase-file',
261
192
+ self.gnupgargs,
262
stdin=subprocess.PIPE,
263
stdout=subprocess.PIPE,
264
stderr=subprocess.PIPE)
265
ciphertext, err = proc.communicate(input=data)
193
stdin = subprocess.PIPE,
194
stdout = subprocess.PIPE,
195
stderr = subprocess.PIPE)
196
ciphertext, err = proc.communicate(input = data)
266
197
if proc.returncode != 0:
267
198
raise PGPError(err)
268
199
return ciphertext
270
201
def decrypt(self, data, password):
271
202
passphrase = self.password_encode(password)
272
with tempfile.NamedTemporaryFile(
273
dir=self.tempdir) as passfile:
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
274
205
passfile.write(passphrase)
276
proc = subprocess.Popen([self.gpg, '--decrypt',
207
proc = subprocess.Popen(['gpg', '--decrypt',
277
208
'--passphrase-file',
279
210
+ self.gnupgargs,
280
stdin=subprocess.PIPE,
281
stdout=subprocess.PIPE,
282
stderr=subprocess.PIPE)
283
decrypted_plaintext, err = proc.communicate(input=data)
211
stdin = subprocess.PIPE,
212
stdout = subprocess.PIPE,
213
stderr = subprocess.PIPE)
214
decrypted_plaintext, err = proc.communicate(input
284
216
if proc.returncode != 0:
285
217
raise PGPError(err)
286
218
return decrypted_plaintext
289
# Pretend that we have an Avahi module
291
"""This isn't so much a class as it is a module-like namespace."""
292
IF_UNSPEC = -1 # avahi-common/address.h
293
PROTO_UNSPEC = -1 # avahi-common/address.h
294
PROTO_INET = 0 # avahi-common/address.h
295
PROTO_INET6 = 1 # avahi-common/address.h
296
DBUS_NAME = "org.freedesktop.Avahi"
297
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
298
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
299
DBUS_PATH_SERVER = "/"
302
def string_array_to_txt_array(t):
303
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
304
for s in t), signature="ay")
305
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
306
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
307
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
308
SERVER_INVALID = 0 # avahi-common/defs.h
309
SERVER_REGISTERING = 1 # avahi-common/defs.h
310
SERVER_RUNNING = 2 # avahi-common/defs.h
311
SERVER_COLLISION = 3 # avahi-common/defs.h
312
SERVER_FAILURE = 4 # avahi-common/defs.h
315
221
class AvahiError(Exception):
316
222
def __init__(self, value, *args, **kwargs):
317
223
self.value = value
318
return super(AvahiError, self).__init__(value, *args,
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
322
228
class AvahiServiceError(AvahiError):
326
231
class AvahiGroupError(AvahiError):
235
class AvahiService(object):
331
236
"""An Avahi (Zeroconf) service.
334
239
interface: integer; avahi.IF_UNSPEC or an interface index.
335
240
Used to optionally bind to the specified interface.
500
383
follow_name_owner_changes=True),
501
384
avahi.DBUS_INTERFACE_SERVER)
502
385
self.server.connect_to_signal("StateChanged",
503
self.server_state_changed)
386
self.server_state_changed)
504
387
self.server_state_changed(self.server.GetState())
507
390
class AvahiServiceToSyslog(AvahiService):
508
def rename(self, *args, **kwargs):
509
392
"""Add the new name to the syslog messages"""
510
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
511
syslogger.setFormatter(logging.Formatter(
512
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
517
# Pretend that we have a GnuTLS module
519
"""This isn't so much a class as it is a module-like namespace."""
521
library = ctypes.util.find_library("gnutls")
523
library = ctypes.util.find_library("gnutls-deb0")
524
_library = ctypes.cdll.LoadLibrary(library)
527
# Unless otherwise indicated, the constants and types below are
528
# all from the gnutls/gnutls.h C header file.
539
E_NO_CERTIFICATE_FOUND = -49
544
KEYID_USE_SHA256 = 1 # gnutls/x509.h
545
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
548
class session_int(ctypes.Structure):
550
session_t = ctypes.POINTER(session_int)
552
class certificate_credentials_st(ctypes.Structure):
554
certificate_credentials_t = ctypes.POINTER(
555
certificate_credentials_st)
556
certificate_type_t = ctypes.c_int
558
class datum_t(ctypes.Structure):
559
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
560
('size', ctypes.c_uint)]
562
class openpgp_crt_int(ctypes.Structure):
564
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
565
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
566
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
567
credentials_type_t = ctypes.c_int
568
transport_ptr_t = ctypes.c_void_p
569
close_request_t = ctypes.c_int
572
class Error(Exception):
573
def __init__(self, message=None, code=None, args=()):
574
# Default usage is by a message string, but if a return
575
# code is passed, convert it to a string with
578
if message is None and code is not None:
579
message = gnutls.strerror(code)
580
return super(gnutls.Error, self).__init__(
583
class CertificateSecurityError(Error):
589
self._c_object = gnutls.certificate_credentials_t()
590
gnutls.certificate_allocate_credentials(
591
ctypes.byref(self._c_object))
592
self.type = gnutls.CRD_CERTIFICATE
595
gnutls.certificate_free_credentials(self._c_object)
598
def __init__(self, socket, credentials=None):
599
self._c_object = gnutls.session_t()
600
gnutls_flags = gnutls.CLIENT
601
if gnutls.check_version(b"3.5.6"):
602
gnutls_flags |= gnutls.NO_TICKETS
604
gnutls_flags |= gnutls.ENABLE_RAWPK
605
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
607
gnutls.set_default_priority(self._c_object)
608
gnutls.transport_set_ptr(self._c_object, socket.fileno())
609
gnutls.handshake_set_private_extensions(self._c_object,
612
if credentials is None:
613
credentials = gnutls.Credentials()
614
gnutls.credentials_set(self._c_object, credentials.type,
615
ctypes.cast(credentials._c_object,
617
self.credentials = credentials
620
gnutls.deinit(self._c_object)
623
return gnutls.handshake(self._c_object)
625
def send(self, data):
629
data_len -= gnutls.record_send(self._c_object,
634
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
636
# Error handling functions
637
def _error_code(result):
638
"""A function to raise exceptions on errors, suitable
639
for the 'restype' attribute on ctypes functions"""
642
if result == gnutls.E_NO_CERTIFICATE_FOUND:
643
raise gnutls.CertificateSecurityError(code=result)
644
raise gnutls.Error(code=result)
646
def _retry_on_error(result, func, arguments):
647
"""A function to retry on some errors, suitable
648
for the 'errcheck' attribute on ctypes functions"""
650
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
651
return _error_code(result)
652
result = func(*arguments)
655
# Unless otherwise indicated, the function declarations below are
656
# all from the gnutls/gnutls.h C header file.
659
priority_set_direct = _library.gnutls_priority_set_direct
660
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
661
ctypes.POINTER(ctypes.c_char_p)]
662
priority_set_direct.restype = _error_code
664
init = _library.gnutls_init
665
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
666
init.restype = _error_code
668
set_default_priority = _library.gnutls_set_default_priority
669
set_default_priority.argtypes = [session_t]
670
set_default_priority.restype = _error_code
672
record_send = _library.gnutls_record_send
673
record_send.argtypes = [session_t, ctypes.c_void_p,
675
record_send.restype = ctypes.c_ssize_t
676
record_send.errcheck = _retry_on_error
678
certificate_allocate_credentials = (
679
_library.gnutls_certificate_allocate_credentials)
680
certificate_allocate_credentials.argtypes = [
681
ctypes.POINTER(certificate_credentials_t)]
682
certificate_allocate_credentials.restype = _error_code
684
certificate_free_credentials = (
685
_library.gnutls_certificate_free_credentials)
686
certificate_free_credentials.argtypes = [
687
certificate_credentials_t]
688
certificate_free_credentials.restype = None
690
handshake_set_private_extensions = (
691
_library.gnutls_handshake_set_private_extensions)
692
handshake_set_private_extensions.argtypes = [session_t,
694
handshake_set_private_extensions.restype = None
696
credentials_set = _library.gnutls_credentials_set
697
credentials_set.argtypes = [session_t, credentials_type_t,
699
credentials_set.restype = _error_code
701
strerror = _library.gnutls_strerror
702
strerror.argtypes = [ctypes.c_int]
703
strerror.restype = ctypes.c_char_p
705
certificate_type_get = _library.gnutls_certificate_type_get
706
certificate_type_get.argtypes = [session_t]
707
certificate_type_get.restype = _error_code
709
certificate_get_peers = _library.gnutls_certificate_get_peers
710
certificate_get_peers.argtypes = [session_t,
711
ctypes.POINTER(ctypes.c_uint)]
712
certificate_get_peers.restype = ctypes.POINTER(datum_t)
714
global_set_log_level = _library.gnutls_global_set_log_level
715
global_set_log_level.argtypes = [ctypes.c_int]
716
global_set_log_level.restype = None
718
global_set_log_function = _library.gnutls_global_set_log_function
719
global_set_log_function.argtypes = [log_func]
720
global_set_log_function.restype = None
722
deinit = _library.gnutls_deinit
723
deinit.argtypes = [session_t]
724
deinit.restype = None
726
handshake = _library.gnutls_handshake
727
handshake.argtypes = [session_t]
728
handshake.restype = _error_code
729
handshake.errcheck = _retry_on_error
731
transport_set_ptr = _library.gnutls_transport_set_ptr
732
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
733
transport_set_ptr.restype = None
735
bye = _library.gnutls_bye
736
bye.argtypes = [session_t, close_request_t]
737
bye.restype = _error_code
738
bye.errcheck = _retry_on_error
740
check_version = _library.gnutls_check_version
741
check_version.argtypes = [ctypes.c_char_p]
742
check_version.restype = ctypes.c_char_p
744
_need_version = b"3.3.0"
745
if check_version(_need_version) is None:
746
raise self.Error("Needs GnuTLS {} or later"
747
.format(_need_version))
749
_tls_rawpk_version = b"3.6.6"
750
has_rawpk = bool(check_version(_tls_rawpk_version))
754
class pubkey_st(ctypes.Structure):
756
pubkey_t = ctypes.POINTER(pubkey_st)
758
x509_crt_fmt_t = ctypes.c_int
760
# All the function declarations below are from gnutls/abstract.h
761
pubkey_init = _library.gnutls_pubkey_init
762
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
763
pubkey_init.restype = _error_code
765
pubkey_import = _library.gnutls_pubkey_import
766
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
768
pubkey_import.restype = _error_code
770
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
771
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
772
ctypes.POINTER(ctypes.c_ubyte),
773
ctypes.POINTER(ctypes.c_size_t)]
774
pubkey_get_key_id.restype = _error_code
776
pubkey_deinit = _library.gnutls_pubkey_deinit
777
pubkey_deinit.argtypes = [pubkey_t]
778
pubkey_deinit.restype = None
780
# All the function declarations below are from gnutls/openpgp.h
782
openpgp_crt_init = _library.gnutls_openpgp_crt_init
783
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
784
openpgp_crt_init.restype = _error_code
786
openpgp_crt_import = _library.gnutls_openpgp_crt_import
787
openpgp_crt_import.argtypes = [openpgp_crt_t,
788
ctypes.POINTER(datum_t),
790
openpgp_crt_import.restype = _error_code
792
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
793
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
794
ctypes.POINTER(ctypes.c_uint)]
795
openpgp_crt_verify_self.restype = _error_code
797
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
798
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
799
openpgp_crt_deinit.restype = None
801
openpgp_crt_get_fingerprint = (
802
_library.gnutls_openpgp_crt_get_fingerprint)
803
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
807
openpgp_crt_get_fingerprint.restype = _error_code
809
if check_version(b"3.6.4"):
810
certificate_type_get2 = _library.gnutls_certificate_type_get2
811
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
812
certificate_type_get2.restype = _error_code
814
# Remove non-public functions
815
del _error_code, _retry_on_error
818
def call_pipe(connection, # : multiprocessing.Connection
819
func, *args, **kwargs):
820
"""This function is meant to be called by multiprocessing.Process
822
This function runs func(*args, **kwargs), and writes the resulting
823
return value on the provided multiprocessing.Connection.
825
connection.send(func(*args, **kwargs))
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):
830
409
"""A representation of a client host served by this server.
833
412
approved: bool(); 'None' if not yet approved/disapproved
834
413
approval_delay: datetime.timedelta(); Time to wait for approval
835
414
approval_duration: datetime.timedelta(); Duration of one approval
836
checker: multiprocessing.Process(); a running checker process used
837
to see if the client lives. 'None' if no process is
839
checker_callback_tag: a GLib event source tag, or None
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
840
419
checker_command: string; External command which is run to check
841
420
if client lives. %() expansions are done at
842
421
runtime with vars(self) as dict, so that for
843
422
instance %(name)s can be used in the command.
844
checker_initiator_tag: a GLib event source tag, or None
423
checker_initiator_tag: a gobject event source tag, or None
845
424
created: datetime.datetime(); (UTC) object creation
846
425
client_structure: Object describing what attributes a client has
847
426
and is used for storing the client at exit
848
427
current_checker_command: string; current running checker_command
849
disable_initiator_tag: a GLib event source tag, or None
428
disable_initiator_tag: a gobject event source tag, or None
851
430
fingerprint: string (40 or 32 hexadecimal digits); used to
852
uniquely identify an OpenPGP client
853
key_id: string (64 hexadecimal digits); used to uniquely identify
854
a client using raw public keys
431
uniquely identify the client
855
432
host: string; available for use by the checker command
856
433
interval: datetime.timedelta(); How often to start a new checker
857
434
last_approval_request: datetime.datetime(); (UTC) or None
1014
601
logger.info("Disabling client %s", self.name)
1015
602
if getattr(self, "disable_initiator_tag", None) is not None:
1016
GLib.source_remove(self.disable_initiator_tag)
603
gobject.source_remove(self.disable_initiator_tag)
1017
604
self.disable_initiator_tag = None
1018
605
self.expires = None
1019
606
if getattr(self, "checker_initiator_tag", None) is not None:
1020
GLib.source_remove(self.checker_initiator_tag)
607
gobject.source_remove(self.checker_initiator_tag)
1021
608
self.checker_initiator_tag = None
1022
609
self.stop_checker()
1023
610
self.enabled = False
1025
612
self.send_changedstate()
1026
# Do not run this again if called by a GLib.timeout_add
613
# Do not run this again if called by a gobject.timeout_add
1029
616
def __del__(self):
1032
619
def init_checker(self):
1033
620
# Schedule a new checker to be started an 'interval' from now,
1034
621
# and every interval from then on.
1035
622
if self.checker_initiator_tag is not None:
1036
GLib.source_remove(self.checker_initiator_tag)
1037
self.checker_initiator_tag = GLib.timeout_add(
1038
int(self.interval.total_seconds() * 1000),
623
gobject.source_remove(self.checker_initiator_tag)
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
1040
627
# Schedule a disable() when 'timeout' has passed
1041
628
if self.disable_initiator_tag is not None:
1042
GLib.source_remove(self.disable_initiator_tag)
1043
self.disable_initiator_tag = GLib.timeout_add(
1044
int(self.timeout.total_seconds() * 1000), self.disable)
629
gobject.source_remove(self.disable_initiator_tag)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
1045
633
# Also start a new checker *right now*.
1046
634
self.start_checker()
1048
def checker_callback(self, source, condition, connection,
636
def checker_callback(self, pid, condition, command):
1050
637
"""The checker has completed, so take appropriate actions."""
1051
# Read return code from connection (see call_pipe)
1052
returncode = connection.recv()
1054
if self.checker is not None:
1056
638
self.checker_callback_tag = None
1057
639
self.checker = None
1060
self.last_checker_status = returncode
1061
self.last_checker_signal = None
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
1062
642
if self.last_checker_status == 0:
1063
643
logger.info("Checker for %(name)s succeeded",
1065
645
self.checked_ok()
1067
logger.info("Checker for %(name)s failed", vars(self))
647
logger.info("Checker for %(name)s failed",
1069
650
self.last_checker_status = -1
1070
self.last_checker_signal = -returncode
1071
651
logger.warning("Checker for %(name)s crashed?",
1075
654
def checked_ok(self):
1076
655
"""Assert that the client has been seen, alive and well."""
1077
656
self.last_checked_ok = datetime.datetime.utcnow()
1078
657
self.last_checker_status = 0
1079
self.last_checker_signal = None
1080
658
self.bump_timeout()
1082
660
def bump_timeout(self, timeout=None):
1083
661
"""Bump up the timeout for this client."""
1084
662
if timeout is None:
1085
663
timeout = self.timeout
1086
664
if self.disable_initiator_tag is not None:
1087
GLib.source_remove(self.disable_initiator_tag)
665
gobject.source_remove(self.disable_initiator_tag)
1088
666
self.disable_initiator_tag = None
1089
667
if getattr(self, "enabled", False):
1090
self.disable_initiator_tag = GLib.timeout_add(
1091
int(timeout.total_seconds() * 1000), self.disable)
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
1092
671
self.expires = datetime.datetime.utcnow() + timeout
1094
673
def need_approval(self):
1095
674
self.last_approval_request = datetime.datetime.utcnow()
1097
676
def start_checker(self):
1098
677
"""Start a new checker subprocess if one is not running.
1100
679
If a checker already exists, leave it running and do
1102
681
# The reason for not killing a running checker is that if we
1107
686
# checkers alone, the checker would have to take more time
1108
687
# than 'timeout' for the client to be disabled, which is as it
1111
if self.checker is not None and not self.checker.is_alive():
1112
logger.warning("Checker was not alive; joining")
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)
1115
703
# Start a new checker if needed
1116
704
if self.checker is None:
1117
705
# Escape attributes for the shell
1119
attr: re.escape(str(getattr(self, attr)))
1120
for attr in self.runtime_expansions}
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
709
self.runtime_expansions)
1122
711
command = self.checker_command % escaped_attrs
1123
712
except TypeError as error:
1124
713
logger.error('Could not format string "%s"',
1125
self.checker_command,
714
self.checker_command, exc_info=error)
715
return True # Try again later
716
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",
1127
return True # Try again later
1128
self.current_checker_command = command
1129
logger.info("Starting checker %r for %s", command,
1131
# We don't need to redirect stdout and stderr, since
1132
# in normal mode, that is already done by daemon(),
1133
# and in debug mode we don't want to. (Stdin is
1134
# always replaced by /dev/null.)
1135
# The exception is when not debugging but nevertheless
1136
# running in the foreground; use the previously
1138
popen_args = {"close_fds": True,
1141
if (not self.server_settings["debug"]
1142
and self.server_settings["foreground"]):
1143
popen_args.update({"stdout": wnull,
1145
pipe = multiprocessing.Pipe(duplex=False)
1146
self.checker = multiprocessing.Process(
1148
args=(pipe[1], subprocess.call, command),
1150
self.checker.start()
1151
self.checker_callback_tag = GLib.io_add_watch(
1152
GLib.IOChannel.unix_new(pipe[0].fileno()),
1153
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1154
self.checker_callback, pipe[0], command)
1155
# Re-run this periodically if run by GLib.timeout_add
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
1158
761
def stop_checker(self):
1159
762
"""Force the checker process, if any, to stop."""
1160
763
if self.checker_callback_tag:
1161
GLib.source_remove(self.checker_callback_tag)
764
gobject.source_remove(self.checker_callback_tag)
1162
765
self.checker_callback_tag = None
1163
766
if getattr(self, "checker", None) is None:
1165
768
logger.debug("Stopping checker for %(name)s", vars(self))
1166
self.checker.terminate()
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
1167
777
self.checker = None
1170
def dbus_service_property(dbus_interface,
780
def dbus_service_property(dbus_interface, signature="v",
781
access="readwrite", byte_arrays=False):
1174
782
"""Decorators for marking methods of a DBusObjectWithProperties to
1175
783
become properties on the D-Bus.
1177
785
The decorated method will be called with no arguments by "Get"
1178
786
and with one argument by "Set".
1180
788
The parameters, where they are supported, are the same as
1181
789
dbus.service.method, except there is only "signature", since the
1182
790
type from Get() and the type sent to Set() is the same.
1265
class DBusObjectWithAnnotations(dbus.service.Object):
1266
"""A D-Bus object with annotations.
1268
Classes inheriting from this can use the dbus_annotations
1269
decorator to add annotations to methods or signals.
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.
1273
875
def _is_dbus_thing(thing):
1274
876
"""Returns a function testing if an attribute is a D-Bus thing
1276
878
If called like _is_dbus_thing("method") it returns a function
1277
879
suitable for use as predicate to inspect.getmembers().
1279
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1282
884
def _get_all_dbus_things(self, thing):
1283
885
"""Returns a generator of (name, attribute) pairs
1285
return ((getattr(athing.__get__(self), "_dbus_name", name),
887
return ((getattr(athing.__get__(self), "_dbus_name",
1286
889
athing.__get__(self))
1287
890
for cls in self.__class__.__mro__
1288
891
for name, athing in
1289
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1291
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1293
path_keyword='object_path',
1294
connection_keyword='connection')
1295
def Introspect(self, object_path, connection):
1296
"""Overloading of standard D-Bus method.
1298
Inserts annotation tags on methods and signals.
1300
xmlstring = dbus.service.Object.Introspect(self, object_path,
1303
document = xml.dom.minidom.parseString(xmlstring)
1305
for if_tag in document.getElementsByTagName("interface"):
1306
# Add annotation tags
1307
for typ in ("method", "signal"):
1308
for tag in if_tag.getElementsByTagName(typ):
1310
for name, prop in (self.
1311
_get_all_dbus_things(typ)):
1312
if (name == tag.getAttribute("name")
1313
and prop._dbus_interface
1314
== if_tag.getAttribute("name")):
1315
annots.update(getattr(
1316
prop, "_dbus_annotations", {}))
1317
for name, value in annots.items():
1318
ann_tag = document.createElement(
1320
ann_tag.setAttribute("name", name)
1321
ann_tag.setAttribute("value", value)
1322
tag.appendChild(ann_tag)
1323
# Add interface annotation tags
1324
for annotation, value in dict(
1325
itertools.chain.from_iterable(
1326
annotations().items()
1327
for name, annotations
1328
in self._get_all_dbus_things("interface")
1329
if name == if_tag.getAttribute("name")
1331
ann_tag = document.createElement("annotation")
1332
ann_tag.setAttribute("name", annotation)
1333
ann_tag.setAttribute("value", value)
1334
if_tag.appendChild(ann_tag)
1335
# Fix argument name for the Introspect method itself
1336
if (if_tag.getAttribute("name")
1337
== dbus.INTROSPECTABLE_IFACE):
1338
for cn in if_tag.getElementsByTagName("method"):
1339
if cn.getAttribute("name") == "Introspect":
1340
for arg in cn.getElementsByTagName("arg"):
1341
if (arg.getAttribute("direction")
1343
arg.setAttribute("name",
1345
xmlstring = document.toxml("utf-8")
1347
except (AttributeError, xml.dom.DOMException,
1348
xml.parsers.expat.ExpatError) as error:
1349
logger.error("Failed to override Introspection method",
1354
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1355
"""A D-Bus object with properties.
1357
Classes inheriting from this can use the dbus_service_property
1358
decorator to expose methods as D-Bus properties. It exposes the
1359
standard Get(), Set(), and GetAll() methods on the D-Bus.
892
inspect.getmembers(cls,
893
self._is_dbus_thing(thing)))
1362
895
def _get_dbus_property(self, interface_name, property_name):
1363
896
"""Returns a bound method if one exists which is a D-Bus
1364
897
property with the specified name and interface.
1366
for cls in self.__class__.__mro__:
1367
for name, value in inspect.getmembers(
1368
cls, self._is_dbus_thing("property")):
899
for cls in self.__class__.__mro__:
900
for name, value in (inspect.getmembers
902
self._is_dbus_thing("property"))):
1369
903
if (value._dbus_name == property_name
1370
904
and value._dbus_interface == interface_name):
1371
905
return value.__get__(self)
1373
907
# No such property
1374
raise DBusPropertyNotFound("{}:{}.{}".format(
1375
self.dbus_object_path, interface_name, property_name))
1378
def _get_all_interface_names(cls):
1379
"""Get a sequence of all interfaces supported by an object"""
1380
return (name for name in set(getattr(getattr(x, attr),
1381
"_dbus_interface", None)
1382
for x in (inspect.getmro(cls))
1384
if name is not None)
1386
@dbus.service.method(dbus.PROPERTIES_IFACE,
908
raise DBusPropertyNotFound(self.dbus_object_path + ":"
909
+ interface_name + "."
912
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1388
913
out_signature="v")
1389
914
def Get(self, interface_name, property_name):
1390
915
"""Standard D-Bus property Get() method, see D-Bus standard.
1518
1045
return xmlstring
1522
dbus.OBJECT_MANAGER_IFACE
1523
except AttributeError:
1524
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1527
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1528
"""A D-Bus object with an ObjectManager.
1530
Classes inheriting from this exposes the standard
1531
GetManagedObjects call and the InterfacesAdded and
1532
InterfacesRemoved signals on the standard
1533
"org.freedesktop.DBus.ObjectManager" interface.
1535
Note: No signals are sent automatically; they must be sent
1538
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1539
out_signature="a{oa{sa{sv}}}")
1540
def GetManagedObjects(self):
1541
"""This function must be overridden"""
1542
raise NotImplementedError()
1544
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1545
signature="oa{sa{sv}}")
1546
def InterfacesAdded(self, object_path, interfaces_and_properties):
1549
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1550
def InterfacesRemoved(self, object_path, interfaces):
1553
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1555
path_keyword='object_path',
1556
connection_keyword='connection')
1557
def Introspect(self, object_path, connection):
1558
"""Overloading of standard D-Bus method.
1560
Override return argument name of GetManagedObjects to be
1561
"objpath_interfaces_and_properties"
1563
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1567
document = xml.dom.minidom.parseString(xmlstring)
1569
for if_tag in document.getElementsByTagName("interface"):
1570
# Fix argument name for the GetManagedObjects method
1571
if (if_tag.getAttribute("name")
1572
== dbus.OBJECT_MANAGER_IFACE):
1573
for cn in if_tag.getElementsByTagName("method"):
1574
if (cn.getAttribute("name")
1575
== "GetManagedObjects"):
1576
for arg in cn.getElementsByTagName("arg"):
1577
if (arg.getAttribute("direction")
1581
"objpath_interfaces"
1583
xmlstring = document.toxml("utf-8")
1585
except (AttributeError, xml.dom.DOMException,
1586
xml.parsers.expat.ExpatError) as error:
1587
logger.error("Failed to override Introspection method",
1592
1048
def datetime_to_dbus(dt, variant_level=0):
1593
1049
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1595
return dbus.String("", variant_level=variant_level)
1596
return dbus.String(dt.isoformat(), variant_level=variant_level)
1051
return dbus.String("", variant_level = variant_level)
1052
return dbus.String(dt.isoformat(),
1053
variant_level=variant_level)
1599
1056
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1960
1409
server to mandos-client
1964
1413
# Rejected - signal
1965
1414
@dbus.service.signal(_interface, signature="s")
1966
1415
def Rejected(self, reason):
1970
1419
# NeedApproval - signal
1971
1420
@dbus.service.signal(_interface, signature="tb")
1972
1421
def NeedApproval(self, timeout, default):
1974
1423
return self.need_approval()
1978
1427
# Approve - method
1979
1428
@dbus.service.method(_interface, in_signature="b")
1980
1429
def Approve(self, value):
1981
1430
self.approve(value)
1983
1432
# CheckedOK - method
1984
1433
@dbus.service.method(_interface)
1985
1434
def CheckedOK(self):
1986
1435
self.checked_ok()
1988
1437
# Enable - method
1989
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1990
1438
@dbus.service.method(_interface)
1991
1439
def Enable(self):
1995
1443
# StartChecker - method
1996
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1997
1444
@dbus.service.method(_interface)
1998
1445
def StartChecker(self):
2000
1447
self.start_checker()
2002
1449
# Disable - method
2003
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2004
1450
@dbus.service.method(_interface)
2005
1451
def Disable(self):
2009
1455
# StopChecker - method
2010
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2011
1456
@dbus.service.method(_interface)
2012
1457
def StopChecker(self):
2013
1458
self.stop_checker()
2017
1462
# ApprovalPending - property
2018
1463
@dbus_service_property(_interface, signature="b", access="read")
2019
1464
def ApprovalPending_dbus_property(self):
2020
1465
return dbus.Boolean(bool(self.approvals_pending))
2022
1467
# ApprovedByDefault - property
2023
@dbus_service_property(_interface,
1468
@dbus_service_property(_interface, signature="b",
2025
1469
access="readwrite")
2026
1470
def ApprovedByDefault_dbus_property(self, value=None):
2027
1471
if value is None: # get
2028
1472
return dbus.Boolean(self.approved_by_default)
2029
1473
self.approved_by_default = bool(value)
2031
1475
# ApprovalDelay - property
2032
@dbus_service_property(_interface,
1476
@dbus_service_property(_interface, signature="t",
2034
1477
access="readwrite")
2035
1478
def ApprovalDelay_dbus_property(self, value=None):
2036
1479
if value is None: # get
2037
return dbus.UInt64(self.approval_delay.total_seconds()
1480
return dbus.UInt64(self.approval_delay_milliseconds())
2039
1481
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2041
1483
# ApprovalDuration - property
2042
@dbus_service_property(_interface,
1484
@dbus_service_property(_interface, signature="t",
2044
1485
access="readwrite")
2045
1486
def ApprovalDuration_dbus_property(self, value=None):
2046
1487
if value is None: # get
2047
return dbus.UInt64(self.approval_duration.total_seconds()
1488
return dbus.UInt64(timedelta_to_milliseconds(
1489
self.approval_duration))
2049
1490
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2051
1492
# Name - property
2053
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2054
1493
@dbus_service_property(_interface, signature="s", access="read")
2055
1494
def Name_dbus_property(self):
2056
1495
return dbus.String(self.name)
2060
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2061
@dbus_service_property(_interface, signature="s", access="read")
2062
def KeyID_dbus_property(self):
2063
return dbus.String(self.key_id)
2065
1497
# Fingerprint - property
2067
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2068
1498
@dbus_service_property(_interface, signature="s", access="read")
2069
1499
def Fingerprint_dbus_property(self):
2070
1500
return dbus.String(self.fingerprint)
2072
1502
# Host - property
2073
@dbus_service_property(_interface,
1503
@dbus_service_property(_interface, signature="s",
2075
1504
access="readwrite")
2076
1505
def Host_dbus_property(self, value=None):
2077
1506
if value is None: # get
2078
1507
return dbus.String(self.host)
2079
self.host = str(value)
1508
self.host = unicode(value)
2081
1510
# Created - property
2083
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2084
1511
@dbus_service_property(_interface, signature="s", access="read")
2085
1512
def Created_dbus_property(self):
2086
1513
return datetime_to_dbus(self.created)
2088
1515
# LastEnabled - property
2089
1516
@dbus_service_property(_interface, signature="s", access="read")
2090
1517
def LastEnabled_dbus_property(self):
2091
1518
return datetime_to_dbus(self.last_enabled)
2093
1520
# Enabled - property
2094
@dbus_service_property(_interface,
1521
@dbus_service_property(_interface, signature="b",
2096
1522
access="readwrite")
2097
1523
def Enabled_dbus_property(self, value=None):
2098
1524
if value is None: # get
2147
1572
if (getattr(self, "disable_initiator_tag", None)
2150
GLib.source_remove(self.disable_initiator_tag)
2151
self.disable_initiator_tag = GLib.timeout_add(
2152
int((self.expires - now).total_seconds() * 1000),
1575
gobject.source_remove(self.disable_initiator_tag)
1576
self.disable_initiator_tag = (
1577
gobject.timeout_add(
1578
timedelta_to_milliseconds(self.expires - now),
2155
1581
# ExtendedTimeout - property
2156
@dbus_service_property(_interface,
1582
@dbus_service_property(_interface, signature="t",
2158
1583
access="readwrite")
2159
1584
def ExtendedTimeout_dbus_property(self, value=None):
2160
1585
if value is None: # get
2161
return dbus.UInt64(self.extended_timeout.total_seconds()
1586
return dbus.UInt64(self.extended_timeout_milliseconds())
2163
1587
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2165
1589
# Interval - property
2166
@dbus_service_property(_interface,
1590
@dbus_service_property(_interface, signature="t",
2168
1591
access="readwrite")
2169
1592
def Interval_dbus_property(self, value=None):
2170
1593
if value is None: # get
2171
return dbus.UInt64(self.interval.total_seconds() * 1000)
1594
return dbus.UInt64(self.interval_milliseconds())
2172
1595
self.interval = datetime.timedelta(0, 0, 0, value)
2173
1596
if getattr(self, "checker_initiator_tag", None) is None:
2175
1598
if self.enabled:
2176
1599
# Reschedule checker run
2177
GLib.source_remove(self.checker_initiator_tag)
2178
self.checker_initiator_tag = GLib.timeout_add(
2179
value, self.start_checker)
2180
self.start_checker() # Start one now, too
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
2182
1605
# Checker - property
2183
@dbus_service_property(_interface,
1606
@dbus_service_property(_interface, signature="s",
2185
1607
access="readwrite")
2186
1608
def Checker_dbus_property(self, value=None):
2187
1609
if value is None: # get
2188
1610
return dbus.String(self.checker_command)
2189
self.checker_command = str(value)
1611
self.checker_command = unicode(value)
2191
1613
# CheckerRunning - property
2192
@dbus_service_property(_interface,
1614
@dbus_service_property(_interface, signature="b",
2194
1615
access="readwrite")
2195
1616
def CheckerRunning_dbus_property(self, value=None):
2196
1617
if value is None: # get
2253
1664
class ClientHandler(socketserver.BaseRequestHandler, object):
2254
1665
"""A class to handle client connections.
2256
1667
Instantiated once for each connection to handle it.
2257
1668
Note: This will run in its own forked process."""
2259
1670
def handle(self):
2260
1671
with contextlib.closing(self.server.child_pipe) as child_pipe:
2261
1672
logger.info("TCP connection from: %s",
2262
str(self.client_address))
1673
unicode(self.client_address))
2263
1674
logger.debug("Pipe FD: %d",
2264
1675
self.server.child_pipe.fileno())
2266
session = gnutls.ClientSession(self.request)
2268
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2269
# "+AES-256-CBC", "+SHA1",
2270
# "+COMP-NULL", "+CTYPE-OPENPGP",
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",
2272
1691
# Use a fallback default, since this MUST be set.
2273
1692
priority = self.server.gnutls_priority
2274
1693
if priority is None:
2275
1694
priority = "NORMAL"
2276
gnutls.priority_set_direct(session._c_object,
2277
priority.encode("utf-8"),
1695
(gnutls.library.functions
1696
.gnutls_priority_set_direct(session._c_object,
2280
1699
# Start communication using the Mandos protocol
2281
1700
# Get protocol number
2282
1701
line = self.request.makefile().readline()
2283
1702
logger.debug("Protocol version: %r", line)
2285
1704
if int(line.strip().split()[0]) > 1:
2286
raise RuntimeError(line)
2287
1706
except (ValueError, IndexError, RuntimeError) as error:
2288
1707
logger.error("Unknown protocol version: %s", error)
2291
1710
# Start GnuTLS connection
2293
1712
session.handshake()
2294
except gnutls.Error as error:
1713
except gnutls.errors.GNUTLSError as error:
2295
1714
logger.warning("Handshake failed: %s", error)
2296
1715
# Do not run session.bye() here: the session is not
2297
1716
# established. Just abandon the request.
2299
1718
logger.debug("Handshake succeeded")
2301
1720
approval_required = False
2303
if gnutls.has_rawpk:
2306
key_id = self.key_id(
2307
self.peer_certificate(session))
2308
except (TypeError, gnutls.Error) as error:
2309
logger.warning("Bad certificate: %s", error)
2311
logger.debug("Key ID: %s", key_id)
2316
fpr = self.fingerprint(
2317
self.peer_certificate(session))
2318
except (TypeError, gnutls.Error) as error:
2319
logger.warning("Bad certificate: %s", error)
2321
logger.debug("Fingerprint: %s", fpr)
2324
client = ProxyClient(child_pipe, key_id, fpr,
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,
2325
1733
self.client_address)
2326
1734
except KeyError:
2329
1737
if client.approval_delay:
2330
1738
delay = client.approval_delay
2331
1739
client.approvals_pending += 1
2332
1740
approval_required = True
2335
1743
if not client.enabled:
2336
1744
logger.info("Client %s is disabled",
2338
1746
if self.server.use_dbus:
2339
1747
# Emit D-Bus signal
2340
1748
client.Rejected("Disabled")
2343
1751
if client.approved or not client.approval_delay:
2344
# We are approved or approval is disabled
1752
#We are approved or approval is disabled
2346
1754
elif client.approved is None:
2347
1755
logger.info("Client %s needs approval",
2380
1790
delay -= time2 - time
2383
session.send(client.secret)
2384
except gnutls.Error as error:
2385
logger.warning("gnutls send failed",
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))
2389
1805
logger.info("Sending secret to %s", client.name)
2390
1806
# bump the timeout using extended_timeout
2391
1807
client.bump_timeout(client.extended_timeout)
2392
1808
if self.server.use_dbus:
2393
1809
# Emit D-Bus signal
2394
1810
client.GotSecret()
2397
1813
if approval_required:
2398
1814
client.approvals_pending -= 1
2401
except gnutls.Error as error:
1817
except gnutls.errors.GNUTLSError as error:
2402
1818
logger.warning("GnuTLS bye failed",
2403
1819
exc_info=error)
2406
1822
def peer_certificate(session):
2407
"Return the peer's certificate as a bytestring"
2409
cert_type = gnutls.certificate_type_get2(session._c_object,
2411
except AttributeError:
2412
cert_type = gnutls.certificate_type_get(session._c_object)
2413
if gnutls.has_rawpk:
2414
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2416
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2417
# If not a valid certificate type...
2418
if cert_type not in valid_cert_types:
2419
logger.info("Cert type %r not in %r", cert_type,
2421
# ...return invalid data
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
2423
1830
list_size = ctypes.c_uint(1)
2424
cert_list = (gnutls.certificate_get_peers
1831
cert_list = (gnutls.library.functions
1832
.gnutls_certificate_get_peers
2425
1833
(session._c_object, ctypes.byref(list_size)))
2426
1834
if not bool(cert_list) and list_size.value != 0:
2427
raise gnutls.Error("error getting peer certificate")
1835
raise gnutls.errors.GNUTLSError("error getting peer"
2428
1837
if list_size.value == 0:
2430
1839
cert = cert_list[0]
2431
1840
return ctypes.string_at(cert.data, cert.size)
2434
def key_id(certificate):
2435
"Convert a certificate bytestring to a hexdigit key ID"
2436
# New GnuTLS "datum" with the public key
2437
datum = gnutls.datum_t(
2438
ctypes.cast(ctypes.c_char_p(certificate),
2439
ctypes.POINTER(ctypes.c_ubyte)),
2440
ctypes.c_uint(len(certificate)))
2441
# XXX all these need to be created in the gnutls "module"
2442
# New empty GnuTLS certificate
2443
pubkey = gnutls.pubkey_t()
2444
gnutls.pubkey_init(ctypes.byref(pubkey))
2445
# Import the raw public key into the certificate
2446
gnutls.pubkey_import(pubkey,
2447
ctypes.byref(datum),
2448
gnutls.X509_FMT_DER)
2449
# New buffer for the key ID
2450
buf = ctypes.create_string_buffer(32)
2451
buf_len = ctypes.c_size_t(len(buf))
2452
# Get the key ID from the raw public key into the buffer
2453
gnutls.pubkey_get_key_id(pubkey,
2454
gnutls.KEYID_USE_SHA256,
2455
ctypes.cast(ctypes.byref(buf),
2456
ctypes.POINTER(ctypes.c_ubyte)),
2457
ctypes.byref(buf_len))
2458
# Deinit the certificate
2459
gnutls.pubkey_deinit(pubkey)
2461
# Convert the buffer to a Python bytestring
2462
key_id = ctypes.string_at(buf, buf_len.value)
2463
# Convert the bytestring to hexadecimal notation
2464
hex_key_id = binascii.hexlify(key_id).upper()
2468
1843
def fingerprint(openpgp):
2469
1844
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2470
1845
# New GnuTLS "datum" with the OpenPGP public key
2471
datum = gnutls.datum_t(
2472
ctypes.cast(ctypes.c_char_p(openpgp),
2473
ctypes.POINTER(ctypes.c_ubyte)),
2474
ctypes.c_uint(len(openpgp)))
1846
datum = (gnutls.library.types
1847
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1850
ctypes.c_uint(len(openpgp))))
2475
1851
# New empty GnuTLS certificate
2476
crt = gnutls.openpgp_crt_t()
2477
gnutls.openpgp_crt_init(ctypes.byref(crt))
1852
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1853
(gnutls.library.functions
1854
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2478
1855
# Import the OpenPGP public key into the certificate
2479
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2480
gnutls.OPENPGP_FMT_RAW)
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1858
gnutls.library.constants
1859
.GNUTLS_OPENPGP_FMT_RAW))
2481
1860
# Verify the self signature in the key
2482
1861
crtverify = ctypes.c_uint()
2483
gnutls.openpgp_crt_verify_self(crt, 0,
2484
ctypes.byref(crtverify))
1862
(gnutls.library.functions
1863
.gnutls_openpgp_crt_verify_self(crt, 0,
1864
ctypes.byref(crtverify)))
2485
1865
if crtverify.value != 0:
2486
gnutls.openpgp_crt_deinit(crt)
2487
raise gnutls.CertificateSecurityError(code
1866
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1867
raise (gnutls.errors.CertificateSecurityError
2489
1869
# New buffer for the fingerprint
2490
1870
buf = ctypes.create_string_buffer(20)
2491
1871
buf_len = ctypes.c_size_t()
2492
1872
# Get the fingerprint from the certificate into the buffer
2493
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2494
ctypes.byref(buf_len))
1873
(gnutls.library.functions
1874
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1875
ctypes.byref(buf_len)))
2495
1876
# Deinit the certificate
2496
gnutls.openpgp_crt_deinit(crt)
1877
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2497
1878
# Convert the buffer to a Python bytestring
2498
1879
fpr = ctypes.string_at(buf, buf_len.value)
2499
1880
# Convert the bytestring to hexadecimal notation
2588
1963
# socket_wrapper(), if socketfd was set.
2589
1964
socketserver.TCPServer.__init__(self, server_address,
2590
1965
RequestHandlerClass)
2592
1967
def server_bind(self):
2593
1968
"""This overrides the normal server_bind() function
2594
1969
to bind to an interface if one was specified, and also NOT to
2595
1970
bind to an address or port if they were not specified."""
2596
global SO_BINDTODEVICE
2597
1971
if self.interface is not None:
2598
1972
if SO_BINDTODEVICE is None:
2599
# Fall back to a hard-coded value which seems to be
2601
logger.warning("SO_BINDTODEVICE not found, trying 25")
2602
SO_BINDTODEVICE = 25
2604
self.socket.setsockopt(
2605
socket.SOL_SOCKET, SO_BINDTODEVICE,
2606
(self.interface + "\0").encode("utf-8"))
2607
except socket.error as error:
2608
if error.errno == errno.EPERM:
2609
logger.error("No permission to bind to"
2610
" interface %s", self.interface)
2611
elif error.errno == errno.ENOPROTOOPT:
2612
logger.error("SO_BINDTODEVICE not available;"
2613
" cannot bind to interface %s",
2615
elif error.errno == errno.ENODEV:
2616
logger.error("Interface %s does not exist,"
2617
" cannot bind", self.interface)
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)
2620
1994
# Only bind(2) the socket if we really need to.
2621
1995
if self.server_address[0] or self.server_address[1]:
2622
if self.server_address[1]:
2623
self.allow_reuse_address = True
2624
1996
if not self.server_address[0]:
2625
1997
if self.address_family == socket.AF_INET6:
2626
any_address = "::" # in6addr_any
1998
any_address = "::" # in6addr_any
2628
any_address = "0.0.0.0" # INADDR_ANY
2000
any_address = "0.0.0.0" # INADDR_ANY
2629
2001
self.server_address = (any_address,
2630
2002
self.server_address[1])
2631
2003
elif not self.server_address[1]:
2632
self.server_address = (self.server_address[0], 0)
2004
self.server_address = (self.server_address[0],
2633
2006
# if self.interface:
2634
2007
# self.server_address = (self.server_address[0],
2665
2033
self.gnutls_priority = gnutls_priority
2666
2034
IPv6_TCPServer.__init__(self, server_address,
2667
2035
RequestHandlerClass,
2668
interface=interface,
2036
interface = interface,
2037
use_ipv6 = use_ipv6,
2038
socketfd = socketfd)
2672
2039
def server_activate(self):
2673
2040
if self.enabled:
2674
2041
return socketserver.TCPServer.server_activate(self)
2676
2043
def enable(self):
2677
2044
self.enabled = True
2679
2046
def add_pipe(self, parent_pipe, proc):
2680
2047
# Call "handle_ipc" for both data and EOF events
2682
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2683
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2684
functools.partial(self.handle_ipc,
2685
parent_pipe=parent_pipe,
2688
def handle_ipc(self, source, condition,
2691
client_object=None):
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):
2692
2057
# error, or the other end of multiprocessing.Pipe has closed
2693
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2058
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2694
2059
# Wait for other process to exit
2698
2063
# Read a request from the child
2699
2064
request = parent_pipe.recv()
2700
2065
command = request[0]
2702
2067
if command == 'init':
2703
key_id = request[1].decode("ascii")
2704
fpr = request[2].decode("ascii")
2705
address = request[3]
2707
for c in self.clients.values():
2708
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2710
if key_id and c.key_id == key_id:
2713
if fpr and c.fingerprint == fpr:
2069
address = request[2]
2071
for c in self.clients.itervalues():
2072
if c.fingerprint == fpr:
2717
logger.info("Client not found for key ID: %s, address"
2718
": %s", key_id or fpr, address)
2076
logger.info("Client not found for fingerprint: %s, ad"
2077
"dress: %s", fpr, address)
2719
2078
if self.use_dbus:
2720
2079
# Emit D-Bus signal
2721
mandos_dbus_service.ClientNotFound(key_id or fpr,
2080
mandos_dbus_service.ClientNotFound(fpr,
2723
2082
parent_pipe.send(False)
2727
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2728
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2729
functools.partial(self.handle_ipc,
2730
parent_pipe=parent_pipe,
2732
client_object=client))
2085
gobject.io_add_watch(parent_pipe.fileno(),
2086
gobject.IO_IN | gobject.IO_HUP,
2087
functools.partial(self.handle_ipc,
2733
2093
parent_pipe.send(True)
2734
2094
# remove the old hook in favor of the new above hook on
2738
2098
funcname = request[1]
2739
2099
args = request[2]
2740
2100
kwargs = request[3]
2742
2102
parent_pipe.send(('data', getattr(client_object,
2743
2103
funcname)(*args,
2746
2106
if command == 'getattr':
2747
2107
attrname = request[1]
2748
if isinstance(client_object.__getattribute__(attrname),
2749
collections.Callable):
2750
parent_pipe.send(('function', ))
2108
if callable(client_object.__getattribute__(attrname)):
2109
parent_pipe.send(('function',))
2753
'data', client_object.__getattribute__(attrname)))
2111
parent_pipe.send(('data', client_object
2112
.__getattribute__(attrname)))
2755
2114
if command == 'setattr':
2756
2115
attrname = request[1]
2757
2116
value = request[2]
2758
2117
setattr(client_object, attrname, value)
2763
2122
def rfc3339_duration_to_delta(duration):
2764
2123
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2766
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2768
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2770
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2772
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2774
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2776
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2778
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
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)
2782
2141
# Parsing an RFC 3339 duration with regular expressions is not
2783
2142
# possible - there would have to be multiple places for the same
2784
2143
# values, like seconds. The current code, while more esoteric, is
2785
2144
# cleaner without depending on a parsing library. If Python had a
2786
2145
# built-in library for parsing we would use it, but we'd like to
2787
2146
# avoid excessive use of external libraries.
2789
2148
# New type for defining tokens, syntax, and semantics all-in-one
2790
Token = collections.namedtuple("Token", (
2791
"regexp", # To match token; if "value" is not None, must have
2792
# a "group" containing digits
2793
"value", # datetime.timedelta or None
2794
"followers")) # Tokens valid after this token
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
2795
2158
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2796
2159
# the "duration" ABNF definition in RFC 3339, Appendix A.
2797
2160
token_end = Token(re.compile(r"$"), None, frozenset())
2798
2161
token_second = Token(re.compile(r"(\d+)S"),
2799
2162
datetime.timedelta(seconds=1),
2800
frozenset((token_end, )))
2163
frozenset((token_end,)))
2801
2164
token_minute = Token(re.compile(r"(\d+)M"),
2802
2165
datetime.timedelta(minutes=1),
2803
2166
frozenset((token_second, token_end)))
3135
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3137
2482
except OSError as error:
3138
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3139
.format(uid, gid, os.strerror(error.errno)))
3140
2483
if error.errno != errno.EPERM:
3144
2487
# Enable all possible GnuTLS debugging
3146
2489
# "Use a log level over 10 to enable all debugging options."
3147
2490
# - GnuTLS manual
3148
gnutls.global_set_log_level(11)
2491
gnutls.library.functions.gnutls_global_set_log_level(11)
2493
@gnutls.library.types.gnutls_log_func
3151
2494
def debug_gnutls(level, string):
3152
2495
logger.debug("GnuTLS: %s", string[:-1])
3154
gnutls.global_set_log_function(debug_gnutls)
2497
(gnutls.library.functions
2498
.gnutls_global_set_log_function(debug_gnutls))
3156
2500
# Redirect stdin so all checkers get /dev/null
3157
2501
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3158
2502
os.dup2(null, sys.stdin.fileno())
3162
2506
# Need to fork before connecting to D-Bus
3163
2507
if not foreground:
3164
2508
# Close all input and output, do double fork, etc.
3167
if gi.version_info < (3, 10, 2):
3168
# multiprocessing will use threads, so before we use GLib we
3169
# need to inform GLib that threads will be used.
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()
3172
2515
global main_loop
3173
2516
# From the Avahi example code
3174
2517
DBusGMainLoop(set_as_default=True)
3175
main_loop = GLib.MainLoop()
2518
main_loop = gobject.MainLoop()
3176
2519
bus = dbus.SystemBus()
3177
2520
# End of Avahi example code
3180
2523
bus_name = dbus.service.BusName("se.recompile.Mandos",
3183
old_bus_name = dbus.service.BusName(
3184
"se.bsnet.fukt.Mandos", bus,
3186
except dbus.exceptions.DBusException as e:
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:
3187
2529
logger.error("Disabling D-Bus:", exc_info=e)
3188
2530
use_dbus = False
3189
2531
server_settings["use_dbus"] = False
3190
2532
tcp_server.use_dbus = False
3192
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3193
service = AvahiServiceToSyslog(
3194
name=server_settings["servicename"],
3195
servicetype="_mandos._tcp",
3198
if server_settings["interface"]:
3199
service.interface = if_nametoindex(
3200
server_settings["interface"].encode("utf-8"))
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"])))
3202
2542
global multiprocessing_manager
3203
2543
multiprocessing_manager = multiprocessing.Manager()
3205
2545
client_class = Client
3207
client_class = functools.partial(ClientDBus, bus=bus)
2547
client_class = functools.partial(ClientDBus, bus = bus)
3209
2549
client_settings = Client.config_parser(client_config)
3210
2550
old_client_settings = {}
3211
2551
clients_data = {}
3213
2553
# This is used to redirect stdout and stderr for checker processes
3215
wnull = open(os.devnull, "w") # A writable /dev/null
2555
wnull = open(os.devnull, "w") # A writable /dev/null
3216
2556
# Only used if server is running in foreground but not in debug
3218
2558
if debug or not foreground:
3221
2561
# Get client data and settings from last running state.
3222
2562
if server_settings["restore"]:
3224
2564
with open(stored_state_path, "rb") as stored_state:
3225
if sys.version_info.major == 2:
3226
clients_data, old_client_settings = pickle.load(
3229
bytes_clients_data, bytes_old_client_settings = (
3230
pickle.load(stored_state, encoding="bytes"))
3231
# Fix bytes to strings
3234
clients_data = {(key.decode("utf-8")
3235
if isinstance(key, bytes)
3238
bytes_clients_data.items()}
3239
del bytes_clients_data
3240
for key in clients_data:
3241
value = {(k.decode("utf-8")
3242
if isinstance(k, bytes) else k): v
3244
clients_data[key].items()}
3245
clients_data[key] = value
3247
value["client_structure"] = [
3249
if isinstance(s, bytes)
3251
value["client_structure"]]
3252
# .name, .host, and .checker_command
3253
for k in ("name", "host", "checker_command"):
3254
if isinstance(value[k], bytes):
3255
value[k] = value[k].decode("utf-8")
3256
if "key_id" not in value:
3257
value["key_id"] = ""
3258
elif "fingerprint" not in value:
3259
value["fingerprint"] = ""
3260
# old_client_settings
3262
old_client_settings = {
3263
(key.decode("utf-8")
3264
if isinstance(key, bytes)
3267
bytes_old_client_settings.items()}
3268
del bytes_old_client_settings
3269
# .host and .checker_command
3270
for value in old_client_settings.values():
3271
for attribute in ("host", "checker_command"):
3272
if isinstance(value[attribute], bytes):
3273
value[attribute] = (value[attribute]
2565
clients_data, old_client_settings = (pickle.load
3275
2567
os.remove(stored_state_path)
3276
2568
except IOError as e:
3277
2569
if e.errno == errno.ENOENT:
3278
logger.warning("Could not load persistent state:"
3279
" {}".format(os.strerror(e.errno)))
2570
logger.warning("Could not load persistent state: {0}"
2571
.format(os.strerror(e.errno)))
3281
2573
logger.critical("Could not load persistent state:",
3284
2576
except EOFError as e:
3285
2577
logger.warning("Could not load persistent state: "
2578
"EOFError:", exc_info=e)
3289
2580
with PGPEngine() as pgp:
3290
for client_name, client in clients_data.items():
2581
for client_name, client in clients_data.iteritems():
3291
2582
# Skip removed clients
3292
2583
if client_name not in client_settings:
3295
2586
# Decide which value to use after restoring saved state.
3296
2587
# We have three different values: Old config file,
3297
2588
# new config file, and saved state.
3355
2646
for client_name in (set(client_settings)
3356
2647
- set(old_client_settings)):
3357
2648
clients_data[client_name] = client_settings[client_name]
3359
2650
# Create all client objects
3360
for client_name, client in clients_data.items():
2651
for client_name, client in clients_data.iteritems():
3361
2652
tcp_server.clients[client_name] = client_class(
3364
server_settings=server_settings)
2653
name = client_name, settings = client,
2654
server_settings = server_settings)
3366
2656
if not tcp_server.clients:
3367
2657
logger.warning("No clients defined")
3369
2659
if not foreground:
3370
2660
if pidfile is not None:
3374
print(pid, file=pidfile)
2664
pidfile.write(str(pid) + "\n".encode("utf-8"))
3375
2665
except IOError:
3376
2666
logger.error("Could not write to file %r with PID %d",
3377
2667
pidfilename, pid)
3379
2669
del pidfilename
3381
for termsig in (signal.SIGHUP, signal.SIGTERM):
3382
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3383
lambda: main_loop.quit() and False)
2671
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2672
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3387
@alternate_dbus_interfaces(
3388
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3389
class MandosDBusService(DBusObjectWithObjectManager):
2675
@alternate_dbus_interfaces({"se.recompile.Mandos":
2676
"se.bsnet.fukt.Mandos"})
2677
class MandosDBusService(DBusObjectWithProperties):
3390
2678
"""A D-Bus proxy object"""
3392
2679
def __init__(self):
3393
2680
dbus.service.Object.__init__(self, bus, "/")
3395
2681
_interface = "se.recompile.Mandos"
2683
@dbus_interface_annotations(_interface)
2685
return { "org.freedesktop.DBus.Property"
2686
".EmitsChangedSignal":
3397
2689
@dbus.service.signal(_interface, signature="o")
3398
2690
def ClientAdded(self, objpath):
3402
2694
@dbus.service.signal(_interface, signature="ss")
3403
def ClientNotFound(self, key_id, address):
2695
def ClientNotFound(self, fingerprint, address):
3407
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3409
2699
@dbus.service.signal(_interface, signature="os")
3410
2700
def ClientRemoved(self, objpath, name):
3414
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3416
2704
@dbus.service.method(_interface, out_signature="ao")
3417
2705
def GetAllClients(self):
3419
return dbus.Array(c.dbus_object_path for c in
3420
tcp_server.clients.values())
3422
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2707
return dbus.Array(c.dbus_object_path
2709
tcp_server.clients.itervalues())
3424
2711
@dbus.service.method(_interface,
3425
2712
out_signature="a{oa{sv}}")
3426
2713
def GetAllClientsWithProperties(self):
3428
2715
return dbus.Dictionary(
3429
{c.dbus_object_path: c.GetAll(
3430
"se.recompile.Mandos.Client")
3431
for c in tcp_server.clients.values()},
2716
((c.dbus_object_path, c.GetAll(""))
2717
for c in tcp_server.clients.itervalues()),
3432
2718
signature="oa{sv}")
3434
2720
@dbus.service.method(_interface, in_signature="o")
3435
2721
def RemoveClient(self, object_path):
3437
for c in tcp_server.clients.values():
2723
for c in tcp_server.clients.itervalues():
3438
2724
if c.dbus_object_path == object_path:
3439
2725
del tcp_server.clients[c.name]
3440
2726
c.remove_from_connection()
3441
# Don't signal the disabling
2727
# Don't signal anything except ClientRemoved
3442
2728
c.disable(quiet=True)
3443
# Emit D-Bus signal for removal
3444
self.client_removed_signal(c)
2730
self.ClientRemoved(object_path, c.name)
3446
2732
raise KeyError(object_path)
3450
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3451
out_signature="a{oa{sa{sv}}}")
3452
def GetManagedObjects(self):
3454
return dbus.Dictionary(
3455
{client.dbus_object_path:
3457
{interface: client.GetAll(interface)
3459
client._get_all_interface_names()})
3460
for client in tcp_server.clients.values()})
3462
def client_added_signal(self, client):
3463
"""Send the new standard signal and the old signal"""
3465
# New standard signal
3466
self.InterfacesAdded(
3467
client.dbus_object_path,
3469
{interface: client.GetAll(interface)
3471
client._get_all_interface_names()}))
3473
self.ClientAdded(client.dbus_object_path)
3475
def client_removed_signal(self, client):
3476
"""Send the new standard signal and the old signal"""
3478
# New standard signal
3479
self.InterfacesRemoved(
3480
client.dbus_object_path,
3481
client._get_all_interface_names())
3483
self.ClientRemoved(client.dbus_object_path,
3486
2736
mandos_dbus_service = MandosDBusService()
3488
# Save modules to variables to exempt the modules from being
3489
# unloaded before the function registered with atexit() is run.
3490
mp = multiprocessing
3494
2739
"Cleanup function; run on exit"
3498
mp.active_children()
2742
multiprocessing.active_children()
3500
2744
if not (tcp_server.clients or client_settings):
3503
2747
# Store client before exiting. Secrets are encrypted with key
3504
2748
# based on what config file has. If config file is
3505
2749
# removed/edited, old secret will thus be unrecovable.
3507
2751
with PGPEngine() as pgp:
3508
for client in tcp_server.clients.values():
2752
for client in tcp_server.clients.itervalues():
3509
2753
key = client_settings[client.name]["secret"]
3510
2754
client.encrypted_secret = pgp.encrypt(client.secret,
3512
2756
client_dict = {}
3514
2758
# A list of attributes that can not be pickled
3516
exclude = {"bus", "changedstate", "secret",
3517
"checker", "server_settings"}
3518
for name, typ in inspect.getmembers(dbus.service
2760
exclude = set(("bus", "changedstate", "secret",
2761
"checker", "server_settings"))
2762
for name, typ in (inspect.getmembers
2763
(dbus.service.Object)):
3520
2764
exclude.add(name)
3522
2766
client_dict["encrypted_secret"] = (client
3523
2767
.encrypted_secret)
3524
2768
for attr in client.client_structure:
3525
2769
if attr not in exclude:
3526
2770
client_dict[attr] = getattr(client, attr)
3528
2772
clients[client.name] = client_dict
3529
2773
del client_settings[client.name]["secret"]
3532
with tempfile.NamedTemporaryFile(
3536
dir=os.path.dirname(stored_state_path),
3537
delete=False) as stored_state:
3538
pickle.dump((clients, client_settings), stored_state,
3540
tempname = stored_state.name
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
3541
2782
os.rename(tempname, stored_state_path)
3542
2783
except (IOError, OSError) as e: