2
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-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
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
35
34
from __future__ import (division, absolute_import, print_function,
39
from future_builtins import *
37
from future_builtins import *
44
import SocketServer as socketserver
39
import SocketServer as socketserver
52
import ConfigParser as configparser
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
83
74
import dbus.service
85
from gi.repository import GLib
86
77
from dbus.mainloop.glib import DBusGMainLoop
89
80
import xml.dom.minidom
92
if sys.version_info.major == 2:
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:
104
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
105
85
except AttributeError:
107
# This is where SO_BINDTODEVICE was up to and including Python
109
87
from IN import SO_BINDTODEVICE
110
88
except ImportError:
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
89
SO_BINDTODEVICE = None
132
92
stored_state_file = "clients.pickle"
134
94
logger = logging.getLogger()
135
logging.captureWarnings(True) # Show warnings via the logging system
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
139
if_nametoindex = ctypes.cdll.LoadLibrary(
140
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
141
103
except (OSError, AttributeError):
143
104
def if_nametoindex(interface):
144
105
"Get an interface index the hard way, i.e. using fcntl()"
145
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
146
107
with contextlib.closing(socket.socket()) as s:
147
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
148
struct.pack(b"16s16x", interface))
149
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
150
113
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__,
169
116
def initlogger(debug, level=logging.WARNING):
170
117
"""init logger and add loglevel"""
173
syslogger = (logging.handlers.SysLogHandler(
174
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
176
119
syslogger.setFormatter(logging.Formatter
177
120
('Mandos [%(process)d]: %(levelname)s:'
179
122
logger.addHandler(syslogger)
182
125
console = logging.StreamHandler()
183
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
240
169
os.rmdir(self.tempdir)
241
170
self.tempdir = None
243
172
def password_encode(self, password):
244
173
# Passphrase can not be empty and can not contain newlines or
245
174
# NUL bytes. So we prefix it and hex encode it.
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"))
175
return b"mandos" + binascii.hexlify(password)
254
177
def encrypt(self, data, password):
255
178
passphrase = self.password_encode(password)
256
with tempfile.NamedTemporaryFile(
257
dir=self.tempdir) as passfile:
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
258
181
passfile.write(passphrase)
260
proc = subprocess.Popen([self.gpg, '--symmetric',
183
proc = subprocess.Popen(['gpg', '--symmetric',
261
184
'--passphrase-file',
263
186
+ self.gnupgargs,
264
stdin=subprocess.PIPE,
265
stdout=subprocess.PIPE,
266
stderr=subprocess.PIPE)
267
ciphertext, err = proc.communicate(input=data)
187
stdin = subprocess.PIPE,
188
stdout = subprocess.PIPE,
189
stderr = subprocess.PIPE)
190
ciphertext, err = proc.communicate(input = data)
268
191
if proc.returncode != 0:
269
192
raise PGPError(err)
270
193
return ciphertext
272
195
def decrypt(self, data, password):
273
196
passphrase = self.password_encode(password)
274
with tempfile.NamedTemporaryFile(
275
dir=self.tempdir) as passfile:
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
276
199
passfile.write(passphrase)
278
proc = subprocess.Popen([self.gpg, '--decrypt',
201
proc = subprocess.Popen(['gpg', '--decrypt',
279
202
'--passphrase-file',
281
204
+ self.gnupgargs,
282
stdin=subprocess.PIPE,
283
stdout=subprocess.PIPE,
284
stderr=subprocess.PIPE)
285
decrypted_plaintext, err = proc.communicate(input=data)
205
stdin = subprocess.PIPE,
206
stdout = subprocess.PIPE,
207
stderr = subprocess.PIPE)
208
decrypted_plaintext, err = proc.communicate(input
286
210
if proc.returncode != 0:
287
211
raise PGPError(err)
288
212
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
317
215
class AvahiError(Exception):
318
216
def __init__(self, value, *args, **kwargs):
319
217
self.value = value
320
return super(AvahiError, self).__init__(value, *args,
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
324
222
class AvahiServiceError(AvahiError):
328
225
class AvahiGroupError(AvahiError):
229
class AvahiService(object):
333
230
"""An Avahi (Zeroconf) service.
336
233
interface: integer; avahi.IF_UNSPEC or an interface index.
337
234
Used to optionally bind to the specified interface.
502
377
follow_name_owner_changes=True),
503
378
avahi.DBUS_INTERFACE_SERVER)
504
379
self.server.connect_to_signal("StateChanged",
505
self.server_state_changed)
380
self.server_state_changed)
506
381
self.server_state_changed(self.server.GetState())
509
384
class AvahiServiceToSyslog(AvahiService):
510
def rename(self, *args, **kwargs):
511
386
"""Add the new name to the syslog messages"""
512
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
513
syslogger.setFormatter(logging.Formatter(
514
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
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))
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):
832
403
"""A representation of a client host served by this server.
835
406
approved: bool(); 'None' if not yet approved/disapproved
836
407
approval_delay: datetime.timedelta(); Time to wait for approval
837
408
approval_duration: datetime.timedelta(); Duration of one approval
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
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
842
413
checker_command: string; External command which is run to check
843
414
if client lives. %() expansions are done at
844
415
runtime with vars(self) as dict, so that for
845
416
instance %(name)s can be used in the command.
846
checker_initiator_tag: a GLib event source tag, or None
417
checker_initiator_tag: a gobject event source tag, or None
847
418
created: datetime.datetime(); (UTC) object creation
848
419
client_structure: Object describing what attributes a client has
849
420
and is used for storing the client at exit
850
421
current_checker_command: string; current running checker_command
851
disable_initiator_tag: a GLib event source tag, or None
422
disable_initiator_tag: a gobject event source tag, or None
853
424
fingerprint: string (40 or 32 hexadecimal digits); used to
854
uniquely identify an OpenPGP client
855
key_id: string (64 hexadecimal digits); used to uniquely identify
856
a client using raw public keys
425
uniquely identify the client
857
426
host: string; available for use by the checker command
858
427
interval: datetime.timedelta(); How often to start a new checker
859
428
last_approval_request: datetime.datetime(); (UTC) or None
1016
595
logger.info("Disabling client %s", self.name)
1017
596
if getattr(self, "disable_initiator_tag", None) is not None:
1018
GLib.source_remove(self.disable_initiator_tag)
597
gobject.source_remove(self.disable_initiator_tag)
1019
598
self.disable_initiator_tag = None
1020
599
self.expires = None
1021
600
if getattr(self, "checker_initiator_tag", None) is not None:
1022
GLib.source_remove(self.checker_initiator_tag)
601
gobject.source_remove(self.checker_initiator_tag)
1023
602
self.checker_initiator_tag = None
1024
603
self.stop_checker()
1025
604
self.enabled = False
1027
606
self.send_changedstate()
1028
# Do not run this again if called by a GLib.timeout_add
607
# Do not run this again if called by a gobject.timeout_add
1031
610
def __del__(self):
1034
613
def init_checker(self):
1035
614
# Schedule a new checker to be started an 'interval' from now,
1036
615
# and every interval from then on.
1037
616
if self.checker_initiator_tag is not None:
1038
GLib.source_remove(self.checker_initiator_tag)
1039
self.checker_initiator_tag = GLib.timeout_add(
1040
int(self.interval.total_seconds() * 1000),
617
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
1042
621
# Schedule a disable() when 'timeout' has passed
1043
622
if self.disable_initiator_tag is not None:
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)
623
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
1047
627
# Also start a new checker *right now*.
1048
628
self.start_checker()
1050
def checker_callback(self, source, condition, connection,
630
def checker_callback(self, pid, condition, command):
1052
631
"""The checker has completed, so take appropriate actions."""
1053
# Read return code from connection (see call_pipe)
1054
returncode = connection.recv()
1056
if self.checker is not None:
1058
632
self.checker_callback_tag = None
1059
633
self.checker = None
1062
self.last_checker_status = returncode
1063
self.last_checker_signal = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
1064
636
if self.last_checker_status == 0:
1065
637
logger.info("Checker for %(name)s succeeded",
1067
639
self.checked_ok()
1069
logger.info("Checker for %(name)s failed", vars(self))
641
logger.info("Checker for %(name)s failed",
1071
644
self.last_checker_status = -1
1072
self.last_checker_signal = -returncode
1073
645
logger.warning("Checker for %(name)s crashed?",
1077
648
def checked_ok(self):
1078
649
"""Assert that the client has been seen, alive and well."""
1079
650
self.last_checked_ok = datetime.datetime.utcnow()
1080
651
self.last_checker_status = 0
1081
self.last_checker_signal = None
1082
652
self.bump_timeout()
1084
654
def bump_timeout(self, timeout=None):
1085
655
"""Bump up the timeout for this client."""
1086
656
if timeout is None:
1087
657
timeout = self.timeout
1088
658
if self.disable_initiator_tag is not None:
1089
GLib.source_remove(self.disable_initiator_tag)
659
gobject.source_remove(self.disable_initiator_tag)
1090
660
self.disable_initiator_tag = None
1091
661
if getattr(self, "enabled", False):
1092
self.disable_initiator_tag = GLib.timeout_add(
1093
int(timeout.total_seconds() * 1000), self.disable)
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
1094
665
self.expires = datetime.datetime.utcnow() + timeout
1096
667
def need_approval(self):
1097
668
self.last_approval_request = datetime.datetime.utcnow()
1099
670
def start_checker(self):
1100
671
"""Start a new checker subprocess if one is not running.
1102
673
If a checker already exists, leave it running and do
1104
675
# The reason for not killing a running checker is that if we
1109
680
# checkers alone, the checker would have to take more time
1110
681
# than 'timeout' for the client to be disabled, which is as it
1113
if self.checker is not None and not self.checker.is_alive():
1114
logger.warning("Checker was not alive; joining")
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)
1117
697
# Start a new checker if needed
1118
698
if self.checker is None:
1119
699
# Escape attributes for the shell
1121
attr: re.escape(str(getattr(self, attr)))
1122
for attr in self.runtime_expansions}
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
1124
705
command = self.checker_command % escaped_attrs
1125
706
except TypeError as error:
1126
707
logger.error('Could not format string "%s"',
1127
self.checker_command,
708
self.checker_command, exc_info=error)
709
return True # Try again later
710
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",
1129
return True # Try again later
1130
self.current_checker_command = command
1131
logger.info("Starting checker %r for %s", command,
1133
# We don't need to redirect stdout and stderr, since
1134
# in normal mode, that is already done by daemon(),
1135
# and in debug mode we don't want to. (Stdin is
1136
# always replaced by /dev/null.)
1137
# The exception is when not debugging but nevertheless
1138
# running in the foreground; use the previously
1140
popen_args = {"close_fds": True,
1143
if (not self.server_settings["debug"]
1144
and self.server_settings["foreground"]):
1145
popen_args.update({"stdout": wnull,
1147
pipe = multiprocessing.Pipe(duplex=False)
1148
self.checker = multiprocessing.Process(
1150
args=(pipe[1], subprocess.call, command),
1152
self.checker.start()
1153
self.checker_callback_tag = GLib.io_add_watch(
1154
GLib.IOChannel.unix_new(pipe[0].fileno()),
1155
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1156
self.checker_callback, pipe[0], command)
1157
# Re-run this periodically if run by GLib.timeout_add
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
1160
755
def stop_checker(self):
1161
756
"""Force the checker process, if any, to stop."""
1162
757
if self.checker_callback_tag:
1163
GLib.source_remove(self.checker_callback_tag)
758
gobject.source_remove(self.checker_callback_tag)
1164
759
self.checker_callback_tag = None
1165
760
if getattr(self, "checker", None) is None:
1167
762
logger.debug("Stopping checker for %(name)s", vars(self))
1168
self.checker.terminate()
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
1169
771
self.checker = None
1172
def dbus_service_property(dbus_interface,
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
1176
776
"""Decorators for marking methods of a DBusObjectWithProperties to
1177
777
become properties on the D-Bus.
1179
779
The decorated method will be called with no arguments by "Get"
1180
780
and with one argument by "Set".
1182
782
The parameters, where they are supported, are the same as
1183
783
dbus.service.method, except there is only "signature", since the
1184
784
type from Get() and the type sent to Set() is the same.
1267
class DBusObjectWithAnnotations(dbus.service.Object):
1268
"""A D-Bus object with annotations.
1270
Classes inheriting from this can use the dbus_annotations
1271
decorator to add annotations to methods or signals.
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.
1275
869
def _is_dbus_thing(thing):
1276
870
"""Returns a function testing if an attribute is a D-Bus thing
1278
872
If called like _is_dbus_thing("method") it returns a function
1279
873
suitable for use as predicate to inspect.getmembers().
1281
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1284
878
def _get_all_dbus_things(self, thing):
1285
879
"""Returns a generator of (name, attribute) pairs
1287
return ((getattr(athing.__get__(self), "_dbus_name", name),
881
return ((getattr(athing.__get__(self), "_dbus_name",
1288
883
athing.__get__(self))
1289
884
for cls in self.__class__.__mro__
1290
885
for name, athing in
1291
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1293
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1295
path_keyword='object_path',
1296
connection_keyword='connection')
1297
def Introspect(self, object_path, connection):
1298
"""Overloading of standard D-Bus method.
1300
Inserts annotation tags on methods and signals.
1302
xmlstring = dbus.service.Object.Introspect(self, object_path,
1305
document = xml.dom.minidom.parseString(xmlstring)
1307
for if_tag in document.getElementsByTagName("interface"):
1308
# Add annotation tags
1309
for typ in ("method", "signal"):
1310
for tag in if_tag.getElementsByTagName(typ):
1312
for name, prop in (self.
1313
_get_all_dbus_things(typ)):
1314
if (name == tag.getAttribute("name")
1315
and prop._dbus_interface
1316
== if_tag.getAttribute("name")):
1317
annots.update(getattr(
1318
prop, "_dbus_annotations", {}))
1319
for name, value in annots.items():
1320
ann_tag = document.createElement(
1322
ann_tag.setAttribute("name", name)
1323
ann_tag.setAttribute("value", value)
1324
tag.appendChild(ann_tag)
1325
# Add interface annotation tags
1326
for annotation, value in dict(
1327
itertools.chain.from_iterable(
1328
annotations().items()
1329
for name, annotations
1330
in self._get_all_dbus_things("interface")
1331
if name == if_tag.getAttribute("name")
1333
ann_tag = document.createElement("annotation")
1334
ann_tag.setAttribute("name", annotation)
1335
ann_tag.setAttribute("value", value)
1336
if_tag.appendChild(ann_tag)
1337
# Fix argument name for the Introspect method itself
1338
if (if_tag.getAttribute("name")
1339
== dbus.INTROSPECTABLE_IFACE):
1340
for cn in if_tag.getElementsByTagName("method"):
1341
if cn.getAttribute("name") == "Introspect":
1342
for arg in cn.getElementsByTagName("arg"):
1343
if (arg.getAttribute("direction")
1345
arg.setAttribute("name",
1347
xmlstring = document.toxml("utf-8")
1349
except (AttributeError, xml.dom.DOMException,
1350
xml.parsers.expat.ExpatError) as error:
1351
logger.error("Failed to override Introspection method",
1356
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1357
"""A D-Bus object with properties.
1359
Classes inheriting from this can use the dbus_service_property
1360
decorator to expose methods as D-Bus properties. It exposes the
1361
standard Get(), Set(), and GetAll() methods on the D-Bus.
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
1364
889
def _get_dbus_property(self, interface_name, property_name):
1365
890
"""Returns a bound method if one exists which is a D-Bus
1366
891
property with the specified name and interface.
1368
for cls in self.__class__.__mro__:
1369
for name, value in inspect.getmembers(
1370
cls, self._is_dbus_thing("property")):
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
self._is_dbus_thing("property"))):
1371
897
if (value._dbus_name == property_name
1372
898
and value._dbus_interface == interface_name):
1373
899
return value.__get__(self)
1375
901
# No such property
1376
raise DBusPropertyNotFound("{}:{}.{}".format(
1377
self.dbus_object_path, interface_name, property_name))
1380
def _get_all_interface_names(cls):
1381
"""Get a sequence of all interfaces supported by an object"""
1382
return (name for name in set(getattr(getattr(x, attr),
1383
"_dbus_interface", None)
1384
for x in (inspect.getmro(cls))
1386
if name is not None)
1388
@dbus.service.method(dbus.PROPERTIES_IFACE,
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1390
907
out_signature="v")
1391
908
def Get(self, interface_name, property_name):
1392
909
"""Standard D-Bus property Get() method, see D-Bus standard.
1521
1039
return xmlstring
1525
dbus.OBJECT_MANAGER_IFACE
1526
except AttributeError:
1527
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1530
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1531
"""A D-Bus object with an ObjectManager.
1533
Classes inheriting from this exposes the standard
1534
GetManagedObjects call and the InterfacesAdded and
1535
InterfacesRemoved signals on the standard
1536
"org.freedesktop.DBus.ObjectManager" interface.
1538
Note: No signals are sent automatically; they must be sent
1541
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1542
out_signature="a{oa{sa{sv}}}")
1543
def GetManagedObjects(self):
1544
"""This function must be overridden"""
1545
raise NotImplementedError()
1547
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1548
signature="oa{sa{sv}}")
1549
def InterfacesAdded(self, object_path, interfaces_and_properties):
1552
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1553
def InterfacesRemoved(self, object_path, interfaces):
1556
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1558
path_keyword='object_path',
1559
connection_keyword='connection')
1560
def Introspect(self, object_path, connection):
1561
"""Overloading of standard D-Bus method.
1563
Override return argument name of GetManagedObjects to be
1564
"objpath_interfaces_and_properties"
1566
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1570
document = xml.dom.minidom.parseString(xmlstring)
1572
for if_tag in document.getElementsByTagName("interface"):
1573
# Fix argument name for the GetManagedObjects method
1574
if (if_tag.getAttribute("name")
1575
== dbus.OBJECT_MANAGER_IFACE):
1576
for cn in if_tag.getElementsByTagName("method"):
1577
if (cn.getAttribute("name")
1578
== "GetManagedObjects"):
1579
for arg in cn.getElementsByTagName("arg"):
1580
if (arg.getAttribute("direction")
1584
"objpath_interfaces"
1586
xmlstring = document.toxml("utf-8")
1588
except (AttributeError, xml.dom.DOMException,
1589
xml.parsers.expat.ExpatError) as error:
1590
logger.error("Failed to override Introspection method",
1595
1042
def datetime_to_dbus(dt, variant_level=0):
1596
1043
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1598
return dbus.String("", variant_level=variant_level)
1599
return dbus.String(dt.isoformat(), variant_level=variant_level)
1045
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1602
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1963
1403
server to mandos-client
1967
1407
# Rejected - signal
1968
1408
@dbus.service.signal(_interface, signature="s")
1969
1409
def Rejected(self, reason):
1973
1413
# NeedApproval - signal
1974
1414
@dbus.service.signal(_interface, signature="tb")
1975
1415
def NeedApproval(self, timeout, default):
1977
1417
return self.need_approval()
1981
1421
# Approve - method
1982
1422
@dbus.service.method(_interface, in_signature="b")
1983
1423
def Approve(self, value):
1984
1424
self.approve(value)
1986
1426
# CheckedOK - method
1987
1427
@dbus.service.method(_interface)
1988
1428
def CheckedOK(self):
1989
1429
self.checked_ok()
1991
1431
# Enable - method
1992
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1993
1432
@dbus.service.method(_interface)
1994
1433
def Enable(self):
1998
1437
# StartChecker - method
1999
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2000
1438
@dbus.service.method(_interface)
2001
1439
def StartChecker(self):
2003
1441
self.start_checker()
2005
1443
# Disable - method
2006
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2007
1444
@dbus.service.method(_interface)
2008
1445
def Disable(self):
2012
1449
# StopChecker - method
2013
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2014
1450
@dbus.service.method(_interface)
2015
1451
def StopChecker(self):
2016
1452
self.stop_checker()
2020
1456
# ApprovalPending - property
2021
1457
@dbus_service_property(_interface, signature="b", access="read")
2022
1458
def ApprovalPending_dbus_property(self):
2023
1459
return dbus.Boolean(bool(self.approvals_pending))
2025
1461
# ApprovedByDefault - property
2026
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="b",
2028
1463
access="readwrite")
2029
1464
def ApprovedByDefault_dbus_property(self, value=None):
2030
1465
if value is None: # get
2031
1466
return dbus.Boolean(self.approved_by_default)
2032
1467
self.approved_by_default = bool(value)
2034
1469
# ApprovalDelay - property
2035
@dbus_service_property(_interface,
1470
@dbus_service_property(_interface, signature="t",
2037
1471
access="readwrite")
2038
1472
def ApprovalDelay_dbus_property(self, value=None):
2039
1473
if value is None: # get
2040
return dbus.UInt64(self.approval_delay.total_seconds()
1474
return dbus.UInt64(self.approval_delay_milliseconds())
2042
1475
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2044
1477
# ApprovalDuration - property
2045
@dbus_service_property(_interface,
1478
@dbus_service_property(_interface, signature="t",
2047
1479
access="readwrite")
2048
1480
def ApprovalDuration_dbus_property(self, value=None):
2049
1481
if value is None: # get
2050
return dbus.UInt64(self.approval_duration.total_seconds()
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
2052
1484
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2054
1486
# Name - property
2056
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2057
1487
@dbus_service_property(_interface, signature="s", access="read")
2058
1488
def Name_dbus_property(self):
2059
1489
return dbus.String(self.name)
2063
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2064
@dbus_service_property(_interface, signature="s", access="read")
2065
def KeyID_dbus_property(self):
2066
return dbus.String(self.key_id)
2068
1491
# Fingerprint - property
2070
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2071
1492
@dbus_service_property(_interface, signature="s", access="read")
2072
1493
def Fingerprint_dbus_property(self):
2073
1494
return dbus.String(self.fingerprint)
2075
1496
# Host - property
2076
@dbus_service_property(_interface,
1497
@dbus_service_property(_interface, signature="s",
2078
1498
access="readwrite")
2079
1499
def Host_dbus_property(self, value=None):
2080
1500
if value is None: # get
2081
1501
return dbus.String(self.host)
2082
self.host = str(value)
1502
self.host = unicode(value)
2084
1504
# Created - property
2086
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2087
1505
@dbus_service_property(_interface, signature="s", access="read")
2088
1506
def Created_dbus_property(self):
2089
1507
return datetime_to_dbus(self.created)
2091
1509
# LastEnabled - property
2092
1510
@dbus_service_property(_interface, signature="s", access="read")
2093
1511
def LastEnabled_dbus_property(self):
2094
1512
return datetime_to_dbus(self.last_enabled)
2096
1514
# Enabled - property
2097
@dbus_service_property(_interface,
1515
@dbus_service_property(_interface, signature="b",
2099
1516
access="readwrite")
2100
1517
def Enabled_dbus_property(self, value=None):
2101
1518
if value is None: # get
2150
1566
if (getattr(self, "disable_initiator_tag", None)
2153
GLib.source_remove(self.disable_initiator_tag)
2154
self.disable_initiator_tag = GLib.timeout_add(
2155
int((self.expires - now).total_seconds() * 1000),
1569
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
2158
1575
# ExtendedTimeout - property
2159
@dbus_service_property(_interface,
1576
@dbus_service_property(_interface, signature="t",
2161
1577
access="readwrite")
2162
1578
def ExtendedTimeout_dbus_property(self, value=None):
2163
1579
if value is None: # get
2164
return dbus.UInt64(self.extended_timeout.total_seconds()
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
2166
1581
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2168
1583
# Interval - property
2169
@dbus_service_property(_interface,
1584
@dbus_service_property(_interface, signature="t",
2171
1585
access="readwrite")
2172
1586
def Interval_dbus_property(self, value=None):
2173
1587
if value is None: # get
2174
return dbus.UInt64(self.interval.total_seconds() * 1000)
1588
return dbus.UInt64(self.interval_milliseconds())
2175
1589
self.interval = datetime.timedelta(0, 0, 0, value)
2176
1590
if getattr(self, "checker_initiator_tag", None) is None:
2178
1592
if self.enabled:
2179
1593
# Reschedule checker run
2180
GLib.source_remove(self.checker_initiator_tag)
2181
self.checker_initiator_tag = GLib.timeout_add(
2182
value, self.start_checker)
2183
self.start_checker() # Start one now, too
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
2185
1599
# Checker - property
2186
@dbus_service_property(_interface,
1600
@dbus_service_property(_interface, signature="s",
2188
1601
access="readwrite")
2189
1602
def Checker_dbus_property(self, value=None):
2190
1603
if value is None: # get
2191
1604
return dbus.String(self.checker_command)
2192
self.checker_command = str(value)
1605
self.checker_command = unicode(value)
2194
1607
# CheckerRunning - property
2195
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="b",
2197
1609
access="readwrite")
2198
1610
def CheckerRunning_dbus_property(self, value=None):
2199
1611
if value is None: # get
2256
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
2257
1659
"""A class to handle client connections.
2259
1661
Instantiated once for each connection to handle it.
2260
1662
Note: This will run in its own forked process."""
2262
1664
def handle(self):
2263
1665
with contextlib.closing(self.server.child_pipe) as child_pipe:
2264
1666
logger.info("TCP connection from: %s",
2265
str(self.client_address))
1667
unicode(self.client_address))
2266
1668
logger.debug("Pipe FD: %d",
2267
1669
self.server.child_pipe.fileno())
2269
session = gnutls.ClientSession(self.request)
2271
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2272
# "+AES-256-CBC", "+SHA1",
2273
# "+COMP-NULL", "+CTYPE-OPENPGP",
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",
2275
1685
# Use a fallback default, since this MUST be set.
2276
1686
priority = self.server.gnutls_priority
2277
1687
if priority is None:
2278
1688
priority = "NORMAL"
2279
gnutls.priority_set_direct(session._c_object,
2280
priority.encode("utf-8"),
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
2283
1693
# Start communication using the Mandos protocol
2284
1694
# Get protocol number
2285
1695
line = self.request.makefile().readline()
2286
1696
logger.debug("Protocol version: %r", line)
2288
1698
if int(line.strip().split()[0]) > 1:
2289
raise RuntimeError(line)
2290
1700
except (ValueError, IndexError, RuntimeError) as error:
2291
1701
logger.error("Unknown protocol version: %s", error)
2294
1704
# Start GnuTLS connection
2296
1706
session.handshake()
2297
except gnutls.Error as error:
1707
except gnutls.errors.GNUTLSError as error:
2298
1708
logger.warning("Handshake failed: %s", error)
2299
1709
# Do not run session.bye() here: the session is not
2300
1710
# established. Just abandon the request.
2302
1712
logger.debug("Handshake succeeded")
2304
1714
approval_required = False
2306
if gnutls.has_rawpk:
2309
key_id = self.key_id(
2310
self.peer_certificate(session))
2311
except (TypeError, gnutls.Error) as error:
2312
logger.warning("Bad certificate: %s", error)
2314
logger.debug("Key ID: %s", key_id)
2319
fpr = self.fingerprint(
2320
self.peer_certificate(session))
2321
except (TypeError, gnutls.Error) as error:
2322
logger.warning("Bad certificate: %s", error)
2324
logger.debug("Fingerprint: %s", fpr)
2327
client = ProxyClient(child_pipe, key_id, fpr,
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,
2328
1727
self.client_address)
2329
1728
except KeyError:
2332
1731
if client.approval_delay:
2333
1732
delay = client.approval_delay
2334
1733
client.approvals_pending += 1
2335
1734
approval_required = True
2338
1737
if not client.enabled:
2339
1738
logger.info("Client %s is disabled",
2341
1740
if self.server.use_dbus:
2342
1741
# Emit D-Bus signal
2343
1742
client.Rejected("Disabled")
2346
1745
if client.approved or not client.approval_delay:
2347
# We are approved or approval is disabled
1746
#We are approved or approval is disabled
2349
1748
elif client.approved is None:
2350
1749
logger.info("Client %s needs approval",
2383
1784
delay -= time2 - time
2386
session.send(client.secret)
2387
except gnutls.Error as error:
2388
logger.warning("gnutls send failed",
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))
2392
1799
logger.info("Sending secret to %s", client.name)
2393
1800
# bump the timeout using extended_timeout
2394
1801
client.bump_timeout(client.extended_timeout)
2395
1802
if self.server.use_dbus:
2396
1803
# Emit D-Bus signal
2397
1804
client.GotSecret()
2400
1807
if approval_required:
2401
1808
client.approvals_pending -= 1
2404
except gnutls.Error as error:
1811
except gnutls.errors.GNUTLSError as error:
2405
1812
logger.warning("GnuTLS bye failed",
2406
1813
exc_info=error)
2409
1816
def peer_certificate(session):
2410
"Return the peer's certificate as a bytestring"
2412
cert_type = gnutls.certificate_type_get2(session._c_object,
2414
except AttributeError:
2415
cert_type = gnutls.certificate_type_get(session._c_object)
2416
if gnutls.has_rawpk:
2417
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2419
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2420
# If not a valid certificate type...
2421
if cert_type not in valid_cert_types:
2422
logger.info("Cert type %r not in %r", cert_type,
2424
# ...return invalid data
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
2426
1824
list_size = ctypes.c_uint(1)
2427
cert_list = (gnutls.certificate_get_peers
1825
cert_list = (gnutls.library.functions
1826
.gnutls_certificate_get_peers
2428
1827
(session._c_object, ctypes.byref(list_size)))
2429
1828
if not bool(cert_list) and list_size.value != 0:
2430
raise gnutls.Error("error getting peer certificate")
1829
raise gnutls.errors.GNUTLSError("error getting peer"
2431
1831
if list_size.value == 0:
2433
1833
cert = cert_list[0]
2434
1834
return ctypes.string_at(cert.data, cert.size)
2437
def key_id(certificate):
2438
"Convert a certificate bytestring to a hexdigit key ID"
2439
# New GnuTLS "datum" with the public key
2440
datum = gnutls.datum_t(
2441
ctypes.cast(ctypes.c_char_p(certificate),
2442
ctypes.POINTER(ctypes.c_ubyte)),
2443
ctypes.c_uint(len(certificate)))
2444
# XXX all these need to be created in the gnutls "module"
2445
# New empty GnuTLS certificate
2446
pubkey = gnutls.pubkey_t()
2447
gnutls.pubkey_init(ctypes.byref(pubkey))
2448
# Import the raw public key into the certificate
2449
gnutls.pubkey_import(pubkey,
2450
ctypes.byref(datum),
2451
gnutls.X509_FMT_DER)
2452
# New buffer for the key ID
2453
buf = ctypes.create_string_buffer(32)
2454
buf_len = ctypes.c_size_t(len(buf))
2455
# Get the key ID from the raw public key into the buffer
2456
gnutls.pubkey_get_key_id(pubkey,
2457
gnutls.KEYID_USE_SHA256,
2458
ctypes.cast(ctypes.byref(buf),
2459
ctypes.POINTER(ctypes.c_ubyte)),
2460
ctypes.byref(buf_len))
2461
# Deinit the certificate
2462
gnutls.pubkey_deinit(pubkey)
2464
# Convert the buffer to a Python bytestring
2465
key_id = ctypes.string_at(buf, buf_len.value)
2466
# Convert the bytestring to hexadecimal notation
2467
hex_key_id = binascii.hexlify(key_id).upper()
2471
1837
def fingerprint(openpgp):
2472
1838
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2473
1839
# New GnuTLS "datum" with the OpenPGP public key
2474
datum = gnutls.datum_t(
2475
ctypes.cast(ctypes.c_char_p(openpgp),
2476
ctypes.POINTER(ctypes.c_ubyte)),
2477
ctypes.c_uint(len(openpgp)))
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
2478
1845
# New empty GnuTLS certificate
2479
crt = gnutls.openpgp_crt_t()
2480
gnutls.openpgp_crt_init(ctypes.byref(crt))
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2481
1849
# Import the OpenPGP public key into the certificate
2482
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2483
gnutls.OPENPGP_FMT_RAW)
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
2484
1854
# Verify the self signature in the key
2485
1855
crtverify = ctypes.c_uint()
2486
gnutls.openpgp_crt_verify_self(crt, 0,
2487
ctypes.byref(crtverify))
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2488
1859
if crtverify.value != 0:
2489
gnutls.openpgp_crt_deinit(crt)
2490
raise gnutls.CertificateSecurityError(code
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2492
1863
# New buffer for the fingerprint
2493
1864
buf = ctypes.create_string_buffer(20)
2494
1865
buf_len = ctypes.c_size_t()
2495
1866
# Get the fingerprint from the certificate into the buffer
2496
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2497
ctypes.byref(buf_len))
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2498
1870
# Deinit the certificate
2499
gnutls.openpgp_crt_deinit(crt)
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2500
1872
# Convert the buffer to a Python bytestring
2501
1873
fpr = ctypes.string_at(buf, buf_len.value)
2502
1874
# Convert the bytestring to hexadecimal notation
2591
1957
# socket_wrapper(), if socketfd was set.
2592
1958
socketserver.TCPServer.__init__(self, server_address,
2593
1959
RequestHandlerClass)
2595
1961
def server_bind(self):
2596
1962
"""This overrides the normal server_bind() function
2597
1963
to bind to an interface if one was specified, and also NOT to
2598
1964
bind to an address or port if they were not specified."""
2599
global SO_BINDTODEVICE
2600
1965
if self.interface is not None:
2601
1966
if SO_BINDTODEVICE is None:
2602
# Fall back to a hard-coded value which seems to be
2604
logger.warning("SO_BINDTODEVICE not found, trying 25")
2605
SO_BINDTODEVICE = 25
2607
self.socket.setsockopt(
2608
socket.SOL_SOCKET, SO_BINDTODEVICE,
2609
(self.interface + "\0").encode("utf-8"))
2610
except socket.error as error:
2611
if error.errno == errno.EPERM:
2612
logger.error("No permission to bind to"
2613
" interface %s", self.interface)
2614
elif error.errno == errno.ENOPROTOOPT:
2615
logger.error("SO_BINDTODEVICE not available;"
2616
" cannot bind to interface %s",
2618
elif error.errno == errno.ENODEV:
2619
logger.error("Interface %s does not exist,"
2620
" cannot bind", self.interface)
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)
2623
1988
# Only bind(2) the socket if we really need to.
2624
1989
if self.server_address[0] or self.server_address[1]:
2625
if self.server_address[1]:
2626
self.allow_reuse_address = True
2627
1990
if not self.server_address[0]:
2628
1991
if self.address_family == socket.AF_INET6:
2629
any_address = "::" # in6addr_any
1992
any_address = "::" # in6addr_any
2631
any_address = "0.0.0.0" # INADDR_ANY
1994
any_address = socket.INADDR_ANY
2632
1995
self.server_address = (any_address,
2633
1996
self.server_address[1])
2634
1997
elif not self.server_address[1]:
2635
self.server_address = (self.server_address[0], 0)
1998
self.server_address = (self.server_address[0],
2636
2000
# if self.interface:
2637
2001
# self.server_address = (self.server_address[0],
2668
2027
self.gnutls_priority = gnutls_priority
2669
2028
IPv6_TCPServer.__init__(self, server_address,
2670
2029
RequestHandlerClass,
2671
interface=interface,
2030
interface = interface,
2031
use_ipv6 = use_ipv6,
2032
socketfd = socketfd)
2675
2033
def server_activate(self):
2676
2034
if self.enabled:
2677
2035
return socketserver.TCPServer.server_activate(self)
2679
2037
def enable(self):
2680
2038
self.enabled = True
2682
2040
def add_pipe(self, parent_pipe, proc):
2683
2041
# Call "handle_ipc" for both data and EOF events
2685
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2686
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2687
functools.partial(self.handle_ipc,
2688
parent_pipe=parent_pipe,
2691
def handle_ipc(self, source, condition,
2694
client_object=None):
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):
2695
2051
# error, or the other end of multiprocessing.Pipe has closed
2696
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2052
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2697
2053
# Wait for other process to exit
2701
2057
# Read a request from the child
2702
2058
request = parent_pipe.recv()
2703
2059
command = request[0]
2705
2061
if command == 'init':
2706
key_id = request[1].decode("ascii")
2707
fpr = request[2].decode("ascii")
2708
address = request[3]
2710
for c in self.clients.values():
2711
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2713
if key_id and c.key_id == key_id:
2716
if fpr and c.fingerprint == fpr:
2063
address = request[2]
2065
for c in self.clients.itervalues():
2066
if c.fingerprint == fpr:
2720
logger.info("Client not found for key ID: %s, address"
2721
": %s", key_id or fpr, address)
2070
logger.info("Client not found for fingerprint: %s, ad"
2071
"dress: %s", fpr, address)
2722
2072
if self.use_dbus:
2723
2073
# Emit D-Bus signal
2724
mandos_dbus_service.ClientNotFound(key_id or fpr,
2074
mandos_dbus_service.ClientNotFound(fpr,
2726
2076
parent_pipe.send(False)
2730
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2731
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2732
functools.partial(self.handle_ipc,
2733
parent_pipe=parent_pipe,
2735
client_object=client))
2079
gobject.io_add_watch(parent_pipe.fileno(),
2080
gobject.IO_IN | gobject.IO_HUP,
2081
functools.partial(self.handle_ipc,
2736
2087
parent_pipe.send(True)
2737
2088
# remove the old hook in favor of the new above hook on
2741
2092
funcname = request[1]
2742
2093
args = request[2]
2743
2094
kwargs = request[3]
2745
2096
parent_pipe.send(('data', getattr(client_object,
2746
2097
funcname)(*args,
2749
2100
if command == 'getattr':
2750
2101
attrname = request[1]
2751
if isinstance(client_object.__getattribute__(attrname),
2752
collections.Callable):
2753
parent_pipe.send(('function', ))
2102
if callable(client_object.__getattribute__(attrname)):
2103
parent_pipe.send(('function',))
2756
'data', client_object.__getattribute__(attrname)))
2105
parent_pipe.send(('data', client_object
2106
.__getattribute__(attrname)))
2758
2108
if command == 'setattr':
2759
2109
attrname = request[1]
2760
2110
value = request[2]
2761
2111
setattr(client_object, attrname, value)
2766
2116
def rfc3339_duration_to_delta(duration):
2767
2117
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2769
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2771
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2773
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2775
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2777
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2779
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2781
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
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)
2785
2135
# Parsing an RFC 3339 duration with regular expressions is not
2786
2136
# possible - there would have to be multiple places for the same
2787
2137
# values, like seconds. The current code, while more esoteric, is
2788
2138
# cleaner without depending on a parsing library. If Python had a
2789
2139
# built-in library for parsing we would use it, but we'd like to
2790
2140
# avoid excessive use of external libraries.
2792
2142
# New type for defining tokens, syntax, and semantics all-in-one
2793
Token = collections.namedtuple("Token", (
2794
"regexp", # To match token; if "value" is not None, must have
2795
# a "group" containing digits
2796
"value", # datetime.timedelta or None
2797
"followers")) # Tokens valid after this token
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
2798
2152
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2799
2153
# the "duration" ABNF definition in RFC 3339, Appendix A.
2800
2154
token_end = Token(re.compile(r"$"), None, frozenset())
2801
2155
token_second = Token(re.compile(r"(\d+)S"),
2802
2156
datetime.timedelta(seconds=1),
2803
frozenset((token_end, )))
2157
frozenset((token_end,)))
2804
2158
token_minute = Token(re.compile(r"(\d+)M"),
2805
2159
datetime.timedelta(minutes=1),
2806
2160
frozenset((token_second, token_end)))
2965
2316
parser.add_argument("--no-dbus", action="store_false",
2966
2317
dest="use_dbus", help="Do not provide D-Bus"
2967
" system bus interface", default=None)
2318
" system bus interface")
2968
2319
parser.add_argument("--no-ipv6", action="store_false",
2969
dest="use_ipv6", help="Do not use IPv6",
2320
dest="use_ipv6", help="Do not use IPv6")
2971
2321
parser.add_argument("--no-restore", action="store_false",
2972
2322
dest="restore", help="Do not restore stored"
2973
" state", default=None)
2974
2324
parser.add_argument("--socket", type=int,
2975
2325
help="Specify a file descriptor to a network"
2976
2326
" socket to use instead of creating one")
2977
2327
parser.add_argument("--statedir", metavar="DIR",
2978
2328
help="Directory to save/restore state in")
2979
2329
parser.add_argument("--foreground", action="store_true",
2980
help="Run in foreground", default=None)
2981
parser.add_argument("--no-zeroconf", action="store_false",
2982
dest="zeroconf", help="Do not use Zeroconf",
2330
help="Run in foreground")
2985
2332
options = parser.parse_args()
2987
2339
# Default values for config file for server-global settings
2988
if gnutls.has_rawpk:
2989
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2990
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2992
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2993
":+SIGN-DSA-SHA256")
2994
server_defaults = {"interface": "",
2998
"priority": priority,
2999
"servicename": "Mandos",
3005
"statedir": "/var/lib/mandos",
3006
"foreground": "False",
2340
server_defaults = { "interface": "",
2345
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2346
"servicename": "Mandos",
2352
"statedir": "/var/lib/mandos",
2353
"foreground": "False",
3011
2356
# Parse config file for server-global settings
3012
server_config = configparser.ConfigParser(server_defaults)
2357
server_config = configparser.SafeConfigParser(server_defaults)
3013
2358
del server_defaults
3014
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3015
# Convert the ConfigParser object to a dict
2359
server_config.read(os.path.join(options.configdir,
2361
# Convert the SafeConfigParser object to a dict
3016
2362
server_settings = server_config.defaults()
3017
2363
# Use the appropriate methods on the non-string config options
3018
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3019
"foreground", "zeroconf"):
2364
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
3020
2365
server_settings[option] = server_config.getboolean("DEFAULT",
3022
2367
if server_settings["port"]:
3138
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3140
2469
except OSError as error:
3141
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3142
.format(uid, gid, os.strerror(error.errno)))
3143
2470
if error.errno != errno.EPERM:
3147
2474
# Enable all possible GnuTLS debugging
3149
2476
# "Use a log level over 10 to enable all debugging options."
3150
2477
# - GnuTLS manual
3151
gnutls.global_set_log_level(11)
2478
gnutls.library.functions.gnutls_global_set_log_level(11)
2480
@gnutls.library.types.gnutls_log_func
3154
2481
def debug_gnutls(level, string):
3155
2482
logger.debug("GnuTLS: %s", string[:-1])
3157
gnutls.global_set_log_function(debug_gnutls)
2484
(gnutls.library.functions
2485
.gnutls_global_set_log_function(debug_gnutls))
3159
2487
# Redirect stdin so all checkers get /dev/null
3160
2488
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3161
2489
os.dup2(null, sys.stdin.fileno())
3165
2493
# Need to fork before connecting to D-Bus
3166
2494
if not foreground:
3167
2495
# Close all input and output, do double fork, etc.
3170
if gi.version_info < (3, 10, 2):
3171
# multiprocessing will use threads, so before we use GLib we
3172
# need to inform GLib that threads will be used.
2498
# multiprocessing will use threads, so before we use gobject we
2499
# need to inform gobject that threads will be used.
2500
gobject.threads_init()
3175
2502
global main_loop
3176
2503
# From the Avahi example code
3177
2504
DBusGMainLoop(set_as_default=True)
3178
main_loop = GLib.MainLoop()
2505
main_loop = gobject.MainLoop()
3179
2506
bus = dbus.SystemBus()
3180
2507
# End of Avahi example code
3183
2510
bus_name = dbus.service.BusName("se.recompile.Mandos",
3186
old_bus_name = dbus.service.BusName(
3187
"se.bsnet.fukt.Mandos", bus,
3189
except dbus.exceptions.DBusException as e:
2511
bus, do_not_queue=True)
2512
old_bus_name = (dbus.service.BusName
2513
("se.bsnet.fukt.Mandos", bus,
2515
except dbus.exceptions.NameExistsException as e:
3190
2516
logger.error("Disabling D-Bus:", exc_info=e)
3191
2517
use_dbus = False
3192
2518
server_settings["use_dbus"] = False
3193
2519
tcp_server.use_dbus = False
3195
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3196
service = AvahiServiceToSyslog(
3197
name=server_settings["servicename"],
3198
servicetype="_mandos._tcp",
3201
if server_settings["interface"]:
3202
service.interface = if_nametoindex(
3203
server_settings["interface"].encode("utf-8"))
2520
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2521
service = AvahiServiceToSyslog(name =
2522
server_settings["servicename"],
2523
servicetype = "_mandos._tcp",
2524
protocol = protocol, bus = bus)
2525
if server_settings["interface"]:
2526
service.interface = (if_nametoindex
2527
(str(server_settings["interface"])))
3205
2529
global multiprocessing_manager
3206
2530
multiprocessing_manager = multiprocessing.Manager()
3208
2532
client_class = Client
3210
client_class = functools.partial(ClientDBus, bus=bus)
2534
client_class = functools.partial(ClientDBus, bus = bus)
3212
2536
client_settings = Client.config_parser(client_config)
3213
2537
old_client_settings = {}
3214
2538
clients_data = {}
3216
2540
# This is used to redirect stdout and stderr for checker processes
3218
wnull = open(os.devnull, "w") # A writable /dev/null
2542
wnull = open(os.devnull, "w") # A writable /dev/null
3219
2543
# Only used if server is running in foreground but not in debug
3221
2545
if debug or not foreground:
3224
2548
# Get client data and settings from last running state.
3225
2549
if server_settings["restore"]:
3227
2551
with open(stored_state_path, "rb") as stored_state:
3228
if sys.version_info.major == 2:
3229
clients_data, old_client_settings = pickle.load(
3232
bytes_clients_data, bytes_old_client_settings = (
3233
pickle.load(stored_state, encoding="bytes"))
3234
# Fix bytes to strings
3237
clients_data = {(key.decode("utf-8")
3238
if isinstance(key, bytes)
3241
bytes_clients_data.items()}
3242
del bytes_clients_data
3243
for key in clients_data:
3244
value = {(k.decode("utf-8")
3245
if isinstance(k, bytes) else k): v
3247
clients_data[key].items()}
3248
clients_data[key] = value
3250
value["client_structure"] = [
3252
if isinstance(s, bytes)
3254
value["client_structure"]]
3255
# .name, .host, and .checker_command
3256
for k in ("name", "host", "checker_command"):
3257
if isinstance(value[k], bytes):
3258
value[k] = value[k].decode("utf-8")
3259
if "key_id" not in value:
3260
value["key_id"] = ""
3261
elif "fingerprint" not in value:
3262
value["fingerprint"] = ""
3263
# old_client_settings
3265
old_client_settings = {
3266
(key.decode("utf-8")
3267
if isinstance(key, bytes)
3270
bytes_old_client_settings.items()}
3271
del bytes_old_client_settings
3272
# .host and .checker_command
3273
for value in old_client_settings.values():
3274
for attribute in ("host", "checker_command"):
3275
if isinstance(value[attribute], bytes):
3276
value[attribute] = (value[attribute]
2552
clients_data, old_client_settings = (pickle.load
3278
2554
os.remove(stored_state_path)
3279
2555
except IOError as e:
3280
2556
if e.errno == errno.ENOENT:
3281
logger.warning("Could not load persistent state:"
3282
" {}".format(os.strerror(e.errno)))
2557
logger.warning("Could not load persistent state: {0}"
2558
.format(os.strerror(e.errno)))
3284
2560
logger.critical("Could not load persistent state:",
3287
2563
except EOFError as e:
3288
2564
logger.warning("Could not load persistent state: "
2565
"EOFError:", exc_info=e)
3292
2567
with PGPEngine() as pgp:
3293
for client_name, client in clients_data.items():
2568
for client_name, client in clients_data.iteritems():
3294
2569
# Skip removed clients
3295
2570
if client_name not in client_settings:
3298
2573
# Decide which value to use after restoring saved state.
3299
2574
# We have three different values: Old config file,
3300
2575
# new config file, and saved state.
3358
2633
for client_name in (set(client_settings)
3359
2634
- set(old_client_settings)):
3360
2635
clients_data[client_name] = client_settings[client_name]
3362
2637
# Create all client objects
3363
for client_name, client in clients_data.items():
2638
for client_name, client in clients_data.iteritems():
3364
2639
tcp_server.clients[client_name] = client_class(
3367
server_settings=server_settings)
2640
name = client_name, settings = client,
2641
server_settings = server_settings)
3369
2643
if not tcp_server.clients:
3370
2644
logger.warning("No clients defined")
3372
2646
if not foreground:
3373
2647
if pidfile is not None:
3377
print(pid, file=pidfile)
2651
pidfile.write(str(pid) + "\n".encode("utf-8"))
3378
2652
except IOError:
3379
2653
logger.error("Could not write to file %r with PID %d",
3380
2654
pidfilename, pid)
3382
2656
del pidfilename
3384
for termsig in (signal.SIGHUP, signal.SIGTERM):
3385
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3386
lambda: main_loop.quit() and False)
2658
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2659
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3390
@alternate_dbus_interfaces(
3391
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3392
class MandosDBusService(DBusObjectWithObjectManager):
2662
@alternate_dbus_interfaces({"se.recompile.Mandos":
2663
"se.bsnet.fukt.Mandos"})
2664
class MandosDBusService(DBusObjectWithProperties):
3393
2665
"""A D-Bus proxy object"""
3395
2666
def __init__(self):
3396
2667
dbus.service.Object.__init__(self, bus, "/")
3398
2668
_interface = "se.recompile.Mandos"
2670
@dbus_interface_annotations(_interface)
2672
return { "org.freedesktop.DBus.Property"
2673
".EmitsChangedSignal":
3400
2676
@dbus.service.signal(_interface, signature="o")
3401
2677
def ClientAdded(self, objpath):
3405
2681
@dbus.service.signal(_interface, signature="ss")
3406
def ClientNotFound(self, key_id, address):
2682
def ClientNotFound(self, fingerprint, address):
3410
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3412
2686
@dbus.service.signal(_interface, signature="os")
3413
2687
def ClientRemoved(self, objpath, name):
3417
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3419
2691
@dbus.service.method(_interface, out_signature="ao")
3420
2692
def GetAllClients(self):
3422
return dbus.Array(c.dbus_object_path for c in
3423
tcp_server.clients.values())
3425
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2694
return dbus.Array(c.dbus_object_path
2696
tcp_server.clients.itervalues())
3427
2698
@dbus.service.method(_interface,
3428
2699
out_signature="a{oa{sv}}")
3429
2700
def GetAllClientsWithProperties(self):
3431
2702
return dbus.Dictionary(
3432
{c.dbus_object_path: c.GetAll(
3433
"se.recompile.Mandos.Client")
3434
for c in tcp_server.clients.values()},
2703
((c.dbus_object_path, c.GetAll(""))
2704
for c in tcp_server.clients.itervalues()),
3435
2705
signature="oa{sv}")
3437
2707
@dbus.service.method(_interface, in_signature="o")
3438
2708
def RemoveClient(self, object_path):
3440
for c in tcp_server.clients.values():
2710
for c in tcp_server.clients.itervalues():
3441
2711
if c.dbus_object_path == object_path:
3442
2712
del tcp_server.clients[c.name]
3443
2713
c.remove_from_connection()
3444
# Don't signal the disabling
2714
# Don't signal anything except ClientRemoved
3445
2715
c.disable(quiet=True)
3446
# Emit D-Bus signal for removal
3447
self.client_removed_signal(c)
2717
self.ClientRemoved(object_path, c.name)
3449
2719
raise KeyError(object_path)
3453
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3454
out_signature="a{oa{sa{sv}}}")
3455
def GetManagedObjects(self):
3457
return dbus.Dictionary(
3458
{client.dbus_object_path:
3460
{interface: client.GetAll(interface)
3462
client._get_all_interface_names()})
3463
for client in tcp_server.clients.values()})
3465
def client_added_signal(self, client):
3466
"""Send the new standard signal and the old signal"""
3468
# New standard signal
3469
self.InterfacesAdded(
3470
client.dbus_object_path,
3472
{interface: client.GetAll(interface)
3474
client._get_all_interface_names()}))
3476
self.ClientAdded(client.dbus_object_path)
3478
def client_removed_signal(self, client):
3479
"""Send the new standard signal and the old signal"""
3481
# New standard signal
3482
self.InterfacesRemoved(
3483
client.dbus_object_path,
3484
client._get_all_interface_names())
3486
self.ClientRemoved(client.dbus_object_path,
3489
2723
mandos_dbus_service = MandosDBusService()
3491
# Save modules to variables to exempt the modules from being
3492
# unloaded before the function registered with atexit() is run.
3493
mp = multiprocessing
3497
2726
"Cleanup function; run on exit"
3501
mp.active_children()
2729
multiprocessing.active_children()
3503
2731
if not (tcp_server.clients or client_settings):
3506
2734
# Store client before exiting. Secrets are encrypted with key
3507
2735
# based on what config file has. If config file is
3508
2736
# removed/edited, old secret will thus be unrecovable.
3510
2738
with PGPEngine() as pgp:
3511
for client in tcp_server.clients.values():
2739
for client in tcp_server.clients.itervalues():
3512
2740
key = client_settings[client.name]["secret"]
3513
2741
client.encrypted_secret = pgp.encrypt(client.secret,
3515
2743
client_dict = {}
3517
2745
# A list of attributes that can not be pickled
3519
exclude = {"bus", "changedstate", "secret",
3520
"checker", "server_settings"}
3521
for name, typ in inspect.getmembers(dbus.service
2747
exclude = set(("bus", "changedstate", "secret",
2748
"checker", "server_settings"))
2749
for name, typ in (inspect.getmembers
2750
(dbus.service.Object)):
3523
2751
exclude.add(name)
3525
2753
client_dict["encrypted_secret"] = (client
3526
2754
.encrypted_secret)
3527
2755
for attr in client.client_structure:
3528
2756
if attr not in exclude:
3529
2757
client_dict[attr] = getattr(client, attr)
3531
2759
clients[client.name] = client_dict
3532
2760
del client_settings[client.name]["secret"]
3535
with tempfile.NamedTemporaryFile(
3539
dir=os.path.dirname(stored_state_path),
3540
delete=False) as stored_state:
3541
pickle.dump((clients, client_settings), stored_state,
3543
tempname = stored_state.name
2763
with (tempfile.NamedTemporaryFile
2764
(mode='wb', suffix=".pickle", prefix='clients-',
2765
dir=os.path.dirname(stored_state_path),
2766
delete=False)) as stored_state:
2767
pickle.dump((clients, client_settings), stored_state)
2768
tempname=stored_state.name
3544
2769
os.rename(tempname, stored_state_path)
3545
2770
except (IOError, OSError) as e: