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-2013 Teddy Hogeborn
15
# Copyright © 2008-2013 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
19
21
# the Free Software Foundation, either version 3 of the License, or
20
22
# (at your option) any later version.
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
24
26
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25
27
# GNU General Public License for more details.
27
29
# You should have received a copy of the GNU General Public License
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
31
32
# Contact the authors at <mandos@recompile.se>.
34
35
from __future__ import (division, absolute_import, print_function,
37
from future_builtins import *
39
from future_builtins import *
39
import SocketServer as socketserver
44
import SocketServer as socketserver
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
52
import ConfigParser as configparser
65
import cPickle as pickle
70
import cPickle as pickle
66
73
import multiprocessing
74
82
import dbus.service
83
from gi.repository import GLib
77
84
from dbus.mainloop.glib import DBusGMainLoop
80
87
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:
84
94
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
95
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
87
99
from IN import SO_BINDTODEVICE
88
100
except ImportError:
89
SO_BINDTODEVICE = None
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:
92
119
stored_state_file = "clients.pickle"
94
121
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
103
127
except (OSError, AttributeError):
104
129
def if_nametoindex(interface):
105
130
"Get an interface index the hard way, i.e. using fcntl()"
106
131
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
132
with contextlib.closing(socket.socket()) as s:
108
133
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
136
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__,
116
155
def initlogger(debug, level=logging.WARNING):
117
156
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
119
162
syslogger.setFormatter(logging.Formatter
120
163
('Mandos [%(process)d]: %(levelname)s:'
122
165
logger.addHandler(syslogger)
125
168
console = logging.StreamHandler()
126
169
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
179
236
.replace(b"\n", b"\\n")
180
237
.replace(b"\0", b"\\x00"))
183
240
def encrypt(self, data, password):
184
241
passphrase = self.password_encode(password)
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
187
244
passfile.write(passphrase)
189
proc = subprocess.Popen(['gpg', '--symmetric',
246
proc = subprocess.Popen([self.gpg, '--symmetric',
190
247
'--passphrase-file',
192
249
+ self.gnupgargs,
193
stdin = subprocess.PIPE,
194
stdout = subprocess.PIPE,
195
stderr = subprocess.PIPE)
196
ciphertext, err = proc.communicate(input = data)
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
197
254
if proc.returncode != 0:
198
255
raise PGPError(err)
199
256
return ciphertext
201
258
def decrypt(self, data, password):
202
259
passphrase = self.password_encode(password)
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
205
262
passfile.write(passphrase)
207
proc = subprocess.Popen(['gpg', '--decrypt',
264
proc = subprocess.Popen([self.gpg, '--decrypt',
208
265
'--passphrase-file',
210
267
+ self.gnupgargs,
211
stdin = subprocess.PIPE,
212
stdout = subprocess.PIPE,
213
stderr = subprocess.PIPE)
214
decrypted_plaintext, err = proc.communicate(input
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
216
272
if proc.returncode != 0:
217
273
raise PGPError(err)
218
274
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
IF_UNSPEC = -1 # avahi-common/address.h
281
PROTO_UNSPEC = -1 # avahi-common/address.h
282
PROTO_INET = 0 # avahi-common/address.h
283
PROTO_INET6 = 1 # avahi-common/address.h
284
DBUS_NAME = "org.freedesktop.Avahi"
285
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
286
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(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
221
303
class AvahiError(Exception):
222
304
def __init__(self, value, *args, **kwargs):
223
305
self.value = value
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
306
return super(AvahiError, self).__init__(value, *args,
228
310
class AvahiServiceError(AvahiError):
231
314
class AvahiGroupError(AvahiError):
235
318
class AvahiService(object):
236
319
"""An Avahi (Zeroconf) service.
239
322
interface: integer; avahi.IF_UNSPEC or an interface index.
240
323
Used to optionally bind to the specified interface.
383
488
follow_name_owner_changes=True),
384
489
avahi.DBUS_INTERFACE_SERVER)
385
490
self.server.connect_to_signal("StateChanged",
386
self.server_state_changed)
491
self.server_state_changed)
387
492
self.server_state_changed(self.server.GetState())
390
495
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
392
497
"""Add the new name to the syslog messages"""
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
498
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
499
syslogger.setFormatter(logging.Formatter(
500
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
401
def timedelta_to_milliseconds(td):
402
"Convert a datetime.timedelta() to milliseconds"
403
return ((td.days * 24 * 60 * 60 * 1000)
404
+ (td.seconds * 1000)
405
+ (td.microseconds // 1000))
505
# Pretend that we have a GnuTLS module
506
class gnutls(object):
507
"""This isn't so much a class as it is a module-like namespace."""
509
library = ctypes.util.find_library("gnutls")
511
library = ctypes.util.find_library("gnutls-deb0")
512
_library = ctypes.cdll.LoadLibrary(library)
515
# Unless otherwise indicated, the constants and types below are
516
# all from the gnutls/gnutls.h C header file.
527
E_NO_CERTIFICATE_FOUND = -49
532
KEYID_USE_SHA256 = 1 # gnutls/x509.h
533
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
536
class session_int(ctypes.Structure):
538
session_t = ctypes.POINTER(session_int)
540
class certificate_credentials_st(ctypes.Structure):
542
certificate_credentials_t = ctypes.POINTER(
543
certificate_credentials_st)
544
certificate_type_t = ctypes.c_int
546
class datum_t(ctypes.Structure):
547
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
548
('size', ctypes.c_uint)]
550
class openpgp_crt_int(ctypes.Structure):
552
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
553
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
554
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
555
credentials_type_t = ctypes.c_int
556
transport_ptr_t = ctypes.c_void_p
557
close_request_t = ctypes.c_int
560
class Error(Exception):
561
def __init__(self, message=None, code=None, args=()):
562
# Default usage is by a message string, but if a return
563
# code is passed, convert it to a string with
566
if message is None and code is not None:
567
message = gnutls.strerror(code)
568
return super(gnutls.Error, self).__init__(
571
class CertificateSecurityError(Error):
575
class Credentials(object):
577
self._c_object = gnutls.certificate_credentials_t()
578
gnutls.certificate_allocate_credentials(
579
ctypes.byref(self._c_object))
580
self.type = gnutls.CRD_CERTIFICATE
583
gnutls.certificate_free_credentials(self._c_object)
585
class ClientSession(object):
586
def __init__(self, socket, credentials=None):
587
self._c_object = gnutls.session_t()
588
gnutls_flags = gnutls.CLIENT
589
if gnutls.check_version("3.5.6"):
590
gnutls_flags |= gnutls.NO_TICKETS
592
gnutls_flags |= gnutls.ENABLE_RAWPK
593
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
595
gnutls.set_default_priority(self._c_object)
596
gnutls.transport_set_ptr(self._c_object, socket.fileno())
597
gnutls.handshake_set_private_extensions(self._c_object,
600
if credentials is None:
601
credentials = gnutls.Credentials()
602
gnutls.credentials_set(self._c_object, credentials.type,
603
ctypes.cast(credentials._c_object,
605
self.credentials = credentials
608
gnutls.deinit(self._c_object)
611
return gnutls.handshake(self._c_object)
613
def send(self, data):
617
data_len -= gnutls.record_send(self._c_object,
622
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
624
# Error handling functions
625
def _error_code(result):
626
"""A function to raise exceptions on errors, suitable
627
for the 'restype' attribute on ctypes functions"""
630
if result == gnutls.E_NO_CERTIFICATE_FOUND:
631
raise gnutls.CertificateSecurityError(code=result)
632
raise gnutls.Error(code=result)
634
def _retry_on_error(result, func, arguments):
635
"""A function to retry on some errors, suitable
636
for the 'errcheck' attribute on ctypes functions"""
638
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
639
return _error_code(result)
640
result = func(*arguments)
643
# Unless otherwise indicated, the function declarations below are
644
# all from the gnutls/gnutls.h C header file.
647
priority_set_direct = _library.gnutls_priority_set_direct
648
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
649
ctypes.POINTER(ctypes.c_char_p)]
650
priority_set_direct.restype = _error_code
652
init = _library.gnutls_init
653
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
654
init.restype = _error_code
656
set_default_priority = _library.gnutls_set_default_priority
657
set_default_priority.argtypes = [session_t]
658
set_default_priority.restype = _error_code
660
record_send = _library.gnutls_record_send
661
record_send.argtypes = [session_t, ctypes.c_void_p,
663
record_send.restype = ctypes.c_ssize_t
664
record_send.errcheck = _retry_on_error
666
certificate_allocate_credentials = (
667
_library.gnutls_certificate_allocate_credentials)
668
certificate_allocate_credentials.argtypes = [
669
ctypes.POINTER(certificate_credentials_t)]
670
certificate_allocate_credentials.restype = _error_code
672
certificate_free_credentials = (
673
_library.gnutls_certificate_free_credentials)
674
certificate_free_credentials.argtypes = [
675
certificate_credentials_t]
676
certificate_free_credentials.restype = None
678
handshake_set_private_extensions = (
679
_library.gnutls_handshake_set_private_extensions)
680
handshake_set_private_extensions.argtypes = [session_t,
682
handshake_set_private_extensions.restype = None
684
credentials_set = _library.gnutls_credentials_set
685
credentials_set.argtypes = [session_t, credentials_type_t,
687
credentials_set.restype = _error_code
689
strerror = _library.gnutls_strerror
690
strerror.argtypes = [ctypes.c_int]
691
strerror.restype = ctypes.c_char_p
693
certificate_type_get = _library.gnutls_certificate_type_get
694
certificate_type_get.argtypes = [session_t]
695
certificate_type_get.restype = _error_code
697
certificate_get_peers = _library.gnutls_certificate_get_peers
698
certificate_get_peers.argtypes = [session_t,
699
ctypes.POINTER(ctypes.c_uint)]
700
certificate_get_peers.restype = ctypes.POINTER(datum_t)
702
global_set_log_level = _library.gnutls_global_set_log_level
703
global_set_log_level.argtypes = [ctypes.c_int]
704
global_set_log_level.restype = None
706
global_set_log_function = _library.gnutls_global_set_log_function
707
global_set_log_function.argtypes = [log_func]
708
global_set_log_function.restype = None
710
deinit = _library.gnutls_deinit
711
deinit.argtypes = [session_t]
712
deinit.restype = None
714
handshake = _library.gnutls_handshake
715
handshake.argtypes = [session_t]
716
handshake.restype = _error_code
717
handshake.errcheck = _retry_on_error
719
transport_set_ptr = _library.gnutls_transport_set_ptr
720
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
721
transport_set_ptr.restype = None
723
bye = _library.gnutls_bye
724
bye.argtypes = [session_t, close_request_t]
725
bye.restype = _error_code
726
bye.errcheck = _retry_on_error
728
check_version = _library.gnutls_check_version
729
check_version.argtypes = [ctypes.c_char_p]
730
check_version.restype = ctypes.c_char_p
732
_need_version = b"3.3.0"
733
if check_version(_need_version) is None:
734
raise self.Error("Needs GnuTLS {} or later"
735
.format(_need_version))
737
_tls_rawpk_version = b"3.6.6"
738
has_rawpk = bool(check_version(_tls_rawpk_version))
742
class pubkey_st(ctypes.Structure):
744
pubkey_t = ctypes.POINTER(pubkey_st)
746
x509_crt_fmt_t = ctypes.c_int
748
# All the function declarations below are from gnutls/abstract.h
749
pubkey_init = _library.gnutls_pubkey_init
750
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
751
pubkey_init.restype = _error_code
753
pubkey_import = _library.gnutls_pubkey_import
754
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
756
pubkey_import.restype = _error_code
758
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
759
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
760
ctypes.POINTER(ctypes.c_ubyte),
761
ctypes.POINTER(ctypes.c_size_t)]
762
pubkey_get_key_id.restype = _error_code
764
pubkey_deinit = _library.gnutls_pubkey_deinit
765
pubkey_deinit.argtypes = [pubkey_t]
766
pubkey_deinit.restype = None
768
# All the function declarations below are from gnutls/openpgp.h
770
openpgp_crt_init = _library.gnutls_openpgp_crt_init
771
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
772
openpgp_crt_init.restype = _error_code
774
openpgp_crt_import = _library.gnutls_openpgp_crt_import
775
openpgp_crt_import.argtypes = [openpgp_crt_t,
776
ctypes.POINTER(datum_t),
778
openpgp_crt_import.restype = _error_code
780
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
781
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
782
ctypes.POINTER(ctypes.c_uint)]
783
openpgp_crt_verify_self.restype = _error_code
785
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
786
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
787
openpgp_crt_deinit.restype = None
789
openpgp_crt_get_fingerprint = (
790
_library.gnutls_openpgp_crt_get_fingerprint)
791
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
795
openpgp_crt_get_fingerprint.restype = _error_code
797
if check_version("3.6.4"):
798
certificate_type_get2 = _library.gnutls_certificate_type_get2
799
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
800
certificate_type_get2.restype = _error_code
802
# Remove non-public functions
803
del _error_code, _retry_on_error
806
def call_pipe(connection, # : multiprocessing.Connection
807
func, *args, **kwargs):
808
"""This function is meant to be called by multiprocessing.Process
810
This function runs func(*args, **kwargs), and writes the resulting
811
return value on the provided multiprocessing.Connection.
813
connection.send(func(*args, **kwargs))
408
817
class Client(object):
409
818
"""A representation of a client host served by this server.
412
821
approved: bool(); 'None' if not yet approved/disapproved
413
822
approval_delay: datetime.timedelta(); Time to wait for approval
601
1002
logger.info("Disabling client %s", self.name)
602
1003
if getattr(self, "disable_initiator_tag", None) is not None:
603
gobject.source_remove(self.disable_initiator_tag)
1004
GLib.source_remove(self.disable_initiator_tag)
604
1005
self.disable_initiator_tag = None
605
1006
self.expires = None
606
1007
if getattr(self, "checker_initiator_tag", None) is not None:
607
gobject.source_remove(self.checker_initiator_tag)
1008
GLib.source_remove(self.checker_initiator_tag)
608
1009
self.checker_initiator_tag = None
609
1010
self.stop_checker()
610
1011
self.enabled = False
612
1013
self.send_changedstate()
613
# Do not run this again if called by a gobject.timeout_add
1014
# Do not run this again if called by a GLib.timeout_add
616
1017
def __del__(self):
619
1020
def init_checker(self):
620
1021
# Schedule a new checker to be started an 'interval' from now,
621
1022
# and every interval from then on.
622
1023
if self.checker_initiator_tag is not None:
623
gobject.source_remove(self.checker_initiator_tag)
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
1024
GLib.source_remove(self.checker_initiator_tag)
1025
self.checker_initiator_tag = GLib.timeout_add(
1026
int(self.interval.total_seconds() * 1000),
627
1028
# Schedule a disable() when 'timeout' has passed
628
1029
if self.disable_initiator_tag is not None:
629
gobject.source_remove(self.disable_initiator_tag)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
1030
GLib.source_remove(self.disable_initiator_tag)
1031
self.disable_initiator_tag = GLib.timeout_add(
1032
int(self.timeout.total_seconds() * 1000), self.disable)
633
1033
# Also start a new checker *right now*.
634
1034
self.start_checker()
636
def checker_callback(self, pid, condition, command):
1036
def checker_callback(self, source, condition, connection,
637
1038
"""The checker has completed, so take appropriate actions."""
638
1039
self.checker_callback_tag = None
639
1040
self.checker = None
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
1041
# Read return code from connection (see call_pipe)
1042
returncode = connection.recv()
1046
self.last_checker_status = returncode
1047
self.last_checker_signal = None
642
1048
if self.last_checker_status == 0:
643
1049
logger.info("Checker for %(name)s succeeded",
645
1051
self.checked_ok()
647
logger.info("Checker for %(name)s failed",
1053
logger.info("Checker for %(name)s failed", vars(self))
650
1055
self.last_checker_status = -1
1056
self.last_checker_signal = -returncode
651
1057
logger.warning("Checker for %(name)s crashed?",
654
1061
def checked_ok(self):
655
1062
"""Assert that the client has been seen, alive and well."""
656
1063
self.last_checked_ok = datetime.datetime.utcnow()
657
1064
self.last_checker_status = 0
1065
self.last_checker_signal = None
658
1066
self.bump_timeout()
660
1068
def bump_timeout(self, timeout=None):
661
1069
"""Bump up the timeout for this client."""
662
1070
if timeout is None:
663
1071
timeout = self.timeout
664
1072
if self.disable_initiator_tag is not None:
665
gobject.source_remove(self.disable_initiator_tag)
1073
GLib.source_remove(self.disable_initiator_tag)
666
1074
self.disable_initiator_tag = None
667
1075
if getattr(self, "enabled", False):
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
1076
self.disable_initiator_tag = GLib.timeout_add(
1077
int(timeout.total_seconds() * 1000), self.disable)
671
1078
self.expires = datetime.datetime.utcnow() + timeout
673
1080
def need_approval(self):
674
1081
self.last_approval_request = datetime.datetime.utcnow()
676
1083
def start_checker(self):
677
1084
"""Start a new checker subprocess if one is not running.
679
1086
If a checker already exists, leave it running and do
681
1088
# The reason for not killing a running checker is that if we
686
1093
# checkers alone, the checker would have to take more time
687
1094
# than 'timeout' for the client to be disabled, which is as it
690
# If a checker exists, make sure it is not a zombie
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
except (AttributeError, OSError) as error:
694
if (isinstance(error, OSError)
695
and error.errno != errno.ECHILD):
699
logger.warning("Checker was a zombie")
700
gobject.source_remove(self.checker_callback_tag)
701
self.checker_callback(pid, status,
702
self.current_checker_command)
1097
if self.checker is not None and not self.checker.is_alive():
1098
logger.warning("Checker was not alive; joining")
703
1101
# Start a new checker if needed
704
1102
if self.checker is None:
705
1103
# Escape attributes for the shell
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
709
self.runtime_expansions)
1105
attr: re.escape(str(getattr(self, attr)))
1106
for attr in self.runtime_expansions}
711
1108
command = self.checker_command % escaped_attrs
712
1109
except TypeError as error:
713
1110
logger.error('Could not format string "%s"',
714
self.checker_command, exc_info=error)
715
return True # Try again later
1111
self.checker_command,
1113
return True # Try again later
716
1114
self.current_checker_command = command
718
logger.info("Starting checker %r for %s",
720
# We don't need to redirect stdout and stderr, since
721
# in normal mode, that is already done by daemon(),
722
# and in debug mode we don't want to. (Stdin is
723
# always replaced by /dev/null.)
724
# The exception is when not debugging but nevertheless
725
# running in the foreground; use the previously
728
if (not self.server_settings["debug"]
729
and self.server_settings["foreground"]):
730
popen_args.update({"stdout": wnull,
732
self.checker = subprocess.Popen(command,
736
except OSError as error:
737
logger.error("Failed to start subprocess",
740
self.checker_callback_tag = (gobject.child_watch_add
742
self.checker_callback,
744
# The checker may have completed before the gobject
745
# watch was added. Check for this.
747
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
748
except OSError as error:
749
if error.errno == errno.ECHILD:
750
# This should never happen
751
logger.error("Child process vanished",
756
gobject.source_remove(self.checker_callback_tag)
757
self.checker_callback(pid, status, command)
758
# Re-run this periodically if run by gobject.timeout_add
1115
logger.info("Starting checker %r for %s", command,
1117
# We don't need to redirect stdout and stderr, since
1118
# in normal mode, that is already done by daemon(),
1119
# and in debug mode we don't want to. (Stdin is
1120
# always replaced by /dev/null.)
1121
# The exception is when not debugging but nevertheless
1122
# running in the foreground; use the previously
1124
popen_args = {"close_fds": True,
1127
if (not self.server_settings["debug"]
1128
and self.server_settings["foreground"]):
1129
popen_args.update({"stdout": wnull,
1131
pipe = multiprocessing.Pipe(duplex=False)
1132
self.checker = multiprocessing.Process(
1134
args=(pipe[1], subprocess.call, command),
1136
self.checker.start()
1137
self.checker_callback_tag = GLib.io_add_watch(
1138
pipe[0].fileno(), GLib.IO_IN,
1139
self.checker_callback, pipe[0], command)
1140
# Re-run this periodically if run by GLib.timeout_add
761
1143
def stop_checker(self):
762
1144
"""Force the checker process, if any, to stop."""
763
1145
if self.checker_callback_tag:
764
gobject.source_remove(self.checker_callback_tag)
1146
GLib.source_remove(self.checker_callback_tag)
765
1147
self.checker_callback_tag = None
766
1148
if getattr(self, "checker", None) is None:
768
1150
logger.debug("Stopping checker for %(name)s", vars(self))
770
self.checker.terminate()
772
#if self.checker.poll() is None:
773
# self.checker.kill()
774
except OSError as error:
775
if error.errno != errno.ESRCH: # No such process
1151
self.checker.terminate()
777
1152
self.checker = None
780
def dbus_service_property(dbus_interface, signature="v",
781
access="readwrite", byte_arrays=False):
1155
def dbus_service_property(dbus_interface,
782
1159
"""Decorators for marking methods of a DBusObjectWithProperties to
783
1160
become properties on the D-Bus.
785
1162
The decorated method will be called with no arguments by "Get"
786
1163
and with one argument by "Set".
788
1165
The parameters, where they are supported, are the same as
789
1166
dbus.service.method, except there is only "signature", since the
790
1167
type from Get() and the type sent to Set() is the same.
866
class DBusObjectWithProperties(dbus.service.Object):
867
"""A D-Bus object with properties.
869
Classes inheriting from this can use the dbus_service_property
870
decorator to expose methods as D-Bus properties. It exposes the
871
standard Get(), Set(), and GetAll() methods on the D-Bus.
1250
class DBusObjectWithAnnotations(dbus.service.Object):
1251
"""A D-Bus object with annotations.
1253
Classes inheriting from this can use the dbus_annotations
1254
decorator to add annotations to methods or signals.
875
1258
def _is_dbus_thing(thing):
876
1259
"""Returns a function testing if an attribute is a D-Bus thing
878
1261
If called like _is_dbus_thing("method") it returns a function
879
1262
suitable for use as predicate to inspect.getmembers().
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1264
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
884
1267
def _get_all_dbus_things(self, thing):
885
1268
"""Returns a generator of (name, attribute) pairs
887
return ((getattr(athing.__get__(self), "_dbus_name",
1270
return ((getattr(athing.__get__(self), "_dbus_name", name),
889
1271
athing.__get__(self))
890
1272
for cls in self.__class__.__mro__
891
1273
for name, athing in
892
inspect.getmembers(cls,
893
self._is_dbus_thing(thing)))
1274
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1276
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1278
path_keyword='object_path',
1279
connection_keyword='connection')
1280
def Introspect(self, object_path, connection):
1281
"""Overloading of standard D-Bus method.
1283
Inserts annotation tags on methods and signals.
1285
xmlstring = dbus.service.Object.Introspect(self, object_path,
1288
document = xml.dom.minidom.parseString(xmlstring)
1290
for if_tag in document.getElementsByTagName("interface"):
1291
# Add annotation tags
1292
for typ in ("method", "signal"):
1293
for tag in if_tag.getElementsByTagName(typ):
1295
for name, prop in (self.
1296
_get_all_dbus_things(typ)):
1297
if (name == tag.getAttribute("name")
1298
and prop._dbus_interface
1299
== if_tag.getAttribute("name")):
1300
annots.update(getattr(
1301
prop, "_dbus_annotations", {}))
1302
for name, value in annots.items():
1303
ann_tag = document.createElement(
1305
ann_tag.setAttribute("name", name)
1306
ann_tag.setAttribute("value", value)
1307
tag.appendChild(ann_tag)
1308
# Add interface annotation tags
1309
for annotation, value in dict(
1310
itertools.chain.from_iterable(
1311
annotations().items()
1312
for name, annotations
1313
in self._get_all_dbus_things("interface")
1314
if name == if_tag.getAttribute("name")
1316
ann_tag = document.createElement("annotation")
1317
ann_tag.setAttribute("name", annotation)
1318
ann_tag.setAttribute("value", value)
1319
if_tag.appendChild(ann_tag)
1320
# Fix argument name for the Introspect method itself
1321
if (if_tag.getAttribute("name")
1322
== dbus.INTROSPECTABLE_IFACE):
1323
for cn in if_tag.getElementsByTagName("method"):
1324
if cn.getAttribute("name") == "Introspect":
1325
for arg in cn.getElementsByTagName("arg"):
1326
if (arg.getAttribute("direction")
1328
arg.setAttribute("name",
1330
xmlstring = document.toxml("utf-8")
1332
except (AttributeError, xml.dom.DOMException,
1333
xml.parsers.expat.ExpatError) as error:
1334
logger.error("Failed to override Introspection method",
1339
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1340
"""A D-Bus object with properties.
1342
Classes inheriting from this can use the dbus_service_property
1343
decorator to expose methods as D-Bus properties. It exposes the
1344
standard Get(), Set(), and GetAll() methods on the D-Bus.
895
1347
def _get_dbus_property(self, interface_name, property_name):
896
1348
"""Returns a bound method if one exists which is a D-Bus
897
1349
property with the specified name and interface.
899
for cls in self.__class__.__mro__:
900
for name, value in (inspect.getmembers
902
self._is_dbus_thing("property"))):
1351
for cls in self.__class__.__mro__:
1352
for name, value in inspect.getmembers(
1353
cls, self._is_dbus_thing("property")):
903
1354
if (value._dbus_name == property_name
904
1355
and value._dbus_interface == interface_name):
905
1356
return value.__get__(self)
907
1358
# No such property
908
raise DBusPropertyNotFound(self.dbus_object_path + ":"
909
+ interface_name + "."
912
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1359
raise DBusPropertyNotFound("{}:{}.{}".format(
1360
self.dbus_object_path, interface_name, property_name))
1363
def _get_all_interface_names(cls):
1364
"""Get a sequence of all interfaces supported by an object"""
1365
return (name for name in set(getattr(getattr(x, attr),
1366
"_dbus_interface", None)
1367
for x in (inspect.getmro(cls))
1369
if name is not None)
1371
@dbus.service.method(dbus.PROPERTIES_IFACE,
913
1373
out_signature="v")
914
1374
def Get(self, interface_name, property_name):
915
1375
"""Standard D-Bus property Get() method, see D-Bus standard.
1045
1504
return xmlstring
1508
dbus.OBJECT_MANAGER_IFACE
1509
except AttributeError:
1510
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1513
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1514
"""A D-Bus object with an ObjectManager.
1516
Classes inheriting from this exposes the standard
1517
GetManagedObjects call and the InterfacesAdded and
1518
InterfacesRemoved signals on the standard
1519
"org.freedesktop.DBus.ObjectManager" interface.
1521
Note: No signals are sent automatically; they must be sent
1524
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1525
out_signature="a{oa{sa{sv}}}")
1526
def GetManagedObjects(self):
1527
"""This function must be overridden"""
1528
raise NotImplementedError()
1530
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1531
signature="oa{sa{sv}}")
1532
def InterfacesAdded(self, object_path, interfaces_and_properties):
1535
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1536
def InterfacesRemoved(self, object_path, interfaces):
1539
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1541
path_keyword='object_path',
1542
connection_keyword='connection')
1543
def Introspect(self, object_path, connection):
1544
"""Overloading of standard D-Bus method.
1546
Override return argument name of GetManagedObjects to be
1547
"objpath_interfaces_and_properties"
1549
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1553
document = xml.dom.minidom.parseString(xmlstring)
1555
for if_tag in document.getElementsByTagName("interface"):
1556
# Fix argument name for the GetManagedObjects method
1557
if (if_tag.getAttribute("name")
1558
== dbus.OBJECT_MANAGER_IFACE):
1559
for cn in if_tag.getElementsByTagName("method"):
1560
if (cn.getAttribute("name")
1561
== "GetManagedObjects"):
1562
for arg in cn.getElementsByTagName("arg"):
1563
if (arg.getAttribute("direction")
1567
"objpath_interfaces"
1569
xmlstring = document.toxml("utf-8")
1571
except (AttributeError, xml.dom.DOMException,
1572
xml.parsers.expat.ExpatError) as error:
1573
logger.error("Failed to override Introspection method",
1048
1578
def datetime_to_dbus(dt, variant_level=0):
1049
1579
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1051
return dbus.String("", variant_level = variant_level)
1052
return dbus.String(dt.isoformat(),
1053
variant_level=variant_level)
1581
return dbus.String("", variant_level=variant_level)
1582
return dbus.String(dt.isoformat(), variant_level=variant_level)
1056
1585
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1086
1616
# Ignore non-D-Bus attributes, and D-Bus attributes
1087
1617
# with the wrong interface name
1088
1618
if (not hasattr(attribute, "_dbus_interface")
1089
or not attribute._dbus_interface
1090
.startswith(orig_interface_name)):
1619
or not attribute._dbus_interface.startswith(
1620
orig_interface_name)):
1092
1622
# Create an alternate D-Bus interface name based on
1093
1623
# the current name
1094
alt_interface = (attribute._dbus_interface
1095
.replace(orig_interface_name,
1096
alt_interface_name))
1624
alt_interface = attribute._dbus_interface.replace(
1625
orig_interface_name, alt_interface_name)
1097
1626
interface_names.add(alt_interface)
1098
1627
# Is this a D-Bus signal?
1099
1628
if getattr(attribute, "_dbus_is_signal", False):
1100
1629
# Extract the original non-method undecorated
1101
1630
# function by black magic
1102
nonmethod_func = (dict(
1631
if sys.version_info.major == 2:
1632
nonmethod_func = (dict(
1103
1633
zip(attribute.func_code.co_freevars,
1104
attribute.__closure__))["func"]
1634
attribute.__closure__))
1635
["func"].cell_contents)
1637
nonmethod_func = (dict(
1638
zip(attribute.__code__.co_freevars,
1639
attribute.__closure__))
1640
["func"].cell_contents)
1106
1641
# Create a new, but exactly alike, function
1107
1642
# object, and decorate it to be a new D-Bus signal
1108
1643
# with the alternate D-Bus interface name
1109
new_function = (dbus.service.signal
1111
attribute._dbus_signature)
1112
(types.FunctionType(
1113
nonmethod_func.func_code,
1114
nonmethod_func.func_globals,
1115
nonmethod_func.func_name,
1116
nonmethod_func.func_defaults,
1117
nonmethod_func.func_closure)))
1644
new_function = copy_function(nonmethod_func)
1645
new_function = (dbus.service.signal(
1647
attribute._dbus_signature)(new_function))
1118
1648
# Copy annotations, if any
1120
new_function._dbus_annotations = (
1121
dict(attribute._dbus_annotations))
1650
new_function._dbus_annotations = dict(
1651
attribute._dbus_annotations)
1122
1652
except AttributeError:
1124
1655
# Define a creator of a function to call both the
1125
1656
# original and alternate functions, so both the
1126
1657
# original and alternate signals gets sent when
1409
1946
server to mandos-client
1413
1950
# Rejected - signal
1414
1951
@dbus.service.signal(_interface, signature="s")
1415
1952
def Rejected(self, reason):
1419
1956
# NeedApproval - signal
1420
1957
@dbus.service.signal(_interface, signature="tb")
1421
1958
def NeedApproval(self, timeout, default):
1423
1960
return self.need_approval()
1427
1964
# Approve - method
1428
1965
@dbus.service.method(_interface, in_signature="b")
1429
1966
def Approve(self, value):
1430
1967
self.approve(value)
1432
1969
# CheckedOK - method
1433
1970
@dbus.service.method(_interface)
1434
1971
def CheckedOK(self):
1435
1972
self.checked_ok()
1437
1974
# Enable - method
1975
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1438
1976
@dbus.service.method(_interface)
1439
1977
def Enable(self):
1443
1981
# StartChecker - method
1982
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1444
1983
@dbus.service.method(_interface)
1445
1984
def StartChecker(self):
1447
1986
self.start_checker()
1449
1988
# Disable - method
1989
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1450
1990
@dbus.service.method(_interface)
1451
1991
def Disable(self):
1455
1995
# StopChecker - method
1996
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1456
1997
@dbus.service.method(_interface)
1457
1998
def StopChecker(self):
1458
1999
self.stop_checker()
1462
2003
# ApprovalPending - property
1463
2004
@dbus_service_property(_interface, signature="b", access="read")
1464
2005
def ApprovalPending_dbus_property(self):
1465
2006
return dbus.Boolean(bool(self.approvals_pending))
1467
2008
# ApprovedByDefault - property
1468
@dbus_service_property(_interface, signature="b",
2009
@dbus_service_property(_interface,
1469
2011
access="readwrite")
1470
2012
def ApprovedByDefault_dbus_property(self, value=None):
1471
2013
if value is None: # get
1472
2014
return dbus.Boolean(self.approved_by_default)
1473
2015
self.approved_by_default = bool(value)
1475
2017
# ApprovalDelay - property
1476
@dbus_service_property(_interface, signature="t",
2018
@dbus_service_property(_interface,
1477
2020
access="readwrite")
1478
2021
def ApprovalDelay_dbus_property(self, value=None):
1479
2022
if value is None: # get
1480
return dbus.UInt64(self.approval_delay_milliseconds())
2023
return dbus.UInt64(self.approval_delay.total_seconds()
1481
2025
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1483
2027
# ApprovalDuration - property
1484
@dbus_service_property(_interface, signature="t",
2028
@dbus_service_property(_interface,
1485
2030
access="readwrite")
1486
2031
def ApprovalDuration_dbus_property(self, value=None):
1487
2032
if value is None: # get
1488
return dbus.UInt64(timedelta_to_milliseconds(
1489
self.approval_duration))
2033
return dbus.UInt64(self.approval_duration.total_seconds()
1490
2035
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1492
2037
# Name - property
2039
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1493
2040
@dbus_service_property(_interface, signature="s", access="read")
1494
2041
def Name_dbus_property(self):
1495
2042
return dbus.String(self.name)
2046
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2047
@dbus_service_property(_interface, signature="s", access="read")
2048
def KeyID_dbus_property(self):
2049
return dbus.String(self.key_id)
1497
2051
# Fingerprint - property
2053
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1498
2054
@dbus_service_property(_interface, signature="s", access="read")
1499
2055
def Fingerprint_dbus_property(self):
1500
2056
return dbus.String(self.fingerprint)
1502
2058
# Host - property
1503
@dbus_service_property(_interface, signature="s",
2059
@dbus_service_property(_interface,
1504
2061
access="readwrite")
1505
2062
def Host_dbus_property(self, value=None):
1506
2063
if value is None: # get
1507
2064
return dbus.String(self.host)
1508
self.host = unicode(value)
2065
self.host = str(value)
1510
2067
# Created - property
2069
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1511
2070
@dbus_service_property(_interface, signature="s", access="read")
1512
2071
def Created_dbus_property(self):
1513
2072
return datetime_to_dbus(self.created)
1515
2074
# LastEnabled - property
1516
2075
@dbus_service_property(_interface, signature="s", access="read")
1517
2076
def LastEnabled_dbus_property(self):
1518
2077
return datetime_to_dbus(self.last_enabled)
1520
2079
# Enabled - property
1521
@dbus_service_property(_interface, signature="b",
2080
@dbus_service_property(_interface,
1522
2082
access="readwrite")
1523
2083
def Enabled_dbus_property(self, value=None):
1524
2084
if value is None: # get
1572
2133
if (getattr(self, "disable_initiator_tag", None)
1575
gobject.source_remove(self.disable_initiator_tag)
1576
self.disable_initiator_tag = (
1577
gobject.timeout_add(
1578
timedelta_to_milliseconds(self.expires - now),
2136
GLib.source_remove(self.disable_initiator_tag)
2137
self.disable_initiator_tag = GLib.timeout_add(
2138
int((self.expires - now).total_seconds() * 1000),
1581
2141
# ExtendedTimeout - property
1582
@dbus_service_property(_interface, signature="t",
2142
@dbus_service_property(_interface,
1583
2144
access="readwrite")
1584
2145
def ExtendedTimeout_dbus_property(self, value=None):
1585
2146
if value is None: # get
1586
return dbus.UInt64(self.extended_timeout_milliseconds())
2147
return dbus.UInt64(self.extended_timeout.total_seconds()
1587
2149
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1589
2151
# Interval - property
1590
@dbus_service_property(_interface, signature="t",
2152
@dbus_service_property(_interface,
1591
2154
access="readwrite")
1592
2155
def Interval_dbus_property(self, value=None):
1593
2156
if value is None: # get
1594
return dbus.UInt64(self.interval_milliseconds())
2157
return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
2158
self.interval = datetime.timedelta(0, 0, 0, value)
1596
2159
if getattr(self, "checker_initiator_tag", None) is None:
1598
2161
if self.enabled:
1599
2162
# Reschedule checker run
1600
gobject.source_remove(self.checker_initiator_tag)
1601
self.checker_initiator_tag = (gobject.timeout_add
1602
(value, self.start_checker))
1603
self.start_checker() # Start one now, too
2163
GLib.source_remove(self.checker_initiator_tag)
2164
self.checker_initiator_tag = GLib.timeout_add(
2165
value, self.start_checker)
2166
self.start_checker() # Start one now, too
1605
2168
# Checker - property
1606
@dbus_service_property(_interface, signature="s",
2169
@dbus_service_property(_interface,
1607
2171
access="readwrite")
1608
2172
def Checker_dbus_property(self, value=None):
1609
2173
if value is None: # get
1610
2174
return dbus.String(self.checker_command)
1611
self.checker_command = unicode(value)
2175
self.checker_command = str(value)
1613
2177
# CheckerRunning - property
1614
@dbus_service_property(_interface, signature="b",
2178
@dbus_service_property(_interface,
1615
2180
access="readwrite")
1616
2181
def CheckerRunning_dbus_property(self, value=None):
1617
2182
if value is None: # get
1664
2239
class ClientHandler(socketserver.BaseRequestHandler, object):
1665
2240
"""A class to handle client connections.
1667
2242
Instantiated once for each connection to handle it.
1668
2243
Note: This will run in its own forked process."""
1670
2245
def handle(self):
1671
2246
with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
2247
logger.info("TCP connection from: %s",
1673
unicode(self.client_address))
2248
str(self.client_address))
1674
2249
logger.debug("Pipe FD: %d",
1675
2250
self.server.child_pipe.fileno())
1677
session = (gnutls.connection
1678
.ClientSession(self.request,
1680
.X509Credentials()))
1682
# Note: gnutls.connection.X509Credentials is really a
1683
# generic GnuTLS certificate credentials object so long as
1684
# no X.509 keys are added to it. Therefore, we can use it
1685
# here despite using OpenPGP certificates.
1687
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1688
# "+AES-256-CBC", "+SHA1",
1689
# "+COMP-NULL", "+CTYPE-OPENPGP",
2252
session = gnutls.ClientSession(self.request)
2254
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2255
# "+AES-256-CBC", "+SHA1",
2256
# "+COMP-NULL", "+CTYPE-OPENPGP",
1691
2258
# Use a fallback default, since this MUST be set.
1692
2259
priority = self.server.gnutls_priority
1693
2260
if priority is None:
1694
2261
priority = "NORMAL"
1695
(gnutls.library.functions
1696
.gnutls_priority_set_direct(session._c_object,
2262
gnutls.priority_set_direct(session._c_object,
2263
priority.encode("utf-8"),
1699
2266
# Start communication using the Mandos protocol
1700
2267
# Get protocol number
1701
2268
line = self.request.makefile().readline()
1702
2269
logger.debug("Protocol version: %r", line)
1704
2271
if int(line.strip().split()[0]) > 1:
2272
raise RuntimeError(line)
1706
2273
except (ValueError, IndexError, RuntimeError) as error:
1707
2274
logger.error("Unknown protocol version: %s", error)
1710
2277
# Start GnuTLS connection
1712
2279
session.handshake()
1713
except gnutls.errors.GNUTLSError as error:
2280
except gnutls.Error as error:
1714
2281
logger.warning("Handshake failed: %s", error)
1715
2282
# Do not run session.bye() here: the session is not
1716
2283
# established. Just abandon the request.
1718
2285
logger.debug("Handshake succeeded")
1720
2287
approval_required = False
1723
fpr = self.fingerprint(self.peer_certificate
1726
gnutls.errors.GNUTLSError) as error:
1727
logger.warning("Bad certificate: %s", error)
1729
logger.debug("Fingerprint: %s", fpr)
1732
client = ProxyClient(child_pipe, fpr,
2289
if gnutls.has_rawpk:
2292
key_id = self.key_id(
2293
self.peer_certificate(session))
2294
except (TypeError, gnutls.Error) as error:
2295
logger.warning("Bad certificate: %s", error)
2297
logger.debug("Key ID: %s", key_id)
2302
fpr = self.fingerprint(
2303
self.peer_certificate(session))
2304
except (TypeError, gnutls.Error) as error:
2305
logger.warning("Bad certificate: %s", error)
2307
logger.debug("Fingerprint: %s", fpr)
2310
client = ProxyClient(child_pipe, key_id, fpr,
1733
2311
self.client_address)
1734
2312
except KeyError:
1737
2315
if client.approval_delay:
1738
2316
delay = client.approval_delay
1739
2317
client.approvals_pending += 1
1740
2318
approval_required = True
1743
2321
if not client.enabled:
1744
2322
logger.info("Client %s is disabled",
1746
2324
if self.server.use_dbus:
1747
2325
# Emit D-Bus signal
1748
2326
client.Rejected("Disabled")
1751
2329
if client.approved or not client.approval_delay:
1752
#We are approved or approval is disabled
2330
# We are approved or approval is disabled
1754
2332
elif client.approved is None:
1755
2333
logger.info("Client %s needs approval",
1790
2366
delay -= time2 - time
1793
while sent_size < len(client.secret):
1795
sent = session.send(client.secret[sent_size:])
1796
except gnutls.errors.GNUTLSError as error:
1797
logger.warning("gnutls send failed",
1800
logger.debug("Sent: %d, remaining: %d",
1801
sent, len(client.secret)
1802
- (sent_size + sent))
2369
session.send(client.secret)
2370
except gnutls.Error as error:
2371
logger.warning("gnutls send failed",
1805
2375
logger.info("Sending secret to %s", client.name)
1806
2376
# bump the timeout using extended_timeout
1807
2377
client.bump_timeout(client.extended_timeout)
1808
2378
if self.server.use_dbus:
1809
2379
# Emit D-Bus signal
1810
2380
client.GotSecret()
1813
2383
if approval_required:
1814
2384
client.approvals_pending -= 1
1817
except gnutls.errors.GNUTLSError as error:
2387
except gnutls.Error as error:
1818
2388
logger.warning("GnuTLS bye failed",
1819
2389
exc_info=error)
1822
2392
def peer_certificate(session):
1823
"Return the peer's OpenPGP certificate as a bytestring"
1824
# If not an OpenPGP certificate...
1825
if (gnutls.library.functions
1826
.gnutls_certificate_type_get(session._c_object)
1827
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1828
# ...do the normal thing
1829
return session.peer_certificate
2393
"Return the peer's certificate as a bytestring"
2395
cert_type = gnutls.certificate_type_get2(session._c_object,
2397
except AttributeError:
2398
cert_type = gnutls.certificate_type_get(session._c_object)
2399
if gnutls.has_rawpk:
2400
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2402
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2403
# If not a valid certificate type...
2404
if cert_type not in valid_cert_types:
2405
logger.info("Cert type %r not in %r", cert_type,
2407
# ...return invalid data
1830
2409
list_size = ctypes.c_uint(1)
1831
cert_list = (gnutls.library.functions
1832
.gnutls_certificate_get_peers
2410
cert_list = (gnutls.certificate_get_peers
1833
2411
(session._c_object, ctypes.byref(list_size)))
1834
2412
if not bool(cert_list) and list_size.value != 0:
1835
raise gnutls.errors.GNUTLSError("error getting peer"
2413
raise gnutls.Error("error getting peer certificate")
1837
2414
if list_size.value == 0:
1839
2416
cert = cert_list[0]
1840
2417
return ctypes.string_at(cert.data, cert.size)
2420
def key_id(certificate):
2421
"Convert a certificate bytestring to a hexdigit key ID"
2422
# New GnuTLS "datum" with the public key
2423
datum = gnutls.datum_t(
2424
ctypes.cast(ctypes.c_char_p(certificate),
2425
ctypes.POINTER(ctypes.c_ubyte)),
2426
ctypes.c_uint(len(certificate)))
2427
# XXX all these need to be created in the gnutls "module"
2428
# New empty GnuTLS certificate
2429
pubkey = gnutls.pubkey_t()
2430
gnutls.pubkey_init(ctypes.byref(pubkey))
2431
# Import the raw public key into the certificate
2432
gnutls.pubkey_import(pubkey,
2433
ctypes.byref(datum),
2434
gnutls.X509_FMT_DER)
2435
# New buffer for the key ID
2436
buf = ctypes.create_string_buffer(32)
2437
buf_len = ctypes.c_size_t(len(buf))
2438
# Get the key ID from the raw public key into the buffer
2439
gnutls.pubkey_get_key_id(pubkey,
2440
gnutls.KEYID_USE_SHA256,
2441
ctypes.cast(ctypes.byref(buf),
2442
ctypes.POINTER(ctypes.c_ubyte)),
2443
ctypes.byref(buf_len))
2444
# Deinit the certificate
2445
gnutls.pubkey_deinit(pubkey)
2447
# Convert the buffer to a Python bytestring
2448
key_id = ctypes.string_at(buf, buf_len.value)
2449
# Convert the bytestring to hexadecimal notation
2450
hex_key_id = binascii.hexlify(key_id).upper()
1843
2454
def fingerprint(openpgp):
1844
2455
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1845
2456
# New GnuTLS "datum" with the OpenPGP public key
1846
datum = (gnutls.library.types
1847
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1850
ctypes.c_uint(len(openpgp))))
2457
datum = gnutls.datum_t(
2458
ctypes.cast(ctypes.c_char_p(openpgp),
2459
ctypes.POINTER(ctypes.c_ubyte)),
2460
ctypes.c_uint(len(openpgp)))
1851
2461
# New empty GnuTLS certificate
1852
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1853
(gnutls.library.functions
1854
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2462
crt = gnutls.openpgp_crt_t()
2463
gnutls.openpgp_crt_init(ctypes.byref(crt))
1855
2464
# Import the OpenPGP public key into the certificate
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1858
gnutls.library.constants
1859
.GNUTLS_OPENPGP_FMT_RAW))
2465
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2466
gnutls.OPENPGP_FMT_RAW)
1860
2467
# Verify the self signature in the key
1861
2468
crtverify = ctypes.c_uint()
1862
(gnutls.library.functions
1863
.gnutls_openpgp_crt_verify_self(crt, 0,
1864
ctypes.byref(crtverify)))
2469
gnutls.openpgp_crt_verify_self(crt, 0,
2470
ctypes.byref(crtverify))
1865
2471
if crtverify.value != 0:
1866
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1867
raise (gnutls.errors.CertificateSecurityError
2472
gnutls.openpgp_crt_deinit(crt)
2473
raise gnutls.CertificateSecurityError(code
1869
2475
# New buffer for the fingerprint
1870
2476
buf = ctypes.create_string_buffer(20)
1871
2477
buf_len = ctypes.c_size_t()
1872
2478
# Get the fingerprint from the certificate into the buffer
1873
(gnutls.library.functions
1874
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1875
ctypes.byref(buf_len)))
2479
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2480
ctypes.byref(buf_len))
1876
2481
# Deinit the certificate
1877
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2482
gnutls.openpgp_crt_deinit(crt)
1878
2483
# Convert the buffer to a Python bytestring
1879
2484
fpr = ctypes.string_at(buf, buf_len.value)
1880
2485
# Convert the bytestring to hexadecimal notation
1885
2490
class MultiprocessingMixIn(object):
1886
2491
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1887
2493
def sub_process_main(self, request, address):
1889
2495
self.finish_request(request, address)
1890
2496
except Exception:
1891
2497
self.handle_error(request, address)
1892
2498
self.close_request(request)
1894
2500
def process_request(self, request, address):
1895
2501
"""Start a new process to process the request."""
1896
proc = multiprocessing.Process(target = self.sub_process_main,
1897
args = (request, address))
2502
proc = multiprocessing.Process(target=self.sub_process_main,
2503
args=(request, address))
1902
2508
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1903
2509
""" adds a pipe to the MixIn """
1904
2511
def process_request(self, request, client_address):
1905
2512
"""Overrides and wraps the original process_request().
1907
2514
This function creates a new pipe in self.pipe
1909
2516
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1911
2518
proc = MultiprocessingMixIn.process_request(self, request,
1912
2519
client_address)
1913
2520
self.child_pipe.close()
1914
2521
self.add_pipe(parent_pipe, proc)
1916
2523
def add_pipe(self, parent_pipe, proc):
1917
2524
"""Dummy function; override as necessary"""
1918
raise NotImplementedError
2525
raise NotImplementedError()
1921
2528
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1922
2529
socketserver.TCPServer, object):
1923
2530
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1926
2533
enabled: Boolean; whether this server is activated yet
1927
2534
interface: None or a network interface name (string)
1928
2535
use_ipv6: Boolean; to use IPv6 or not
1930
2538
def __init__(self, server_address, RequestHandlerClass,
1931
interface=None, use_ipv6=True, socketfd=None):
1932
2542
"""If socketfd is set, use that file descriptor instead of
1933
2543
creating a new one with socket.socket().
1963
2574
# socket_wrapper(), if socketfd was set.
1964
2575
socketserver.TCPServer.__init__(self, server_address,
1965
2576
RequestHandlerClass)
1967
2578
def server_bind(self):
1968
2579
"""This overrides the normal server_bind() function
1969
2580
to bind to an interface if one was specified, and also NOT to
1970
2581
bind to an address or port if they were not specified."""
2582
global SO_BINDTODEVICE
1971
2583
if self.interface is not None:
1972
2584
if SO_BINDTODEVICE is None:
1973
logger.error("SO_BINDTODEVICE does not exist;"
1974
" cannot bind to interface %s",
1978
self.socket.setsockopt(socket.SOL_SOCKET,
1980
str(self.interface + '\0'))
1981
except socket.error as error:
1982
if error.errno == errno.EPERM:
1983
logger.error("No permission to bind to"
1984
" interface %s", self.interface)
1985
elif error.errno == errno.ENOPROTOOPT:
1986
logger.error("SO_BINDTODEVICE not available;"
1987
" cannot bind to interface %s",
1989
elif error.errno == errno.ENODEV:
1990
logger.error("Interface %s does not exist,"
1991
" cannot bind", self.interface)
2585
# Fall back to a hard-coded value which seems to be
2587
logger.warning("SO_BINDTODEVICE not found, trying 25")
2588
SO_BINDTODEVICE = 25
2590
self.socket.setsockopt(
2591
socket.SOL_SOCKET, SO_BINDTODEVICE,
2592
(self.interface + "\0").encode("utf-8"))
2593
except socket.error as error:
2594
if error.errno == errno.EPERM:
2595
logger.error("No permission to bind to"
2596
" interface %s", self.interface)
2597
elif error.errno == errno.ENOPROTOOPT:
2598
logger.error("SO_BINDTODEVICE not available;"
2599
" cannot bind to interface %s",
2601
elif error.errno == errno.ENODEV:
2602
logger.error("Interface %s does not exist,"
2603
" cannot bind", self.interface)
1994
2606
# Only bind(2) the socket if we really need to.
1995
2607
if self.server_address[0] or self.server_address[1]:
1996
2608
if not self.server_address[0]:
1997
2609
if self.address_family == socket.AF_INET6:
1998
any_address = "::" # in6addr_any
2610
any_address = "::" # in6addr_any
2000
any_address = "0.0.0.0" # INADDR_ANY
2612
any_address = "0.0.0.0" # INADDR_ANY
2001
2613
self.server_address = (any_address,
2002
2614
self.server_address[1])
2003
2615
elif not self.server_address[1]:
2004
self.server_address = (self.server_address[0],
2616
self.server_address = (self.server_address[0], 0)
2006
2617
# if self.interface:
2007
2618
# self.server_address = (self.server_address[0],
2033
2649
self.gnutls_priority = gnutls_priority
2034
2650
IPv6_TCPServer.__init__(self, server_address,
2035
2651
RequestHandlerClass,
2036
interface = interface,
2037
use_ipv6 = use_ipv6,
2038
socketfd = socketfd)
2652
interface=interface,
2039
2656
def server_activate(self):
2040
2657
if self.enabled:
2041
2658
return socketserver.TCPServer.server_activate(self)
2043
2660
def enable(self):
2044
2661
self.enabled = True
2046
2663
def add_pipe(self, parent_pipe, proc):
2047
2664
# Call "handle_ipc" for both data and EOF events
2048
gobject.io_add_watch(parent_pipe.fileno(),
2049
gobject.IO_IN | gobject.IO_HUP,
2050
functools.partial(self.handle_ipc,
2055
def handle_ipc(self, source, condition, parent_pipe=None,
2056
proc = None, client_object=None):
2666
parent_pipe.fileno(),
2667
GLib.IO_IN | GLib.IO_HUP,
2668
functools.partial(self.handle_ipc,
2669
parent_pipe=parent_pipe,
2672
def handle_ipc(self, source, condition,
2675
client_object=None):
2057
2676
# error, or the other end of multiprocessing.Pipe has closed
2058
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2677
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2059
2678
# Wait for other process to exit
2063
2682
# Read a request from the child
2064
2683
request = parent_pipe.recv()
2065
2684
command = request[0]
2067
2686
if command == 'init':
2069
address = request[2]
2071
for c in self.clients.itervalues():
2072
if c.fingerprint == fpr:
2687
key_id = request[1].decode("ascii")
2688
fpr = request[2].decode("ascii")
2689
address = request[3]
2691
for c in self.clients.values():
2692
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2694
if key_id and c.key_id == key_id:
2697
if fpr and c.fingerprint == fpr:
2076
logger.info("Client not found for fingerprint: %s, ad"
2077
"dress: %s", fpr, address)
2701
logger.info("Client not found for key ID: %s, address"
2702
": %s", key_id or fpr, address)
2078
2703
if self.use_dbus:
2079
2704
# Emit D-Bus signal
2080
mandos_dbus_service.ClientNotFound(fpr,
2705
mandos_dbus_service.ClientNotFound(key_id or fpr,
2082
2707
parent_pipe.send(False)
2085
gobject.io_add_watch(parent_pipe.fileno(),
2086
gobject.IO_IN | gobject.IO_HUP,
2087
functools.partial(self.handle_ipc,
2711
parent_pipe.fileno(),
2712
GLib.IO_IN | GLib.IO_HUP,
2713
functools.partial(self.handle_ipc,
2714
parent_pipe=parent_pipe,
2716
client_object=client))
2093
2717
parent_pipe.send(True)
2094
2718
# remove the old hook in favor of the new above hook on
2384
3018
server_settings["socket"] = os.dup(server_settings
2386
3020
del server_config
2388
3022
# Override the settings from the config file with command line
2389
3023
# options, if set.
2390
3024
for option in ("interface", "address", "port", "debug",
2391
"priority", "servicename", "configdir",
2392
"use_dbus", "use_ipv6", "debuglevel", "restore",
2393
"statedir", "socket", "foreground"):
3025
"priority", "servicename", "configdir", "use_dbus",
3026
"use_ipv6", "debuglevel", "restore", "statedir",
3027
"socket", "foreground", "zeroconf"):
2394
3028
value = getattr(options, option)
2395
3029
if value is not None:
2396
3030
server_settings[option] = value
2398
3032
# Force all strings to be unicode
2399
3033
for option in server_settings.keys():
2400
if type(server_settings[option]) is str:
2401
server_settings[option] = unicode(server_settings[option])
3034
if isinstance(server_settings[option], bytes):
3035
server_settings[option] = (server_settings[option]
2402
3037
# Force all boolean options to be boolean
2403
3038
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3039
"foreground", "zeroconf"):
2405
3040
server_settings[option] = bool(server_settings[option])
2406
3041
# Debug implies foreground
2407
3042
if server_settings["debug"]:
2408
3043
server_settings["foreground"] = True
2409
3044
# Now we have our good server settings in "server_settings"
2411
3046
##################################################################
3048
if (not server_settings["zeroconf"]
3049
and not (server_settings["port"]
3050
or server_settings["socket"] != "")):
3051
parser.error("Needs port or socket to work without Zeroconf")
2413
3053
# For convenience
2414
3054
debug = server_settings["debug"]
2415
3055
debuglevel = server_settings["debuglevel"]
3125
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2480
3127
except OSError as error:
3128
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3129
.format(uid, gid, os.strerror(error.errno)))
2481
3130
if error.errno != errno.EPERM:
2485
3134
# Enable all possible GnuTLS debugging
2487
3136
# "Use a log level over 10 to enable all debugging options."
2488
3137
# - GnuTLS manual
2489
gnutls.library.functions.gnutls_global_set_log_level(11)
2491
@gnutls.library.types.gnutls_log_func
3138
gnutls.global_set_log_level(11)
2492
3141
def debug_gnutls(level, string):
2493
3142
logger.debug("GnuTLS: %s", string[:-1])
2495
(gnutls.library.functions
2496
.gnutls_global_set_log_function(debug_gnutls))
3144
gnutls.global_set_log_function(debug_gnutls)
2498
3146
# Redirect stdin so all checkers get /dev/null
2499
3147
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2500
3148
os.dup2(null, sys.stdin.fileno())
2504
3152
# Need to fork before connecting to D-Bus
2505
3153
if not foreground:
2506
3154
# Close all input and output, do double fork, etc.
2509
# multiprocessing will use threads, so before we use gobject we
2510
# need to inform gobject that threads will be used.
2511
gobject.threads_init()
3157
# multiprocessing will use threads, so before we use GLib we need
3158
# to inform GLib that threads will be used.
2513
3161
global main_loop
2514
3162
# From the Avahi example code
2515
3163
DBusGMainLoop(set_as_default=True)
2516
main_loop = gobject.MainLoop()
3164
main_loop = GLib.MainLoop()
2517
3165
bus = dbus.SystemBus()
2518
3166
# End of Avahi example code
2521
3169
bus_name = dbus.service.BusName("se.recompile.Mandos",
2522
bus, do_not_queue=True)
2523
old_bus_name = (dbus.service.BusName
2524
("se.bsnet.fukt.Mandos", bus,
2526
except dbus.exceptions.NameExistsException as e:
3172
old_bus_name = dbus.service.BusName(
3173
"se.bsnet.fukt.Mandos", bus,
3175
except dbus.exceptions.DBusException as e:
2527
3176
logger.error("Disabling D-Bus:", exc_info=e)
2528
3177
use_dbus = False
2529
3178
server_settings["use_dbus"] = False
2530
3179
tcp_server.use_dbus = False
2531
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2532
service = AvahiServiceToSyslog(name =
2533
server_settings["servicename"],
2534
servicetype = "_mandos._tcp",
2535
protocol = protocol, bus = bus)
2536
if server_settings["interface"]:
2537
service.interface = (if_nametoindex
2538
(str(server_settings["interface"])))
3181
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3182
service = AvahiServiceToSyslog(
3183
name=server_settings["servicename"],
3184
servicetype="_mandos._tcp",
3187
if server_settings["interface"]:
3188
service.interface = if_nametoindex(
3189
server_settings["interface"].encode("utf-8"))
2540
3191
global multiprocessing_manager
2541
3192
multiprocessing_manager = multiprocessing.Manager()
2543
3194
client_class = Client
2545
client_class = functools.partial(ClientDBus, bus = bus)
3196
client_class = functools.partial(ClientDBus, bus=bus)
2547
3198
client_settings = Client.config_parser(client_config)
2548
3199
old_client_settings = {}
2549
3200
clients_data = {}
2551
3202
# This is used to redirect stdout and stderr for checker processes
2553
wnull = open(os.devnull, "w") # A writable /dev/null
3204
wnull = open(os.devnull, "w") # A writable /dev/null
2554
3205
# Only used if server is running in foreground but not in debug
2556
3207
if debug or not foreground:
2559
3210
# Get client data and settings from last running state.
2560
3211
if server_settings["restore"]:
2562
3213
with open(stored_state_path, "rb") as stored_state:
2563
clients_data, old_client_settings = (pickle.load
3214
if sys.version_info.major == 2:
3215
clients_data, old_client_settings = pickle.load(
3218
bytes_clients_data, bytes_old_client_settings = (
3219
pickle.load(stored_state, encoding="bytes"))
3220
# Fix bytes to strings
3223
clients_data = {(key.decode("utf-8")
3224
if isinstance(key, bytes)
3227
bytes_clients_data.items()}
3228
del bytes_clients_data
3229
for key in clients_data:
3230
value = {(k.decode("utf-8")
3231
if isinstance(k, bytes) else k): v
3233
clients_data[key].items()}
3234
clients_data[key] = value
3236
value["client_structure"] = [
3238
if isinstance(s, bytes)
3240
value["client_structure"]]
3242
for k in ("name", "host"):
3243
if isinstance(value[k], bytes):
3244
value[k] = value[k].decode("utf-8")
3245
if not value.has_key("key_id"):
3246
value["key_id"] = ""
3247
elif not value.has_key("fingerprint"):
3248
value["fingerprint"] = ""
3249
# old_client_settings
3251
old_client_settings = {
3252
(key.decode("utf-8")
3253
if isinstance(key, bytes)
3256
bytes_old_client_settings.items()}
3257
del bytes_old_client_settings
3259
for value in old_client_settings.values():
3260
if isinstance(value["host"], bytes):
3261
value["host"] = (value["host"]
2565
3263
os.remove(stored_state_path)
2566
3264
except IOError as e:
2567
3265
if e.errno == errno.ENOENT:
2568
logger.warning("Could not load persistent state: {0}"
2569
.format(os.strerror(e.errno)))
3266
logger.warning("Could not load persistent state:"
3267
" {}".format(os.strerror(e.errno)))
2571
3269
logger.critical("Could not load persistent state:",
2574
3272
except EOFError as e:
2575
3273
logger.warning("Could not load persistent state: "
2576
"EOFError:", exc_info=e)
2578
3277
with PGPEngine() as pgp:
2579
for client_name, client in clients_data.iteritems():
3278
for client_name, client in clients_data.items():
2580
3279
# Skip removed clients
2581
3280
if client_name not in client_settings:
2584
3283
# Decide which value to use after restoring saved state.
2585
3284
# We have three different values: Old config file,
2586
3285
# new config file, and saved state.
2644
3343
for client_name in (set(client_settings)
2645
3344
- set(old_client_settings)):
2646
3345
clients_data[client_name] = client_settings[client_name]
2648
3347
# Create all client objects
2649
for client_name, client in clients_data.iteritems():
3348
for client_name, client in clients_data.items():
2650
3349
tcp_server.clients[client_name] = client_class(
2651
name = client_name, settings = client,
2652
server_settings = server_settings)
3352
server_settings=server_settings)
2654
3354
if not tcp_server.clients:
2655
3355
logger.warning("No clients defined")
2657
3357
if not foreground:
2658
3358
if pidfile is not None:
2662
pidfile.write(str(pid) + "\n".encode("utf-8"))
3362
print(pid, file=pidfile)
2663
3363
except IOError:
2664
3364
logger.error("Could not write to file %r with PID %d",
2665
3365
pidfilename, pid)
2667
3367
del pidfilename
2669
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2670
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3369
for termsig in (signal.SIGHUP, signal.SIGTERM):
3370
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3371
lambda: main_loop.quit() and False)
2673
@alternate_dbus_interfaces({"se.recompile.Mandos":
2674
"se.bsnet.fukt.Mandos"})
2675
class MandosDBusService(DBusObjectWithProperties):
3375
@alternate_dbus_interfaces(
3376
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3377
class MandosDBusService(DBusObjectWithObjectManager):
2676
3378
"""A D-Bus proxy object"""
2677
3380
def __init__(self):
2678
3381
dbus.service.Object.__init__(self, bus, "/")
2679
3383
_interface = "se.recompile.Mandos"
2681
@dbus_interface_annotations(_interface)
2683
return { "org.freedesktop.DBus.Property"
2684
".EmitsChangedSignal":
2687
3385
@dbus.service.signal(_interface, signature="o")
2688
3386
def ClientAdded(self, objpath):
2692
3390
@dbus.service.signal(_interface, signature="ss")
2693
def ClientNotFound(self, fingerprint, address):
3391
def ClientNotFound(self, key_id, address):
3395
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2697
3397
@dbus.service.signal(_interface, signature="os")
2698
3398
def ClientRemoved(self, objpath, name):
3402
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2702
3404
@dbus.service.method(_interface, out_signature="ao")
2703
3405
def GetAllClients(self):
2705
return dbus.Array(c.dbus_object_path
2707
tcp_server.clients.itervalues())
3407
return dbus.Array(c.dbus_object_path for c in
3408
tcp_server.clients.values())
3410
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2709
3412
@dbus.service.method(_interface,
2710
3413
out_signature="a{oa{sv}}")
2711
3414
def GetAllClientsWithProperties(self):
2713
3416
return dbus.Dictionary(
2714
((c.dbus_object_path, c.GetAll(""))
2715
for c in tcp_server.clients.itervalues()),
3417
{c.dbus_object_path: c.GetAll(
3418
"se.recompile.Mandos.Client")
3419
for c in tcp_server.clients.values()},
2716
3420
signature="oa{sv}")
2718
3422
@dbus.service.method(_interface, in_signature="o")
2719
3423
def RemoveClient(self, object_path):
2721
for c in tcp_server.clients.itervalues():
3425
for c in tcp_server.clients.values():
2722
3426
if c.dbus_object_path == object_path:
2723
3427
del tcp_server.clients[c.name]
2724
3428
c.remove_from_connection()
2725
# Don't signal anything except ClientRemoved
3429
# Don't signal the disabling
2726
3430
c.disable(quiet=True)
2728
self.ClientRemoved(object_path, c.name)
3431
# Emit D-Bus signal for removal
3432
self.client_removed_signal(c)
2730
3434
raise KeyError(object_path)
3438
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3439
out_signature="a{oa{sa{sv}}}")
3440
def GetManagedObjects(self):
3442
return dbus.Dictionary(
3443
{client.dbus_object_path:
3445
{interface: client.GetAll(interface)
3447
client._get_all_interface_names()})
3448
for client in tcp_server.clients.values()})
3450
def client_added_signal(self, client):
3451
"""Send the new standard signal and the old signal"""
3453
# New standard signal
3454
self.InterfacesAdded(
3455
client.dbus_object_path,
3457
{interface: client.GetAll(interface)
3459
client._get_all_interface_names()}))
3461
self.ClientAdded(client.dbus_object_path)
3463
def client_removed_signal(self, client):
3464
"""Send the new standard signal and the old signal"""
3466
# New standard signal
3467
self.InterfacesRemoved(
3468
client.dbus_object_path,
3469
client._get_all_interface_names())
3471
self.ClientRemoved(client.dbus_object_path,
2734
3474
mandos_dbus_service = MandosDBusService()
3476
# Save modules to variables to exempt the modules from being
3477
# unloaded before the function registered with atexit() is run.
3478
mp = multiprocessing
2737
3482
"Cleanup function; run on exit"
2740
multiprocessing.active_children()
3486
mp.active_children()
2742
3488
if not (tcp_server.clients or client_settings):
2745
3491
# Store client before exiting. Secrets are encrypted with key
2746
3492
# based on what config file has. If config file is
2747
3493
# removed/edited, old secret will thus be unrecovable.
2749
3495
with PGPEngine() as pgp:
2750
for client in tcp_server.clients.itervalues():
3496
for client in tcp_server.clients.values():
2751
3497
key = client_settings[client.name]["secret"]
2752
3498
client.encrypted_secret = pgp.encrypt(client.secret,
2754
3500
client_dict = {}
2756
3502
# A list of attributes that can not be pickled
2758
exclude = set(("bus", "changedstate", "secret",
2759
"checker", "server_settings"))
2760
for name, typ in (inspect.getmembers
2761
(dbus.service.Object)):
3504
exclude = {"bus", "changedstate", "secret",
3505
"checker", "server_settings"}
3506
for name, typ in inspect.getmembers(dbus.service
2762
3508
exclude.add(name)
2764
3510
client_dict["encrypted_secret"] = (client
2765
3511
.encrypted_secret)
2766
3512
for attr in client.client_structure:
2767
3513
if attr not in exclude:
2768
3514
client_dict[attr] = getattr(client, attr)
2770
3516
clients[client.name] = client_dict
2771
3517
del client_settings[client.name]["secret"]
2774
with (tempfile.NamedTemporaryFile
2775
(mode='wb', suffix=".pickle", prefix='clients-',
2776
dir=os.path.dirname(stored_state_path),
2777
delete=False)) as stored_state:
2778
pickle.dump((clients, client_settings), stored_state)
2779
tempname=stored_state.name
3520
with tempfile.NamedTemporaryFile(
3524
dir=os.path.dirname(stored_state_path),
3525
delete=False) as stored_state:
3526
pickle.dump((clients, client_settings), stored_state,
3528
tempname = stored_state.name
2780
3529
os.rename(tempname, stored_state_path)
2781
3530
except (IOError, OSError) as e: