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-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2018 Teddy Hogeborn
15
# Copyright © 2008-2018 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'
169
226
os.rmdir(self.tempdir)
170
227
self.tempdir = None
172
229
def password_encode(self, password):
173
230
# Passphrase can not be empty and can not contain newlines or
174
231
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
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"))
177
240
def encrypt(self, data, password):
178
241
passphrase = self.password_encode(password)
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
181
244
passfile.write(passphrase)
183
proc = subprocess.Popen(['gpg', '--symmetric',
246
proc = subprocess.Popen([self.gpg, '--symmetric',
184
247
'--passphrase-file',
186
249
+ self.gnupgargs,
187
stdin = subprocess.PIPE,
188
stdout = subprocess.PIPE,
189
stderr = subprocess.PIPE)
190
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)
191
254
if proc.returncode != 0:
192
255
raise PGPError(err)
193
256
return ciphertext
195
258
def decrypt(self, data, password):
196
259
passphrase = self.password_encode(password)
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
199
262
passfile.write(passphrase)
201
proc = subprocess.Popen(['gpg', '--decrypt',
264
proc = subprocess.Popen([self.gpg, '--decrypt',
202
265
'--passphrase-file',
204
267
+ self.gnupgargs,
205
stdin = subprocess.PIPE,
206
stdout = subprocess.PIPE,
207
stderr = subprocess.PIPE)
208
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)
210
272
if proc.returncode != 0:
211
273
raise PGPError(err)
212
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
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
215
304
class AvahiError(Exception):
216
305
def __init__(self, value, *args, **kwargs):
217
306
self.value = value
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
307
return super(AvahiError, self).__init__(value, *args,
222
311
class AvahiServiceError(AvahiError):
225
315
class AvahiGroupError(AvahiError):
229
319
class AvahiService(object):
230
320
"""An Avahi (Zeroconf) service.
233
323
interface: integer; avahi.IF_UNSPEC or an interface index.
234
324
Used to optionally bind to the specified interface.
377
489
follow_name_owner_changes=True),
378
490
avahi.DBUS_INTERFACE_SERVER)
379
491
self.server.connect_to_signal("StateChanged",
380
self.server_state_changed)
492
self.server_state_changed)
381
493
self.server_state_changed(self.server.GetState())
384
496
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
386
498
"""Add the new name to the syslog messages"""
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
500
syslogger.setFormatter(logging.Formatter(
501
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
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"
519
# Need to use "self" here, since this method is called before
520
# the assignment to the "gnutls" global variable happens.
521
if self.check_version(self._need_version) is None:
522
raise self.Error("Needs GnuTLS {} or later"
523
.format(self._need_version))
525
# Unless otherwise indicated, the constants and types below are
526
# all from the gnutls/gnutls.h C header file.
536
E_NO_CERTIFICATE_FOUND = -49
537
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
540
class session_int(ctypes.Structure):
542
session_t = ctypes.POINTER(session_int)
544
class certificate_credentials_st(ctypes.Structure):
546
certificate_credentials_t = ctypes.POINTER(
547
certificate_credentials_st)
548
certificate_type_t = ctypes.c_int
550
class datum_t(ctypes.Structure):
551
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
('size', ctypes.c_uint)]
554
class openpgp_crt_int(ctypes.Structure):
556
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
credentials_type_t = ctypes.c_int
560
transport_ptr_t = ctypes.c_void_p
561
close_request_t = ctypes.c_int
564
class Error(Exception):
565
# We need to use the class name "GnuTLS" here, since this
566
# exception might be raised from within GnuTLS.__init__,
567
# which is called before the assignment to the "gnutls"
568
# global variable has happened.
569
def __init__(self, message=None, code=None, args=()):
570
# Default usage is by a message string, but if a return
571
# code is passed, convert it to a string with
574
if message is None and code is not None:
575
message = GnuTLS.strerror(code)
576
return super(GnuTLS.Error, self).__init__(
579
class CertificateSecurityError(Error):
583
class Credentials(object):
585
self._c_object = gnutls.certificate_credentials_t()
586
gnutls.certificate_allocate_credentials(
587
ctypes.byref(self._c_object))
588
self.type = gnutls.CRD_CERTIFICATE
591
gnutls.certificate_free_credentials(self._c_object)
593
class ClientSession(object):
594
def __init__(self, socket, credentials=None):
595
self._c_object = gnutls.session_t()
596
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
597
gnutls.set_default_priority(self._c_object)
598
gnutls.transport_set_ptr(self._c_object, socket.fileno())
599
gnutls.handshake_set_private_extensions(self._c_object,
602
if credentials is None:
603
credentials = gnutls.Credentials()
604
gnutls.credentials_set(self._c_object, credentials.type,
605
ctypes.cast(credentials._c_object,
607
self.credentials = credentials
610
gnutls.deinit(self._c_object)
613
return gnutls.handshake(self._c_object)
615
def send(self, data):
619
data_len -= gnutls.record_send(self._c_object,
624
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
626
# Error handling functions
627
def _error_code(result):
628
"""A function to raise exceptions on errors, suitable
629
for the 'restype' attribute on ctypes functions"""
632
if result == gnutls.E_NO_CERTIFICATE_FOUND:
633
raise gnutls.CertificateSecurityError(code=result)
634
raise gnutls.Error(code=result)
636
def _retry_on_error(result, func, arguments):
637
"""A function to retry on some errors, suitable
638
for the 'errcheck' attribute on ctypes functions"""
640
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
641
return _error_code(result)
642
result = func(*arguments)
645
# Unless otherwise indicated, the function declarations below are
646
# all from the gnutls/gnutls.h C header file.
649
priority_set_direct = _library.gnutls_priority_set_direct
650
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
651
ctypes.POINTER(ctypes.c_char_p)]
652
priority_set_direct.restype = _error_code
654
init = _library.gnutls_init
655
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
656
init.restype = _error_code
658
set_default_priority = _library.gnutls_set_default_priority
659
set_default_priority.argtypes = [session_t]
660
set_default_priority.restype = _error_code
662
record_send = _library.gnutls_record_send
663
record_send.argtypes = [session_t, ctypes.c_void_p,
665
record_send.restype = ctypes.c_ssize_t
666
record_send.errcheck = _retry_on_error
668
certificate_allocate_credentials = (
669
_library.gnutls_certificate_allocate_credentials)
670
certificate_allocate_credentials.argtypes = [
671
ctypes.POINTER(certificate_credentials_t)]
672
certificate_allocate_credentials.restype = _error_code
674
certificate_free_credentials = (
675
_library.gnutls_certificate_free_credentials)
676
certificate_free_credentials.argtypes = [
677
certificate_credentials_t]
678
certificate_free_credentials.restype = None
680
handshake_set_private_extensions = (
681
_library.gnutls_handshake_set_private_extensions)
682
handshake_set_private_extensions.argtypes = [session_t,
684
handshake_set_private_extensions.restype = None
686
credentials_set = _library.gnutls_credentials_set
687
credentials_set.argtypes = [session_t, credentials_type_t,
689
credentials_set.restype = _error_code
691
strerror = _library.gnutls_strerror
692
strerror.argtypes = [ctypes.c_int]
693
strerror.restype = ctypes.c_char_p
695
certificate_type_get = _library.gnutls_certificate_type_get
696
certificate_type_get.argtypes = [session_t]
697
certificate_type_get.restype = _error_code
699
certificate_get_peers = _library.gnutls_certificate_get_peers
700
certificate_get_peers.argtypes = [session_t,
701
ctypes.POINTER(ctypes.c_uint)]
702
certificate_get_peers.restype = ctypes.POINTER(datum_t)
704
global_set_log_level = _library.gnutls_global_set_log_level
705
global_set_log_level.argtypes = [ctypes.c_int]
706
global_set_log_level.restype = None
708
global_set_log_function = _library.gnutls_global_set_log_function
709
global_set_log_function.argtypes = [log_func]
710
global_set_log_function.restype = None
712
deinit = _library.gnutls_deinit
713
deinit.argtypes = [session_t]
714
deinit.restype = None
716
handshake = _library.gnutls_handshake
717
handshake.argtypes = [session_t]
718
handshake.restype = _error_code
719
handshake.errcheck = _retry_on_error
721
transport_set_ptr = _library.gnutls_transport_set_ptr
722
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
723
transport_set_ptr.restype = None
725
bye = _library.gnutls_bye
726
bye.argtypes = [session_t, close_request_t]
727
bye.restype = _error_code
728
bye.errcheck = _retry_on_error
730
check_version = _library.gnutls_check_version
731
check_version.argtypes = [ctypes.c_char_p]
732
check_version.restype = ctypes.c_char_p
734
# All the function declarations below are from gnutls/openpgp.h
736
openpgp_crt_init = _library.gnutls_openpgp_crt_init
737
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
738
openpgp_crt_init.restype = _error_code
740
openpgp_crt_import = _library.gnutls_openpgp_crt_import
741
openpgp_crt_import.argtypes = [openpgp_crt_t,
742
ctypes.POINTER(datum_t),
744
openpgp_crt_import.restype = _error_code
746
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
747
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
748
ctypes.POINTER(ctypes.c_uint)]
749
openpgp_crt_verify_self.restype = _error_code
751
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
752
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
753
openpgp_crt_deinit.restype = None
755
openpgp_crt_get_fingerprint = (
756
_library.gnutls_openpgp_crt_get_fingerprint)
757
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
761
openpgp_crt_get_fingerprint.restype = _error_code
763
# Remove non-public functions
764
del _error_code, _retry_on_error
765
# Create the global "gnutls" object, simulating a module
769
def call_pipe(connection, # : multiprocessing.Connection
770
func, *args, **kwargs):
771
"""This function is meant to be called by multiprocessing.Process
773
This function runs func(*args, **kwargs), and writes the resulting
774
return value on the provided multiprocessing.Connection.
776
connection.send(func(*args, **kwargs))
402
780
class Client(object):
403
781
"""A representation of a client host served by this server.
406
784
approved: bool(); 'None' if not yet approved/disapproved
407
785
approval_delay: datetime.timedelta(); Time to wait for approval
595
960
logger.info("Disabling client %s", self.name)
596
961
if getattr(self, "disable_initiator_tag", None) is not None:
597
gobject.source_remove(self.disable_initiator_tag)
962
GLib.source_remove(self.disable_initiator_tag)
598
963
self.disable_initiator_tag = None
599
964
self.expires = None
600
965
if getattr(self, "checker_initiator_tag", None) is not None:
601
gobject.source_remove(self.checker_initiator_tag)
966
GLib.source_remove(self.checker_initiator_tag)
602
967
self.checker_initiator_tag = None
603
968
self.stop_checker()
604
969
self.enabled = False
606
971
self.send_changedstate()
607
# Do not run this again if called by a gobject.timeout_add
972
# Do not run this again if called by a GLib.timeout_add
610
975
def __del__(self):
613
978
def init_checker(self):
614
979
# Schedule a new checker to be started an 'interval' from now,
615
980
# and every interval from then on.
616
981
if self.checker_initiator_tag is not None:
617
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
982
GLib.source_remove(self.checker_initiator_tag)
983
self.checker_initiator_tag = GLib.timeout_add(
984
int(self.interval.total_seconds() * 1000),
621
986
# Schedule a disable() when 'timeout' has passed
622
987
if self.disable_initiator_tag is not None:
623
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
988
GLib.source_remove(self.disable_initiator_tag)
989
self.disable_initiator_tag = GLib.timeout_add(
990
int(self.timeout.total_seconds() * 1000), self.disable)
627
991
# Also start a new checker *right now*.
628
992
self.start_checker()
630
def checker_callback(self, pid, condition, command):
994
def checker_callback(self, source, condition, connection,
631
996
"""The checker has completed, so take appropriate actions."""
632
997
self.checker_callback_tag = None
633
998
self.checker = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
999
# Read return code from connection (see call_pipe)
1000
returncode = connection.recv()
1004
self.last_checker_status = returncode
1005
self.last_checker_signal = None
636
1006
if self.last_checker_status == 0:
637
1007
logger.info("Checker for %(name)s succeeded",
639
1009
self.checked_ok()
641
logger.info("Checker for %(name)s failed",
1011
logger.info("Checker for %(name)s failed", vars(self))
644
1013
self.last_checker_status = -1
1014
self.last_checker_signal = -returncode
645
1015
logger.warning("Checker for %(name)s crashed?",
648
1019
def checked_ok(self):
649
1020
"""Assert that the client has been seen, alive and well."""
650
1021
self.last_checked_ok = datetime.datetime.utcnow()
651
1022
self.last_checker_status = 0
1023
self.last_checker_signal = None
652
1024
self.bump_timeout()
654
1026
def bump_timeout(self, timeout=None):
655
1027
"""Bump up the timeout for this client."""
656
1028
if timeout is None:
657
1029
timeout = self.timeout
658
1030
if self.disable_initiator_tag is not None:
659
gobject.source_remove(self.disable_initiator_tag)
1031
GLib.source_remove(self.disable_initiator_tag)
660
1032
self.disable_initiator_tag = None
661
1033
if getattr(self, "enabled", False):
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
1034
self.disable_initiator_tag = GLib.timeout_add(
1035
int(timeout.total_seconds() * 1000), self.disable)
665
1036
self.expires = datetime.datetime.utcnow() + timeout
667
1038
def need_approval(self):
668
1039
self.last_approval_request = datetime.datetime.utcnow()
670
1041
def start_checker(self):
671
1042
"""Start a new checker subprocess if one is not running.
673
1044
If a checker already exists, leave it running and do
675
1046
# The reason for not killing a running checker is that if we
680
1051
# checkers alone, the checker would have to take more time
681
1052
# than 'timeout' for the client to be disabled, which is as it
684
# If a checker exists, make sure it is not a zombie
686
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
693
logger.warning("Checker was a zombie")
694
gobject.source_remove(self.checker_callback_tag)
695
self.checker_callback(pid, status,
696
self.current_checker_command)
1055
if self.checker is not None and not self.checker.is_alive():
1056
logger.warning("Checker was not alive; joining")
697
1059
# Start a new checker if needed
698
1060
if self.checker is None:
699
1061
# Escape attributes for the shell
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
1063
attr: re.escape(str(getattr(self, attr)))
1064
for attr in self.runtime_expansions}
705
1066
command = self.checker_command % escaped_attrs
706
1067
except TypeError as error:
707
1068
logger.error('Could not format string "%s"',
708
self.checker_command, exc_info=error)
709
return True # Try again later
1069
self.checker_command,
1071
return True # Try again later
710
1072
self.current_checker_command = command
712
logger.info("Starting checker %r for %s",
714
# We don't need to redirect stdout and stderr, since
715
# in normal mode, that is already done by daemon(),
716
# and in debug mode we don't want to. (Stdin is
717
# always replaced by /dev/null.)
718
# The exception is when not debugging but nevertheless
719
# running in the foreground; use the previously
722
if (not self.server_settings["debug"]
723
and self.server_settings["foreground"]):
724
popen_args.update({"stdout": wnull,
726
self.checker = subprocess.Popen(command,
730
except OSError as error:
731
logger.error("Failed to start subprocess",
734
self.checker_callback_tag = (gobject.child_watch_add
736
self.checker_callback,
738
# The checker may have completed before the gobject
739
# watch was added. Check for this.
741
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
742
except OSError as error:
743
if error.errno == errno.ECHILD:
744
# This should never happen
745
logger.error("Child process vanished",
750
gobject.source_remove(self.checker_callback_tag)
751
self.checker_callback(pid, status, command)
752
# Re-run this periodically if run by gobject.timeout_add
1073
logger.info("Starting checker %r for %s", command,
1075
# We don't need to redirect stdout and stderr, since
1076
# in normal mode, that is already done by daemon(),
1077
# and in debug mode we don't want to. (Stdin is
1078
# always replaced by /dev/null.)
1079
# The exception is when not debugging but nevertheless
1080
# running in the foreground; use the previously
1082
popen_args = {"close_fds": True,
1085
if (not self.server_settings["debug"]
1086
and self.server_settings["foreground"]):
1087
popen_args.update({"stdout": wnull,
1089
pipe = multiprocessing.Pipe(duplex=False)
1090
self.checker = multiprocessing.Process(
1092
args=(pipe[1], subprocess.call, command),
1094
self.checker.start()
1095
self.checker_callback_tag = GLib.io_add_watch(
1096
pipe[0].fileno(), GLib.IO_IN,
1097
self.checker_callback, pipe[0], command)
1098
# Re-run this periodically if run by GLib.timeout_add
755
1101
def stop_checker(self):
756
1102
"""Force the checker process, if any, to stop."""
757
1103
if self.checker_callback_tag:
758
gobject.source_remove(self.checker_callback_tag)
1104
GLib.source_remove(self.checker_callback_tag)
759
1105
self.checker_callback_tag = None
760
1106
if getattr(self, "checker", None) is None:
762
1108
logger.debug("Stopping checker for %(name)s", vars(self))
764
self.checker.terminate()
766
#if self.checker.poll() is None:
767
# self.checker.kill()
768
except OSError as error:
769
if error.errno != errno.ESRCH: # No such process
1109
self.checker.terminate()
771
1110
self.checker = None
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
1113
def dbus_service_property(dbus_interface,
776
1117
"""Decorators for marking methods of a DBusObjectWithProperties to
777
1118
become properties on the D-Bus.
779
1120
The decorated method will be called with no arguments by "Get"
780
1121
and with one argument by "Set".
782
1123
The parameters, where they are supported, are the same as
783
1124
dbus.service.method, except there is only "signature", since the
784
1125
type from Get() and the type sent to Set() is the same.
860
class DBusObjectWithProperties(dbus.service.Object):
861
"""A D-Bus object with properties.
863
Classes inheriting from this can use the dbus_service_property
864
decorator to expose methods as D-Bus properties. It exposes the
865
standard Get(), Set(), and GetAll() methods on the D-Bus.
1208
class DBusObjectWithAnnotations(dbus.service.Object):
1209
"""A D-Bus object with annotations.
1211
Classes inheriting from this can use the dbus_annotations
1212
decorator to add annotations to methods or signals.
869
1216
def _is_dbus_thing(thing):
870
1217
"""Returns a function testing if an attribute is a D-Bus thing
872
1219
If called like _is_dbus_thing("method") it returns a function
873
1220
suitable for use as predicate to inspect.getmembers().
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1222
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
878
1225
def _get_all_dbus_things(self, thing):
879
1226
"""Returns a generator of (name, attribute) pairs
881
return ((getattr(athing.__get__(self), "_dbus_name",
1228
return ((getattr(athing.__get__(self), "_dbus_name", name),
883
1229
athing.__get__(self))
884
1230
for cls in self.__class__.__mro__
885
1231
for name, athing in
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
1232
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1234
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1236
path_keyword='object_path',
1237
connection_keyword='connection')
1238
def Introspect(self, object_path, connection):
1239
"""Overloading of standard D-Bus method.
1241
Inserts annotation tags on methods and signals.
1243
xmlstring = dbus.service.Object.Introspect(self, object_path,
1246
document = xml.dom.minidom.parseString(xmlstring)
1248
for if_tag in document.getElementsByTagName("interface"):
1249
# Add annotation tags
1250
for typ in ("method", "signal"):
1251
for tag in if_tag.getElementsByTagName(typ):
1253
for name, prop in (self.
1254
_get_all_dbus_things(typ)):
1255
if (name == tag.getAttribute("name")
1256
and prop._dbus_interface
1257
== if_tag.getAttribute("name")):
1258
annots.update(getattr(
1259
prop, "_dbus_annotations", {}))
1260
for name, value in annots.items():
1261
ann_tag = document.createElement(
1263
ann_tag.setAttribute("name", name)
1264
ann_tag.setAttribute("value", value)
1265
tag.appendChild(ann_tag)
1266
# Add interface annotation tags
1267
for annotation, value in dict(
1268
itertools.chain.from_iterable(
1269
annotations().items()
1270
for name, annotations
1271
in self._get_all_dbus_things("interface")
1272
if name == if_tag.getAttribute("name")
1274
ann_tag = document.createElement("annotation")
1275
ann_tag.setAttribute("name", annotation)
1276
ann_tag.setAttribute("value", value)
1277
if_tag.appendChild(ann_tag)
1278
# Fix argument name for the Introspect method itself
1279
if (if_tag.getAttribute("name")
1280
== dbus.INTROSPECTABLE_IFACE):
1281
for cn in if_tag.getElementsByTagName("method"):
1282
if cn.getAttribute("name") == "Introspect":
1283
for arg in cn.getElementsByTagName("arg"):
1284
if (arg.getAttribute("direction")
1286
arg.setAttribute("name",
1288
xmlstring = document.toxml("utf-8")
1290
except (AttributeError, xml.dom.DOMException,
1291
xml.parsers.expat.ExpatError) as error:
1292
logger.error("Failed to override Introspection method",
1297
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1298
"""A D-Bus object with properties.
1300
Classes inheriting from this can use the dbus_service_property
1301
decorator to expose methods as D-Bus properties. It exposes the
1302
standard Get(), Set(), and GetAll() methods on the D-Bus.
889
1305
def _get_dbus_property(self, interface_name, property_name):
890
1306
"""Returns a bound method if one exists which is a D-Bus
891
1307
property with the specified name and interface.
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
self._is_dbus_thing("property"))):
1309
for cls in self.__class__.__mro__:
1310
for name, value in inspect.getmembers(
1311
cls, self._is_dbus_thing("property")):
897
1312
if (value._dbus_name == property_name
898
1313
and value._dbus_interface == interface_name):
899
1314
return value.__get__(self)
901
1316
# No such property
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1317
raise DBusPropertyNotFound("{}:{}.{}".format(
1318
self.dbus_object_path, interface_name, property_name))
1321
def _get_all_interface_names(cls):
1322
"""Get a sequence of all interfaces supported by an object"""
1323
return (name for name in set(getattr(getattr(x, attr),
1324
"_dbus_interface", None)
1325
for x in (inspect.getmro(cls))
1327
if name is not None)
1329
@dbus.service.method(dbus.PROPERTIES_IFACE,
907
1331
out_signature="v")
908
1332
def Get(self, interface_name, property_name):
909
1333
"""Standard D-Bus property Get() method, see D-Bus standard.
1039
1462
return xmlstring
1466
dbus.OBJECT_MANAGER_IFACE
1467
except AttributeError:
1468
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1471
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1472
"""A D-Bus object with an ObjectManager.
1474
Classes inheriting from this exposes the standard
1475
GetManagedObjects call and the InterfacesAdded and
1476
InterfacesRemoved signals on the standard
1477
"org.freedesktop.DBus.ObjectManager" interface.
1479
Note: No signals are sent automatically; they must be sent
1482
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1483
out_signature="a{oa{sa{sv}}}")
1484
def GetManagedObjects(self):
1485
"""This function must be overridden"""
1486
raise NotImplementedError()
1488
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1489
signature="oa{sa{sv}}")
1490
def InterfacesAdded(self, object_path, interfaces_and_properties):
1493
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1494
def InterfacesRemoved(self, object_path, interfaces):
1497
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1499
path_keyword='object_path',
1500
connection_keyword='connection')
1501
def Introspect(self, object_path, connection):
1502
"""Overloading of standard D-Bus method.
1504
Override return argument name of GetManagedObjects to be
1505
"objpath_interfaces_and_properties"
1507
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1511
document = xml.dom.minidom.parseString(xmlstring)
1513
for if_tag in document.getElementsByTagName("interface"):
1514
# Fix argument name for the GetManagedObjects method
1515
if (if_tag.getAttribute("name")
1516
== dbus.OBJECT_MANAGER_IFACE):
1517
for cn in if_tag.getElementsByTagName("method"):
1518
if (cn.getAttribute("name")
1519
== "GetManagedObjects"):
1520
for arg in cn.getElementsByTagName("arg"):
1521
if (arg.getAttribute("direction")
1525
"objpath_interfaces"
1527
xmlstring = document.toxml("utf-8")
1529
except (AttributeError, xml.dom.DOMException,
1530
xml.parsers.expat.ExpatError) as error:
1531
logger.error("Failed to override Introspection method",
1042
1536
def datetime_to_dbus(dt, variant_level=0):
1043
1537
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1045
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1539
return dbus.String("", variant_level=variant_level)
1540
return dbus.String(dt.isoformat(), variant_level=variant_level)
1050
1543
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1080
1574
# Ignore non-D-Bus attributes, and D-Bus attributes
1081
1575
# with the wrong interface name
1082
1576
if (not hasattr(attribute, "_dbus_interface")
1083
or not attribute._dbus_interface
1084
.startswith(orig_interface_name)):
1577
or not attribute._dbus_interface.startswith(
1578
orig_interface_name)):
1086
1580
# Create an alternate D-Bus interface name based on
1087
1581
# the current name
1088
alt_interface = (attribute._dbus_interface
1089
.replace(orig_interface_name,
1090
alt_interface_name))
1582
alt_interface = attribute._dbus_interface.replace(
1583
orig_interface_name, alt_interface_name)
1091
1584
interface_names.add(alt_interface)
1092
1585
# Is this a D-Bus signal?
1093
1586
if getattr(attribute, "_dbus_is_signal", False):
1094
1587
# Extract the original non-method undecorated
1095
1588
# function by black magic
1096
nonmethod_func = (dict(
1589
if sys.version_info.major == 2:
1590
nonmethod_func = (dict(
1097
1591
zip(attribute.func_code.co_freevars,
1098
attribute.__closure__))["func"]
1592
attribute.__closure__))
1593
["func"].cell_contents)
1595
nonmethod_func = (dict(
1596
zip(attribute.__code__.co_freevars,
1597
attribute.__closure__))
1598
["func"].cell_contents)
1100
1599
# Create a new, but exactly alike, function
1101
1600
# object, and decorate it to be a new D-Bus signal
1102
1601
# with the alternate D-Bus interface name
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)))
1602
new_function = copy_function(nonmethod_func)
1603
new_function = (dbus.service.signal(
1605
attribute._dbus_signature)(new_function))
1112
1606
# Copy annotations, if any
1114
new_function._dbus_annotations = (
1115
dict(attribute._dbus_annotations))
1608
new_function._dbus_annotations = dict(
1609
attribute._dbus_annotations)
1116
1610
except AttributeError:
1118
1613
# Define a creator of a function to call both the
1119
1614
# original and alternate functions, so both the
1120
1615
# original and alternate signals gets sent when
1210
1698
if interface_names:
1211
1699
# Replace the class with a new subclass of it with
1212
1700
# methods, signals, etc. as created above.
1213
cls = type(b"{0}Alternate".format(cls.__name__),
1701
if sys.version_info.major == 2:
1702
cls = type(b"{}Alternate".format(cls.__name__),
1705
cls = type("{}Alternate".format(cls.__name__),
1219
1712
@alternate_dbus_interfaces({"se.recompile.Mandos":
1220
"se.bsnet.fukt.Mandos"})
1713
"se.bsnet.fukt.Mandos"})
1221
1714
class ClientDBus(Client, DBusObjectWithProperties):
1222
1715
"""A Client class using D-Bus
1225
1718
dbus_object_path: dbus.ObjectPath
1226
1719
bus: dbus.SystemBus()
1229
1722
runtime_expansions = (Client.runtime_expansions
1230
+ ("dbus_object_path",))
1723
+ ("dbus_object_path", ))
1725
_interface = "se.recompile.Mandos.Client"
1232
1727
# dbus.service.Object doesn't use super(), so we can't either.
1234
def __init__(self, bus = None, *args, **kwargs):
1729
def __init__(self, bus=None, *args, **kwargs):
1236
1731
Client.__init__(self, *args, **kwargs)
1237
1732
# Only now, when this client is initialized, can it show up on
1239
client_object_name = unicode(self.name).translate(
1734
client_object_name = str(self.name).translate(
1240
1735
{ord("."): ord("_"),
1241
1736
ord("-"): ord("_")})
1242
self.dbus_object_path = (dbus.ObjectPath
1243
("/clients/" + client_object_name))
1737
self.dbus_object_path = dbus.ObjectPath(
1738
"/clients/" + client_object_name)
1244
1739
DBusObjectWithProperties.__init__(self, self.bus,
1245
1740
self.dbus_object_path)
1247
def notifychangeproperty(transform_func,
1248
dbus_name, type_func=lambda x: x,
1742
def notifychangeproperty(transform_func, dbus_name,
1743
type_func=lambda x: x,
1745
invalidate_only=False,
1746
_interface=_interface):
1250
1747
""" Modify a variable so that it's a property which announces
1251
1748
its changes to DBus.
1253
1750
transform_fun: Function that takes a value and a variant_level
1254
1751
and transforms it to a D-Bus type.
1255
1752
dbus_name: D-Bus name of the variable
1320
1828
if hasattr(DBusObjectWithProperties, "__del__"):
1321
1829
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1322
1830
Client.__del__(self, *args, **kwargs)
1324
def checker_callback(self, pid, condition, command,
1326
self.checker_callback_tag = None
1328
if os.WIFEXITED(condition):
1329
exitstatus = os.WEXITSTATUS(condition)
1832
def checker_callback(self, source, condition,
1833
connection, command, *args, **kwargs):
1834
ret = Client.checker_callback(self, source, condition,
1835
connection, command, *args,
1837
exitstatus = self.last_checker_status
1330
1839
# Emit D-Bus signal
1331
1840
self.CheckerCompleted(dbus.Int16(exitstatus),
1332
dbus.Int64(condition),
1841
# This is specific to GNU libC
1842
dbus.Int64(exitstatus << 8),
1333
1843
dbus.String(command))
1335
1845
# Emit D-Bus signal
1336
1846
self.CheckerCompleted(dbus.Int16(-1),
1337
dbus.Int64(condition),
1848
# This is specific to GNU libC
1850
| self.last_checker_signal),
1338
1851
dbus.String(command))
1340
return Client.checker_callback(self, pid, condition, command,
1343
1854
def start_checker(self, *args, **kwargs):
1344
old_checker = self.checker
1345
if self.checker is not None:
1346
old_checker_pid = self.checker.pid
1348
old_checker_pid = None
1855
old_checker_pid = getattr(self.checker, "pid", None)
1349
1856
r = Client.start_checker(self, *args, **kwargs)
1350
1857
# Only if new checker process was started
1351
1858
if (self.checker is not None
1403
1904
server to mandos-client
1407
1908
# Rejected - signal
1408
1909
@dbus.service.signal(_interface, signature="s")
1409
1910
def Rejected(self, reason):
1413
1914
# NeedApproval - signal
1414
1915
@dbus.service.signal(_interface, signature="tb")
1415
1916
def NeedApproval(self, timeout, default):
1417
1918
return self.need_approval()
1421
1922
# Approve - method
1422
1923
@dbus.service.method(_interface, in_signature="b")
1423
1924
def Approve(self, value):
1424
1925
self.approve(value)
1426
1927
# CheckedOK - method
1427
1928
@dbus.service.method(_interface)
1428
1929
def CheckedOK(self):
1429
1930
self.checked_ok()
1431
1932
# Enable - method
1933
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1432
1934
@dbus.service.method(_interface)
1433
1935
def Enable(self):
1437
1939
# StartChecker - method
1940
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1438
1941
@dbus.service.method(_interface)
1439
1942
def StartChecker(self):
1441
1944
self.start_checker()
1443
1946
# Disable - method
1947
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1444
1948
@dbus.service.method(_interface)
1445
1949
def Disable(self):
1449
1953
# StopChecker - method
1954
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1450
1955
@dbus.service.method(_interface)
1451
1956
def StopChecker(self):
1452
1957
self.stop_checker()
1456
1961
# ApprovalPending - property
1457
1962
@dbus_service_property(_interface, signature="b", access="read")
1458
1963
def ApprovalPending_dbus_property(self):
1459
1964
return dbus.Boolean(bool(self.approvals_pending))
1461
1966
# ApprovedByDefault - property
1462
@dbus_service_property(_interface, signature="b",
1967
@dbus_service_property(_interface,
1463
1969
access="readwrite")
1464
1970
def ApprovedByDefault_dbus_property(self, value=None):
1465
1971
if value is None: # get
1466
1972
return dbus.Boolean(self.approved_by_default)
1467
1973
self.approved_by_default = bool(value)
1469
1975
# ApprovalDelay - property
1470
@dbus_service_property(_interface, signature="t",
1976
@dbus_service_property(_interface,
1471
1978
access="readwrite")
1472
1979
def ApprovalDelay_dbus_property(self, value=None):
1473
1980
if value is None: # get
1474
return dbus.UInt64(self.approval_delay_milliseconds())
1981
return dbus.UInt64(self.approval_delay.total_seconds()
1475
1983
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1477
1985
# ApprovalDuration - property
1478
@dbus_service_property(_interface, signature="t",
1986
@dbus_service_property(_interface,
1479
1988
access="readwrite")
1480
1989
def ApprovalDuration_dbus_property(self, value=None):
1481
1990
if value is None: # get
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
1991
return dbus.UInt64(self.approval_duration.total_seconds()
1484
1993
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1486
1995
# Name - property
1997
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1487
1998
@dbus_service_property(_interface, signature="s", access="read")
1488
1999
def Name_dbus_property(self):
1489
2000
return dbus.String(self.name)
1491
2002
# Fingerprint - property
2004
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1492
2005
@dbus_service_property(_interface, signature="s", access="read")
1493
2006
def Fingerprint_dbus_property(self):
1494
2007
return dbus.String(self.fingerprint)
1496
2009
# Host - property
1497
@dbus_service_property(_interface, signature="s",
2010
@dbus_service_property(_interface,
1498
2012
access="readwrite")
1499
2013
def Host_dbus_property(self, value=None):
1500
2014
if value is None: # get
1501
2015
return dbus.String(self.host)
1502
self.host = unicode(value)
2016
self.host = str(value)
1504
2018
# Created - property
2020
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1505
2021
@dbus_service_property(_interface, signature="s", access="read")
1506
2022
def Created_dbus_property(self):
1507
2023
return datetime_to_dbus(self.created)
1509
2025
# LastEnabled - property
1510
2026
@dbus_service_property(_interface, signature="s", access="read")
1511
2027
def LastEnabled_dbus_property(self):
1512
2028
return datetime_to_dbus(self.last_enabled)
1514
2030
# Enabled - property
1515
@dbus_service_property(_interface, signature="b",
2031
@dbus_service_property(_interface,
1516
2033
access="readwrite")
1517
2034
def Enabled_dbus_property(self, value=None):
1518
2035
if value is None: # get
1566
2084
if (getattr(self, "disable_initiator_tag", None)
1569
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
2087
GLib.source_remove(self.disable_initiator_tag)
2088
self.disable_initiator_tag = GLib.timeout_add(
2089
int((self.expires - now).total_seconds() * 1000),
1575
2092
# ExtendedTimeout - property
1576
@dbus_service_property(_interface, signature="t",
2093
@dbus_service_property(_interface,
1577
2095
access="readwrite")
1578
2096
def ExtendedTimeout_dbus_property(self, value=None):
1579
2097
if value is None: # get
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
2098
return dbus.UInt64(self.extended_timeout.total_seconds()
1581
2100
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1583
2102
# Interval - property
1584
@dbus_service_property(_interface, signature="t",
2103
@dbus_service_property(_interface,
1585
2105
access="readwrite")
1586
2106
def Interval_dbus_property(self, value=None):
1587
2107
if value is None: # get
1588
return dbus.UInt64(self.interval_milliseconds())
2108
return dbus.UInt64(self.interval.total_seconds() * 1000)
1589
2109
self.interval = datetime.timedelta(0, 0, 0, value)
1590
2110
if getattr(self, "checker_initiator_tag", None) is None:
1592
2112
if self.enabled:
1593
2113
# Reschedule checker run
1594
gobject.source_remove(self.checker_initiator_tag)
1595
self.checker_initiator_tag = (gobject.timeout_add
1596
(value, self.start_checker))
1597
self.start_checker() # Start one now, too
2114
GLib.source_remove(self.checker_initiator_tag)
2115
self.checker_initiator_tag = GLib.timeout_add(
2116
value, self.start_checker)
2117
self.start_checker() # Start one now, too
1599
2119
# Checker - property
1600
@dbus_service_property(_interface, signature="s",
2120
@dbus_service_property(_interface,
1601
2122
access="readwrite")
1602
2123
def Checker_dbus_property(self, value=None):
1603
2124
if value is None: # get
1604
2125
return dbus.String(self.checker_command)
1605
self.checker_command = unicode(value)
2126
self.checker_command = str(value)
1607
2128
# CheckerRunning - property
1608
@dbus_service_property(_interface, signature="b",
2129
@dbus_service_property(_interface,
1609
2131
access="readwrite")
1610
2132
def CheckerRunning_dbus_property(self, value=None):
1611
2133
if value is None: # get
1658
2190
class ClientHandler(socketserver.BaseRequestHandler, object):
1659
2191
"""A class to handle client connections.
1661
2193
Instantiated once for each connection to handle it.
1662
2194
Note: This will run in its own forked process."""
1664
2196
def handle(self):
1665
2197
with contextlib.closing(self.server.child_pipe) as child_pipe:
1666
2198
logger.info("TCP connection from: %s",
1667
unicode(self.client_address))
2199
str(self.client_address))
1668
2200
logger.debug("Pipe FD: %d",
1669
2201
self.server.child_pipe.fileno())
1671
session = (gnutls.connection
1672
.ClientSession(self.request,
1674
.X509Credentials()))
1676
# Note: gnutls.connection.X509Credentials is really a
1677
# generic GnuTLS certificate credentials object so long as
1678
# no X.509 keys are added to it. Therefore, we can use it
1679
# here despite using OpenPGP certificates.
1681
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1682
# "+AES-256-CBC", "+SHA1",
1683
# "+COMP-NULL", "+CTYPE-OPENPGP",
2203
session = gnutls.ClientSession(self.request)
2205
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2206
# "+AES-256-CBC", "+SHA1",
2207
# "+COMP-NULL", "+CTYPE-OPENPGP",
1685
2209
# Use a fallback default, since this MUST be set.
1686
2210
priority = self.server.gnutls_priority
1687
2211
if priority is None:
1688
2212
priority = "NORMAL"
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
2213
gnutls.priority_set_direct(session._c_object,
2214
priority.encode("utf-8"),
1693
2217
# Start communication using the Mandos protocol
1694
2218
# Get protocol number
1695
2219
line = self.request.makefile().readline()
1696
2220
logger.debug("Protocol version: %r", line)
1698
2222
if int(line.strip().split()[0]) > 1:
2223
raise RuntimeError(line)
1700
2224
except (ValueError, IndexError, RuntimeError) as error:
1701
2225
logger.error("Unknown protocol version: %s", error)
1704
2228
# Start GnuTLS connection
1706
2230
session.handshake()
1707
except gnutls.errors.GNUTLSError as error:
2231
except gnutls.Error as error:
1708
2232
logger.warning("Handshake failed: %s", error)
1709
2233
# Do not run session.bye() here: the session is not
1710
2234
# established. Just abandon the request.
1712
2236
logger.debug("Handshake succeeded")
1714
2238
approval_required = False
1717
fpr = self.fingerprint(self.peer_certificate
1720
gnutls.errors.GNUTLSError) as error:
2241
fpr = self.fingerprint(
2242
self.peer_certificate(session))
2243
except (TypeError, gnutls.Error) as error:
1721
2244
logger.warning("Bad certificate: %s", error)
1723
2246
logger.debug("Fingerprint: %s", fpr)
1726
2249
client = ProxyClient(child_pipe, fpr,
1727
2250
self.client_address)
1728
2251
except KeyError:
1731
2254
if client.approval_delay:
1732
2255
delay = client.approval_delay
1733
2256
client.approvals_pending += 1
1734
2257
approval_required = True
1737
2260
if not client.enabled:
1738
2261
logger.info("Client %s is disabled",
1740
2263
if self.server.use_dbus:
1741
2264
# Emit D-Bus signal
1742
2265
client.Rejected("Disabled")
1745
2268
if client.approved or not client.approval_delay:
1746
#We are approved or approval is disabled
2269
# We are approved or approval is disabled
1748
2271
elif client.approved is None:
1749
2272
logger.info("Client %s needs approval",
1784
2305
delay -= time2 - time
1787
while sent_size < len(client.secret):
1789
sent = session.send(client.secret[sent_size:])
1790
except gnutls.errors.GNUTLSError as error:
1791
logger.warning("gnutls send failed",
1794
logger.debug("Sent: %d, remaining: %d",
1795
sent, len(client.secret)
1796
- (sent_size + sent))
2308
session.send(client.secret)
2309
except gnutls.Error as error:
2310
logger.warning("gnutls send failed",
1799
2314
logger.info("Sending secret to %s", client.name)
1800
2315
# bump the timeout using extended_timeout
1801
2316
client.bump_timeout(client.extended_timeout)
1802
2317
if self.server.use_dbus:
1803
2318
# Emit D-Bus signal
1804
2319
client.GotSecret()
1807
2322
if approval_required:
1808
2323
client.approvals_pending -= 1
1811
except gnutls.errors.GNUTLSError as error:
2326
except gnutls.Error as error:
1812
2327
logger.warning("GnuTLS bye failed",
1813
2328
exc_info=error)
1816
2331
def peer_certificate(session):
1817
2332
"Return the peer's OpenPGP certificate as a bytestring"
1818
2333
# 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
2334
if (gnutls.certificate_type_get(session._c_object)
2335
!= gnutls.CRT_OPENPGP):
2336
# ...return invalid data
1824
2338
list_size = ctypes.c_uint(1)
1825
cert_list = (gnutls.library.functions
1826
.gnutls_certificate_get_peers
2339
cert_list = (gnutls.certificate_get_peers
1827
2340
(session._c_object, ctypes.byref(list_size)))
1828
2341
if not bool(cert_list) and list_size.value != 0:
1829
raise gnutls.errors.GNUTLSError("error getting peer"
2342
raise gnutls.Error("error getting peer certificate")
1831
2343
if list_size.value == 0:
1833
2345
cert = cert_list[0]
1834
2346
return ctypes.string_at(cert.data, cert.size)
1837
2349
def fingerprint(openpgp):
1838
2350
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1839
2351
# New GnuTLS "datum" with the OpenPGP public key
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
2352
datum = gnutls.datum_t(
2353
ctypes.cast(ctypes.c_char_p(openpgp),
2354
ctypes.POINTER(ctypes.c_ubyte)),
2355
ctypes.c_uint(len(openpgp)))
1845
2356
# New empty GnuTLS certificate
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2357
crt = gnutls.openpgp_crt_t()
2358
gnutls.openpgp_crt_init(ctypes.byref(crt))
1849
2359
# Import the OpenPGP public key into the certificate
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
2360
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2361
gnutls.OPENPGP_FMT_RAW)
1854
2362
# Verify the self signature in the key
1855
2363
crtverify = ctypes.c_uint()
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2364
gnutls.openpgp_crt_verify_self(crt, 0,
2365
ctypes.byref(crtverify))
1859
2366
if crtverify.value != 0:
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2367
gnutls.openpgp_crt_deinit(crt)
2368
raise gnutls.CertificateSecurityError("Verify failed")
1863
2369
# New buffer for the fingerprint
1864
2370
buf = ctypes.create_string_buffer(20)
1865
2371
buf_len = ctypes.c_size_t()
1866
2372
# Get the fingerprint from the certificate into the buffer
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2373
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2374
ctypes.byref(buf_len))
1870
2375
# Deinit the certificate
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2376
gnutls.openpgp_crt_deinit(crt)
1872
2377
# Convert the buffer to a Python bytestring
1873
2378
fpr = ctypes.string_at(buf, buf_len.value)
1874
2379
# Convert the bytestring to hexadecimal notation
1879
2384
class MultiprocessingMixIn(object):
1880
2385
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1881
2387
def sub_process_main(self, request, address):
1883
2389
self.finish_request(request, address)
1884
2390
except Exception:
1885
2391
self.handle_error(request, address)
1886
2392
self.close_request(request)
1888
2394
def process_request(self, request, address):
1889
2395
"""Start a new process to process the request."""
1890
proc = multiprocessing.Process(target = self.sub_process_main,
1891
args = (request, address))
2396
proc = multiprocessing.Process(target=self.sub_process_main,
2397
args=(request, address))
1896
2402
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1897
2403
""" adds a pipe to the MixIn """
1898
2405
def process_request(self, request, client_address):
1899
2406
"""Overrides and wraps the original process_request().
1901
2408
This function creates a new pipe in self.pipe
1903
2410
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1905
2412
proc = MultiprocessingMixIn.process_request(self, request,
1906
2413
client_address)
1907
2414
self.child_pipe.close()
1908
2415
self.add_pipe(parent_pipe, proc)
1910
2417
def add_pipe(self, parent_pipe, proc):
1911
2418
"""Dummy function; override as necessary"""
1912
raise NotImplementedError
2419
raise NotImplementedError()
1915
2422
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1916
2423
socketserver.TCPServer, object):
1917
2424
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1920
2427
enabled: Boolean; whether this server is activated yet
1921
2428
interface: None or a network interface name (string)
1922
2429
use_ipv6: Boolean; to use IPv6 or not
1924
2432
def __init__(self, server_address, RequestHandlerClass,
1925
interface=None, use_ipv6=True, socketfd=None):
1926
2436
"""If socketfd is set, use that file descriptor instead of
1927
2437
creating a new one with socket.socket().
1957
2468
# socket_wrapper(), if socketfd was set.
1958
2469
socketserver.TCPServer.__init__(self, server_address,
1959
2470
RequestHandlerClass)
1961
2472
def server_bind(self):
1962
2473
"""This overrides the normal server_bind() function
1963
2474
to bind to an interface if one was specified, and also NOT to
1964
2475
bind to an address or port if they were not specified."""
2476
global SO_BINDTODEVICE
1965
2477
if self.interface is not None:
1966
2478
if SO_BINDTODEVICE is None:
1967
logger.error("SO_BINDTODEVICE does not exist;"
1968
" cannot bind to interface %s",
1972
self.socket.setsockopt(socket.SOL_SOCKET,
1974
str(self.interface + '\0'))
1975
except socket.error as error:
1976
if error.errno == errno.EPERM:
1977
logger.error("No permission to bind to"
1978
" interface %s", self.interface)
1979
elif error.errno == errno.ENOPROTOOPT:
1980
logger.error("SO_BINDTODEVICE not available;"
1981
" cannot bind to interface %s",
1983
elif error.errno == errno.ENODEV:
1984
logger.error("Interface %s does not exist,"
1985
" cannot bind", self.interface)
2479
# Fall back to a hard-coded value which seems to be
2481
logger.warning("SO_BINDTODEVICE not found, trying 25")
2482
SO_BINDTODEVICE = 25
2484
self.socket.setsockopt(
2485
socket.SOL_SOCKET, SO_BINDTODEVICE,
2486
(self.interface + "\0").encode("utf-8"))
2487
except socket.error as error:
2488
if error.errno == errno.EPERM:
2489
logger.error("No permission to bind to"
2490
" interface %s", self.interface)
2491
elif error.errno == errno.ENOPROTOOPT:
2492
logger.error("SO_BINDTODEVICE not available;"
2493
" cannot bind to interface %s",
2495
elif error.errno == errno.ENODEV:
2496
logger.error("Interface %s does not exist,"
2497
" cannot bind", self.interface)
1988
2500
# Only bind(2) the socket if we really need to.
1989
2501
if self.server_address[0] or self.server_address[1]:
1990
2502
if not self.server_address[0]:
1991
2503
if self.address_family == socket.AF_INET6:
1992
any_address = "::" # in6addr_any
2504
any_address = "::" # in6addr_any
1994
any_address = "0.0.0.0" # INADDR_ANY
2506
any_address = "0.0.0.0" # INADDR_ANY
1995
2507
self.server_address = (any_address,
1996
2508
self.server_address[1])
1997
2509
elif not self.server_address[1]:
1998
self.server_address = (self.server_address[0],
2510
self.server_address = (self.server_address[0], 0)
2000
2511
# if self.interface:
2001
2512
# self.server_address = (self.server_address[0],
2378
2901
server_settings["socket"] = os.dup(server_settings
2380
2903
del server_config
2382
2905
# Override the settings from the config file with command line
2383
2906
# options, if set.
2384
2907
for option in ("interface", "address", "port", "debug",
2385
"priority", "servicename", "configdir",
2386
"use_dbus", "use_ipv6", "debuglevel", "restore",
2387
"statedir", "socket", "foreground"):
2908
"priority", "servicename", "configdir", "use_dbus",
2909
"use_ipv6", "debuglevel", "restore", "statedir",
2910
"socket", "foreground", "zeroconf"):
2388
2911
value = getattr(options, option)
2389
2912
if value is not None:
2390
2913
server_settings[option] = value
2392
2915
# Force all strings to be unicode
2393
2916
for option in server_settings.keys():
2394
if type(server_settings[option]) is str:
2395
server_settings[option] = unicode(server_settings[option])
2917
if isinstance(server_settings[option], bytes):
2918
server_settings[option] = (server_settings[option]
2396
2920
# Force all boolean options to be boolean
2397
2921
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2922
"foreground", "zeroconf"):
2399
2923
server_settings[option] = bool(server_settings[option])
2400
2924
# Debug implies foreground
2401
2925
if server_settings["debug"]:
2402
2926
server_settings["foreground"] = True
2403
2927
# Now we have our good server settings in "server_settings"
2405
2929
##################################################################
2931
if (not server_settings["zeroconf"]
2932
and not (server_settings["port"]
2933
or server_settings["socket"] != "")):
2934
parser.error("Needs port or socket to work without Zeroconf")
2407
2936
# For convenience
2408
2937
debug = server_settings["debug"]
2409
2938
debuglevel = server_settings["debuglevel"]
2422
2952
level = getattr(logging, debuglevel.upper())
2423
2953
initlogger(debug, level)
2425
2955
if server_settings["servicename"] != "Mandos":
2426
syslogger.setFormatter(logging.Formatter
2427
('Mandos ({0}) [%(process)d]:'
2428
' %(levelname)s: %(message)s'
2429
.format(server_settings
2956
syslogger.setFormatter(
2957
logging.Formatter('Mandos ({}) [%(process)d]:'
2958
' %(levelname)s: %(message)s'.format(
2959
server_settings["servicename"])))
2432
2961
# Parse config file with clients
2433
2962
client_config = configparser.SafeConfigParser(Client
2434
2963
.client_defaults)
2435
2964
client_config.read(os.path.join(server_settings["configdir"],
2436
2965
"clients.conf"))
2438
2967
global mandos_dbus_service
2439
2968
mandos_dbus_service = None
2441
tcp_server = MandosServer((server_settings["address"],
2442
server_settings["port"]),
2444
interface=(server_settings["interface"]
2448
server_settings["priority"],
2450
socketfd=(server_settings["socket"]
2971
if server_settings["socket"] != "":
2972
socketfd = server_settings["socket"]
2973
tcp_server = MandosServer(
2974
(server_settings["address"], server_settings["port"]),
2976
interface=(server_settings["interface"] or None),
2978
gnutls_priority=server_settings["priority"],
2452
2981
if not foreground:
2453
pidfilename = "/var/run/mandos.pid"
2982
pidfilename = "/run/mandos.pid"
2983
if not os.path.isdir("/run/."):
2984
pidfilename = "/var/run/mandos.pid"
2456
pidfile = open(pidfilename, "w")
2987
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2457
2988
except IOError as e:
2458
2989
logger.error("Could not open file %r", pidfilename,
2461
for name in ("_mandos", "mandos", "nobody"):
2992
for name, group in (("_mandos", "_mandos"),
2993
("mandos", "mandos"),
2994
("nobody", "nogroup")):
2463
2996
uid = pwd.getpwnam(name).pw_uid
2464
gid = pwd.getpwnam(name).pw_gid
2997
gid = pwd.getpwnam(group).pw_gid
2466
2999
except KeyError:
3008
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2474
3010
except OSError as error:
3011
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3012
.format(uid, gid, os.strerror(error.errno)))
2475
3013
if error.errno != errno.EPERM:
2479
3017
# Enable all possible GnuTLS debugging
2481
3019
# "Use a log level over 10 to enable all debugging options."
2482
3020
# - GnuTLS manual
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
2485
@gnutls.library.types.gnutls_log_func
3021
gnutls.global_set_log_level(11)
2486
3024
def debug_gnutls(level, string):
2487
3025
logger.debug("GnuTLS: %s", string[:-1])
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
3027
gnutls.global_set_log_function(debug_gnutls)
2492
3029
# Redirect stdin so all checkers get /dev/null
2493
3030
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2494
3031
os.dup2(null, sys.stdin.fileno())
2498
3035
# Need to fork before connecting to D-Bus
2499
3036
if not foreground:
2500
3037
# Close all input and output, do double fork, etc.
2503
# multiprocessing will use threads, so before we use gobject we
2504
# need to inform gobject that threads will be used.
2505
gobject.threads_init()
3040
# multiprocessing will use threads, so before we use GLib we need
3041
# to inform GLib that threads will be used.
2507
3044
global main_loop
2508
3045
# From the Avahi example code
2509
3046
DBusGMainLoop(set_as_default=True)
2510
main_loop = gobject.MainLoop()
3047
main_loop = GLib.MainLoop()
2511
3048
bus = dbus.SystemBus()
2512
3049
# End of Avahi example code
2515
3052
bus_name = dbus.service.BusName("se.recompile.Mandos",
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2520
except dbus.exceptions.NameExistsException as e:
3055
old_bus_name = dbus.service.BusName(
3056
"se.bsnet.fukt.Mandos", bus,
3058
except dbus.exceptions.DBusException as e:
2521
3059
logger.error("Disabling D-Bus:", exc_info=e)
2522
3060
use_dbus = False
2523
3061
server_settings["use_dbus"] = False
2524
3062
tcp_server.use_dbus = False
2525
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2526
service = AvahiServiceToSyslog(name =
2527
server_settings["servicename"],
2528
servicetype = "_mandos._tcp",
2529
protocol = protocol, bus = bus)
2530
if server_settings["interface"]:
2531
service.interface = (if_nametoindex
2532
(str(server_settings["interface"])))
3064
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3065
service = AvahiServiceToSyslog(
3066
name=server_settings["servicename"],
3067
servicetype="_mandos._tcp",
3070
if server_settings["interface"]:
3071
service.interface = if_nametoindex(
3072
server_settings["interface"].encode("utf-8"))
2534
3074
global multiprocessing_manager
2535
3075
multiprocessing_manager = multiprocessing.Manager()
2537
3077
client_class = Client
2539
client_class = functools.partial(ClientDBus, bus = bus)
3079
client_class = functools.partial(ClientDBus, bus=bus)
2541
3081
client_settings = Client.config_parser(client_config)
2542
3082
old_client_settings = {}
2543
3083
clients_data = {}
2545
3085
# This is used to redirect stdout and stderr for checker processes
2547
wnull = open(os.devnull, "w") # A writable /dev/null
3087
wnull = open(os.devnull, "w") # A writable /dev/null
2548
3088
# Only used if server is running in foreground but not in debug
2550
3090
if debug or not foreground:
2553
3093
# Get client data and settings from last running state.
2554
3094
if server_settings["restore"]:
2556
3096
with open(stored_state_path, "rb") as stored_state:
2557
clients_data, old_client_settings = (pickle.load
3097
if sys.version_info.major == 2:
3098
clients_data, old_client_settings = pickle.load(
3101
bytes_clients_data, bytes_old_client_settings = (
3102
pickle.load(stored_state, encoding="bytes"))
3103
# Fix bytes to strings
3106
clients_data = {(key.decode("utf-8")
3107
if isinstance(key, bytes)
3110
bytes_clients_data.items()}
3111
del bytes_clients_data
3112
for key in clients_data:
3113
value = {(k.decode("utf-8")
3114
if isinstance(k, bytes) else k): v
3116
clients_data[key].items()}
3117
clients_data[key] = value
3119
value["client_structure"] = [
3121
if isinstance(s, bytes)
3123
value["client_structure"]]
3125
for k in ("name", "host"):
3126
if isinstance(value[k], bytes):
3127
value[k] = value[k].decode("utf-8")
3128
# old_client_settings
3130
old_client_settings = {
3131
(key.decode("utf-8")
3132
if isinstance(key, bytes)
3135
bytes_old_client_settings.items()}
3136
del bytes_old_client_settings
3138
for value in old_client_settings.values():
3139
if isinstance(value["host"], bytes):
3140
value["host"] = (value["host"]
2559
3142
os.remove(stored_state_path)
2560
3143
except IOError as e:
2561
3144
if e.errno == errno.ENOENT:
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
3145
logger.warning("Could not load persistent state:"
3146
" {}".format(os.strerror(e.errno)))
2565
3148
logger.critical("Could not load persistent state:",
2568
3151
except EOFError as e:
2569
3152
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
2572
3156
with PGPEngine() as pgp:
2573
for client_name, client in clients_data.iteritems():
3157
for client_name, client in clients_data.items():
2574
3158
# Skip removed clients
2575
3159
if client_name not in client_settings:
2578
3162
# Decide which value to use after restoring saved state.
2579
3163
# We have three different values: Old config file,
2580
3164
# new config file, and saved state.
2638
3222
for client_name in (set(client_settings)
2639
3223
- set(old_client_settings)):
2640
3224
clients_data[client_name] = client_settings[client_name]
2642
3226
# Create all client objects
2643
for client_name, client in clients_data.iteritems():
3227
for client_name, client in clients_data.items():
2644
3228
tcp_server.clients[client_name] = client_class(
2645
name = client_name, settings = client,
2646
server_settings = server_settings)
3231
server_settings=server_settings)
2648
3233
if not tcp_server.clients:
2649
3234
logger.warning("No clients defined")
2651
3236
if not foreground:
2652
3237
if pidfile is not None:
2656
pidfile.write(str(pid) + "\n".encode("utf-8"))
3241
print(pid, file=pidfile)
2657
3242
except IOError:
2658
3243
logger.error("Could not write to file %r with PID %d",
2659
3244
pidfilename, pid)
2661
3246
del pidfilename
2663
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3248
for termsig in (signal.SIGHUP, signal.SIGTERM):
3249
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3250
lambda: main_loop.quit() and False)
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2669
class MandosDBusService(DBusObjectWithProperties):
3254
@alternate_dbus_interfaces(
3255
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3256
class MandosDBusService(DBusObjectWithObjectManager):
2670
3257
"""A D-Bus proxy object"""
2671
3259
def __init__(self):
2672
3260
dbus.service.Object.__init__(self, bus, "/")
2673
3262
_interface = "se.recompile.Mandos"
2675
@dbus_interface_annotations(_interface)
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
2681
3264
@dbus.service.signal(_interface, signature="o")
2682
3265
def ClientAdded(self, objpath):
2686
3269
@dbus.service.signal(_interface, signature="ss")
2687
3270
def ClientNotFound(self, fingerprint, address):
3274
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2691
3276
@dbus.service.signal(_interface, signature="os")
2692
3277
def ClientRemoved(self, objpath, name):
3281
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2696
3283
@dbus.service.method(_interface, out_signature="ao")
2697
3284
def GetAllClients(self):
2699
return dbus.Array(c.dbus_object_path
2701
tcp_server.clients.itervalues())
3286
return dbus.Array(c.dbus_object_path for c in
3287
tcp_server.clients.values())
3289
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2703
3291
@dbus.service.method(_interface,
2704
3292
out_signature="a{oa{sv}}")
2705
3293
def GetAllClientsWithProperties(self):
2707
3295
return dbus.Dictionary(
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
3296
{c.dbus_object_path: c.GetAll(
3297
"se.recompile.Mandos.Client")
3298
for c in tcp_server.clients.values()},
2710
3299
signature="oa{sv}")
2712
3301
@dbus.service.method(_interface, in_signature="o")
2713
3302
def RemoveClient(self, object_path):
2715
for c in tcp_server.clients.itervalues():
3304
for c in tcp_server.clients.values():
2716
3305
if c.dbus_object_path == object_path:
2717
3306
del tcp_server.clients[c.name]
2718
3307
c.remove_from_connection()
2719
# Don't signal anything except ClientRemoved
3308
# Don't signal the disabling
2720
3309
c.disable(quiet=True)
2722
self.ClientRemoved(object_path, c.name)
3310
# Emit D-Bus signal for removal
3311
self.client_removed_signal(c)
2724
3313
raise KeyError(object_path)
3317
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3318
out_signature="a{oa{sa{sv}}}")
3319
def GetManagedObjects(self):
3321
return dbus.Dictionary(
3322
{client.dbus_object_path:
3324
{interface: client.GetAll(interface)
3326
client._get_all_interface_names()})
3327
for client in tcp_server.clients.values()})
3329
def client_added_signal(self, client):
3330
"""Send the new standard signal and the old signal"""
3332
# New standard signal
3333
self.InterfacesAdded(
3334
client.dbus_object_path,
3336
{interface: client.GetAll(interface)
3338
client._get_all_interface_names()}))
3340
self.ClientAdded(client.dbus_object_path)
3342
def client_removed_signal(self, client):
3343
"""Send the new standard signal and the old signal"""
3345
# New standard signal
3346
self.InterfacesRemoved(
3347
client.dbus_object_path,
3348
client._get_all_interface_names())
3350
self.ClientRemoved(client.dbus_object_path,
2728
3353
mandos_dbus_service = MandosDBusService()
3355
# Save modules to variables to exempt the modules from being
3356
# unloaded before the function registered with atexit() is run.
3357
mp = multiprocessing
2731
3361
"Cleanup function; run on exit"
2734
multiprocessing.active_children()
3365
mp.active_children()
2736
3367
if not (tcp_server.clients or client_settings):
2739
3370
# Store client before exiting. Secrets are encrypted with key
2740
3371
# based on what config file has. If config file is
2741
3372
# removed/edited, old secret will thus be unrecovable.
2743
3374
with PGPEngine() as pgp:
2744
for client in tcp_server.clients.itervalues():
3375
for client in tcp_server.clients.values():
2745
3376
key = client_settings[client.name]["secret"]
2746
3377
client.encrypted_secret = pgp.encrypt(client.secret,
2748
3379
client_dict = {}
2750
3381
# A list of attributes that can not be pickled
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
3383
exclude = {"bus", "changedstate", "secret",
3384
"checker", "server_settings"}
3385
for name, typ in inspect.getmembers(dbus.service
2756
3387
exclude.add(name)
2758
3389
client_dict["encrypted_secret"] = (client
2759
3390
.encrypted_secret)
2760
3391
for attr in client.client_structure:
2761
3392
if attr not in exclude:
2762
3393
client_dict[attr] = getattr(client, attr)
2764
3395
clients[client.name] = client_dict
2765
3396
del client_settings[client.name]["secret"]
2768
with (tempfile.NamedTemporaryFile
2769
(mode='wb', suffix=".pickle", prefix='clients-',
2770
dir=os.path.dirname(stored_state_path),
2771
delete=False)) as stored_state:
2772
pickle.dump((clients, client_settings), stored_state)
2773
tempname=stored_state.name
3399
with tempfile.NamedTemporaryFile(
3403
dir=os.path.dirname(stored_state_path),
3404
delete=False) as stored_state:
3405
pickle.dump((clients, client_settings), stored_state,
3407
tempname = stored_state.name
2774
3408
os.rename(tempname, stored_state_path)
2775
3409
except (IOError, OSError) as e: