2
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2013 Teddy Hogeborn
15
# Copyright © 2008-2013 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
35
34
from __future__ import (division, absolute_import, print_function,
39
from future_builtins import *
37
from future_builtins import *
44
import SocketServer as socketserver
39
import SocketServer as socketserver
52
import ConfigParser as configparser
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
82
74
import dbus.service
83
from gi.repository import GLib
84
77
from dbus.mainloop.glib import DBusGMainLoop
87
80
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
94
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
85
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
99
87
from IN import SO_BINDTODEVICE
100
88
except ImportError:
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
115
if sys.version_info.major == 2:
89
SO_BINDTODEVICE = None
119
92
stored_state_file = "clients.pickle"
121
94
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
127
103
except (OSError, AttributeError):
129
104
def if_nametoindex(interface):
130
105
"Get an interface index the hard way, i.e. using fcntl()"
131
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
132
107
with contextlib.closing(socket.socket()) as s:
133
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
136
113
return interface_index
139
def copy_function(func):
140
"""Make a copy of a function"""
141
if sys.version_info.major == 2:
142
return types.FunctionType(func.func_code,
148
return types.FunctionType(func.__code__,
155
116
def initlogger(debug, level=logging.WARNING):
156
117
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
162
119
syslogger.setFormatter(logging.Formatter
163
120
('Mandos [%(process)d]: %(levelname)s:'
165
122
logger.addHandler(syslogger)
168
125
console = logging.StreamHandler()
169
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
226
169
os.rmdir(self.tempdir)
227
170
self.tempdir = None
229
172
def password_encode(self, password):
230
173
# Passphrase can not be empty and can not contain newlines or
231
174
# NUL bytes. So we prefix it and hex encode it.
232
encoded = b"mandos" + binascii.hexlify(password)
233
if len(encoded) > 2048:
234
# GnuPG can't handle long passwords, so encode differently
235
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
236
.replace(b"\n", b"\\n")
237
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
240
177
def encrypt(self, data, password):
241
178
passphrase = self.password_encode(password)
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
244
181
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
183
proc = subprocess.Popen(['gpg', '--symmetric',
247
184
'--passphrase-file',
249
186
+ self.gnupgargs,
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
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)
254
191
if proc.returncode != 0:
255
192
raise PGPError(err)
256
193
return ciphertext
258
195
def decrypt(self, data, password):
259
196
passphrase = self.password_encode(password)
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
262
199
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
201
proc = subprocess.Popen(['gpg', '--decrypt',
265
202
'--passphrase-file',
267
204
+ self.gnupgargs,
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
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
272
210
if proc.returncode != 0:
273
211
raise PGPError(err)
274
212
return decrypted_plaintext
277
# Pretend that we have an Avahi module
279
"""This isn't so much a class as it is a module-like namespace.
280
It is instantiated once, and simulates having an Avahi module."""
281
IF_UNSPEC = -1 # avahi-common/address.h
282
PROTO_UNSPEC = -1 # avahi-common/address.h
283
PROTO_INET = 0 # avahi-common/address.h
284
PROTO_INET6 = 1 # avahi-common/address.h
285
DBUS_NAME = "org.freedesktop.Avahi"
286
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
287
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
288
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(self, t):
291
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
for s in t), signature="ay")
293
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
294
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
295
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
296
SERVER_INVALID = 0 # avahi-common/defs.h
297
SERVER_REGISTERING = 1 # avahi-common/defs.h
298
SERVER_RUNNING = 2 # avahi-common/defs.h
299
SERVER_COLLISION = 3 # avahi-common/defs.h
300
SERVER_FAILURE = 4 # avahi-common/defs.h
304
215
class AvahiError(Exception):
305
216
def __init__(self, value, *args, **kwargs):
306
217
self.value = value
307
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))
311
222
class AvahiServiceError(AvahiError):
315
225
class AvahiGroupError(AvahiError):
319
229
class AvahiService(object):
320
230
"""An Avahi (Zeroconf) service.
323
233
interface: integer; avahi.IF_UNSPEC or an interface index.
324
234
Used to optionally bind to the specified interface.
489
377
follow_name_owner_changes=True),
490
378
avahi.DBUS_INTERFACE_SERVER)
491
379
self.server.connect_to_signal("StateChanged",
492
self.server_state_changed)
380
self.server_state_changed)
493
381
self.server_state_changed(self.server.GetState())
496
384
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
498
386
"""Add the new name to the syslog messages"""
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
500
syslogger.setFormatter(logging.Formatter(
501
'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'
506
# Pretend that we have a GnuTLS module
507
class GnuTLS(object):
508
"""This isn't so much a class as it is a module-like namespace.
509
It is instantiated once, and simulates having a GnuTLS module."""
511
library = ctypes.util.find_library("gnutls")
513
library = ctypes.util.find_library("gnutls-deb0")
514
_library = ctypes.cdll.LoadLibrary(library)
516
_need_version = b"3.3.0"
517
_tls_rawpk_version = b"3.6.6"
520
# Need to use "self" here, since this method is called before
521
# the assignment to the "gnutls" global variable happens.
522
if self.check_version(self._need_version) is None:
523
raise self.Error("Needs GnuTLS {} or later"
524
.format(self._need_version))
526
# Unless otherwise indicated, the constants and types below are
527
# all from the gnutls/gnutls.h C header file.
538
E_NO_CERTIFICATE_FOUND = -49
543
KEYID_USE_SHA256 = 1 # gnutls/x509.h
544
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
547
class session_int(ctypes.Structure):
549
session_t = ctypes.POINTER(session_int)
551
class certificate_credentials_st(ctypes.Structure):
553
certificate_credentials_t = ctypes.POINTER(
554
certificate_credentials_st)
555
certificate_type_t = ctypes.c_int
557
class datum_t(ctypes.Structure):
558
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
559
('size', ctypes.c_uint)]
561
class openpgp_crt_int(ctypes.Structure):
563
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
564
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
565
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
566
credentials_type_t = ctypes.c_int
567
transport_ptr_t = ctypes.c_void_p
568
close_request_t = ctypes.c_int
571
class Error(Exception):
572
# We need to use the class name "GnuTLS" here, since this
573
# exception might be raised from within GnuTLS.__init__,
574
# which is called before the assignment to the "gnutls"
575
# global variable has happened.
576
def __init__(self, message=None, code=None, args=()):
577
# Default usage is by a message string, but if a return
578
# code is passed, convert it to a string with
581
if message is None and code is not None:
582
message = GnuTLS.strerror(code)
583
return super(GnuTLS.Error, self).__init__(
586
class CertificateSecurityError(Error):
590
class Credentials(object):
592
self._c_object = gnutls.certificate_credentials_t()
593
gnutls.certificate_allocate_credentials(
594
ctypes.byref(self._c_object))
595
self.type = gnutls.CRD_CERTIFICATE
598
gnutls.certificate_free_credentials(self._c_object)
600
class ClientSession(object):
601
def __init__(self, socket, credentials=None):
602
self._c_object = gnutls.session_t()
603
gnutls_flags = gnutls.CLIENT
604
if gnutls.check_version("3.5.6"):
605
gnutls_flags |= gnutls.NO_TICKETS
607
gnutls_flags |= gnutls.ENABLE_RAWPK
608
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
610
gnutls.set_default_priority(self._c_object)
611
gnutls.transport_set_ptr(self._c_object, socket.fileno())
612
gnutls.handshake_set_private_extensions(self._c_object,
615
if credentials is None:
616
credentials = gnutls.Credentials()
617
gnutls.credentials_set(self._c_object, credentials.type,
618
ctypes.cast(credentials._c_object,
620
self.credentials = credentials
623
gnutls.deinit(self._c_object)
626
return gnutls.handshake(self._c_object)
628
def send(self, data):
632
data_len -= gnutls.record_send(self._c_object,
637
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
639
# Error handling functions
640
def _error_code(result):
641
"""A function to raise exceptions on errors, suitable
642
for the 'restype' attribute on ctypes functions"""
645
if result == gnutls.E_NO_CERTIFICATE_FOUND:
646
raise gnutls.CertificateSecurityError(code=result)
647
raise gnutls.Error(code=result)
649
def _retry_on_error(result, func, arguments):
650
"""A function to retry on some errors, suitable
651
for the 'errcheck' attribute on ctypes functions"""
653
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
654
return _error_code(result)
655
result = func(*arguments)
658
# Unless otherwise indicated, the function declarations below are
659
# all from the gnutls/gnutls.h C header file.
662
priority_set_direct = _library.gnutls_priority_set_direct
663
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
664
ctypes.POINTER(ctypes.c_char_p)]
665
priority_set_direct.restype = _error_code
667
init = _library.gnutls_init
668
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
669
init.restype = _error_code
671
set_default_priority = _library.gnutls_set_default_priority
672
set_default_priority.argtypes = [session_t]
673
set_default_priority.restype = _error_code
675
record_send = _library.gnutls_record_send
676
record_send.argtypes = [session_t, ctypes.c_void_p,
678
record_send.restype = ctypes.c_ssize_t
679
record_send.errcheck = _retry_on_error
681
certificate_allocate_credentials = (
682
_library.gnutls_certificate_allocate_credentials)
683
certificate_allocate_credentials.argtypes = [
684
ctypes.POINTER(certificate_credentials_t)]
685
certificate_allocate_credentials.restype = _error_code
687
certificate_free_credentials = (
688
_library.gnutls_certificate_free_credentials)
689
certificate_free_credentials.argtypes = [
690
certificate_credentials_t]
691
certificate_free_credentials.restype = None
693
handshake_set_private_extensions = (
694
_library.gnutls_handshake_set_private_extensions)
695
handshake_set_private_extensions.argtypes = [session_t,
697
handshake_set_private_extensions.restype = None
699
credentials_set = _library.gnutls_credentials_set
700
credentials_set.argtypes = [session_t, credentials_type_t,
702
credentials_set.restype = _error_code
704
strerror = _library.gnutls_strerror
705
strerror.argtypes = [ctypes.c_int]
706
strerror.restype = ctypes.c_char_p
708
certificate_type_get = _library.gnutls_certificate_type_get
709
certificate_type_get.argtypes = [session_t]
710
certificate_type_get.restype = _error_code
712
certificate_get_peers = _library.gnutls_certificate_get_peers
713
certificate_get_peers.argtypes = [session_t,
714
ctypes.POINTER(ctypes.c_uint)]
715
certificate_get_peers.restype = ctypes.POINTER(datum_t)
717
global_set_log_level = _library.gnutls_global_set_log_level
718
global_set_log_level.argtypes = [ctypes.c_int]
719
global_set_log_level.restype = None
721
global_set_log_function = _library.gnutls_global_set_log_function
722
global_set_log_function.argtypes = [log_func]
723
global_set_log_function.restype = None
725
deinit = _library.gnutls_deinit
726
deinit.argtypes = [session_t]
727
deinit.restype = None
729
handshake = _library.gnutls_handshake
730
handshake.argtypes = [session_t]
731
handshake.restype = _error_code
732
handshake.errcheck = _retry_on_error
734
transport_set_ptr = _library.gnutls_transport_set_ptr
735
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
736
transport_set_ptr.restype = None
738
bye = _library.gnutls_bye
739
bye.argtypes = [session_t, close_request_t]
740
bye.restype = _error_code
741
bye.errcheck = _retry_on_error
743
check_version = _library.gnutls_check_version
744
check_version.argtypes = [ctypes.c_char_p]
745
check_version.restype = ctypes.c_char_p
747
has_rawpk = bool(check_version(_tls_rawpk_version))
751
class pubkey_st(ctypes.Structure):
753
pubkey_t = ctypes.POINTER(pubkey_st)
755
x509_crt_fmt_t = ctypes.c_int
757
# All the function declarations below are from gnutls/abstract.h
758
pubkey_init = _library.gnutls_pubkey_init
759
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
760
pubkey_init.restype = _error_code
762
pubkey_import = _library.gnutls_pubkey_import
763
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
765
pubkey_import.restype = _error_code
767
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
768
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
769
ctypes.POINTER(ctypes.c_ubyte),
770
ctypes.POINTER(ctypes.c_size_t)]
771
pubkey_get_key_id.restype = _error_code
773
pubkey_deinit = _library.gnutls_pubkey_deinit
774
pubkey_deinit.argtypes = [pubkey_t]
775
pubkey_deinit.restype = None
777
# All the function declarations below are from gnutls/openpgp.h
779
openpgp_crt_init = _library.gnutls_openpgp_crt_init
780
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
781
openpgp_crt_init.restype = _error_code
783
openpgp_crt_import = _library.gnutls_openpgp_crt_import
784
openpgp_crt_import.argtypes = [openpgp_crt_t,
785
ctypes.POINTER(datum_t),
787
openpgp_crt_import.restype = _error_code
789
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
790
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
791
ctypes.POINTER(ctypes.c_uint)]
792
openpgp_crt_verify_self.restype = _error_code
794
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
795
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
796
openpgp_crt_deinit.restype = None
798
openpgp_crt_get_fingerprint = (
799
_library.gnutls_openpgp_crt_get_fingerprint)
800
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
804
openpgp_crt_get_fingerprint.restype = _error_code
806
if check_version("3.6.4"):
807
certificate_type_get2 = _library.gnutls_certificate_type_get2
808
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
809
certificate_type_get2.restype = _error_code
811
# Remove non-public functions
812
del _error_code, _retry_on_error
813
# Create the global "gnutls" object, simulating a module
817
def call_pipe(connection, # : multiprocessing.Connection
818
func, *args, **kwargs):
819
"""This function is meant to be called by multiprocessing.Process
821
This function runs func(*args, **kwargs), and writes the resulting
822
return value on the provided multiprocessing.Connection.
824
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))
828
402
class Client(object):
829
403
"""A representation of a client host served by this server.
832
406
approved: bool(); 'None' if not yet approved/disapproved
833
407
approval_delay: datetime.timedelta(); Time to wait for approval
1013
595
logger.info("Disabling client %s", self.name)
1014
596
if getattr(self, "disable_initiator_tag", None) is not None:
1015
GLib.source_remove(self.disable_initiator_tag)
597
gobject.source_remove(self.disable_initiator_tag)
1016
598
self.disable_initiator_tag = None
1017
599
self.expires = None
1018
600
if getattr(self, "checker_initiator_tag", None) is not None:
1019
GLib.source_remove(self.checker_initiator_tag)
601
gobject.source_remove(self.checker_initiator_tag)
1020
602
self.checker_initiator_tag = None
1021
603
self.stop_checker()
1022
604
self.enabled = False
1024
606
self.send_changedstate()
1025
# 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
1028
610
def __del__(self):
1031
613
def init_checker(self):
1032
614
# Schedule a new checker to be started an 'interval' from now,
1033
615
# and every interval from then on.
1034
616
if self.checker_initiator_tag is not None:
1035
GLib.source_remove(self.checker_initiator_tag)
1036
self.checker_initiator_tag = GLib.timeout_add(
1037
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(),
1039
621
# Schedule a disable() when 'timeout' has passed
1040
622
if self.disable_initiator_tag is not None:
1041
GLib.source_remove(self.disable_initiator_tag)
1042
self.disable_initiator_tag = GLib.timeout_add(
1043
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(),
1044
627
# Also start a new checker *right now*.
1045
628
self.start_checker()
1047
def checker_callback(self, source, condition, connection,
630
def checker_callback(self, pid, condition, command):
1049
631
"""The checker has completed, so take appropriate actions."""
1050
632
self.checker_callback_tag = None
1051
633
self.checker = None
1052
# Read return code from connection (see call_pipe)
1053
returncode = connection.recv()
1057
self.last_checker_status = returncode
1058
self.last_checker_signal = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
1059
636
if self.last_checker_status == 0:
1060
637
logger.info("Checker for %(name)s succeeded",
1062
639
self.checked_ok()
1064
logger.info("Checker for %(name)s failed", vars(self))
641
logger.info("Checker for %(name)s failed",
1066
644
self.last_checker_status = -1
1067
self.last_checker_signal = -returncode
1068
645
logger.warning("Checker for %(name)s crashed?",
1072
648
def checked_ok(self):
1073
649
"""Assert that the client has been seen, alive and well."""
1074
650
self.last_checked_ok = datetime.datetime.utcnow()
1075
651
self.last_checker_status = 0
1076
self.last_checker_signal = None
1077
652
self.bump_timeout()
1079
654
def bump_timeout(self, timeout=None):
1080
655
"""Bump up the timeout for this client."""
1081
656
if timeout is None:
1082
657
timeout = self.timeout
1083
658
if self.disable_initiator_tag is not None:
1084
GLib.source_remove(self.disable_initiator_tag)
659
gobject.source_remove(self.disable_initiator_tag)
1085
660
self.disable_initiator_tag = None
1086
661
if getattr(self, "enabled", False):
1087
self.disable_initiator_tag = GLib.timeout_add(
1088
int(timeout.total_seconds() * 1000), self.disable)
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
1089
665
self.expires = datetime.datetime.utcnow() + timeout
1091
667
def need_approval(self):
1092
668
self.last_approval_request = datetime.datetime.utcnow()
1094
670
def start_checker(self):
1095
671
"""Start a new checker subprocess if one is not running.
1097
673
If a checker already exists, leave it running and do
1099
675
# The reason for not killing a running checker is that if we
1104
680
# checkers alone, the checker would have to take more time
1105
681
# than 'timeout' for the client to be disabled, which is as it
1108
if self.checker is not None and not self.checker.is_alive():
1109
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)
1112
697
# Start a new checker if needed
1113
698
if self.checker is None:
1114
699
# Escape attributes for the shell
1116
attr: re.escape(str(getattr(self, attr)))
1117
for attr in self.runtime_expansions}
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
1119
705
command = self.checker_command % escaped_attrs
1120
706
except TypeError as error:
1121
707
logger.error('Could not format string "%s"',
1122
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",
1124
return True # Try again later
1125
self.current_checker_command = command
1126
logger.info("Starting checker %r for %s", command,
1128
# We don't need to redirect stdout and stderr, since
1129
# in normal mode, that is already done by daemon(),
1130
# and in debug mode we don't want to. (Stdin is
1131
# always replaced by /dev/null.)
1132
# The exception is when not debugging but nevertheless
1133
# running in the foreground; use the previously
1135
popen_args = {"close_fds": True,
1138
if (not self.server_settings["debug"]
1139
and self.server_settings["foreground"]):
1140
popen_args.update({"stdout": wnull,
1142
pipe = multiprocessing.Pipe(duplex=False)
1143
self.checker = multiprocessing.Process(
1145
args=(pipe[1], subprocess.call, command),
1147
self.checker.start()
1148
self.checker_callback_tag = GLib.io_add_watch(
1149
pipe[0].fileno(), GLib.IO_IN,
1150
self.checker_callback, pipe[0], command)
1151
# 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
1154
755
def stop_checker(self):
1155
756
"""Force the checker process, if any, to stop."""
1156
757
if self.checker_callback_tag:
1157
GLib.source_remove(self.checker_callback_tag)
758
gobject.source_remove(self.checker_callback_tag)
1158
759
self.checker_callback_tag = None
1159
760
if getattr(self, "checker", None) is None:
1161
762
logger.debug("Stopping checker for %(name)s", vars(self))
1162
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
1163
771
self.checker = None
1166
def dbus_service_property(dbus_interface,
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
1170
776
"""Decorators for marking methods of a DBusObjectWithProperties to
1171
777
become properties on the D-Bus.
1173
779
The decorated method will be called with no arguments by "Get"
1174
780
and with one argument by "Set".
1176
782
The parameters, where they are supported, are the same as
1177
783
dbus.service.method, except there is only "signature", since the
1178
784
type from Get() and the type sent to Set() is the same.
1261
class DBusObjectWithAnnotations(dbus.service.Object):
1262
"""A D-Bus object with annotations.
1264
Classes inheriting from this can use the dbus_annotations
1265
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.
1269
869
def _is_dbus_thing(thing):
1270
870
"""Returns a function testing if an attribute is a D-Bus thing
1272
872
If called like _is_dbus_thing("method") it returns a function
1273
873
suitable for use as predicate to inspect.getmembers().
1275
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1278
878
def _get_all_dbus_things(self, thing):
1279
879
"""Returns a generator of (name, attribute) pairs
1281
return ((getattr(athing.__get__(self), "_dbus_name", name),
881
return ((getattr(athing.__get__(self), "_dbus_name",
1282
883
athing.__get__(self))
1283
884
for cls in self.__class__.__mro__
1284
885
for name, athing in
1285
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1287
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1289
path_keyword='object_path',
1290
connection_keyword='connection')
1291
def Introspect(self, object_path, connection):
1292
"""Overloading of standard D-Bus method.
1294
Inserts annotation tags on methods and signals.
1296
xmlstring = dbus.service.Object.Introspect(self, object_path,
1299
document = xml.dom.minidom.parseString(xmlstring)
1301
for if_tag in document.getElementsByTagName("interface"):
1302
# Add annotation tags
1303
for typ in ("method", "signal"):
1304
for tag in if_tag.getElementsByTagName(typ):
1306
for name, prop in (self.
1307
_get_all_dbus_things(typ)):
1308
if (name == tag.getAttribute("name")
1309
and prop._dbus_interface
1310
== if_tag.getAttribute("name")):
1311
annots.update(getattr(
1312
prop, "_dbus_annotations", {}))
1313
for name, value in annots.items():
1314
ann_tag = document.createElement(
1316
ann_tag.setAttribute("name", name)
1317
ann_tag.setAttribute("value", value)
1318
tag.appendChild(ann_tag)
1319
# Add interface annotation tags
1320
for annotation, value in dict(
1321
itertools.chain.from_iterable(
1322
annotations().items()
1323
for name, annotations
1324
in self._get_all_dbus_things("interface")
1325
if name == if_tag.getAttribute("name")
1327
ann_tag = document.createElement("annotation")
1328
ann_tag.setAttribute("name", annotation)
1329
ann_tag.setAttribute("value", value)
1330
if_tag.appendChild(ann_tag)
1331
# Fix argument name for the Introspect method itself
1332
if (if_tag.getAttribute("name")
1333
== dbus.INTROSPECTABLE_IFACE):
1334
for cn in if_tag.getElementsByTagName("method"):
1335
if cn.getAttribute("name") == "Introspect":
1336
for arg in cn.getElementsByTagName("arg"):
1337
if (arg.getAttribute("direction")
1339
arg.setAttribute("name",
1341
xmlstring = document.toxml("utf-8")
1343
except (AttributeError, xml.dom.DOMException,
1344
xml.parsers.expat.ExpatError) as error:
1345
logger.error("Failed to override Introspection method",
1350
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1351
"""A D-Bus object with properties.
1353
Classes inheriting from this can use the dbus_service_property
1354
decorator to expose methods as D-Bus properties. It exposes the
1355
standard Get(), Set(), and GetAll() methods on the D-Bus.
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
1358
889
def _get_dbus_property(self, interface_name, property_name):
1359
890
"""Returns a bound method if one exists which is a D-Bus
1360
891
property with the specified name and interface.
1362
for cls in self.__class__.__mro__:
1363
for name, value in inspect.getmembers(
1364
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"))):
1365
897
if (value._dbus_name == property_name
1366
898
and value._dbus_interface == interface_name):
1367
899
return value.__get__(self)
1369
901
# No such property
1370
raise DBusPropertyNotFound("{}:{}.{}".format(
1371
self.dbus_object_path, interface_name, property_name))
1374
def _get_all_interface_names(cls):
1375
"""Get a sequence of all interfaces supported by an object"""
1376
return (name for name in set(getattr(getattr(x, attr),
1377
"_dbus_interface", None)
1378
for x in (inspect.getmro(cls))
1380
if name is not None)
1382
@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",
1384
907
out_signature="v")
1385
908
def Get(self, interface_name, property_name):
1386
909
"""Standard D-Bus property Get() method, see D-Bus standard.
1515
1039
return xmlstring
1519
dbus.OBJECT_MANAGER_IFACE
1520
except AttributeError:
1521
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1524
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1525
"""A D-Bus object with an ObjectManager.
1527
Classes inheriting from this exposes the standard
1528
GetManagedObjects call and the InterfacesAdded and
1529
InterfacesRemoved signals on the standard
1530
"org.freedesktop.DBus.ObjectManager" interface.
1532
Note: No signals are sent automatically; they must be sent
1535
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1536
out_signature="a{oa{sa{sv}}}")
1537
def GetManagedObjects(self):
1538
"""This function must be overridden"""
1539
raise NotImplementedError()
1541
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1542
signature="oa{sa{sv}}")
1543
def InterfacesAdded(self, object_path, interfaces_and_properties):
1546
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1547
def InterfacesRemoved(self, object_path, interfaces):
1550
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1552
path_keyword='object_path',
1553
connection_keyword='connection')
1554
def Introspect(self, object_path, connection):
1555
"""Overloading of standard D-Bus method.
1557
Override return argument name of GetManagedObjects to be
1558
"objpath_interfaces_and_properties"
1560
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1564
document = xml.dom.minidom.parseString(xmlstring)
1566
for if_tag in document.getElementsByTagName("interface"):
1567
# Fix argument name for the GetManagedObjects method
1568
if (if_tag.getAttribute("name")
1569
== dbus.OBJECT_MANAGER_IFACE):
1570
for cn in if_tag.getElementsByTagName("method"):
1571
if (cn.getAttribute("name")
1572
== "GetManagedObjects"):
1573
for arg in cn.getElementsByTagName("arg"):
1574
if (arg.getAttribute("direction")
1578
"objpath_interfaces"
1580
xmlstring = document.toxml("utf-8")
1582
except (AttributeError, xml.dom.DOMException,
1583
xml.parsers.expat.ExpatError) as error:
1584
logger.error("Failed to override Introspection method",
1589
1042
def datetime_to_dbus(dt, variant_level=0):
1590
1043
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1592
return dbus.String("", variant_level=variant_level)
1593
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)
1596
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1627
1080
# Ignore non-D-Bus attributes, and D-Bus attributes
1628
1081
# with the wrong interface name
1629
1082
if (not hasattr(attribute, "_dbus_interface")
1630
or not attribute._dbus_interface.startswith(
1631
orig_interface_name)):
1083
or not attribute._dbus_interface
1084
.startswith(orig_interface_name)):
1633
1086
# Create an alternate D-Bus interface name based on
1634
1087
# the current name
1635
alt_interface = attribute._dbus_interface.replace(
1636
orig_interface_name, alt_interface_name)
1088
alt_interface = (attribute._dbus_interface
1089
.replace(orig_interface_name,
1090
alt_interface_name))
1637
1091
interface_names.add(alt_interface)
1638
1092
# Is this a D-Bus signal?
1639
1093
if getattr(attribute, "_dbus_is_signal", False):
1640
1094
# Extract the original non-method undecorated
1641
1095
# function by black magic
1642
if sys.version_info.major == 2:
1643
nonmethod_func = (dict(
1096
nonmethod_func = (dict(
1644
1097
zip(attribute.func_code.co_freevars,
1645
attribute.__closure__))
1646
["func"].cell_contents)
1648
nonmethod_func = (dict(
1649
zip(attribute.__code__.co_freevars,
1650
attribute.__closure__))
1651
["func"].cell_contents)
1098
attribute.__closure__))["func"]
1652
1100
# Create a new, but exactly alike, function
1653
1101
# object, and decorate it to be a new D-Bus signal
1654
1102
# with the alternate D-Bus interface name
1655
new_function = copy_function(nonmethod_func)
1656
new_function = (dbus.service.signal(
1658
attribute._dbus_signature)(new_function))
1103
new_function = (dbus.service.signal
1105
attribute._dbus_signature)
1106
(types.FunctionType(
1107
nonmethod_func.func_code,
1108
nonmethod_func.func_globals,
1109
nonmethod_func.func_name,
1110
nonmethod_func.func_defaults,
1111
nonmethod_func.func_closure)))
1659
1112
# Copy annotations, if any
1661
new_function._dbus_annotations = dict(
1662
attribute._dbus_annotations)
1114
new_function._dbus_annotations = (
1115
dict(attribute._dbus_annotations))
1663
1116
except AttributeError:
1666
1118
# Define a creator of a function to call both the
1667
1119
# original and alternate functions, so both the
1668
1120
# original and alternate signals gets sent when
1957
1403
server to mandos-client
1961
1407
# Rejected - signal
1962
1408
@dbus.service.signal(_interface, signature="s")
1963
1409
def Rejected(self, reason):
1967
1413
# NeedApproval - signal
1968
1414
@dbus.service.signal(_interface, signature="tb")
1969
1415
def NeedApproval(self, timeout, default):
1971
1417
return self.need_approval()
1975
1421
# Approve - method
1976
1422
@dbus.service.method(_interface, in_signature="b")
1977
1423
def Approve(self, value):
1978
1424
self.approve(value)
1980
1426
# CheckedOK - method
1981
1427
@dbus.service.method(_interface)
1982
1428
def CheckedOK(self):
1983
1429
self.checked_ok()
1985
1431
# Enable - method
1986
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1987
1432
@dbus.service.method(_interface)
1988
1433
def Enable(self):
1992
1437
# StartChecker - method
1993
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1994
1438
@dbus.service.method(_interface)
1995
1439
def StartChecker(self):
1997
1441
self.start_checker()
1999
1443
# Disable - method
2000
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2001
1444
@dbus.service.method(_interface)
2002
1445
def Disable(self):
2006
1449
# StopChecker - method
2007
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2008
1450
@dbus.service.method(_interface)
2009
1451
def StopChecker(self):
2010
1452
self.stop_checker()
2014
1456
# ApprovalPending - property
2015
1457
@dbus_service_property(_interface, signature="b", access="read")
2016
1458
def ApprovalPending_dbus_property(self):
2017
1459
return dbus.Boolean(bool(self.approvals_pending))
2019
1461
# ApprovedByDefault - property
2020
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="b",
2022
1463
access="readwrite")
2023
1464
def ApprovedByDefault_dbus_property(self, value=None):
2024
1465
if value is None: # get
2025
1466
return dbus.Boolean(self.approved_by_default)
2026
1467
self.approved_by_default = bool(value)
2028
1469
# ApprovalDelay - property
2029
@dbus_service_property(_interface,
1470
@dbus_service_property(_interface, signature="t",
2031
1471
access="readwrite")
2032
1472
def ApprovalDelay_dbus_property(self, value=None):
2033
1473
if value is None: # get
2034
return dbus.UInt64(self.approval_delay.total_seconds()
1474
return dbus.UInt64(self.approval_delay_milliseconds())
2036
1475
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2038
1477
# ApprovalDuration - property
2039
@dbus_service_property(_interface,
1478
@dbus_service_property(_interface, signature="t",
2041
1479
access="readwrite")
2042
1480
def ApprovalDuration_dbus_property(self, value=None):
2043
1481
if value is None: # get
2044
return dbus.UInt64(self.approval_duration.total_seconds()
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
2046
1484
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2048
1486
# Name - property
2050
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2051
1487
@dbus_service_property(_interface, signature="s", access="read")
2052
1488
def Name_dbus_property(self):
2053
1489
return dbus.String(self.name)
2057
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2058
@dbus_service_property(_interface, signature="s", access="read")
2059
def KeyID_dbus_property(self):
2060
return dbus.String(self.key_id)
2062
1491
# Fingerprint - property
2064
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2065
1492
@dbus_service_property(_interface, signature="s", access="read")
2066
1493
def Fingerprint_dbus_property(self):
2067
1494
return dbus.String(self.fingerprint)
2069
1496
# Host - property
2070
@dbus_service_property(_interface,
1497
@dbus_service_property(_interface, signature="s",
2072
1498
access="readwrite")
2073
1499
def Host_dbus_property(self, value=None):
2074
1500
if value is None: # get
2075
1501
return dbus.String(self.host)
2076
self.host = str(value)
1502
self.host = unicode(value)
2078
1504
# Created - property
2080
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2081
1505
@dbus_service_property(_interface, signature="s", access="read")
2082
1506
def Created_dbus_property(self):
2083
1507
return datetime_to_dbus(self.created)
2085
1509
# LastEnabled - property
2086
1510
@dbus_service_property(_interface, signature="s", access="read")
2087
1511
def LastEnabled_dbus_property(self):
2088
1512
return datetime_to_dbus(self.last_enabled)
2090
1514
# Enabled - property
2091
@dbus_service_property(_interface,
1515
@dbus_service_property(_interface, signature="b",
2093
1516
access="readwrite")
2094
1517
def Enabled_dbus_property(self, value=None):
2095
1518
if value is None: # get
2144
1566
if (getattr(self, "disable_initiator_tag", None)
2147
GLib.source_remove(self.disable_initiator_tag)
2148
self.disable_initiator_tag = GLib.timeout_add(
2149
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),
2152
1575
# ExtendedTimeout - property
2153
@dbus_service_property(_interface,
1576
@dbus_service_property(_interface, signature="t",
2155
1577
access="readwrite")
2156
1578
def ExtendedTimeout_dbus_property(self, value=None):
2157
1579
if value is None: # get
2158
return dbus.UInt64(self.extended_timeout.total_seconds()
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
2160
1581
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2162
1583
# Interval - property
2163
@dbus_service_property(_interface,
1584
@dbus_service_property(_interface, signature="t",
2165
1585
access="readwrite")
2166
1586
def Interval_dbus_property(self, value=None):
2167
1587
if value is None: # get
2168
return dbus.UInt64(self.interval.total_seconds() * 1000)
1588
return dbus.UInt64(self.interval_milliseconds())
2169
1589
self.interval = datetime.timedelta(0, 0, 0, value)
2170
1590
if getattr(self, "checker_initiator_tag", None) is None:
2172
1592
if self.enabled:
2173
1593
# Reschedule checker run
2174
GLib.source_remove(self.checker_initiator_tag)
2175
self.checker_initiator_tag = GLib.timeout_add(
2176
value, self.start_checker)
2177
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
2179
1599
# Checker - property
2180
@dbus_service_property(_interface,
1600
@dbus_service_property(_interface, signature="s",
2182
1601
access="readwrite")
2183
1602
def Checker_dbus_property(self, value=None):
2184
1603
if value is None: # get
2185
1604
return dbus.String(self.checker_command)
2186
self.checker_command = str(value)
1605
self.checker_command = unicode(value)
2188
1607
# CheckerRunning - property
2189
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="b",
2191
1609
access="readwrite")
2192
1610
def CheckerRunning_dbus_property(self, value=None):
2193
1611
if value is None: # get
2250
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
2251
1659
"""A class to handle client connections.
2253
1661
Instantiated once for each connection to handle it.
2254
1662
Note: This will run in its own forked process."""
2256
1664
def handle(self):
2257
1665
with contextlib.closing(self.server.child_pipe) as child_pipe:
2258
1666
logger.info("TCP connection from: %s",
2259
str(self.client_address))
1667
unicode(self.client_address))
2260
1668
logger.debug("Pipe FD: %d",
2261
1669
self.server.child_pipe.fileno())
2263
session = gnutls.ClientSession(self.request)
2265
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2266
# "+AES-256-CBC", "+SHA1",
2267
# "+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",
2269
1685
# Use a fallback default, since this MUST be set.
2270
1686
priority = self.server.gnutls_priority
2271
1687
if priority is None:
2272
1688
priority = "NORMAL"
2273
gnutls.priority_set_direct(session._c_object,
2274
priority.encode("utf-8"),
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
2277
1693
# Start communication using the Mandos protocol
2278
1694
# Get protocol number
2279
1695
line = self.request.makefile().readline()
2280
1696
logger.debug("Protocol version: %r", line)
2282
1698
if int(line.strip().split()[0]) > 1:
2283
raise RuntimeError(line)
2284
1700
except (ValueError, IndexError, RuntimeError) as error:
2285
1701
logger.error("Unknown protocol version: %s", error)
2288
1704
# Start GnuTLS connection
2290
1706
session.handshake()
2291
except gnutls.Error as error:
1707
except gnutls.errors.GNUTLSError as error:
2292
1708
logger.warning("Handshake failed: %s", error)
2293
1709
# Do not run session.bye() here: the session is not
2294
1710
# established. Just abandon the request.
2296
1712
logger.debug("Handshake succeeded")
2298
1714
approval_required = False
2300
if gnutls.has_rawpk:
2303
key_id = self.key_id(
2304
self.peer_certificate(session))
2305
except (TypeError, gnutls.Error) as error:
2306
logger.warning("Bad certificate: %s", error)
2308
logger.debug("Key ID: %s", key_id)
2313
fpr = self.fingerprint(
2314
self.peer_certificate(session))
2315
except (TypeError, gnutls.Error) as error:
2316
logger.warning("Bad certificate: %s", error)
2318
logger.debug("Fingerprint: %s", fpr)
2321
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,
2322
1727
self.client_address)
2323
1728
except KeyError:
2326
1731
if client.approval_delay:
2327
1732
delay = client.approval_delay
2328
1733
client.approvals_pending += 1
2329
1734
approval_required = True
2332
1737
if not client.enabled:
2333
1738
logger.info("Client %s is disabled",
2335
1740
if self.server.use_dbus:
2336
1741
# Emit D-Bus signal
2337
1742
client.Rejected("Disabled")
2340
1745
if client.approved or not client.approval_delay:
2341
# We are approved or approval is disabled
1746
#We are approved or approval is disabled
2343
1748
elif client.approved is None:
2344
1749
logger.info("Client %s needs approval",
2377
1784
delay -= time2 - time
2380
session.send(client.secret)
2381
except gnutls.Error as error:
2382
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))
2386
1799
logger.info("Sending secret to %s", client.name)
2387
1800
# bump the timeout using extended_timeout
2388
1801
client.bump_timeout(client.extended_timeout)
2389
1802
if self.server.use_dbus:
2390
1803
# Emit D-Bus signal
2391
1804
client.GotSecret()
2394
1807
if approval_required:
2395
1808
client.approvals_pending -= 1
2398
except gnutls.Error as error:
1811
except gnutls.errors.GNUTLSError as error:
2399
1812
logger.warning("GnuTLS bye failed",
2400
1813
exc_info=error)
2403
1816
def peer_certificate(session):
2404
"Return the peer's certificate as a bytestring"
2406
cert_type = gnutls.certificate_type_get2(session._c_object,
2408
except AttributeError:
2409
cert_type = gnutls.certificate_type_get(session._c_object)
2410
if gnutls.has_rawpk:
2411
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2413
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2414
# If not a valid certificate type...
2415
if cert_type not in valid_cert_types:
2416
logger.info("Cert type %r not in %r", cert_type,
2418
# ...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
2420
1824
list_size = ctypes.c_uint(1)
2421
cert_list = (gnutls.certificate_get_peers
1825
cert_list = (gnutls.library.functions
1826
.gnutls_certificate_get_peers
2422
1827
(session._c_object, ctypes.byref(list_size)))
2423
1828
if not bool(cert_list) and list_size.value != 0:
2424
raise gnutls.Error("error getting peer certificate")
1829
raise gnutls.errors.GNUTLSError("error getting peer"
2425
1831
if list_size.value == 0:
2427
1833
cert = cert_list[0]
2428
1834
return ctypes.string_at(cert.data, cert.size)
2431
def key_id(certificate):
2432
"Convert a certificate bytestring to a hexdigit key ID"
2433
# New GnuTLS "datum" with the public key
2434
datum = gnutls.datum_t(
2435
ctypes.cast(ctypes.c_char_p(certificate),
2436
ctypes.POINTER(ctypes.c_ubyte)),
2437
ctypes.c_uint(len(certificate)))
2438
# XXX all these need to be created in the gnutls "module"
2439
# New empty GnuTLS certificate
2440
pubkey = gnutls.pubkey_t()
2441
gnutls.pubkey_init(ctypes.byref(pubkey))
2442
# Import the raw public key into the certificate
2443
gnutls.pubkey_import(pubkey,
2444
ctypes.byref(datum),
2445
gnutls.X509_FMT_DER)
2446
# New buffer for the key ID
2447
buf = ctypes.create_string_buffer(32)
2448
buf_len = ctypes.c_size_t(len(buf))
2449
# Get the key ID from the raw public key into the buffer
2450
gnutls.pubkey_get_key_id(pubkey,
2451
gnutls.KEYID_USE_SHA256,
2452
ctypes.cast(ctypes.byref(buf),
2453
ctypes.POINTER(ctypes.c_ubyte)),
2454
ctypes.byref(buf_len))
2455
# Deinit the certificate
2456
gnutls.pubkey_deinit(pubkey)
2458
# Convert the buffer to a Python bytestring
2459
key_id = ctypes.string_at(buf, buf_len.value)
2460
# Convert the bytestring to hexadecimal notation
2461
hex_key_id = binascii.hexlify(key_id).upper()
2465
1837
def fingerprint(openpgp):
2466
1838
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2467
1839
# New GnuTLS "datum" with the OpenPGP public key
2468
datum = gnutls.datum_t(
2469
ctypes.cast(ctypes.c_char_p(openpgp),
2470
ctypes.POINTER(ctypes.c_ubyte)),
2471
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))))
2472
1845
# New empty GnuTLS certificate
2473
crt = gnutls.openpgp_crt_t()
2474
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)))
2475
1849
# Import the OpenPGP public key into the certificate
2476
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2477
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))
2478
1854
# Verify the self signature in the key
2479
1855
crtverify = ctypes.c_uint()
2480
gnutls.openpgp_crt_verify_self(crt, 0,
2481
ctypes.byref(crtverify))
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2482
1859
if crtverify.value != 0:
2483
gnutls.openpgp_crt_deinit(crt)
2484
raise gnutls.CertificateSecurityError(code
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2486
1863
# New buffer for the fingerprint
2487
1864
buf = ctypes.create_string_buffer(20)
2488
1865
buf_len = ctypes.c_size_t()
2489
1866
# Get the fingerprint from the certificate into the buffer
2490
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2491
ctypes.byref(buf_len))
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2492
1870
# Deinit the certificate
2493
gnutls.openpgp_crt_deinit(crt)
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2494
1872
# Convert the buffer to a Python bytestring
2495
1873
fpr = ctypes.string_at(buf, buf_len.value)
2496
1874
# Convert the bytestring to hexadecimal notation
2585
1957
# socket_wrapper(), if socketfd was set.
2586
1958
socketserver.TCPServer.__init__(self, server_address,
2587
1959
RequestHandlerClass)
2589
1961
def server_bind(self):
2590
1962
"""This overrides the normal server_bind() function
2591
1963
to bind to an interface if one was specified, and also NOT to
2592
1964
bind to an address or port if they were not specified."""
2593
global SO_BINDTODEVICE
2594
1965
if self.interface is not None:
2595
1966
if SO_BINDTODEVICE is None:
2596
# Fall back to a hard-coded value which seems to be
2598
logger.warning("SO_BINDTODEVICE not found, trying 25")
2599
SO_BINDTODEVICE = 25
2601
self.socket.setsockopt(
2602
socket.SOL_SOCKET, SO_BINDTODEVICE,
2603
(self.interface + "\0").encode("utf-8"))
2604
except socket.error as error:
2605
if error.errno == errno.EPERM:
2606
logger.error("No permission to bind to"
2607
" interface %s", self.interface)
2608
elif error.errno == errno.ENOPROTOOPT:
2609
logger.error("SO_BINDTODEVICE not available;"
2610
" cannot bind to interface %s",
2612
elif error.errno == errno.ENODEV:
2613
logger.error("Interface %s does not exist,"
2614
" 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)
2617
1988
# Only bind(2) the socket if we really need to.
2618
1989
if self.server_address[0] or self.server_address[1]:
2619
1990
if not self.server_address[0]:
2620
1991
if self.address_family == socket.AF_INET6:
2621
any_address = "::" # in6addr_any
1992
any_address = "::" # in6addr_any
2623
any_address = "0.0.0.0" # INADDR_ANY
1994
any_address = "0.0.0.0" # INADDR_ANY
2624
1995
self.server_address = (any_address,
2625
1996
self.server_address[1])
2626
1997
elif not self.server_address[1]:
2627
self.server_address = (self.server_address[0], 0)
1998
self.server_address = (self.server_address[0],
2628
2000
# if self.interface:
2629
2001
# self.server_address = (self.server_address[0],
2660
2027
self.gnutls_priority = gnutls_priority
2661
2028
IPv6_TCPServer.__init__(self, server_address,
2662
2029
RequestHandlerClass,
2663
interface=interface,
2030
interface = interface,
2031
use_ipv6 = use_ipv6,
2032
socketfd = socketfd)
2667
2033
def server_activate(self):
2668
2034
if self.enabled:
2669
2035
return socketserver.TCPServer.server_activate(self)
2671
2037
def enable(self):
2672
2038
self.enabled = True
2674
2040
def add_pipe(self, parent_pipe, proc):
2675
2041
# Call "handle_ipc" for both data and EOF events
2677
parent_pipe.fileno(),
2678
GLib.IO_IN | GLib.IO_HUP,
2679
functools.partial(self.handle_ipc,
2680
parent_pipe=parent_pipe,
2683
def handle_ipc(self, source, condition,
2686
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):
2687
2051
# error, or the other end of multiprocessing.Pipe has closed
2688
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2052
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2689
2053
# Wait for other process to exit
2693
2057
# Read a request from the child
2694
2058
request = parent_pipe.recv()
2695
2059
command = request[0]
2697
2061
if command == 'init':
2698
key_id = request[1].decode("ascii")
2699
fpr = request[2].decode("ascii")
2700
address = request[3]
2702
for c in self.clients.values():
2703
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2705
if key_id and c.key_id == key_id:
2708
if fpr and c.fingerprint == fpr:
2063
address = request[2]
2065
for c in self.clients.itervalues():
2066
if c.fingerprint == fpr:
2712
logger.info("Client not found for key ID: %s, address"
2713
": %s", key_id or fpr, address)
2070
logger.info("Client not found for fingerprint: %s, ad"
2071
"dress: %s", fpr, address)
2714
2072
if self.use_dbus:
2715
2073
# Emit D-Bus signal
2716
mandos_dbus_service.ClientNotFound(key_id or fpr,
2074
mandos_dbus_service.ClientNotFound(fpr,
2718
2076
parent_pipe.send(False)
2722
parent_pipe.fileno(),
2723
GLib.IO_IN | GLib.IO_HUP,
2724
functools.partial(self.handle_ipc,
2725
parent_pipe=parent_pipe,
2727
client_object=client))
2079
gobject.io_add_watch(parent_pipe.fileno(),
2080
gobject.IO_IN | gobject.IO_HUP,
2081
functools.partial(self.handle_ipc,
2728
2087
parent_pipe.send(True)
2729
2088
# remove the old hook in favor of the new above hook on
3136
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3138
2474
except OSError as error:
3139
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3140
.format(uid, gid, os.strerror(error.errno)))
3141
2475
if error.errno != errno.EPERM:
3145
2479
# Enable all possible GnuTLS debugging
3147
2481
# "Use a log level over 10 to enable all debugging options."
3148
2482
# - GnuTLS manual
3149
gnutls.global_set_log_level(11)
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
2485
@gnutls.library.types.gnutls_log_func
3152
2486
def debug_gnutls(level, string):
3153
2487
logger.debug("GnuTLS: %s", string[:-1])
3155
gnutls.global_set_log_function(debug_gnutls)
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
3157
2492
# Redirect stdin so all checkers get /dev/null
3158
2493
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3159
2494
os.dup2(null, sys.stdin.fileno())
3163
2498
# Need to fork before connecting to D-Bus
3164
2499
if not foreground:
3165
2500
# Close all input and output, do double fork, etc.
3168
# multiprocessing will use threads, so before we use GLib we need
3169
# to inform GLib that threads will be used.
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()
3172
2507
global main_loop
3173
2508
# From the Avahi example code
3174
2509
DBusGMainLoop(set_as_default=True)
3175
main_loop = GLib.MainLoop()
2510
main_loop = gobject.MainLoop()
3176
2511
bus = dbus.SystemBus()
3177
2512
# End of Avahi example code
3180
2515
bus_name = dbus.service.BusName("se.recompile.Mandos",
3183
old_bus_name = dbus.service.BusName(
3184
"se.bsnet.fukt.Mandos", bus,
3186
except dbus.exceptions.DBusException as e:
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:
3187
2521
logger.error("Disabling D-Bus:", exc_info=e)
3188
2522
use_dbus = False
3189
2523
server_settings["use_dbus"] = False
3190
2524
tcp_server.use_dbus = False
3192
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3193
service = AvahiServiceToSyslog(
3194
name=server_settings["servicename"],
3195
servicetype="_mandos._tcp",
3198
if server_settings["interface"]:
3199
service.interface = if_nametoindex(
3200
server_settings["interface"].encode("utf-8"))
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"])))
3202
2534
global multiprocessing_manager
3203
2535
multiprocessing_manager = multiprocessing.Manager()
3205
2537
client_class = Client
3207
client_class = functools.partial(ClientDBus, bus=bus)
2539
client_class = functools.partial(ClientDBus, bus = bus)
3209
2541
client_settings = Client.config_parser(client_config)
3210
2542
old_client_settings = {}
3211
2543
clients_data = {}
3213
2545
# This is used to redirect stdout and stderr for checker processes
3215
wnull = open(os.devnull, "w") # A writable /dev/null
2547
wnull = open(os.devnull, "w") # A writable /dev/null
3216
2548
# Only used if server is running in foreground but not in debug
3218
2550
if debug or not foreground:
3221
2553
# Get client data and settings from last running state.
3222
2554
if server_settings["restore"]:
3224
2556
with open(stored_state_path, "rb") as stored_state:
3225
if sys.version_info.major == 2:
3226
clients_data, old_client_settings = pickle.load(
3229
bytes_clients_data, bytes_old_client_settings = (
3230
pickle.load(stored_state, encoding="bytes"))
3231
# Fix bytes to strings
3234
clients_data = {(key.decode("utf-8")
3235
if isinstance(key, bytes)
3238
bytes_clients_data.items()}
3239
del bytes_clients_data
3240
for key in clients_data:
3241
value = {(k.decode("utf-8")
3242
if isinstance(k, bytes) else k): v
3244
clients_data[key].items()}
3245
clients_data[key] = value
3247
value["client_structure"] = [
3249
if isinstance(s, bytes)
3251
value["client_structure"]]
3253
for k in ("name", "host"):
3254
if isinstance(value[k], bytes):
3255
value[k] = value[k].decode("utf-8")
3256
if not value.has_key("key_id"):
3257
value["key_id"] = ""
3258
elif not value.has_key("fingerprint"):
3259
value["fingerprint"] = ""
3260
# old_client_settings
3262
old_client_settings = {
3263
(key.decode("utf-8")
3264
if isinstance(key, bytes)
3267
bytes_old_client_settings.items()}
3268
del bytes_old_client_settings
3270
for value in old_client_settings.values():
3271
if isinstance(value["host"], bytes):
3272
value["host"] = (value["host"]
2557
clients_data, old_client_settings = (pickle.load
3274
2559
os.remove(stored_state_path)
3275
2560
except IOError as e:
3276
2561
if e.errno == errno.ENOENT:
3277
logger.warning("Could not load persistent state:"
3278
" {}".format(os.strerror(e.errno)))
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
3280
2565
logger.critical("Could not load persistent state:",
3283
2568
except EOFError as e:
3284
2569
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
3288
2572
with PGPEngine() as pgp:
3289
for client_name, client in clients_data.items():
2573
for client_name, client in clients_data.iteritems():
3290
2574
# Skip removed clients
3291
2575
if client_name not in client_settings:
3294
2578
# Decide which value to use after restoring saved state.
3295
2579
# We have three different values: Old config file,
3296
2580
# new config file, and saved state.
3354
2638
for client_name in (set(client_settings)
3355
2639
- set(old_client_settings)):
3356
2640
clients_data[client_name] = client_settings[client_name]
3358
2642
# Create all client objects
3359
for client_name, client in clients_data.items():
2643
for client_name, client in clients_data.iteritems():
3360
2644
tcp_server.clients[client_name] = client_class(
3363
server_settings=server_settings)
2645
name = client_name, settings = client,
2646
server_settings = server_settings)
3365
2648
if not tcp_server.clients:
3366
2649
logger.warning("No clients defined")
3368
2651
if not foreground:
3369
2652
if pidfile is not None:
3373
print(pid, file=pidfile)
2656
pidfile.write(str(pid) + "\n".encode("utf-8"))
3374
2657
except IOError:
3375
2658
logger.error("Could not write to file %r with PID %d",
3376
2659
pidfilename, pid)
3378
2661
del pidfilename
3380
for termsig in (signal.SIGHUP, signal.SIGTERM):
3381
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3382
lambda: main_loop.quit() and False)
2663
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3386
@alternate_dbus_interfaces(
3387
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3388
class MandosDBusService(DBusObjectWithObjectManager):
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2669
class MandosDBusService(DBusObjectWithProperties):
3389
2670
"""A D-Bus proxy object"""
3391
2671
def __init__(self):
3392
2672
dbus.service.Object.__init__(self, bus, "/")
3394
2673
_interface = "se.recompile.Mandos"
2675
@dbus_interface_annotations(_interface)
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
3396
2681
@dbus.service.signal(_interface, signature="o")
3397
2682
def ClientAdded(self, objpath):
3401
2686
@dbus.service.signal(_interface, signature="ss")
3402
def ClientNotFound(self, key_id, address):
2687
def ClientNotFound(self, fingerprint, address):
3406
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3408
2691
@dbus.service.signal(_interface, signature="os")
3409
2692
def ClientRemoved(self, objpath, name):
3413
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3415
2696
@dbus.service.method(_interface, out_signature="ao")
3416
2697
def GetAllClients(self):
3418
return dbus.Array(c.dbus_object_path for c in
3419
tcp_server.clients.values())
3421
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2699
return dbus.Array(c.dbus_object_path
2701
tcp_server.clients.itervalues())
3423
2703
@dbus.service.method(_interface,
3424
2704
out_signature="a{oa{sv}}")
3425
2705
def GetAllClientsWithProperties(self):
3427
2707
return dbus.Dictionary(
3428
{c.dbus_object_path: c.GetAll(
3429
"se.recompile.Mandos.Client")
3430
for c in tcp_server.clients.values()},
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
3431
2710
signature="oa{sv}")
3433
2712
@dbus.service.method(_interface, in_signature="o")
3434
2713
def RemoveClient(self, object_path):
3436
for c in tcp_server.clients.values():
2715
for c in tcp_server.clients.itervalues():
3437
2716
if c.dbus_object_path == object_path:
3438
2717
del tcp_server.clients[c.name]
3439
2718
c.remove_from_connection()
3440
# Don't signal the disabling
2719
# Don't signal anything except ClientRemoved
3441
2720
c.disable(quiet=True)
3442
# Emit D-Bus signal for removal
3443
self.client_removed_signal(c)
2722
self.ClientRemoved(object_path, c.name)
3445
2724
raise KeyError(object_path)
3449
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3450
out_signature="a{oa{sa{sv}}}")
3451
def GetManagedObjects(self):
3453
return dbus.Dictionary(
3454
{client.dbus_object_path:
3456
{interface: client.GetAll(interface)
3458
client._get_all_interface_names()})
3459
for client in tcp_server.clients.values()})
3461
def client_added_signal(self, client):
3462
"""Send the new standard signal and the old signal"""
3464
# New standard signal
3465
self.InterfacesAdded(
3466
client.dbus_object_path,
3468
{interface: client.GetAll(interface)
3470
client._get_all_interface_names()}))
3472
self.ClientAdded(client.dbus_object_path)
3474
def client_removed_signal(self, client):
3475
"""Send the new standard signal and the old signal"""
3477
# New standard signal
3478
self.InterfacesRemoved(
3479
client.dbus_object_path,
3480
client._get_all_interface_names())
3482
self.ClientRemoved(client.dbus_object_path,
3485
2728
mandos_dbus_service = MandosDBusService()
3487
# Save modules to variables to exempt the modules from being
3488
# unloaded before the function registered with atexit() is run.
3489
mp = multiprocessing
3493
2731
"Cleanup function; run on exit"
3497
mp.active_children()
2734
multiprocessing.active_children()
3499
2736
if not (tcp_server.clients or client_settings):
3502
2739
# Store client before exiting. Secrets are encrypted with key
3503
2740
# based on what config file has. If config file is
3504
2741
# removed/edited, old secret will thus be unrecovable.
3506
2743
with PGPEngine() as pgp:
3507
for client in tcp_server.clients.values():
2744
for client in tcp_server.clients.itervalues():
3508
2745
key = client_settings[client.name]["secret"]
3509
2746
client.encrypted_secret = pgp.encrypt(client.secret,
3511
2748
client_dict = {}
3513
2750
# A list of attributes that can not be pickled
3515
exclude = {"bus", "changedstate", "secret",
3516
"checker", "server_settings"}
3517
for name, typ in inspect.getmembers(dbus.service
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
3519
2756
exclude.add(name)
3521
2758
client_dict["encrypted_secret"] = (client
3522
2759
.encrypted_secret)
3523
2760
for attr in client.client_structure:
3524
2761
if attr not in exclude:
3525
2762
client_dict[attr] = getattr(client, attr)
3527
2764
clients[client.name] = client_dict
3528
2765
del client_settings[client.name]["secret"]
3531
with tempfile.NamedTemporaryFile(
3535
dir=os.path.dirname(stored_state_path),
3536
delete=False) as stored_state:
3537
pickle.dump((clients, client_settings), stored_state,
3539
tempname = stored_state.name
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
3540
2774
os.rename(tempname, stored_state_path)
3541
2775
except (IOError, OSError) as e: