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
83
import dbus.service
85
from gi.repository import GLib
77
86
from dbus.mainloop.glib import DBusGMainLoop
80
89
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:
84
105
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
106
except AttributeError:
108
# This is where SO_BINDTODEVICE was up to and including Python
87
110
from IN import SO_BINDTODEVICE
88
111
except ImportError:
89
SO_BINDTODEVICE = None
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
92
130
stored_state_file = "clients.pickle"
94
132
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
133
logging.captureWarnings(True) # Show warnings via the logging system
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
137
if_nametoindex = ctypes.cdll.LoadLibrary(
138
ctypes.util.find_library("c")).if_nametoindex
103
139
except (OSError, AttributeError):
104
141
def if_nametoindex(interface):
105
142
"Get an interface index the hard way, i.e. using fcntl()"
106
143
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
144
with contextlib.closing(socket.socket()) as s:
108
145
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
146
struct.pack(b"16s16x", interface))
147
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
148
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__,
116
167
def initlogger(debug, level=logging.WARNING):
117
168
"""init logger and add loglevel"""
171
syslogger = (logging.handlers.SysLogHandler(
172
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
119
174
syslogger.setFormatter(logging.Formatter
120
175
('Mandos [%(process)d]: %(levelname)s:'
122
177
logger.addHandler(syslogger)
125
180
console = logging.StreamHandler()
126
181
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
179
248
.replace(b"\n", b"\\n")
180
249
.replace(b"\0", b"\\x00"))
183
252
def encrypt(self, data, password):
184
253
passphrase = self.password_encode(password)
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
254
with tempfile.NamedTemporaryFile(
255
dir=self.tempdir) as passfile:
187
256
passfile.write(passphrase)
189
proc = subprocess.Popen(['gpg', '--symmetric',
258
proc = subprocess.Popen([self.gpg, '--symmetric',
190
259
'--passphrase-file',
192
261
+ self.gnupgargs,
193
stdin = subprocess.PIPE,
194
stdout = subprocess.PIPE,
195
stderr = subprocess.PIPE)
196
ciphertext, err = proc.communicate(input = data)
262
stdin=subprocess.PIPE,
263
stdout=subprocess.PIPE,
264
stderr=subprocess.PIPE)
265
ciphertext, err = proc.communicate(input=data)
197
266
if proc.returncode != 0:
198
267
raise PGPError(err)
199
268
return ciphertext
201
270
def decrypt(self, data, password):
202
271
passphrase = self.password_encode(password)
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
272
with tempfile.NamedTemporaryFile(
273
dir=self.tempdir) as passfile:
205
274
passfile.write(passphrase)
207
proc = subprocess.Popen(['gpg', '--decrypt',
276
proc = subprocess.Popen([self.gpg, '--decrypt',
208
277
'--passphrase-file',
210
279
+ self.gnupgargs,
211
stdin = subprocess.PIPE,
212
stdout = subprocess.PIPE,
213
stderr = subprocess.PIPE)
214
decrypted_plaintext, err = proc.communicate(input
280
stdin=subprocess.PIPE,
281
stdout=subprocess.PIPE,
282
stderr=subprocess.PIPE)
283
decrypted_plaintext, err = proc.communicate(input=data)
216
284
if proc.returncode != 0:
217
285
raise PGPError(err)
218
286
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
221
315
class AvahiError(Exception):
222
316
def __init__(self, value, *args, **kwargs):
223
317
self.value = value
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
318
return super(AvahiError, self).__init__(value, *args,
228
322
class AvahiServiceError(AvahiError):
231
326
class AvahiGroupError(AvahiError):
235
class AvahiService(object):
236
331
"""An Avahi (Zeroconf) service.
239
334
interface: integer; avahi.IF_UNSPEC or an interface index.
240
335
Used to optionally bind to the specified interface.
383
500
follow_name_owner_changes=True),
384
501
avahi.DBUS_INTERFACE_SERVER)
385
502
self.server.connect_to_signal("StateChanged",
386
self.server_state_changed)
503
self.server_state_changed)
387
504
self.server_state_changed(self.server.GetState())
390
507
class AvahiServiceToSyslog(AvahiService):
508
def rename(self, *args, **kwargs):
392
509
"""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'
510
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
511
syslogger.setFormatter(logging.Formatter(
512
'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):
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))
409
830
"""A representation of a client host served by this server.
412
833
approved: bool(); 'None' if not yet approved/disapproved
413
834
approval_delay: datetime.timedelta(); Time to wait for approval
414
835
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
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
419
840
checker_command: string; External command which is run to check
420
841
if client lives. %() expansions are done at
421
842
runtime with vars(self) as dict, so that for
422
843
instance %(name)s can be used in the command.
423
checker_initiator_tag: a gobject event source tag, or None
844
checker_initiator_tag: a GLib event source tag, or None
424
845
created: datetime.datetime(); (UTC) object creation
425
846
client_structure: Object describing what attributes a client has
426
847
and is used for storing the client at exit
427
848
current_checker_command: string; current running checker_command
428
disable_initiator_tag: a gobject event source tag, or None
849
disable_initiator_tag: a GLib event source tag, or None
430
851
fingerprint: string (40 or 32 hexadecimal digits); used to
431
uniquely identify the client
852
uniquely identify an OpenPGP client
853
key_id: string (64 hexadecimal digits); used to uniquely identify
854
a client using raw public keys
432
855
host: string; available for use by the checker command
433
856
interval: datetime.timedelta(); How often to start a new checker
434
857
last_approval_request: datetime.datetime(); (UTC) or None
601
1014
logger.info("Disabling client %s", self.name)
602
1015
if getattr(self, "disable_initiator_tag", None) is not None:
603
gobject.source_remove(self.disable_initiator_tag)
1016
GLib.source_remove(self.disable_initiator_tag)
604
1017
self.disable_initiator_tag = None
605
1018
self.expires = None
606
1019
if getattr(self, "checker_initiator_tag", None) is not None:
607
gobject.source_remove(self.checker_initiator_tag)
1020
GLib.source_remove(self.checker_initiator_tag)
608
1021
self.checker_initiator_tag = None
609
1022
self.stop_checker()
610
1023
self.enabled = False
612
1025
self.send_changedstate()
613
# Do not run this again if called by a gobject.timeout_add
1026
# Do not run this again if called by a GLib.timeout_add
616
1029
def __del__(self):
619
1032
def init_checker(self):
620
1033
# Schedule a new checker to be started an 'interval' from now,
621
1034
# and every interval from then on.
622
1035
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(),
1036
GLib.source_remove(self.checker_initiator_tag)
1037
self.checker_initiator_tag = GLib.timeout_add(
1038
int(self.interval.total_seconds() * 1000),
627
1040
# Schedule a disable() when 'timeout' has passed
628
1041
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(),
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)
633
1045
# Also start a new checker *right now*.
634
1046
self.start_checker()
636
def checker_callback(self, pid, condition, command):
1048
def checker_callback(self, source, condition, connection,
637
1050
"""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:
638
1056
self.checker_callback_tag = None
639
1057
self.checker = None
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
1060
self.last_checker_status = returncode
1061
self.last_checker_signal = None
642
1062
if self.last_checker_status == 0:
643
1063
logger.info("Checker for %(name)s succeeded",
645
1065
self.checked_ok()
647
logger.info("Checker for %(name)s failed",
1067
logger.info("Checker for %(name)s failed", vars(self))
650
1069
self.last_checker_status = -1
1070
self.last_checker_signal = -returncode
651
1071
logger.warning("Checker for %(name)s crashed?",
654
1075
def checked_ok(self):
655
1076
"""Assert that the client has been seen, alive and well."""
656
1077
self.last_checked_ok = datetime.datetime.utcnow()
657
1078
self.last_checker_status = 0
1079
self.last_checker_signal = None
658
1080
self.bump_timeout()
660
1082
def bump_timeout(self, timeout=None):
661
1083
"""Bump up the timeout for this client."""
662
1084
if timeout is None:
663
1085
timeout = self.timeout
664
1086
if self.disable_initiator_tag is not None:
665
gobject.source_remove(self.disable_initiator_tag)
1087
GLib.source_remove(self.disable_initiator_tag)
666
1088
self.disable_initiator_tag = None
667
1089
if getattr(self, "enabled", False):
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
1090
self.disable_initiator_tag = GLib.timeout_add(
1091
int(timeout.total_seconds() * 1000), self.disable)
671
1092
self.expires = datetime.datetime.utcnow() + timeout
673
1094
def need_approval(self):
674
1095
self.last_approval_request = datetime.datetime.utcnow()
676
1097
def start_checker(self):
677
1098
"""Start a new checker subprocess if one is not running.
679
1100
If a checker already exists, leave it running and do
681
1102
# The reason for not killing a running checker is that if we
686
1107
# checkers alone, the checker would have to take more time
687
1108
# 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)
1111
if self.checker is not None and not self.checker.is_alive():
1112
logger.warning("Checker was not alive; joining")
703
1115
# Start a new checker if needed
704
1116
if self.checker is None:
705
1117
# Escape attributes for the shell
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
709
self.runtime_expansions)
1119
attr: re.escape(str(getattr(self, attr)))
1120
for attr in self.runtime_expansions}
711
1122
command = self.checker_command % escaped_attrs
712
1123
except TypeError as error:
713
1124
logger.error('Could not format string "%s"',
714
self.checker_command, exc_info=error)
715
return True # Try again later
1125
self.checker_command,
1127
return True # Try again later
716
1128
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
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
761
1158
def stop_checker(self):
762
1159
"""Force the checker process, if any, to stop."""
763
1160
if self.checker_callback_tag:
764
gobject.source_remove(self.checker_callback_tag)
1161
GLib.source_remove(self.checker_callback_tag)
765
1162
self.checker_callback_tag = None
766
1163
if getattr(self, "checker", None) is None:
768
1165
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
1166
self.checker.terminate()
777
1167
self.checker = None
780
def dbus_service_property(dbus_interface, signature="v",
781
access="readwrite", byte_arrays=False):
1170
def dbus_service_property(dbus_interface,
782
1174
"""Decorators for marking methods of a DBusObjectWithProperties to
783
1175
become properties on the D-Bus.
785
1177
The decorated method will be called with no arguments by "Get"
786
1178
and with one argument by "Set".
788
1180
The parameters, where they are supported, are the same as
789
1181
dbus.service.method, except there is only "signature", since the
790
1182
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.
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.
875
1273
def _is_dbus_thing(thing):
876
1274
"""Returns a function testing if an attribute is a D-Bus thing
878
1276
If called like _is_dbus_thing("method") it returns a function
879
1277
suitable for use as predicate to inspect.getmembers().
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1279
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
884
1282
def _get_all_dbus_things(self, thing):
885
1283
"""Returns a generator of (name, attribute) pairs
887
return ((getattr(athing.__get__(self), "_dbus_name",
1285
return ((getattr(athing.__get__(self), "_dbus_name", name),
889
1286
athing.__get__(self))
890
1287
for cls in self.__class__.__mro__
891
1288
for name, athing in
892
inspect.getmembers(cls,
893
self._is_dbus_thing(thing)))
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.
895
1362
def _get_dbus_property(self, interface_name, property_name):
896
1363
"""Returns a bound method if one exists which is a D-Bus
897
1364
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"))):
1366
for cls in self.__class__.__mro__:
1367
for name, value in inspect.getmembers(
1368
cls, self._is_dbus_thing("property")):
903
1369
if (value._dbus_name == property_name
904
1370
and value._dbus_interface == interface_name):
905
1371
return value.__get__(self)
907
1373
# No such property
908
raise DBusPropertyNotFound(self.dbus_object_path + ":"
909
+ interface_name + "."
912
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
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,
913
1388
out_signature="v")
914
1389
def Get(self, interface_name, property_name):
915
1390
"""Standard D-Bus property Get() method, see D-Bus standard.
1045
1518
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",
1048
1592
def datetime_to_dbus(dt, variant_level=0):
1049
1593
"""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)
1595
return dbus.String("", variant_level=variant_level)
1596
return dbus.String(dt.isoformat(), variant_level=variant_level)
1056
1599
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1409
1960
server to mandos-client
1413
1964
# Rejected - signal
1414
1965
@dbus.service.signal(_interface, signature="s")
1415
1966
def Rejected(self, reason):
1419
1970
# NeedApproval - signal
1420
1971
@dbus.service.signal(_interface, signature="tb")
1421
1972
def NeedApproval(self, timeout, default):
1423
1974
return self.need_approval()
1427
1978
# Approve - method
1428
1979
@dbus.service.method(_interface, in_signature="b")
1429
1980
def Approve(self, value):
1430
1981
self.approve(value)
1432
1983
# CheckedOK - method
1433
1984
@dbus.service.method(_interface)
1434
1985
def CheckedOK(self):
1435
1986
self.checked_ok()
1437
1988
# Enable - method
1989
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1438
1990
@dbus.service.method(_interface)
1439
1991
def Enable(self):
1443
1995
# StartChecker - method
1996
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1444
1997
@dbus.service.method(_interface)
1445
1998
def StartChecker(self):
1447
2000
self.start_checker()
1449
2002
# Disable - method
2003
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1450
2004
@dbus.service.method(_interface)
1451
2005
def Disable(self):
1455
2009
# StopChecker - method
2010
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1456
2011
@dbus.service.method(_interface)
1457
2012
def StopChecker(self):
1458
2013
self.stop_checker()
1462
2017
# ApprovalPending - property
1463
2018
@dbus_service_property(_interface, signature="b", access="read")
1464
2019
def ApprovalPending_dbus_property(self):
1465
2020
return dbus.Boolean(bool(self.approvals_pending))
1467
2022
# ApprovedByDefault - property
1468
@dbus_service_property(_interface, signature="b",
2023
@dbus_service_property(_interface,
1469
2025
access="readwrite")
1470
2026
def ApprovedByDefault_dbus_property(self, value=None):
1471
2027
if value is None: # get
1472
2028
return dbus.Boolean(self.approved_by_default)
1473
2029
self.approved_by_default = bool(value)
1475
2031
# ApprovalDelay - property
1476
@dbus_service_property(_interface, signature="t",
2032
@dbus_service_property(_interface,
1477
2034
access="readwrite")
1478
2035
def ApprovalDelay_dbus_property(self, value=None):
1479
2036
if value is None: # get
1480
return dbus.UInt64(self.approval_delay_milliseconds())
2037
return dbus.UInt64(self.approval_delay.total_seconds()
1481
2039
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1483
2041
# ApprovalDuration - property
1484
@dbus_service_property(_interface, signature="t",
2042
@dbus_service_property(_interface,
1485
2044
access="readwrite")
1486
2045
def ApprovalDuration_dbus_property(self, value=None):
1487
2046
if value is None: # get
1488
return dbus.UInt64(timedelta_to_milliseconds(
1489
self.approval_duration))
2047
return dbus.UInt64(self.approval_duration.total_seconds()
1490
2049
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1492
2051
# Name - property
2053
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1493
2054
@dbus_service_property(_interface, signature="s", access="read")
1494
2055
def Name_dbus_property(self):
1495
2056
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)
1497
2065
# Fingerprint - property
2067
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1498
2068
@dbus_service_property(_interface, signature="s", access="read")
1499
2069
def Fingerprint_dbus_property(self):
1500
2070
return dbus.String(self.fingerprint)
1502
2072
# Host - property
1503
@dbus_service_property(_interface, signature="s",
2073
@dbus_service_property(_interface,
1504
2075
access="readwrite")
1505
2076
def Host_dbus_property(self, value=None):
1506
2077
if value is None: # get
1507
2078
return dbus.String(self.host)
1508
self.host = unicode(value)
2079
self.host = str(value)
1510
2081
# Created - property
2083
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1511
2084
@dbus_service_property(_interface, signature="s", access="read")
1512
2085
def Created_dbus_property(self):
1513
2086
return datetime_to_dbus(self.created)
1515
2088
# LastEnabled - property
1516
2089
@dbus_service_property(_interface, signature="s", access="read")
1517
2090
def LastEnabled_dbus_property(self):
1518
2091
return datetime_to_dbus(self.last_enabled)
1520
2093
# Enabled - property
1521
@dbus_service_property(_interface, signature="b",
2094
@dbus_service_property(_interface,
1522
2096
access="readwrite")
1523
2097
def Enabled_dbus_property(self, value=None):
1524
2098
if value is None: # get
1572
2147
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),
2150
GLib.source_remove(self.disable_initiator_tag)
2151
self.disable_initiator_tag = GLib.timeout_add(
2152
int((self.expires - now).total_seconds() * 1000),
1581
2155
# ExtendedTimeout - property
1582
@dbus_service_property(_interface, signature="t",
2156
@dbus_service_property(_interface,
1583
2158
access="readwrite")
1584
2159
def ExtendedTimeout_dbus_property(self, value=None):
1585
2160
if value is None: # get
1586
return dbus.UInt64(self.extended_timeout_milliseconds())
2161
return dbus.UInt64(self.extended_timeout.total_seconds()
1587
2163
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1589
2165
# Interval - property
1590
@dbus_service_property(_interface, signature="t",
2166
@dbus_service_property(_interface,
1591
2168
access="readwrite")
1592
2169
def Interval_dbus_property(self, value=None):
1593
2170
if value is None: # get
1594
return dbus.UInt64(self.interval_milliseconds())
2171
return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
2172
self.interval = datetime.timedelta(0, 0, 0, value)
1596
2173
if getattr(self, "checker_initiator_tag", None) is None:
1598
2175
if self.enabled:
1599
2176
# 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
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
1605
2182
# Checker - property
1606
@dbus_service_property(_interface, signature="s",
2183
@dbus_service_property(_interface,
1607
2185
access="readwrite")
1608
2186
def Checker_dbus_property(self, value=None):
1609
2187
if value is None: # get
1610
2188
return dbus.String(self.checker_command)
1611
self.checker_command = unicode(value)
2189
self.checker_command = str(value)
1613
2191
# CheckerRunning - property
1614
@dbus_service_property(_interface, signature="b",
2192
@dbus_service_property(_interface,
1615
2194
access="readwrite")
1616
2195
def CheckerRunning_dbus_property(self, value=None):
1617
2196
if value is None: # get
1664
2253
class ClientHandler(socketserver.BaseRequestHandler, object):
1665
2254
"""A class to handle client connections.
1667
2256
Instantiated once for each connection to handle it.
1668
2257
Note: This will run in its own forked process."""
1670
2259
def handle(self):
1671
2260
with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
2261
logger.info("TCP connection from: %s",
1673
unicode(self.client_address))
2262
str(self.client_address))
1674
2263
logger.debug("Pipe FD: %d",
1675
2264
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",
2266
session = gnutls.ClientSession(self.request)
2268
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2269
# "+AES-256-CBC", "+SHA1",
2270
# "+COMP-NULL", "+CTYPE-OPENPGP",
1691
2272
# Use a fallback default, since this MUST be set.
1692
2273
priority = self.server.gnutls_priority
1693
2274
if priority is None:
1694
2275
priority = "NORMAL"
1695
(gnutls.library.functions
1696
.gnutls_priority_set_direct(session._c_object,
2276
gnutls.priority_set_direct(session._c_object,
2277
priority.encode("utf-8"),
1699
2280
# Start communication using the Mandos protocol
1700
2281
# Get protocol number
1701
2282
line = self.request.makefile().readline()
1702
2283
logger.debug("Protocol version: %r", line)
1704
2285
if int(line.strip().split()[0]) > 1:
2286
raise RuntimeError(line)
1706
2287
except (ValueError, IndexError, RuntimeError) as error:
1707
2288
logger.error("Unknown protocol version: %s", error)
1710
2291
# Start GnuTLS connection
1712
2293
session.handshake()
1713
except gnutls.errors.GNUTLSError as error:
2294
except gnutls.Error as error:
1714
2295
logger.warning("Handshake failed: %s", error)
1715
2296
# Do not run session.bye() here: the session is not
1716
2297
# established. Just abandon the request.
1718
2299
logger.debug("Handshake succeeded")
1720
2301
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,
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,
1733
2325
self.client_address)
1734
2326
except KeyError:
1737
2329
if client.approval_delay:
1738
2330
delay = client.approval_delay
1739
2331
client.approvals_pending += 1
1740
2332
approval_required = True
1743
2335
if not client.enabled:
1744
2336
logger.info("Client %s is disabled",
1746
2338
if self.server.use_dbus:
1747
2339
# Emit D-Bus signal
1748
2340
client.Rejected("Disabled")
1751
2343
if client.approved or not client.approval_delay:
1752
#We are approved or approval is disabled
2344
# We are approved or approval is disabled
1754
2346
elif client.approved is None:
1755
2347
logger.info("Client %s needs approval",
1790
2380
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))
2383
session.send(client.secret)
2384
except gnutls.Error as error:
2385
logger.warning("gnutls send failed",
1805
2389
logger.info("Sending secret to %s", client.name)
1806
2390
# bump the timeout using extended_timeout
1807
2391
client.bump_timeout(client.extended_timeout)
1808
2392
if self.server.use_dbus:
1809
2393
# Emit D-Bus signal
1810
2394
client.GotSecret()
1813
2397
if approval_required:
1814
2398
client.approvals_pending -= 1
1817
except gnutls.errors.GNUTLSError as error:
2401
except gnutls.Error as error:
1818
2402
logger.warning("GnuTLS bye failed",
1819
2403
exc_info=error)
1822
2406
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
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
1830
2423
list_size = ctypes.c_uint(1)
1831
cert_list = (gnutls.library.functions
1832
.gnutls_certificate_get_peers
2424
cert_list = (gnutls.certificate_get_peers
1833
2425
(session._c_object, ctypes.byref(list_size)))
1834
2426
if not bool(cert_list) and list_size.value != 0:
1835
raise gnutls.errors.GNUTLSError("error getting peer"
2427
raise gnutls.Error("error getting peer certificate")
1837
2428
if list_size.value == 0:
1839
2430
cert = cert_list[0]
1840
2431
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()
1843
2468
def fingerprint(openpgp):
1844
2469
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1845
2470
# 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))))
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)))
1851
2475
# 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)))
2476
crt = gnutls.openpgp_crt_t()
2477
gnutls.openpgp_crt_init(ctypes.byref(crt))
1855
2478
# 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))
2479
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2480
gnutls.OPENPGP_FMT_RAW)
1860
2481
# Verify the self signature in the key
1861
2482
crtverify = ctypes.c_uint()
1862
(gnutls.library.functions
1863
.gnutls_openpgp_crt_verify_self(crt, 0,
1864
ctypes.byref(crtverify)))
2483
gnutls.openpgp_crt_verify_self(crt, 0,
2484
ctypes.byref(crtverify))
1865
2485
if crtverify.value != 0:
1866
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1867
raise (gnutls.errors.CertificateSecurityError
2486
gnutls.openpgp_crt_deinit(crt)
2487
raise gnutls.CertificateSecurityError(code
1869
2489
# New buffer for the fingerprint
1870
2490
buf = ctypes.create_string_buffer(20)
1871
2491
buf_len = ctypes.c_size_t()
1872
2492
# 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)))
2493
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2494
ctypes.byref(buf_len))
1876
2495
# Deinit the certificate
1877
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2496
gnutls.openpgp_crt_deinit(crt)
1878
2497
# Convert the buffer to a Python bytestring
1879
2498
fpr = ctypes.string_at(buf, buf_len.value)
1880
2499
# Convert the bytestring to hexadecimal notation
1963
2588
# socket_wrapper(), if socketfd was set.
1964
2589
socketserver.TCPServer.__init__(self, server_address,
1965
2590
RequestHandlerClass)
1967
2592
def server_bind(self):
1968
2593
"""This overrides the normal server_bind() function
1969
2594
to bind to an interface if one was specified, and also NOT to
1970
2595
bind to an address or port if they were not specified."""
2596
global SO_BINDTODEVICE
1971
2597
if self.interface is not None:
1972
2598
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)
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)
1994
2620
# Only bind(2) the socket if we really need to.
1995
2621
if self.server_address[0] or self.server_address[1]:
2622
if self.server_address[1]:
2623
self.allow_reuse_address = True
1996
2624
if not self.server_address[0]:
1997
2625
if self.address_family == socket.AF_INET6:
1998
any_address = "::" # in6addr_any
2626
any_address = "::" # in6addr_any
2000
any_address = "0.0.0.0" # INADDR_ANY
2628
any_address = "0.0.0.0" # INADDR_ANY
2001
2629
self.server_address = (any_address,
2002
2630
self.server_address[1])
2003
2631
elif not self.server_address[1]:
2004
self.server_address = (self.server_address[0],
2632
self.server_address = (self.server_address[0], 0)
2006
2633
# if self.interface:
2007
2634
# self.server_address = (self.server_address[0],
2033
2665
self.gnutls_priority = gnutls_priority
2034
2666
IPv6_TCPServer.__init__(self, server_address,
2035
2667
RequestHandlerClass,
2036
interface = interface,
2037
use_ipv6 = use_ipv6,
2038
socketfd = socketfd)
2668
interface=interface,
2039
2672
def server_activate(self):
2040
2673
if self.enabled:
2041
2674
return socketserver.TCPServer.server_activate(self)
2043
2676
def enable(self):
2044
2677
self.enabled = True
2046
2679
def add_pipe(self, parent_pipe, proc):
2047
2680
# 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):
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):
2057
2692
# error, or the other end of multiprocessing.Pipe has closed
2058
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2693
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2059
2694
# Wait for other process to exit
2063
2698
# Read a request from the child
2064
2699
request = parent_pipe.recv()
2065
2700
command = request[0]
2067
2702
if command == 'init':
2069
address = request[2]
2071
for c in self.clients.itervalues():
2072
if c.fingerprint == fpr:
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:
2076
logger.info("Client not found for fingerprint: %s, ad"
2077
"dress: %s", fpr, address)
2717
logger.info("Client not found for key ID: %s, address"
2718
": %s", key_id or fpr, address)
2078
2719
if self.use_dbus:
2079
2720
# Emit D-Bus signal
2080
mandos_dbus_service.ClientNotFound(fpr,
2721
mandos_dbus_service.ClientNotFound(key_id or fpr,
2082
2723
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,
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))
2093
2733
parent_pipe.send(True)
2094
2734
# remove the old hook in favor of the new above hook on
2098
2738
funcname = request[1]
2099
2739
args = request[2]
2100
2740
kwargs = request[3]
2102
2742
parent_pipe.send(('data', getattr(client_object,
2103
2743
funcname)(*args,
2106
2746
if command == 'getattr':
2107
2747
attrname = request[1]
2108
if callable(client_object.__getattribute__(attrname)):
2109
parent_pipe.send(('function',))
2748
if isinstance(client_object.__getattribute__(attrname),
2749
collections.Callable):
2750
parent_pipe.send(('function', ))
2111
parent_pipe.send(('data', client_object
2112
.__getattribute__(attrname)))
2753
'data', client_object.__getattribute__(attrname)))
2114
2755
if command == 'setattr':
2115
2756
attrname = request[1]
2116
2757
value = request[2]
2117
2758
setattr(client_object, attrname, value)
2122
2763
def rfc3339_duration_to_delta(duration):
2123
2764
"""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)
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)
2141
2782
# Parsing an RFC 3339 duration with regular expressions is not
2142
2783
# possible - there would have to be multiple places for the same
2143
2784
# values, like seconds. The current code, while more esoteric, is
2144
2785
# cleaner without depending on a parsing library. If Python had a
2145
2786
# built-in library for parsing we would use it, but we'd like to
2146
2787
# avoid excessive use of external libraries.
2148
2789
# 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
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
2158
2795
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2159
2796
# the "duration" ABNF definition in RFC 3339, Appendix A.
2160
2797
token_end = Token(re.compile(r"$"), None, frozenset())
2161
2798
token_second = Token(re.compile(r"(\d+)S"),
2162
2799
datetime.timedelta(seconds=1),
2163
frozenset((token_end,)))
2800
frozenset((token_end, )))
2164
2801
token_minute = Token(re.compile(r"(\d+)M"),
2165
2802
datetime.timedelta(minutes=1),
2166
2803
frozenset((token_second, token_end)))
3135
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2482
3137
except OSError as error:
3138
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3139
.format(uid, gid, os.strerror(error.errno)))
2483
3140
if error.errno != errno.EPERM:
2487
3144
# Enable all possible GnuTLS debugging
2489
3146
# "Use a log level over 10 to enable all debugging options."
2490
3147
# - GnuTLS manual
2491
gnutls.library.functions.gnutls_global_set_log_level(11)
2493
@gnutls.library.types.gnutls_log_func
3148
gnutls.global_set_log_level(11)
2494
3151
def debug_gnutls(level, string):
2495
3152
logger.debug("GnuTLS: %s", string[:-1])
2497
(gnutls.library.functions
2498
.gnutls_global_set_log_function(debug_gnutls))
3154
gnutls.global_set_log_function(debug_gnutls)
2500
3156
# Redirect stdin so all checkers get /dev/null
2501
3157
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2502
3158
os.dup2(null, sys.stdin.fileno())
2506
3162
# Need to fork before connecting to D-Bus
2507
3163
if not foreground:
2508
3164
# 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()
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.
2515
3172
global main_loop
2516
3173
# From the Avahi example code
2517
3174
DBusGMainLoop(set_as_default=True)
2518
main_loop = gobject.MainLoop()
3175
main_loop = GLib.MainLoop()
2519
3176
bus = dbus.SystemBus()
2520
3177
# End of Avahi example code
2523
3180
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:
3183
old_bus_name = dbus.service.BusName(
3184
"se.bsnet.fukt.Mandos", bus,
3186
except dbus.exceptions.DBusException as e:
2529
3187
logger.error("Disabling D-Bus:", exc_info=e)
2530
3188
use_dbus = False
2531
3189
server_settings["use_dbus"] = False
2532
3190
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"])))
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"))
2542
3202
global multiprocessing_manager
2543
3203
multiprocessing_manager = multiprocessing.Manager()
2545
3205
client_class = Client
2547
client_class = functools.partial(ClientDBus, bus = bus)
3207
client_class = functools.partial(ClientDBus, bus=bus)
2549
3209
client_settings = Client.config_parser(client_config)
2550
3210
old_client_settings = {}
2551
3211
clients_data = {}
2553
3213
# This is used to redirect stdout and stderr for checker processes
2555
wnull = open(os.devnull, "w") # A writable /dev/null
3215
wnull = open(os.devnull, "w") # A writable /dev/null
2556
3216
# Only used if server is running in foreground but not in debug
2558
3218
if debug or not foreground:
2561
3221
# Get client data and settings from last running state.
2562
3222
if server_settings["restore"]:
2564
3224
with open(stored_state_path, "rb") as stored_state:
2565
clients_data, old_client_settings = (pickle.load
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]
2567
3275
os.remove(stored_state_path)
2568
3276
except IOError as e:
2569
3277
if e.errno == errno.ENOENT:
2570
logger.warning("Could not load persistent state: {0}"
2571
.format(os.strerror(e.errno)))
3278
logger.warning("Could not load persistent state:"
3279
" {}".format(os.strerror(e.errno)))
2573
3281
logger.critical("Could not load persistent state:",
2576
3284
except EOFError as e:
2577
3285
logger.warning("Could not load persistent state: "
2578
"EOFError:", exc_info=e)
2580
3289
with PGPEngine() as pgp:
2581
for client_name, client in clients_data.iteritems():
3290
for client_name, client in clients_data.items():
2582
3291
# Skip removed clients
2583
3292
if client_name not in client_settings:
2586
3295
# Decide which value to use after restoring saved state.
2587
3296
# We have three different values: Old config file,
2588
3297
# new config file, and saved state.
2646
3355
for client_name in (set(client_settings)
2647
3356
- set(old_client_settings)):
2648
3357
clients_data[client_name] = client_settings[client_name]
2650
3359
# Create all client objects
2651
for client_name, client in clients_data.iteritems():
3360
for client_name, client in clients_data.items():
2652
3361
tcp_server.clients[client_name] = client_class(
2653
name = client_name, settings = client,
2654
server_settings = server_settings)
3364
server_settings=server_settings)
2656
3366
if not tcp_server.clients:
2657
3367
logger.warning("No clients defined")
2659
3369
if not foreground:
2660
3370
if pidfile is not None:
2664
pidfile.write(str(pid) + "\n".encode("utf-8"))
3374
print(pid, file=pidfile)
2665
3375
except IOError:
2666
3376
logger.error("Could not write to file %r with PID %d",
2667
3377
pidfilename, pid)
2669
3379
del pidfilename
2671
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2672
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3381
for termsig in (signal.SIGHUP, signal.SIGTERM):
3382
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3383
lambda: main_loop.quit() and False)
2675
@alternate_dbus_interfaces({"se.recompile.Mandos":
2676
"se.bsnet.fukt.Mandos"})
2677
class MandosDBusService(DBusObjectWithProperties):
3387
@alternate_dbus_interfaces(
3388
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3389
class MandosDBusService(DBusObjectWithObjectManager):
2678
3390
"""A D-Bus proxy object"""
2679
3392
def __init__(self):
2680
3393
dbus.service.Object.__init__(self, bus, "/")
2681
3395
_interface = "se.recompile.Mandos"
2683
@dbus_interface_annotations(_interface)
2685
return { "org.freedesktop.DBus.Property"
2686
".EmitsChangedSignal":
2689
3397
@dbus.service.signal(_interface, signature="o")
2690
3398
def ClientAdded(self, objpath):
2694
3402
@dbus.service.signal(_interface, signature="ss")
2695
def ClientNotFound(self, fingerprint, address):
3403
def ClientNotFound(self, key_id, address):
3407
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2699
3409
@dbus.service.signal(_interface, signature="os")
2700
3410
def ClientRemoved(self, objpath, name):
3414
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2704
3416
@dbus.service.method(_interface, out_signature="ao")
2705
3417
def GetAllClients(self):
2707
return dbus.Array(c.dbus_object_path
2709
tcp_server.clients.itervalues())
3419
return dbus.Array(c.dbus_object_path for c in
3420
tcp_server.clients.values())
3422
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2711
3424
@dbus.service.method(_interface,
2712
3425
out_signature="a{oa{sv}}")
2713
3426
def GetAllClientsWithProperties(self):
2715
3428
return dbus.Dictionary(
2716
((c.dbus_object_path, c.GetAll(""))
2717
for c in tcp_server.clients.itervalues()),
3429
{c.dbus_object_path: c.GetAll(
3430
"se.recompile.Mandos.Client")
3431
for c in tcp_server.clients.values()},
2718
3432
signature="oa{sv}")
2720
3434
@dbus.service.method(_interface, in_signature="o")
2721
3435
def RemoveClient(self, object_path):
2723
for c in tcp_server.clients.itervalues():
3437
for c in tcp_server.clients.values():
2724
3438
if c.dbus_object_path == object_path:
2725
3439
del tcp_server.clients[c.name]
2726
3440
c.remove_from_connection()
2727
# Don't signal anything except ClientRemoved
3441
# Don't signal the disabling
2728
3442
c.disable(quiet=True)
2730
self.ClientRemoved(object_path, c.name)
3443
# Emit D-Bus signal for removal
3444
self.client_removed_signal(c)
2732
3446
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,
2736
3486
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
2739
3494
"Cleanup function; run on exit"
2742
multiprocessing.active_children()
3498
mp.active_children()
2744
3500
if not (tcp_server.clients or client_settings):
2747
3503
# Store client before exiting. Secrets are encrypted with key
2748
3504
# based on what config file has. If config file is
2749
3505
# removed/edited, old secret will thus be unrecovable.
2751
3507
with PGPEngine() as pgp:
2752
for client in tcp_server.clients.itervalues():
3508
for client in tcp_server.clients.values():
2753
3509
key = client_settings[client.name]["secret"]
2754
3510
client.encrypted_secret = pgp.encrypt(client.secret,
2756
3512
client_dict = {}
2758
3514
# 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)):
3516
exclude = {"bus", "changedstate", "secret",
3517
"checker", "server_settings"}
3518
for name, typ in inspect.getmembers(dbus.service
2764
3520
exclude.add(name)
2766
3522
client_dict["encrypted_secret"] = (client
2767
3523
.encrypted_secret)
2768
3524
for attr in client.client_structure:
2769
3525
if attr not in exclude:
2770
3526
client_dict[attr] = getattr(client, attr)
2772
3528
clients[client.name] = client_dict
2773
3529
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
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
2782
3541
os.rename(tempname, stored_state_path)
2783
3542
except (IOError, OSError) as e: