2
# -*- mode: python; coding: utf-8 -*-
2
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
19
21
# the Free Software Foundation, either version 3 of the License, or
20
22
# (at your option) any later version.
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
24
26
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25
27
# GNU General Public License for more details.
27
29
# You should have received a copy of the GNU General Public License
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
31
32
# Contact the authors at <mandos@recompile.se>.
34
35
from __future__ import (division, absolute_import, print_function,
37
from future_builtins import *
39
from future_builtins import *
39
import SocketServer as socketserver
44
import SocketServer as socketserver
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
52
import ConfigParser as configparser
65
import cPickle as pickle
70
import cPickle as pickle
66
73
import multiprocessing
74
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:
95
# Show warnings by default
96
if not sys.warnoptions:
98
warnings.simplefilter("default")
100
# Try to find the value of SO_BINDTODEVICE:
102
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
103
# newer, and it is also the most natural place for it:
84
104
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
105
except AttributeError:
107
# This is where SO_BINDTODEVICE was up to and including Python
87
109
from IN import SO_BINDTODEVICE
88
110
except ImportError:
89
SO_BINDTODEVICE = None
111
# In Python 2.7 it seems to have been removed entirely.
112
# Try running the C preprocessor:
114
cc = subprocess.Popen(["cc", "--language=c", "-E",
116
stdin=subprocess.PIPE,
117
stdout=subprocess.PIPE)
118
stdout = cc.communicate(
119
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
120
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
121
except (OSError, ValueError, IndexError):
123
SO_BINDTODEVICE = None
125
if sys.version_info.major == 2:
128
if sys.version_info < (3, 2):
129
configparser.Configparser = configparser.SafeConfigParser
92
132
stored_state_file = "clients.pickle"
94
134
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
135
logging.captureWarnings(True) # Show warnings via the logging system
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
139
if_nametoindex = ctypes.cdll.LoadLibrary(
140
ctypes.util.find_library("c")).if_nametoindex
103
141
except (OSError, AttributeError):
104
143
def if_nametoindex(interface):
105
144
"Get an interface index the hard way, i.e. using fcntl()"
106
145
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
146
with contextlib.closing(socket.socket()) as s:
108
147
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
148
struct.pack(b"16s16x", interface))
149
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
150
return interface_index
153
def copy_function(func):
154
"""Make a copy of a function"""
155
if sys.version_info.major == 2:
156
return types.FunctionType(func.func_code,
162
return types.FunctionType(func.__code__,
116
169
def initlogger(debug, level=logging.WARNING):
117
170
"""init logger and add loglevel"""
173
syslogger = (logging.handlers.SysLogHandler(
174
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
119
176
syslogger.setFormatter(logging.Formatter
120
177
('Mandos [%(process)d]: %(levelname)s:'
122
179
logger.addHandler(syslogger)
125
182
console = logging.StreamHandler()
126
183
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
169
240
os.rmdir(self.tempdir)
170
241
self.tempdir = None
172
243
def password_encode(self, password):
173
244
# Passphrase can not be empty and can not contain newlines or
174
245
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
246
encoded = b"mandos" + binascii.hexlify(password)
247
if len(encoded) > 2048:
248
# GnuPG can't handle long passwords, so encode differently
249
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
250
.replace(b"\n", b"\\n")
251
.replace(b"\0", b"\\x00"))
177
254
def encrypt(self, data, password):
178
255
passphrase = self.password_encode(password)
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
256
with tempfile.NamedTemporaryFile(
257
dir=self.tempdir) as passfile:
181
258
passfile.write(passphrase)
183
proc = subprocess.Popen(['gpg', '--symmetric',
260
proc = subprocess.Popen([self.gpg, '--symmetric',
184
261
'--passphrase-file',
186
263
+ self.gnupgargs,
187
stdin = subprocess.PIPE,
188
stdout = subprocess.PIPE,
189
stderr = subprocess.PIPE)
190
ciphertext, err = proc.communicate(input = data)
264
stdin=subprocess.PIPE,
265
stdout=subprocess.PIPE,
266
stderr=subprocess.PIPE)
267
ciphertext, err = proc.communicate(input=data)
191
268
if proc.returncode != 0:
192
269
raise PGPError(err)
193
270
return ciphertext
195
272
def decrypt(self, data, password):
196
273
passphrase = self.password_encode(password)
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
274
with tempfile.NamedTemporaryFile(
275
dir=self.tempdir) as passfile:
199
276
passfile.write(passphrase)
201
proc = subprocess.Popen(['gpg', '--decrypt',
278
proc = subprocess.Popen([self.gpg, '--decrypt',
202
279
'--passphrase-file',
204
281
+ self.gnupgargs,
205
stdin = subprocess.PIPE,
206
stdout = subprocess.PIPE,
207
stderr = subprocess.PIPE)
208
decrypted_plaintext, err = proc.communicate(input
282
stdin=subprocess.PIPE,
283
stdout=subprocess.PIPE,
284
stderr=subprocess.PIPE)
285
decrypted_plaintext, err = proc.communicate(input=data)
210
286
if proc.returncode != 0:
211
287
raise PGPError(err)
212
288
return decrypted_plaintext
291
# Pretend that we have an Avahi module
293
"""This isn't so much a class as it is a module-like namespace."""
294
IF_UNSPEC = -1 # avahi-common/address.h
295
PROTO_UNSPEC = -1 # avahi-common/address.h
296
PROTO_INET = 0 # avahi-common/address.h
297
PROTO_INET6 = 1 # avahi-common/address.h
298
DBUS_NAME = "org.freedesktop.Avahi"
299
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
300
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
301
DBUS_PATH_SERVER = "/"
304
def string_array_to_txt_array(t):
305
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
306
for s in t), signature="ay")
307
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
308
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
309
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
310
SERVER_INVALID = 0 # avahi-common/defs.h
311
SERVER_REGISTERING = 1 # avahi-common/defs.h
312
SERVER_RUNNING = 2 # avahi-common/defs.h
313
SERVER_COLLISION = 3 # avahi-common/defs.h
314
SERVER_FAILURE = 4 # avahi-common/defs.h
215
317
class AvahiError(Exception):
216
318
def __init__(self, value, *args, **kwargs):
217
319
self.value = value
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
320
return super(AvahiError, self).__init__(value, *args,
222
324
class AvahiServiceError(AvahiError):
225
328
class AvahiGroupError(AvahiError):
229
class AvahiService(object):
230
333
"""An Avahi (Zeroconf) service.
233
336
interface: integer; avahi.IF_UNSPEC or an interface index.
234
337
Used to optionally bind to the specified interface.
377
502
follow_name_owner_changes=True),
378
503
avahi.DBUS_INTERFACE_SERVER)
379
504
self.server.connect_to_signal("StateChanged",
380
self.server_state_changed)
505
self.server_state_changed)
381
506
self.server_state_changed(self.server.GetState())
384
509
class AvahiServiceToSyslog(AvahiService):
510
def rename(self, *args, **kwargs):
386
511
"""Add the new name to the syslog messages"""
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
512
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
513
syslogger.setFormatter(logging.Formatter(
514
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
402
class Client(object):
519
# Pretend that we have a GnuTLS module
521
"""This isn't so much a class as it is a module-like namespace."""
523
library = ctypes.util.find_library("gnutls")
525
library = ctypes.util.find_library("gnutls-deb0")
526
_library = ctypes.cdll.LoadLibrary(library)
529
# Unless otherwise indicated, the constants and types below are
530
# all from the gnutls/gnutls.h C header file.
541
E_NO_CERTIFICATE_FOUND = -49
546
KEYID_USE_SHA256 = 1 # gnutls/x509.h
547
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
550
class session_int(ctypes.Structure):
552
session_t = ctypes.POINTER(session_int)
554
class certificate_credentials_st(ctypes.Structure):
556
certificate_credentials_t = ctypes.POINTER(
557
certificate_credentials_st)
558
certificate_type_t = ctypes.c_int
560
class datum_t(ctypes.Structure):
561
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
562
('size', ctypes.c_uint)]
564
class openpgp_crt_int(ctypes.Structure):
566
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
567
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
568
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
569
credentials_type_t = ctypes.c_int
570
transport_ptr_t = ctypes.c_void_p
571
close_request_t = ctypes.c_int
574
class Error(Exception):
575
def __init__(self, message=None, code=None, args=()):
576
# Default usage is by a message string, but if a return
577
# code is passed, convert it to a string with
580
if message is None and code is not None:
581
message = gnutls.strerror(code)
582
return super(gnutls.Error, self).__init__(
585
class CertificateSecurityError(Error):
591
self._c_object = gnutls.certificate_credentials_t()
592
gnutls.certificate_allocate_credentials(
593
ctypes.byref(self._c_object))
594
self.type = gnutls.CRD_CERTIFICATE
597
gnutls.certificate_free_credentials(self._c_object)
600
def __init__(self, socket, credentials=None):
601
self._c_object = gnutls.session_t()
602
gnutls_flags = gnutls.CLIENT
603
if gnutls.check_version(b"3.5.6"):
604
gnutls_flags |= gnutls.NO_TICKETS
606
gnutls_flags |= gnutls.ENABLE_RAWPK
607
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
609
gnutls.set_default_priority(self._c_object)
610
gnutls.transport_set_ptr(self._c_object, socket.fileno())
611
gnutls.handshake_set_private_extensions(self._c_object,
614
if credentials is None:
615
credentials = gnutls.Credentials()
616
gnutls.credentials_set(self._c_object, credentials.type,
617
ctypes.cast(credentials._c_object,
619
self.credentials = credentials
622
gnutls.deinit(self._c_object)
625
return gnutls.handshake(self._c_object)
627
def send(self, data):
631
data_len -= gnutls.record_send(self._c_object,
636
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
638
# Error handling functions
639
def _error_code(result):
640
"""A function to raise exceptions on errors, suitable
641
for the 'restype' attribute on ctypes functions"""
644
if result == gnutls.E_NO_CERTIFICATE_FOUND:
645
raise gnutls.CertificateSecurityError(code=result)
646
raise gnutls.Error(code=result)
648
def _retry_on_error(result, func, arguments):
649
"""A function to retry on some errors, suitable
650
for the 'errcheck' attribute on ctypes functions"""
652
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
653
return _error_code(result)
654
result = func(*arguments)
657
# Unless otherwise indicated, the function declarations below are
658
# all from the gnutls/gnutls.h C header file.
661
priority_set_direct = _library.gnutls_priority_set_direct
662
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
663
ctypes.POINTER(ctypes.c_char_p)]
664
priority_set_direct.restype = _error_code
666
init = _library.gnutls_init
667
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
668
init.restype = _error_code
670
set_default_priority = _library.gnutls_set_default_priority
671
set_default_priority.argtypes = [session_t]
672
set_default_priority.restype = _error_code
674
record_send = _library.gnutls_record_send
675
record_send.argtypes = [session_t, ctypes.c_void_p,
677
record_send.restype = ctypes.c_ssize_t
678
record_send.errcheck = _retry_on_error
680
certificate_allocate_credentials = (
681
_library.gnutls_certificate_allocate_credentials)
682
certificate_allocate_credentials.argtypes = [
683
ctypes.POINTER(certificate_credentials_t)]
684
certificate_allocate_credentials.restype = _error_code
686
certificate_free_credentials = (
687
_library.gnutls_certificate_free_credentials)
688
certificate_free_credentials.argtypes = [
689
certificate_credentials_t]
690
certificate_free_credentials.restype = None
692
handshake_set_private_extensions = (
693
_library.gnutls_handshake_set_private_extensions)
694
handshake_set_private_extensions.argtypes = [session_t,
696
handshake_set_private_extensions.restype = None
698
credentials_set = _library.gnutls_credentials_set
699
credentials_set.argtypes = [session_t, credentials_type_t,
701
credentials_set.restype = _error_code
703
strerror = _library.gnutls_strerror
704
strerror.argtypes = [ctypes.c_int]
705
strerror.restype = ctypes.c_char_p
707
certificate_type_get = _library.gnutls_certificate_type_get
708
certificate_type_get.argtypes = [session_t]
709
certificate_type_get.restype = _error_code
711
certificate_get_peers = _library.gnutls_certificate_get_peers
712
certificate_get_peers.argtypes = [session_t,
713
ctypes.POINTER(ctypes.c_uint)]
714
certificate_get_peers.restype = ctypes.POINTER(datum_t)
716
global_set_log_level = _library.gnutls_global_set_log_level
717
global_set_log_level.argtypes = [ctypes.c_int]
718
global_set_log_level.restype = None
720
global_set_log_function = _library.gnutls_global_set_log_function
721
global_set_log_function.argtypes = [log_func]
722
global_set_log_function.restype = None
724
deinit = _library.gnutls_deinit
725
deinit.argtypes = [session_t]
726
deinit.restype = None
728
handshake = _library.gnutls_handshake
729
handshake.argtypes = [session_t]
730
handshake.restype = _error_code
731
handshake.errcheck = _retry_on_error
733
transport_set_ptr = _library.gnutls_transport_set_ptr
734
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
735
transport_set_ptr.restype = None
737
bye = _library.gnutls_bye
738
bye.argtypes = [session_t, close_request_t]
739
bye.restype = _error_code
740
bye.errcheck = _retry_on_error
742
check_version = _library.gnutls_check_version
743
check_version.argtypes = [ctypes.c_char_p]
744
check_version.restype = ctypes.c_char_p
746
_need_version = b"3.3.0"
747
if check_version(_need_version) is None:
748
raise self.Error("Needs GnuTLS {} or later"
749
.format(_need_version))
751
_tls_rawpk_version = b"3.6.6"
752
has_rawpk = bool(check_version(_tls_rawpk_version))
756
class pubkey_st(ctypes.Structure):
758
pubkey_t = ctypes.POINTER(pubkey_st)
760
x509_crt_fmt_t = ctypes.c_int
762
# All the function declarations below are from gnutls/abstract.h
763
pubkey_init = _library.gnutls_pubkey_init
764
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
765
pubkey_init.restype = _error_code
767
pubkey_import = _library.gnutls_pubkey_import
768
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
770
pubkey_import.restype = _error_code
772
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
773
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
774
ctypes.POINTER(ctypes.c_ubyte),
775
ctypes.POINTER(ctypes.c_size_t)]
776
pubkey_get_key_id.restype = _error_code
778
pubkey_deinit = _library.gnutls_pubkey_deinit
779
pubkey_deinit.argtypes = [pubkey_t]
780
pubkey_deinit.restype = None
782
# All the function declarations below are from gnutls/openpgp.h
784
openpgp_crt_init = _library.gnutls_openpgp_crt_init
785
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
786
openpgp_crt_init.restype = _error_code
788
openpgp_crt_import = _library.gnutls_openpgp_crt_import
789
openpgp_crt_import.argtypes = [openpgp_crt_t,
790
ctypes.POINTER(datum_t),
792
openpgp_crt_import.restype = _error_code
794
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
795
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
796
ctypes.POINTER(ctypes.c_uint)]
797
openpgp_crt_verify_self.restype = _error_code
799
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
800
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
801
openpgp_crt_deinit.restype = None
803
openpgp_crt_get_fingerprint = (
804
_library.gnutls_openpgp_crt_get_fingerprint)
805
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
809
openpgp_crt_get_fingerprint.restype = _error_code
811
if check_version(b"3.6.4"):
812
certificate_type_get2 = _library.gnutls_certificate_type_get2
813
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
814
certificate_type_get2.restype = _error_code
816
# Remove non-public functions
817
del _error_code, _retry_on_error
820
def call_pipe(connection, # : multiprocessing.Connection
821
func, *args, **kwargs):
822
"""This function is meant to be called by multiprocessing.Process
824
This function runs func(*args, **kwargs), and writes the resulting
825
return value on the provided multiprocessing.Connection.
827
connection.send(func(*args, **kwargs))
403
832
"""A representation of a client host served by this server.
406
835
approved: bool(); 'None' if not yet approved/disapproved
407
836
approval_delay: datetime.timedelta(); Time to wait for approval
408
837
approval_duration: datetime.timedelta(); Duration of one approval
409
checker: subprocess.Popen(); a running checker process used
410
to see if the client lives.
411
'None' if no process is running.
412
checker_callback_tag: a gobject event source tag, or None
838
checker: multiprocessing.Process(); a running checker process used
839
to see if the client lives. 'None' if no process is
841
checker_callback_tag: a GLib event source tag, or None
413
842
checker_command: string; External command which is run to check
414
843
if client lives. %() expansions are done at
415
844
runtime with vars(self) as dict, so that for
416
845
instance %(name)s can be used in the command.
417
checker_initiator_tag: a gobject event source tag, or None
846
checker_initiator_tag: a GLib event source tag, or None
418
847
created: datetime.datetime(); (UTC) object creation
419
848
client_structure: Object describing what attributes a client has
420
849
and is used for storing the client at exit
421
850
current_checker_command: string; current running checker_command
422
disable_initiator_tag: a gobject event source tag, or None
851
disable_initiator_tag: a GLib event source tag, or None
424
853
fingerprint: string (40 or 32 hexadecimal digits); used to
425
uniquely identify the client
854
uniquely identify an OpenPGP client
855
key_id: string (64 hexadecimal digits); used to uniquely identify
856
a client using raw public keys
426
857
host: string; available for use by the checker command
427
858
interval: datetime.timedelta(); How often to start a new checker
428
859
last_approval_request: datetime.datetime(); (UTC) or None
595
1016
logger.info("Disabling client %s", self.name)
596
1017
if getattr(self, "disable_initiator_tag", None) is not None:
597
gobject.source_remove(self.disable_initiator_tag)
1018
GLib.source_remove(self.disable_initiator_tag)
598
1019
self.disable_initiator_tag = None
599
1020
self.expires = None
600
1021
if getattr(self, "checker_initiator_tag", None) is not None:
601
gobject.source_remove(self.checker_initiator_tag)
1022
GLib.source_remove(self.checker_initiator_tag)
602
1023
self.checker_initiator_tag = None
603
1024
self.stop_checker()
604
1025
self.enabled = False
606
1027
self.send_changedstate()
607
# Do not run this again if called by a gobject.timeout_add
1028
# Do not run this again if called by a GLib.timeout_add
610
1031
def __del__(self):
613
1034
def init_checker(self):
614
1035
# Schedule a new checker to be started an 'interval' from now,
615
1036
# and every interval from then on.
616
1037
if self.checker_initiator_tag is not None:
617
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
1038
GLib.source_remove(self.checker_initiator_tag)
1039
self.checker_initiator_tag = GLib.timeout_add(
1040
int(self.interval.total_seconds() * 1000),
621
1042
# Schedule a disable() when 'timeout' has passed
622
1043
if self.disable_initiator_tag is not None:
623
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
1044
GLib.source_remove(self.disable_initiator_tag)
1045
self.disable_initiator_tag = GLib.timeout_add(
1046
int(self.timeout.total_seconds() * 1000), self.disable)
627
1047
# Also start a new checker *right now*.
628
1048
self.start_checker()
630
def checker_callback(self, pid, condition, command):
1050
def checker_callback(self, source, condition, connection,
631
1052
"""The checker has completed, so take appropriate actions."""
1053
# Read return code from connection (see call_pipe)
1054
returncode = connection.recv()
632
1057
self.checker_callback_tag = None
633
1058
self.checker = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
1061
self.last_checker_status = returncode
1062
self.last_checker_signal = None
636
1063
if self.last_checker_status == 0:
637
1064
logger.info("Checker for %(name)s succeeded",
639
1066
self.checked_ok()
641
logger.info("Checker for %(name)s failed",
1068
logger.info("Checker for %(name)s failed", vars(self))
644
1070
self.last_checker_status = -1
1071
self.last_checker_signal = -returncode
645
1072
logger.warning("Checker for %(name)s crashed?",
648
1076
def checked_ok(self):
649
1077
"""Assert that the client has been seen, alive and well."""
650
1078
self.last_checked_ok = datetime.datetime.utcnow()
651
1079
self.last_checker_status = 0
1080
self.last_checker_signal = None
652
1081
self.bump_timeout()
654
1083
def bump_timeout(self, timeout=None):
655
1084
"""Bump up the timeout for this client."""
656
1085
if timeout is None:
657
1086
timeout = self.timeout
658
1087
if self.disable_initiator_tag is not None:
659
gobject.source_remove(self.disable_initiator_tag)
1088
GLib.source_remove(self.disable_initiator_tag)
660
1089
self.disable_initiator_tag = None
661
1090
if getattr(self, "enabled", False):
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
1091
self.disable_initiator_tag = GLib.timeout_add(
1092
int(timeout.total_seconds() * 1000), self.disable)
665
1093
self.expires = datetime.datetime.utcnow() + timeout
667
1095
def need_approval(self):
668
1096
self.last_approval_request = datetime.datetime.utcnow()
670
1098
def start_checker(self):
671
1099
"""Start a new checker subprocess if one is not running.
673
1101
If a checker already exists, leave it running and do
675
1103
# The reason for not killing a running checker is that if we
680
1108
# checkers alone, the checker would have to take more time
681
1109
# than 'timeout' for the client to be disabled, which is as it
684
# If a checker exists, make sure it is not a zombie
686
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
693
logger.warning("Checker was a zombie")
694
gobject.source_remove(self.checker_callback_tag)
695
self.checker_callback(pid, status,
696
self.current_checker_command)
1112
if self.checker is not None and not self.checker.is_alive():
1113
logger.warning("Checker was not alive; joining")
697
1116
# Start a new checker if needed
698
1117
if self.checker is None:
699
1118
# Escape attributes for the shell
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
1120
attr: re.escape(str(getattr(self, attr)))
1121
for attr in self.runtime_expansions}
705
1123
command = self.checker_command % escaped_attrs
706
1124
except TypeError as error:
707
1125
logger.error('Could not format string "%s"',
708
self.checker_command, exc_info=error)
709
return True # Try again later
1126
self.checker_command,
1128
return True # Try again later
710
1129
self.current_checker_command = command
712
logger.info("Starting checker %r for %s",
714
# We don't need to redirect stdout and stderr, since
715
# in normal mode, that is already done by daemon(),
716
# and in debug mode we don't want to. (Stdin is
717
# always replaced by /dev/null.)
718
# The exception is when not debugging but nevertheless
719
# running in the foreground; use the previously
722
if (not self.server_settings["debug"]
723
and self.server_settings["foreground"]):
724
popen_args.update({"stdout": wnull,
726
self.checker = subprocess.Popen(command,
730
except OSError as error:
731
logger.error("Failed to start subprocess",
734
self.checker_callback_tag = (gobject.child_watch_add
736
self.checker_callback,
738
# The checker may have completed before the gobject
739
# watch was added. Check for this.
741
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
742
except OSError as error:
743
if error.errno == errno.ECHILD:
744
# This should never happen
745
logger.error("Child process vanished",
750
gobject.source_remove(self.checker_callback_tag)
751
self.checker_callback(pid, status, command)
752
# Re-run this periodically if run by gobject.timeout_add
1130
logger.info("Starting checker %r for %s", command,
1132
# We don't need to redirect stdout and stderr, since
1133
# in normal mode, that is already done by daemon(),
1134
# and in debug mode we don't want to. (Stdin is
1135
# always replaced by /dev/null.)
1136
# The exception is when not debugging but nevertheless
1137
# running in the foreground; use the previously
1139
popen_args = {"close_fds": True,
1142
if (not self.server_settings["debug"]
1143
and self.server_settings["foreground"]):
1144
popen_args.update({"stdout": wnull,
1146
pipe = multiprocessing.Pipe(duplex=False)
1147
self.checker = multiprocessing.Process(
1149
args=(pipe[1], subprocess.call, command),
1151
self.checker.start()
1152
self.checker_callback_tag = GLib.io_add_watch(
1153
GLib.IOChannel.unix_new(pipe[0].fileno()),
1154
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1155
self.checker_callback, pipe[0], command)
1156
# Re-run this periodically if run by GLib.timeout_add
755
1159
def stop_checker(self):
756
1160
"""Force the checker process, if any, to stop."""
757
1161
if self.checker_callback_tag:
758
gobject.source_remove(self.checker_callback_tag)
1162
GLib.source_remove(self.checker_callback_tag)
759
1163
self.checker_callback_tag = None
760
1164
if getattr(self, "checker", None) is None:
762
1166
logger.debug("Stopping checker for %(name)s", vars(self))
764
self.checker.terminate()
766
#if self.checker.poll() is None:
767
# self.checker.kill()
768
except OSError as error:
769
if error.errno != errno.ESRCH: # No such process
1167
self.checker.terminate()
771
1168
self.checker = None
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
1171
def dbus_service_property(dbus_interface,
776
1175
"""Decorators for marking methods of a DBusObjectWithProperties to
777
1176
become properties on the D-Bus.
779
1178
The decorated method will be called with no arguments by "Get"
780
1179
and with one argument by "Set".
782
1181
The parameters, where they are supported, are the same as
783
1182
dbus.service.method, except there is only "signature", since the
784
1183
type from Get() and the type sent to Set() is the same.
860
class DBusObjectWithProperties(dbus.service.Object):
861
"""A D-Bus object with properties.
863
Classes inheriting from this can use the dbus_service_property
864
decorator to expose methods as D-Bus properties. It exposes the
865
standard Get(), Set(), and GetAll() methods on the D-Bus.
1266
class DBusObjectWithAnnotations(dbus.service.Object):
1267
"""A D-Bus object with annotations.
1269
Classes inheriting from this can use the dbus_annotations
1270
decorator to add annotations to methods or signals.
869
1274
def _is_dbus_thing(thing):
870
1275
"""Returns a function testing if an attribute is a D-Bus thing
872
1277
If called like _is_dbus_thing("method") it returns a function
873
1278
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1280
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
878
1283
def _get_all_dbus_things(self, thing):
879
1284
"""Returns a generator of (name, attribute) pairs
881
return ((getattr(athing.__get__(self), "_dbus_name",
1286
return ((getattr(athing.__get__(self), "_dbus_name", name),
883
1287
athing.__get__(self))
884
1288
for cls in self.__class__.__mro__
885
1289
for name, athing in
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
1290
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1292
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1294
path_keyword='object_path',
1295
connection_keyword='connection')
1296
def Introspect(self, object_path, connection):
1297
"""Overloading of standard D-Bus method.
1299
Inserts annotation tags on methods and signals.
1301
xmlstring = dbus.service.Object.Introspect(self, object_path,
1304
document = xml.dom.minidom.parseString(xmlstring)
1306
for if_tag in document.getElementsByTagName("interface"):
1307
# Add annotation tags
1308
for typ in ("method", "signal"):
1309
for tag in if_tag.getElementsByTagName(typ):
1311
for name, prop in (self.
1312
_get_all_dbus_things(typ)):
1313
if (name == tag.getAttribute("name")
1314
and prop._dbus_interface
1315
== if_tag.getAttribute("name")):
1316
annots.update(getattr(
1317
prop, "_dbus_annotations", {}))
1318
for name, value in annots.items():
1319
ann_tag = document.createElement(
1321
ann_tag.setAttribute("name", name)
1322
ann_tag.setAttribute("value", value)
1323
tag.appendChild(ann_tag)
1324
# Add interface annotation tags
1325
for annotation, value in dict(
1326
itertools.chain.from_iterable(
1327
annotations().items()
1328
for name, annotations
1329
in self._get_all_dbus_things("interface")
1330
if name == if_tag.getAttribute("name")
1332
ann_tag = document.createElement("annotation")
1333
ann_tag.setAttribute("name", annotation)
1334
ann_tag.setAttribute("value", value)
1335
if_tag.appendChild(ann_tag)
1336
# Fix argument name for the Introspect method itself
1337
if (if_tag.getAttribute("name")
1338
== dbus.INTROSPECTABLE_IFACE):
1339
for cn in if_tag.getElementsByTagName("method"):
1340
if cn.getAttribute("name") == "Introspect":
1341
for arg in cn.getElementsByTagName("arg"):
1342
if (arg.getAttribute("direction")
1344
arg.setAttribute("name",
1346
xmlstring = document.toxml("utf-8")
1348
except (AttributeError, xml.dom.DOMException,
1349
xml.parsers.expat.ExpatError) as error:
1350
logger.error("Failed to override Introspection method",
1355
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1356
"""A D-Bus object with properties.
1358
Classes inheriting from this can use the dbus_service_property
1359
decorator to expose methods as D-Bus properties. It exposes the
1360
standard Get(), Set(), and GetAll() methods on the D-Bus.
889
1363
def _get_dbus_property(self, interface_name, property_name):
890
1364
"""Returns a bound method if one exists which is a D-Bus
891
1365
property with the specified name and interface.
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
self._is_dbus_thing("property"))):
1367
for cls in self.__class__.__mro__:
1368
for name, value in inspect.getmembers(
1369
cls, self._is_dbus_thing("property")):
897
1370
if (value._dbus_name == property_name
898
1371
and value._dbus_interface == interface_name):
899
1372
return value.__get__(self)
901
1374
# No such property
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1375
raise DBusPropertyNotFound("{}:{}.{}".format(
1376
self.dbus_object_path, interface_name, property_name))
1379
def _get_all_interface_names(cls):
1380
"""Get a sequence of all interfaces supported by an object"""
1381
return (name for name in set(getattr(getattr(x, attr),
1382
"_dbus_interface", None)
1383
for x in (inspect.getmro(cls))
1385
if name is not None)
1387
@dbus.service.method(dbus.PROPERTIES_IFACE,
907
1389
out_signature="v")
908
1390
def Get(self, interface_name, property_name):
909
1391
"""Standard D-Bus property Get() method, see D-Bus standard.
1039
1520
return xmlstring
1524
dbus.OBJECT_MANAGER_IFACE
1525
except AttributeError:
1526
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1529
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1530
"""A D-Bus object with an ObjectManager.
1532
Classes inheriting from this exposes the standard
1533
GetManagedObjects call and the InterfacesAdded and
1534
InterfacesRemoved signals on the standard
1535
"org.freedesktop.DBus.ObjectManager" interface.
1537
Note: No signals are sent automatically; they must be sent
1540
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1541
out_signature="a{oa{sa{sv}}}")
1542
def GetManagedObjects(self):
1543
"""This function must be overridden"""
1544
raise NotImplementedError()
1546
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1547
signature="oa{sa{sv}}")
1548
def InterfacesAdded(self, object_path, interfaces_and_properties):
1551
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1552
def InterfacesRemoved(self, object_path, interfaces):
1555
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1557
path_keyword='object_path',
1558
connection_keyword='connection')
1559
def Introspect(self, object_path, connection):
1560
"""Overloading of standard D-Bus method.
1562
Override return argument name of GetManagedObjects to be
1563
"objpath_interfaces_and_properties"
1565
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1569
document = xml.dom.minidom.parseString(xmlstring)
1571
for if_tag in document.getElementsByTagName("interface"):
1572
# Fix argument name for the GetManagedObjects method
1573
if (if_tag.getAttribute("name")
1574
== dbus.OBJECT_MANAGER_IFACE):
1575
for cn in if_tag.getElementsByTagName("method"):
1576
if (cn.getAttribute("name")
1577
== "GetManagedObjects"):
1578
for arg in cn.getElementsByTagName("arg"):
1579
if (arg.getAttribute("direction")
1583
"objpath_interfaces"
1585
xmlstring = document.toxml("utf-8")
1587
except (AttributeError, xml.dom.DOMException,
1588
xml.parsers.expat.ExpatError) as error:
1589
logger.error("Failed to override Introspection method",
1042
1594
def datetime_to_dbus(dt, variant_level=0):
1043
1595
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1045
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1597
return dbus.String("", variant_level=variant_level)
1598
return dbus.String(dt.isoformat(), variant_level=variant_level)
1050
1601
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1403
1962
server to mandos-client
1407
1966
# Rejected - signal
1408
1967
@dbus.service.signal(_interface, signature="s")
1409
1968
def Rejected(self, reason):
1413
1972
# NeedApproval - signal
1414
1973
@dbus.service.signal(_interface, signature="tb")
1415
1974
def NeedApproval(self, timeout, default):
1417
1976
return self.need_approval()
1421
1980
# Approve - method
1422
1981
@dbus.service.method(_interface, in_signature="b")
1423
1982
def Approve(self, value):
1424
1983
self.approve(value)
1426
1985
# CheckedOK - method
1427
1986
@dbus.service.method(_interface)
1428
1987
def CheckedOK(self):
1429
1988
self.checked_ok()
1431
1990
# Enable - method
1991
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1432
1992
@dbus.service.method(_interface)
1433
1993
def Enable(self):
1437
1997
# StartChecker - method
1998
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1438
1999
@dbus.service.method(_interface)
1439
2000
def StartChecker(self):
1441
2002
self.start_checker()
1443
2004
# Disable - method
2005
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1444
2006
@dbus.service.method(_interface)
1445
2007
def Disable(self):
1449
2011
# StopChecker - method
2012
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1450
2013
@dbus.service.method(_interface)
1451
2014
def StopChecker(self):
1452
2015
self.stop_checker()
1456
2019
# ApprovalPending - property
1457
2020
@dbus_service_property(_interface, signature="b", access="read")
1458
2021
def ApprovalPending_dbus_property(self):
1459
2022
return dbus.Boolean(bool(self.approvals_pending))
1461
2024
# ApprovedByDefault - property
1462
@dbus_service_property(_interface, signature="b",
2025
@dbus_service_property(_interface,
1463
2027
access="readwrite")
1464
2028
def ApprovedByDefault_dbus_property(self, value=None):
1465
2029
if value is None: # get
1466
2030
return dbus.Boolean(self.approved_by_default)
1467
2031
self.approved_by_default = bool(value)
1469
2033
# ApprovalDelay - property
1470
@dbus_service_property(_interface, signature="t",
2034
@dbus_service_property(_interface,
1471
2036
access="readwrite")
1472
2037
def ApprovalDelay_dbus_property(self, value=None):
1473
2038
if value is None: # get
1474
return dbus.UInt64(self.approval_delay_milliseconds())
2039
return dbus.UInt64(self.approval_delay.total_seconds()
1475
2041
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1477
2043
# ApprovalDuration - property
1478
@dbus_service_property(_interface, signature="t",
2044
@dbus_service_property(_interface,
1479
2046
access="readwrite")
1480
2047
def ApprovalDuration_dbus_property(self, value=None):
1481
2048
if value is None: # get
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
2049
return dbus.UInt64(self.approval_duration.total_seconds()
1484
2051
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1486
2053
# Name - property
2055
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1487
2056
@dbus_service_property(_interface, signature="s", access="read")
1488
2057
def Name_dbus_property(self):
1489
2058
return dbus.String(self.name)
2062
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2063
@dbus_service_property(_interface, signature="s", access="read")
2064
def KeyID_dbus_property(self):
2065
return dbus.String(self.key_id)
1491
2067
# Fingerprint - property
2069
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1492
2070
@dbus_service_property(_interface, signature="s", access="read")
1493
2071
def Fingerprint_dbus_property(self):
1494
2072
return dbus.String(self.fingerprint)
1496
2074
# Host - property
1497
@dbus_service_property(_interface, signature="s",
2075
@dbus_service_property(_interface,
1498
2077
access="readwrite")
1499
2078
def Host_dbus_property(self, value=None):
1500
2079
if value is None: # get
1501
2080
return dbus.String(self.host)
1502
self.host = unicode(value)
2081
self.host = str(value)
1504
2083
# Created - property
2085
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1505
2086
@dbus_service_property(_interface, signature="s", access="read")
1506
2087
def Created_dbus_property(self):
1507
2088
return datetime_to_dbus(self.created)
1509
2090
# LastEnabled - property
1510
2091
@dbus_service_property(_interface, signature="s", access="read")
1511
2092
def LastEnabled_dbus_property(self):
1512
2093
return datetime_to_dbus(self.last_enabled)
1514
2095
# Enabled - property
1515
@dbus_service_property(_interface, signature="b",
2096
@dbus_service_property(_interface,
1516
2098
access="readwrite")
1517
2099
def Enabled_dbus_property(self, value=None):
1518
2100
if value is None: # get
1566
2149
if (getattr(self, "disable_initiator_tag", None)
1569
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
2152
GLib.source_remove(self.disable_initiator_tag)
2153
self.disable_initiator_tag = GLib.timeout_add(
2154
int((self.expires - now).total_seconds() * 1000),
1575
2157
# ExtendedTimeout - property
1576
@dbus_service_property(_interface, signature="t",
2158
@dbus_service_property(_interface,
1577
2160
access="readwrite")
1578
2161
def ExtendedTimeout_dbus_property(self, value=None):
1579
2162
if value is None: # get
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
2163
return dbus.UInt64(self.extended_timeout.total_seconds()
1581
2165
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1583
2167
# Interval - property
1584
@dbus_service_property(_interface, signature="t",
2168
@dbus_service_property(_interface,
1585
2170
access="readwrite")
1586
2171
def Interval_dbus_property(self, value=None):
1587
2172
if value is None: # get
1588
return dbus.UInt64(self.interval_milliseconds())
2173
return dbus.UInt64(self.interval.total_seconds() * 1000)
1589
2174
self.interval = datetime.timedelta(0, 0, 0, value)
1590
2175
if getattr(self, "checker_initiator_tag", None) is None:
1592
2177
if self.enabled:
1593
2178
# Reschedule checker run
1594
gobject.source_remove(self.checker_initiator_tag)
1595
self.checker_initiator_tag = (gobject.timeout_add
1596
(value, self.start_checker))
1597
self.start_checker() # Start one now, too
2179
GLib.source_remove(self.checker_initiator_tag)
2180
self.checker_initiator_tag = GLib.timeout_add(
2181
value, self.start_checker)
2182
self.start_checker() # Start one now, too
1599
2184
# Checker - property
1600
@dbus_service_property(_interface, signature="s",
2185
@dbus_service_property(_interface,
1601
2187
access="readwrite")
1602
2188
def Checker_dbus_property(self, value=None):
1603
2189
if value is None: # get
1604
2190
return dbus.String(self.checker_command)
1605
self.checker_command = unicode(value)
2191
self.checker_command = str(value)
1607
2193
# CheckerRunning - property
1608
@dbus_service_property(_interface, signature="b",
2194
@dbus_service_property(_interface,
1609
2196
access="readwrite")
1610
2197
def CheckerRunning_dbus_property(self, value=None):
1611
2198
if value is None: # get
1658
2255
class ClientHandler(socketserver.BaseRequestHandler, object):
1659
2256
"""A class to handle client connections.
1661
2258
Instantiated once for each connection to handle it.
1662
2259
Note: This will run in its own forked process."""
1664
2261
def handle(self):
1665
2262
with contextlib.closing(self.server.child_pipe) as child_pipe:
1666
2263
logger.info("TCP connection from: %s",
1667
unicode(self.client_address))
2264
str(self.client_address))
1668
2265
logger.debug("Pipe FD: %d",
1669
2266
self.server.child_pipe.fileno())
1671
session = (gnutls.connection
1672
.ClientSession(self.request,
1674
.X509Credentials()))
1676
# Note: gnutls.connection.X509Credentials is really a
1677
# generic GnuTLS certificate credentials object so long as
1678
# no X.509 keys are added to it. Therefore, we can use it
1679
# here despite using OpenPGP certificates.
1681
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1682
# "+AES-256-CBC", "+SHA1",
1683
# "+COMP-NULL", "+CTYPE-OPENPGP",
2268
session = gnutls.ClientSession(self.request)
2270
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2271
# "+AES-256-CBC", "+SHA1",
2272
# "+COMP-NULL", "+CTYPE-OPENPGP",
1685
2274
# Use a fallback default, since this MUST be set.
1686
2275
priority = self.server.gnutls_priority
1687
2276
if priority is None:
1688
2277
priority = "NORMAL"
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
2278
gnutls.priority_set_direct(session._c_object,
2279
priority.encode("utf-8"),
1693
2282
# Start communication using the Mandos protocol
1694
2283
# Get protocol number
1695
2284
line = self.request.makefile().readline()
1696
2285
logger.debug("Protocol version: %r", line)
1698
2287
if int(line.strip().split()[0]) > 1:
2288
raise RuntimeError(line)
1700
2289
except (ValueError, IndexError, RuntimeError) as error:
1701
2290
logger.error("Unknown protocol version: %s", error)
1704
2293
# Start GnuTLS connection
1706
2295
session.handshake()
1707
except gnutls.errors.GNUTLSError as error:
2296
except gnutls.Error as error:
1708
2297
logger.warning("Handshake failed: %s", error)
1709
2298
# Do not run session.bye() here: the session is not
1710
2299
# established. Just abandon the request.
1712
2301
logger.debug("Handshake succeeded")
1714
2303
approval_required = False
1717
fpr = self.fingerprint(self.peer_certificate
1720
gnutls.errors.GNUTLSError) as error:
1721
logger.warning("Bad certificate: %s", error)
1723
logger.debug("Fingerprint: %s", fpr)
1726
client = ProxyClient(child_pipe, fpr,
2305
if gnutls.has_rawpk:
2308
key_id = self.key_id(
2309
self.peer_certificate(session))
2310
except (TypeError, gnutls.Error) as error:
2311
logger.warning("Bad certificate: %s", error)
2313
logger.debug("Key ID: %s", key_id)
2318
fpr = self.fingerprint(
2319
self.peer_certificate(session))
2320
except (TypeError, gnutls.Error) as error:
2321
logger.warning("Bad certificate: %s", error)
2323
logger.debug("Fingerprint: %s", fpr)
2326
client = ProxyClient(child_pipe, key_id, fpr,
1727
2327
self.client_address)
1728
2328
except KeyError:
1731
2331
if client.approval_delay:
1732
2332
delay = client.approval_delay
1733
2333
client.approvals_pending += 1
1734
2334
approval_required = True
1737
2337
if not client.enabled:
1738
2338
logger.info("Client %s is disabled",
1740
2340
if self.server.use_dbus:
1741
2341
# Emit D-Bus signal
1742
2342
client.Rejected("Disabled")
1745
2345
if client.approved or not client.approval_delay:
1746
#We are approved or approval is disabled
2346
# We are approved or approval is disabled
1748
2348
elif client.approved is None:
1749
2349
logger.info("Client %s needs approval",
1784
2382
delay -= time2 - time
1787
while sent_size < len(client.secret):
1789
sent = session.send(client.secret[sent_size:])
1790
except gnutls.errors.GNUTLSError as error:
1791
logger.warning("gnutls send failed",
1794
logger.debug("Sent: %d, remaining: %d",
1795
sent, len(client.secret)
1796
- (sent_size + sent))
2385
session.send(client.secret)
2386
except gnutls.Error as error:
2387
logger.warning("gnutls send failed",
1799
2391
logger.info("Sending secret to %s", client.name)
1800
2392
# bump the timeout using extended_timeout
1801
2393
client.bump_timeout(client.extended_timeout)
1802
2394
if self.server.use_dbus:
1803
2395
# Emit D-Bus signal
1804
2396
client.GotSecret()
1807
2399
if approval_required:
1808
2400
client.approvals_pending -= 1
1811
except gnutls.errors.GNUTLSError as error:
2403
except gnutls.Error as error:
1812
2404
logger.warning("GnuTLS bye failed",
1813
2405
exc_info=error)
1816
2408
def peer_certificate(session):
1817
"Return the peer's OpenPGP certificate as a bytestring"
1818
# If not an OpenPGP certificate...
1819
if (gnutls.library.functions
1820
.gnutls_certificate_type_get(session._c_object)
1821
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1822
# ...do the normal thing
1823
return session.peer_certificate
2409
"Return the peer's certificate as a bytestring"
2411
cert_type = gnutls.certificate_type_get2(session._c_object,
2413
except AttributeError:
2414
cert_type = gnutls.certificate_type_get(session._c_object)
2415
if gnutls.has_rawpk:
2416
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2418
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2419
# If not a valid certificate type...
2420
if cert_type not in valid_cert_types:
2421
logger.info("Cert type %r not in %r", cert_type,
2423
# ...return invalid data
1824
2425
list_size = ctypes.c_uint(1)
1825
cert_list = (gnutls.library.functions
1826
.gnutls_certificate_get_peers
2426
cert_list = (gnutls.certificate_get_peers
1827
2427
(session._c_object, ctypes.byref(list_size)))
1828
2428
if not bool(cert_list) and list_size.value != 0:
1829
raise gnutls.errors.GNUTLSError("error getting peer"
2429
raise gnutls.Error("error getting peer certificate")
1831
2430
if list_size.value == 0:
1833
2432
cert = cert_list[0]
1834
2433
return ctypes.string_at(cert.data, cert.size)
2436
def key_id(certificate):
2437
"Convert a certificate bytestring to a hexdigit key ID"
2438
# New GnuTLS "datum" with the public key
2439
datum = gnutls.datum_t(
2440
ctypes.cast(ctypes.c_char_p(certificate),
2441
ctypes.POINTER(ctypes.c_ubyte)),
2442
ctypes.c_uint(len(certificate)))
2443
# XXX all these need to be created in the gnutls "module"
2444
# New empty GnuTLS certificate
2445
pubkey = gnutls.pubkey_t()
2446
gnutls.pubkey_init(ctypes.byref(pubkey))
2447
# Import the raw public key into the certificate
2448
gnutls.pubkey_import(pubkey,
2449
ctypes.byref(datum),
2450
gnutls.X509_FMT_DER)
2451
# New buffer for the key ID
2452
buf = ctypes.create_string_buffer(32)
2453
buf_len = ctypes.c_size_t(len(buf))
2454
# Get the key ID from the raw public key into the buffer
2455
gnutls.pubkey_get_key_id(pubkey,
2456
gnutls.KEYID_USE_SHA256,
2457
ctypes.cast(ctypes.byref(buf),
2458
ctypes.POINTER(ctypes.c_ubyte)),
2459
ctypes.byref(buf_len))
2460
# Deinit the certificate
2461
gnutls.pubkey_deinit(pubkey)
2463
# Convert the buffer to a Python bytestring
2464
key_id = ctypes.string_at(buf, buf_len.value)
2465
# Convert the bytestring to hexadecimal notation
2466
hex_key_id = binascii.hexlify(key_id).upper()
1837
2470
def fingerprint(openpgp):
1838
2471
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1839
2472
# New GnuTLS "datum" with the OpenPGP public key
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
2473
datum = gnutls.datum_t(
2474
ctypes.cast(ctypes.c_char_p(openpgp),
2475
ctypes.POINTER(ctypes.c_ubyte)),
2476
ctypes.c_uint(len(openpgp)))
1845
2477
# New empty GnuTLS certificate
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2478
crt = gnutls.openpgp_crt_t()
2479
gnutls.openpgp_crt_init(ctypes.byref(crt))
1849
2480
# Import the OpenPGP public key into the certificate
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
2481
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2482
gnutls.OPENPGP_FMT_RAW)
1854
2483
# Verify the self signature in the key
1855
2484
crtverify = ctypes.c_uint()
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2485
gnutls.openpgp_crt_verify_self(crt, 0,
2486
ctypes.byref(crtverify))
1859
2487
if crtverify.value != 0:
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2488
gnutls.openpgp_crt_deinit(crt)
2489
raise gnutls.CertificateSecurityError(code
1863
2491
# New buffer for the fingerprint
1864
2492
buf = ctypes.create_string_buffer(20)
1865
2493
buf_len = ctypes.c_size_t()
1866
2494
# Get the fingerprint from the certificate into the buffer
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2495
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2496
ctypes.byref(buf_len))
1870
2497
# Deinit the certificate
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2498
gnutls.openpgp_crt_deinit(crt)
1872
2499
# Convert the buffer to a Python bytestring
1873
2500
fpr = ctypes.string_at(buf, buf_len.value)
1874
2501
# Convert the bytestring to hexadecimal notation
1957
2590
# socket_wrapper(), if socketfd was set.
1958
2591
socketserver.TCPServer.__init__(self, server_address,
1959
2592
RequestHandlerClass)
1961
2594
def server_bind(self):
1962
2595
"""This overrides the normal server_bind() function
1963
2596
to bind to an interface if one was specified, and also NOT to
1964
2597
bind to an address or port if they were not specified."""
2598
global SO_BINDTODEVICE
1965
2599
if self.interface is not None:
1966
2600
if SO_BINDTODEVICE is None:
1967
logger.error("SO_BINDTODEVICE does not exist;"
1968
" cannot bind to interface %s",
1972
self.socket.setsockopt(socket.SOL_SOCKET,
1974
str(self.interface + '\0'))
1975
except socket.error as error:
1976
if error.errno == errno.EPERM:
1977
logger.error("No permission to bind to"
1978
" interface %s", self.interface)
1979
elif error.errno == errno.ENOPROTOOPT:
1980
logger.error("SO_BINDTODEVICE not available;"
1981
" cannot bind to interface %s",
1983
elif error.errno == errno.ENODEV:
1984
logger.error("Interface %s does not exist,"
1985
" cannot bind", self.interface)
2601
# Fall back to a hard-coded value which seems to be
2603
logger.warning("SO_BINDTODEVICE not found, trying 25")
2604
SO_BINDTODEVICE = 25
2606
self.socket.setsockopt(
2607
socket.SOL_SOCKET, SO_BINDTODEVICE,
2608
(self.interface + "\0").encode("utf-8"))
2609
except socket.error as error:
2610
if error.errno == errno.EPERM:
2611
logger.error("No permission to bind to"
2612
" interface %s", self.interface)
2613
elif error.errno == errno.ENOPROTOOPT:
2614
logger.error("SO_BINDTODEVICE not available;"
2615
" cannot bind to interface %s",
2617
elif error.errno == errno.ENODEV:
2618
logger.error("Interface %s does not exist,"
2619
" cannot bind", self.interface)
1988
2622
# Only bind(2) the socket if we really need to.
1989
2623
if self.server_address[0] or self.server_address[1]:
2624
if self.server_address[1]:
2625
self.allow_reuse_address = True
1990
2626
if not self.server_address[0]:
1991
2627
if self.address_family == socket.AF_INET6:
1992
any_address = "::" # in6addr_any
2628
any_address = "::" # in6addr_any
1994
any_address = "0.0.0.0" # INADDR_ANY
2630
any_address = "0.0.0.0" # INADDR_ANY
1995
2631
self.server_address = (any_address,
1996
2632
self.server_address[1])
1997
2633
elif not self.server_address[1]:
1998
self.server_address = (self.server_address[0],
2634
self.server_address = (self.server_address[0], 0)
2000
2635
# if self.interface:
2001
2636
# self.server_address = (self.server_address[0],
2027
2667
self.gnutls_priority = gnutls_priority
2028
2668
IPv6_TCPServer.__init__(self, server_address,
2029
2669
RequestHandlerClass,
2030
interface = interface,
2031
use_ipv6 = use_ipv6,
2032
socketfd = socketfd)
2670
interface=interface,
2033
2674
def server_activate(self):
2034
2675
if self.enabled:
2035
2676
return socketserver.TCPServer.server_activate(self)
2037
2678
def enable(self):
2038
2679
self.enabled = True
2040
2681
def add_pipe(self, parent_pipe, proc):
2041
2682
# Call "handle_ipc" for both data and EOF events
2042
gobject.io_add_watch(parent_pipe.fileno(),
2043
gobject.IO_IN | gobject.IO_HUP,
2044
functools.partial(self.handle_ipc,
2049
def handle_ipc(self, source, condition, parent_pipe=None,
2050
proc = None, client_object=None):
2684
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2685
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2686
functools.partial(self.handle_ipc,
2687
parent_pipe=parent_pipe,
2690
def handle_ipc(self, source, condition,
2693
client_object=None):
2051
2694
# error, or the other end of multiprocessing.Pipe has closed
2052
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2695
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2053
2696
# Wait for other process to exit
2057
2700
# Read a request from the child
2058
2701
request = parent_pipe.recv()
2059
2702
command = request[0]
2061
2704
if command == 'init':
2063
address = request[2]
2065
for c in self.clients.itervalues():
2066
if c.fingerprint == fpr:
2705
key_id = request[1].decode("ascii")
2706
fpr = request[2].decode("ascii")
2707
address = request[3]
2709
for c in self.clients.values():
2710
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2712
if key_id and c.key_id == key_id:
2715
if fpr and c.fingerprint == fpr:
2070
logger.info("Client not found for fingerprint: %s, ad"
2071
"dress: %s", fpr, address)
2719
logger.info("Client not found for key ID: %s, address"
2720
": %s", key_id or fpr, address)
2072
2721
if self.use_dbus:
2073
2722
# Emit D-Bus signal
2074
mandos_dbus_service.ClientNotFound(fpr,
2723
mandos_dbus_service.ClientNotFound(key_id or fpr,
2076
2725
parent_pipe.send(False)
2079
gobject.io_add_watch(parent_pipe.fileno(),
2080
gobject.IO_IN | gobject.IO_HUP,
2081
functools.partial(self.handle_ipc,
2729
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2730
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2731
functools.partial(self.handle_ipc,
2732
parent_pipe=parent_pipe,
2734
client_object=client))
2087
2735
parent_pipe.send(True)
2088
2736
# remove the old hook in favor of the new above hook on
2092
2740
funcname = request[1]
2093
2741
args = request[2]
2094
2742
kwargs = request[3]
2096
2744
parent_pipe.send(('data', getattr(client_object,
2097
2745
funcname)(*args,
2100
2748
if command == 'getattr':
2101
2749
attrname = request[1]
2102
if callable(client_object.__getattribute__(attrname)):
2103
parent_pipe.send(('function',))
2750
if isinstance(client_object.__getattribute__(attrname),
2751
collections.Callable):
2752
parent_pipe.send(('function', ))
2105
parent_pipe.send(('data', client_object
2106
.__getattribute__(attrname)))
2755
'data', client_object.__getattribute__(attrname)))
2108
2757
if command == 'setattr':
2109
2758
attrname = request[1]
2110
2759
value = request[2]
2111
2760
setattr(client_object, attrname, value)
2116
2765
def rfc3339_duration_to_delta(duration):
2117
2766
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2119
>>> rfc3339_duration_to_delta("P7D")
2120
datetime.timedelta(7)
2121
>>> rfc3339_duration_to_delta("PT60S")
2122
datetime.timedelta(0, 60)
2123
>>> rfc3339_duration_to_delta("PT60M")
2124
datetime.timedelta(0, 3600)
2125
>>> rfc3339_duration_to_delta("PT24H")
2126
datetime.timedelta(1)
2127
>>> rfc3339_duration_to_delta("P1W")
2128
datetime.timedelta(7)
2129
>>> rfc3339_duration_to_delta("PT5M30S")
2130
datetime.timedelta(0, 330)
2131
>>> rfc3339_duration_to_delta("P1DT3M20S")
2132
datetime.timedelta(1, 200)
2768
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2770
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2772
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2774
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2776
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2778
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2780
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2135
2784
# Parsing an RFC 3339 duration with regular expressions is not
2136
2785
# possible - there would have to be multiple places for the same
2137
2786
# values, like seconds. The current code, while more esoteric, is
2138
2787
# cleaner without depending on a parsing library. If Python had a
2139
2788
# built-in library for parsing we would use it, but we'd like to
2140
2789
# avoid excessive use of external libraries.
2142
2791
# New type for defining tokens, syntax, and semantics all-in-one
2143
Token = collections.namedtuple("Token",
2144
("regexp", # To match token; if
2145
# "value" is not None,
2146
# must have a "group"
2148
"value", # datetime.timedelta or
2150
"followers")) # Tokens valid after
2792
Token = collections.namedtuple("Token", (
2793
"regexp", # To match token; if "value" is not None, must have
2794
# a "group" containing digits
2795
"value", # datetime.timedelta or None
2796
"followers")) # Tokens valid after this token
2152
2797
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2153
2798
# the "duration" ABNF definition in RFC 3339, Appendix A.
2154
2799
token_end = Token(re.compile(r"$"), None, frozenset())
2155
2800
token_second = Token(re.compile(r"(\d+)S"),
2156
2801
datetime.timedelta(seconds=1),
2157
frozenset((token_end,)))
2802
frozenset((token_end, )))
2158
2803
token_minute = Token(re.compile(r"(\d+)M"),
2159
2804
datetime.timedelta(minutes=1),
2160
2805
frozenset((token_second, token_end)))
3137
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2474
3139
except OSError as error:
3140
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3141
.format(uid, gid, os.strerror(error.errno)))
2475
3142
if error.errno != errno.EPERM:
2479
3146
# Enable all possible GnuTLS debugging
2481
3148
# "Use a log level over 10 to enable all debugging options."
2482
3149
# - GnuTLS manual
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
2485
@gnutls.library.types.gnutls_log_func
3150
gnutls.global_set_log_level(11)
2486
3153
def debug_gnutls(level, string):
2487
3154
logger.debug("GnuTLS: %s", string[:-1])
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
3156
gnutls.global_set_log_function(debug_gnutls)
2492
3158
# Redirect stdin so all checkers get /dev/null
2493
3159
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2494
3160
os.dup2(null, sys.stdin.fileno())
2498
3164
# Need to fork before connecting to D-Bus
2499
3165
if not foreground:
2500
3166
# Close all input and output, do double fork, etc.
2503
# multiprocessing will use threads, so before we use gobject we
2504
# need to inform gobject that threads will be used.
2505
gobject.threads_init()
3169
if gi.version_info < (3, 10, 2):
3170
# multiprocessing will use threads, so before we use GLib we
3171
# need to inform GLib that threads will be used.
2507
3174
global main_loop
2508
3175
# From the Avahi example code
2509
3176
DBusGMainLoop(set_as_default=True)
2510
main_loop = gobject.MainLoop()
3177
main_loop = GLib.MainLoop()
2511
3178
bus = dbus.SystemBus()
2512
3179
# End of Avahi example code
2515
3182
bus_name = dbus.service.BusName("se.recompile.Mandos",
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2520
except dbus.exceptions.NameExistsException as e:
3185
old_bus_name = dbus.service.BusName(
3186
"se.bsnet.fukt.Mandos", bus,
3188
except dbus.exceptions.DBusException as e:
2521
3189
logger.error("Disabling D-Bus:", exc_info=e)
2522
3190
use_dbus = False
2523
3191
server_settings["use_dbus"] = False
2524
3192
tcp_server.use_dbus = False
2525
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2526
service = AvahiServiceToSyslog(name =
2527
server_settings["servicename"],
2528
servicetype = "_mandos._tcp",
2529
protocol = protocol, bus = bus)
2530
if server_settings["interface"]:
2531
service.interface = (if_nametoindex
2532
(str(server_settings["interface"])))
3194
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3195
service = AvahiServiceToSyslog(
3196
name=server_settings["servicename"],
3197
servicetype="_mandos._tcp",
3200
if server_settings["interface"]:
3201
service.interface = if_nametoindex(
3202
server_settings["interface"].encode("utf-8"))
2534
3204
global multiprocessing_manager
2535
3205
multiprocessing_manager = multiprocessing.Manager()
2537
3207
client_class = Client
2539
client_class = functools.partial(ClientDBus, bus = bus)
3209
client_class = functools.partial(ClientDBus, bus=bus)
2541
3211
client_settings = Client.config_parser(client_config)
2542
3212
old_client_settings = {}
2543
3213
clients_data = {}
2545
3215
# This is used to redirect stdout and stderr for checker processes
2547
wnull = open(os.devnull, "w") # A writable /dev/null
3217
wnull = open(os.devnull, "w") # A writable /dev/null
2548
3218
# Only used if server is running in foreground but not in debug
2550
3220
if debug or not foreground:
2553
3223
# Get client data and settings from last running state.
2554
3224
if server_settings["restore"]:
2556
3226
with open(stored_state_path, "rb") as stored_state:
2557
clients_data, old_client_settings = (pickle.load
3227
if sys.version_info.major == 2:
3228
clients_data, old_client_settings = pickle.load(
3231
bytes_clients_data, bytes_old_client_settings = (
3232
pickle.load(stored_state, encoding="bytes"))
3233
# Fix bytes to strings
3236
clients_data = {(key.decode("utf-8")
3237
if isinstance(key, bytes)
3240
bytes_clients_data.items()}
3241
del bytes_clients_data
3242
for key in clients_data:
3243
value = {(k.decode("utf-8")
3244
if isinstance(k, bytes) else k): v
3246
clients_data[key].items()}
3247
clients_data[key] = value
3249
value["client_structure"] = [
3251
if isinstance(s, bytes)
3253
value["client_structure"]]
3255
for k in ("name", "host"):
3256
if isinstance(value[k], bytes):
3257
value[k] = value[k].decode("utf-8")
3258
if "key_id" not in value:
3259
value["key_id"] = ""
3260
elif "fingerprint" not in value:
3261
value["fingerprint"] = ""
3262
# old_client_settings
3264
old_client_settings = {
3265
(key.decode("utf-8")
3266
if isinstance(key, bytes)
3269
bytes_old_client_settings.items()}
3270
del bytes_old_client_settings
3272
for value in old_client_settings.values():
3273
if isinstance(value["host"], bytes):
3274
value["host"] = (value["host"]
2559
3276
os.remove(stored_state_path)
2560
3277
except IOError as e:
2561
3278
if e.errno == errno.ENOENT:
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
3279
logger.warning("Could not load persistent state:"
3280
" {}".format(os.strerror(e.errno)))
2565
3282
logger.critical("Could not load persistent state:",
2568
3285
except EOFError as e:
2569
3286
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
2572
3290
with PGPEngine() as pgp:
2573
for client_name, client in clients_data.iteritems():
3291
for client_name, client in clients_data.items():
2574
3292
# Skip removed clients
2575
3293
if client_name not in client_settings:
2578
3296
# Decide which value to use after restoring saved state.
2579
3297
# We have three different values: Old config file,
2580
3298
# new config file, and saved state.
2638
3356
for client_name in (set(client_settings)
2639
3357
- set(old_client_settings)):
2640
3358
clients_data[client_name] = client_settings[client_name]
2642
3360
# Create all client objects
2643
for client_name, client in clients_data.iteritems():
3361
for client_name, client in clients_data.items():
2644
3362
tcp_server.clients[client_name] = client_class(
2645
name = client_name, settings = client,
2646
server_settings = server_settings)
3365
server_settings=server_settings)
2648
3367
if not tcp_server.clients:
2649
3368
logger.warning("No clients defined")
2651
3370
if not foreground:
2652
3371
if pidfile is not None:
2656
pidfile.write(str(pid) + "\n".encode("utf-8"))
3375
print(pid, file=pidfile)
2657
3376
except IOError:
2658
3377
logger.error("Could not write to file %r with PID %d",
2659
3378
pidfilename, pid)
2661
3380
del pidfilename
2663
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3382
for termsig in (signal.SIGHUP, signal.SIGTERM):
3383
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3384
lambda: main_loop.quit() and False)
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2669
class MandosDBusService(DBusObjectWithProperties):
3388
@alternate_dbus_interfaces(
3389
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3390
class MandosDBusService(DBusObjectWithObjectManager):
2670
3391
"""A D-Bus proxy object"""
2671
3393
def __init__(self):
2672
3394
dbus.service.Object.__init__(self, bus, "/")
2673
3396
_interface = "se.recompile.Mandos"
2675
@dbus_interface_annotations(_interface)
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
2681
3398
@dbus.service.signal(_interface, signature="o")
2682
3399
def ClientAdded(self, objpath):
2686
3403
@dbus.service.signal(_interface, signature="ss")
2687
def ClientNotFound(self, fingerprint, address):
3404
def ClientNotFound(self, key_id, address):
3408
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2691
3410
@dbus.service.signal(_interface, signature="os")
2692
3411
def ClientRemoved(self, objpath, name):
3415
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2696
3417
@dbus.service.method(_interface, out_signature="ao")
2697
3418
def GetAllClients(self):
2699
return dbus.Array(c.dbus_object_path
2701
tcp_server.clients.itervalues())
3420
return dbus.Array(c.dbus_object_path for c in
3421
tcp_server.clients.values())
3423
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2703
3425
@dbus.service.method(_interface,
2704
3426
out_signature="a{oa{sv}}")
2705
3427
def GetAllClientsWithProperties(self):
2707
3429
return dbus.Dictionary(
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
3430
{c.dbus_object_path: c.GetAll(
3431
"se.recompile.Mandos.Client")
3432
for c in tcp_server.clients.values()},
2710
3433
signature="oa{sv}")
2712
3435
@dbus.service.method(_interface, in_signature="o")
2713
3436
def RemoveClient(self, object_path):
2715
for c in tcp_server.clients.itervalues():
3438
for c in tcp_server.clients.values():
2716
3439
if c.dbus_object_path == object_path:
2717
3440
del tcp_server.clients[c.name]
2718
3441
c.remove_from_connection()
2719
# Don't signal anything except ClientRemoved
3442
# Don't signal the disabling
2720
3443
c.disable(quiet=True)
2722
self.ClientRemoved(object_path, c.name)
3444
# Emit D-Bus signal for removal
3445
self.client_removed_signal(c)
2724
3447
raise KeyError(object_path)
3451
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3452
out_signature="a{oa{sa{sv}}}")
3453
def GetManagedObjects(self):
3455
return dbus.Dictionary(
3456
{client.dbus_object_path:
3458
{interface: client.GetAll(interface)
3460
client._get_all_interface_names()})
3461
for client in tcp_server.clients.values()})
3463
def client_added_signal(self, client):
3464
"""Send the new standard signal and the old signal"""
3466
# New standard signal
3467
self.InterfacesAdded(
3468
client.dbus_object_path,
3470
{interface: client.GetAll(interface)
3472
client._get_all_interface_names()}))
3474
self.ClientAdded(client.dbus_object_path)
3476
def client_removed_signal(self, client):
3477
"""Send the new standard signal and the old signal"""
3479
# New standard signal
3480
self.InterfacesRemoved(
3481
client.dbus_object_path,
3482
client._get_all_interface_names())
3484
self.ClientRemoved(client.dbus_object_path,
2728
3487
mandos_dbus_service = MandosDBusService()
3489
# Save modules to variables to exempt the modules from being
3490
# unloaded before the function registered with atexit() is run.
3491
mp = multiprocessing
2731
3495
"Cleanup function; run on exit"
2734
multiprocessing.active_children()
3499
mp.active_children()
2736
3501
if not (tcp_server.clients or client_settings):
2739
3504
# Store client before exiting. Secrets are encrypted with key
2740
3505
# based on what config file has. If config file is
2741
3506
# removed/edited, old secret will thus be unrecovable.
2743
3508
with PGPEngine() as pgp:
2744
for client in tcp_server.clients.itervalues():
3509
for client in tcp_server.clients.values():
2745
3510
key = client_settings[client.name]["secret"]
2746
3511
client.encrypted_secret = pgp.encrypt(client.secret,
2748
3513
client_dict = {}
2750
3515
# A list of attributes that can not be pickled
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
3517
exclude = {"bus", "changedstate", "secret",
3518
"checker", "server_settings"}
3519
for name, typ in inspect.getmembers(dbus.service
2756
3521
exclude.add(name)
2758
3523
client_dict["encrypted_secret"] = (client
2759
3524
.encrypted_secret)
2760
3525
for attr in client.client_structure:
2761
3526
if attr not in exclude:
2762
3527
client_dict[attr] = getattr(client, attr)
2764
3529
clients[client.name] = client_dict
2765
3530
del client_settings[client.name]["secret"]
2768
with (tempfile.NamedTemporaryFile
2769
(mode='wb', suffix=".pickle", prefix='clients-',
2770
dir=os.path.dirname(stored_state_path),
2771
delete=False)) as stored_state:
2772
pickle.dump((clients, client_settings), stored_state)
2773
tempname=stored_state.name
3533
with tempfile.NamedTemporaryFile(
3537
dir=os.path.dirname(stored_state_path),
3538
delete=False) as stored_state:
3539
pickle.dump((clients, client_settings), stored_state,
3541
tempname = stored_state.name
2774
3542
os.rename(tempname, stored_state_path)
2775
3543
except (IOError, OSError) as e: