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-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'
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
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
221
304
class AvahiError(Exception):
222
305
def __init__(self, value, *args, **kwargs):
223
306
self.value = value
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
307
return super(AvahiError, self).__init__(value, *args,
228
311
class AvahiServiceError(AvahiError):
231
315
class AvahiGroupError(AvahiError):
235
319
class AvahiService(object):
236
320
"""An Avahi (Zeroconf) service.
239
323
interface: integer; avahi.IF_UNSPEC or an interface index.
240
324
Used to optionally bind to the specified interface.
383
489
follow_name_owner_changes=True),
384
490
avahi.DBUS_INTERFACE_SERVER)
385
491
self.server.connect_to_signal("StateChanged",
386
self.server_state_changed)
492
self.server_state_changed)
387
493
self.server_state_changed(self.server.GetState())
390
496
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
392
498
"""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'
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
500
syslogger.setFormatter(logging.Formatter(
501
'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))
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))
408
780
class Client(object):
409
781
"""A representation of a client host served by this server.
412
784
approved: bool(); 'None' if not yet approved/disapproved
413
785
approval_delay: datetime.timedelta(); Time to wait for approval
601
960
logger.info("Disabling client %s", self.name)
602
961
if getattr(self, "disable_initiator_tag", None) is not None:
603
gobject.source_remove(self.disable_initiator_tag)
962
GLib.source_remove(self.disable_initiator_tag)
604
963
self.disable_initiator_tag = None
605
964
self.expires = None
606
965
if getattr(self, "checker_initiator_tag", None) is not None:
607
gobject.source_remove(self.checker_initiator_tag)
966
GLib.source_remove(self.checker_initiator_tag)
608
967
self.checker_initiator_tag = None
609
968
self.stop_checker()
610
969
self.enabled = False
612
971
self.send_changedstate()
613
# 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
616
975
def __del__(self):
619
978
def init_checker(self):
620
979
# Schedule a new checker to be started an 'interval' from now,
621
980
# and every interval from then on.
622
981
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(),
982
GLib.source_remove(self.checker_initiator_tag)
983
self.checker_initiator_tag = GLib.timeout_add(
984
int(self.interval.total_seconds() * 1000),
627
986
# Schedule a disable() when 'timeout' has passed
628
987
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(),
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)
633
991
# Also start a new checker *right now*.
634
992
self.start_checker()
636
def checker_callback(self, pid, condition, command):
994
def checker_callback(self, source, condition, connection,
637
996
"""The checker has completed, so take appropriate actions."""
638
997
self.checker_callback_tag = None
639
998
self.checker = None
640
if os.WIFEXITED(condition):
641
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
642
1006
if self.last_checker_status == 0:
643
1007
logger.info("Checker for %(name)s succeeded",
645
1009
self.checked_ok()
647
logger.info("Checker for %(name)s failed",
1011
logger.info("Checker for %(name)s failed", vars(self))
650
1013
self.last_checker_status = -1
1014
self.last_checker_signal = -returncode
651
1015
logger.warning("Checker for %(name)s crashed?",
654
1019
def checked_ok(self):
655
1020
"""Assert that the client has been seen, alive and well."""
656
1021
self.last_checked_ok = datetime.datetime.utcnow()
657
1022
self.last_checker_status = 0
1023
self.last_checker_signal = None
658
1024
self.bump_timeout()
660
1026
def bump_timeout(self, timeout=None):
661
1027
"""Bump up the timeout for this client."""
662
1028
if timeout is None:
663
1029
timeout = self.timeout
664
1030
if self.disable_initiator_tag is not None:
665
gobject.source_remove(self.disable_initiator_tag)
1031
GLib.source_remove(self.disable_initiator_tag)
666
1032
self.disable_initiator_tag = None
667
1033
if getattr(self, "enabled", False):
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
1034
self.disable_initiator_tag = GLib.timeout_add(
1035
int(timeout.total_seconds() * 1000), self.disable)
671
1036
self.expires = datetime.datetime.utcnow() + timeout
673
1038
def need_approval(self):
674
1039
self.last_approval_request = datetime.datetime.utcnow()
676
1041
def start_checker(self):
677
1042
"""Start a new checker subprocess if one is not running.
679
1044
If a checker already exists, leave it running and do
681
1046
# The reason for not killing a running checker is that if we
686
1051
# checkers alone, the checker would have to take more time
687
1052
# 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)
1055
if self.checker is not None and not self.checker.is_alive():
1056
logger.warning("Checker was not alive; joining")
703
1059
# Start a new checker if needed
704
1060
if self.checker is None:
705
1061
# Escape attributes for the shell
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
709
self.runtime_expansions)
1063
attr: re.escape(str(getattr(self, attr)))
1064
for attr in self.runtime_expansions}
711
1066
command = self.checker_command % escaped_attrs
712
1067
except TypeError as error:
713
1068
logger.error('Could not format string "%s"',
714
self.checker_command, exc_info=error)
715
return True # Try again later
1069
self.checker_command,
1071
return True # Try again later
716
1072
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
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
761
1101
def stop_checker(self):
762
1102
"""Force the checker process, if any, to stop."""
763
1103
if self.checker_callback_tag:
764
gobject.source_remove(self.checker_callback_tag)
1104
GLib.source_remove(self.checker_callback_tag)
765
1105
self.checker_callback_tag = None
766
1106
if getattr(self, "checker", None) is None:
768
1108
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
1109
self.checker.terminate()
777
1110
self.checker = None
780
def dbus_service_property(dbus_interface, signature="v",
781
access="readwrite", byte_arrays=False):
1113
def dbus_service_property(dbus_interface,
782
1117
"""Decorators for marking methods of a DBusObjectWithProperties to
783
1118
become properties on the D-Bus.
785
1120
The decorated method will be called with no arguments by "Get"
786
1121
and with one argument by "Set".
788
1123
The parameters, where they are supported, are the same as
789
1124
dbus.service.method, except there is only "signature", since the
790
1125
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.
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.
875
1216
def _is_dbus_thing(thing):
876
1217
"""Returns a function testing if an attribute is a D-Bus thing
878
1219
If called like _is_dbus_thing("method") it returns a function
879
1220
suitable for use as predicate to inspect.getmembers().
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1222
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
884
1225
def _get_all_dbus_things(self, thing):
885
1226
"""Returns a generator of (name, attribute) pairs
887
return ((getattr(athing.__get__(self), "_dbus_name",
1228
return ((getattr(athing.__get__(self), "_dbus_name", name),
889
1229
athing.__get__(self))
890
1230
for cls in self.__class__.__mro__
891
1231
for name, athing in
892
inspect.getmembers(cls,
893
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.
895
1305
def _get_dbus_property(self, interface_name, property_name):
896
1306
"""Returns a bound method if one exists which is a D-Bus
897
1307
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"))):
1309
for cls in self.__class__.__mro__:
1310
for name, value in inspect.getmembers(
1311
cls, self._is_dbus_thing("property")):
903
1312
if (value._dbus_name == property_name
904
1313
and value._dbus_interface == interface_name):
905
1314
return value.__get__(self)
907
1316
# No such property
908
raise DBusPropertyNotFound(self.dbus_object_path + ":"
909
+ interface_name + "."
912
@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,
913
1331
out_signature="v")
914
1332
def Get(self, interface_name, property_name):
915
1333
"""Standard D-Bus property Get() method, see D-Bus standard.
1045
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",
1048
1536
def datetime_to_dbus(dt, variant_level=0):
1049
1537
"""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)
1539
return dbus.String("", variant_level=variant_level)
1540
return dbus.String(dt.isoformat(), variant_level=variant_level)
1056
1543
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1086
1574
# Ignore non-D-Bus attributes, and D-Bus attributes
1087
1575
# with the wrong interface name
1088
1576
if (not hasattr(attribute, "_dbus_interface")
1089
or not attribute._dbus_interface
1090
.startswith(orig_interface_name)):
1577
or not attribute._dbus_interface.startswith(
1578
orig_interface_name)):
1092
1580
# Create an alternate D-Bus interface name based on
1093
1581
# the current name
1094
alt_interface = (attribute._dbus_interface
1095
.replace(orig_interface_name,
1096
alt_interface_name))
1582
alt_interface = attribute._dbus_interface.replace(
1583
orig_interface_name, alt_interface_name)
1097
1584
interface_names.add(alt_interface)
1098
1585
# Is this a D-Bus signal?
1099
1586
if getattr(attribute, "_dbus_is_signal", False):
1100
1587
# Extract the original non-method undecorated
1101
1588
# function by black magic
1102
nonmethod_func = (dict(
1589
if sys.version_info.major == 2:
1590
nonmethod_func = (dict(
1103
1591
zip(attribute.func_code.co_freevars,
1104
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)
1106
1599
# Create a new, but exactly alike, function
1107
1600
# object, and decorate it to be a new D-Bus signal
1108
1601
# 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)))
1602
new_function = copy_function(nonmethod_func)
1603
new_function = (dbus.service.signal(
1605
attribute._dbus_signature)(new_function))
1118
1606
# Copy annotations, if any
1120
new_function._dbus_annotations = (
1121
dict(attribute._dbus_annotations))
1608
new_function._dbus_annotations = dict(
1609
attribute._dbus_annotations)
1122
1610
except AttributeError:
1124
1613
# Define a creator of a function to call both the
1125
1614
# original and alternate functions, so both the
1126
1615
# original and alternate signals gets sent when
1216
1698
if interface_names:
1217
1699
# Replace the class with a new subclass of it with
1218
1700
# methods, signals, etc. as created above.
1219
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__),
1225
1712
@alternate_dbus_interfaces({"se.recompile.Mandos":
1226
"se.bsnet.fukt.Mandos"})
1713
"se.bsnet.fukt.Mandos"})
1227
1714
class ClientDBus(Client, DBusObjectWithProperties):
1228
1715
"""A Client class using D-Bus
1231
1718
dbus_object_path: dbus.ObjectPath
1232
1719
bus: dbus.SystemBus()
1235
1722
runtime_expansions = (Client.runtime_expansions
1236
+ ("dbus_object_path",))
1723
+ ("dbus_object_path", ))
1725
_interface = "se.recompile.Mandos.Client"
1238
1727
# dbus.service.Object doesn't use super(), so we can't either.
1240
def __init__(self, bus = None, *args, **kwargs):
1729
def __init__(self, bus=None, *args, **kwargs):
1242
1731
Client.__init__(self, *args, **kwargs)
1243
1732
# Only now, when this client is initialized, can it show up on
1245
client_object_name = unicode(self.name).translate(
1734
client_object_name = str(self.name).translate(
1246
1735
{ord("."): ord("_"),
1247
1736
ord("-"): ord("_")})
1248
self.dbus_object_path = (dbus.ObjectPath
1249
("/clients/" + client_object_name))
1737
self.dbus_object_path = dbus.ObjectPath(
1738
"/clients/" + client_object_name)
1250
1739
DBusObjectWithProperties.__init__(self, self.bus,
1251
1740
self.dbus_object_path)
1253
def notifychangeproperty(transform_func,
1254
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):
1256
1747
""" Modify a variable so that it's a property which announces
1257
1748
its changes to DBus.
1259
1750
transform_fun: Function that takes a value and a variant_level
1260
1751
and transforms it to a D-Bus type.
1261
1752
dbus_name: D-Bus name of the variable
1326
1828
if hasattr(DBusObjectWithProperties, "__del__"):
1327
1829
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1328
1830
Client.__del__(self, *args, **kwargs)
1330
def checker_callback(self, pid, condition, command,
1332
self.checker_callback_tag = None
1334
if os.WIFEXITED(condition):
1335
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
1336
1839
# Emit D-Bus signal
1337
1840
self.CheckerCompleted(dbus.Int16(exitstatus),
1338
dbus.Int64(condition),
1841
# This is specific to GNU libC
1842
dbus.Int64(exitstatus << 8),
1339
1843
dbus.String(command))
1341
1845
# Emit D-Bus signal
1342
1846
self.CheckerCompleted(dbus.Int16(-1),
1343
dbus.Int64(condition),
1848
# This is specific to GNU libC
1850
| self.last_checker_signal),
1344
1851
dbus.String(command))
1346
return Client.checker_callback(self, pid, condition, command,
1349
1854
def start_checker(self, *args, **kwargs):
1350
old_checker = self.checker
1351
if self.checker is not None:
1352
old_checker_pid = self.checker.pid
1354
old_checker_pid = None
1855
old_checker_pid = getattr(self.checker, "pid", None)
1355
1856
r = Client.start_checker(self, *args, **kwargs)
1356
1857
# Only if new checker process was started
1357
1858
if (self.checker is not None
1409
1904
server to mandos-client
1413
1908
# Rejected - signal
1414
1909
@dbus.service.signal(_interface, signature="s")
1415
1910
def Rejected(self, reason):
1419
1914
# NeedApproval - signal
1420
1915
@dbus.service.signal(_interface, signature="tb")
1421
1916
def NeedApproval(self, timeout, default):
1423
1918
return self.need_approval()
1427
1922
# Approve - method
1428
1923
@dbus.service.method(_interface, in_signature="b")
1429
1924
def Approve(self, value):
1430
1925
self.approve(value)
1432
1927
# CheckedOK - method
1433
1928
@dbus.service.method(_interface)
1434
1929
def CheckedOK(self):
1435
1930
self.checked_ok()
1437
1932
# Enable - method
1933
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1438
1934
@dbus.service.method(_interface)
1439
1935
def Enable(self):
1443
1939
# StartChecker - method
1940
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1444
1941
@dbus.service.method(_interface)
1445
1942
def StartChecker(self):
1447
1944
self.start_checker()
1449
1946
# Disable - method
1947
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1450
1948
@dbus.service.method(_interface)
1451
1949
def Disable(self):
1455
1953
# StopChecker - method
1954
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1456
1955
@dbus.service.method(_interface)
1457
1956
def StopChecker(self):
1458
1957
self.stop_checker()
1462
1961
# ApprovalPending - property
1463
1962
@dbus_service_property(_interface, signature="b", access="read")
1464
1963
def ApprovalPending_dbus_property(self):
1465
1964
return dbus.Boolean(bool(self.approvals_pending))
1467
1966
# ApprovedByDefault - property
1468
@dbus_service_property(_interface, signature="b",
1967
@dbus_service_property(_interface,
1469
1969
access="readwrite")
1470
1970
def ApprovedByDefault_dbus_property(self, value=None):
1471
1971
if value is None: # get
1472
1972
return dbus.Boolean(self.approved_by_default)
1473
1973
self.approved_by_default = bool(value)
1475
1975
# ApprovalDelay - property
1476
@dbus_service_property(_interface, signature="t",
1976
@dbus_service_property(_interface,
1477
1978
access="readwrite")
1478
1979
def ApprovalDelay_dbus_property(self, value=None):
1479
1980
if value is None: # get
1480
return dbus.UInt64(self.approval_delay_milliseconds())
1981
return dbus.UInt64(self.approval_delay.total_seconds()
1481
1983
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1483
1985
# ApprovalDuration - property
1484
@dbus_service_property(_interface, signature="t",
1986
@dbus_service_property(_interface,
1485
1988
access="readwrite")
1486
1989
def ApprovalDuration_dbus_property(self, value=None):
1487
1990
if value is None: # get
1488
return dbus.UInt64(timedelta_to_milliseconds(
1489
self.approval_duration))
1991
return dbus.UInt64(self.approval_duration.total_seconds()
1490
1993
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1492
1995
# Name - property
1997
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1493
1998
@dbus_service_property(_interface, signature="s", access="read")
1494
1999
def Name_dbus_property(self):
1495
2000
return dbus.String(self.name)
1497
2002
# Fingerprint - property
2004
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1498
2005
@dbus_service_property(_interface, signature="s", access="read")
1499
2006
def Fingerprint_dbus_property(self):
1500
2007
return dbus.String(self.fingerprint)
1502
2009
# Host - property
1503
@dbus_service_property(_interface, signature="s",
2010
@dbus_service_property(_interface,
1504
2012
access="readwrite")
1505
2013
def Host_dbus_property(self, value=None):
1506
2014
if value is None: # get
1507
2015
return dbus.String(self.host)
1508
self.host = unicode(value)
2016
self.host = str(value)
1510
2018
# Created - property
2020
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1511
2021
@dbus_service_property(_interface, signature="s", access="read")
1512
2022
def Created_dbus_property(self):
1513
2023
return datetime_to_dbus(self.created)
1515
2025
# LastEnabled - property
1516
2026
@dbus_service_property(_interface, signature="s", access="read")
1517
2027
def LastEnabled_dbus_property(self):
1518
2028
return datetime_to_dbus(self.last_enabled)
1520
2030
# Enabled - property
1521
@dbus_service_property(_interface, signature="b",
2031
@dbus_service_property(_interface,
1522
2033
access="readwrite")
1523
2034
def Enabled_dbus_property(self, value=None):
1524
2035
if value is None: # get
1572
2084
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),
2087
GLib.source_remove(self.disable_initiator_tag)
2088
self.disable_initiator_tag = GLib.timeout_add(
2089
int((self.expires - now).total_seconds() * 1000),
1581
2092
# ExtendedTimeout - property
1582
@dbus_service_property(_interface, signature="t",
2093
@dbus_service_property(_interface,
1583
2095
access="readwrite")
1584
2096
def ExtendedTimeout_dbus_property(self, value=None):
1585
2097
if value is None: # get
1586
return dbus.UInt64(self.extended_timeout_milliseconds())
2098
return dbus.UInt64(self.extended_timeout.total_seconds()
1587
2100
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1589
2102
# Interval - property
1590
@dbus_service_property(_interface, signature="t",
2103
@dbus_service_property(_interface,
1591
2105
access="readwrite")
1592
2106
def Interval_dbus_property(self, value=None):
1593
2107
if value is None: # get
1594
return dbus.UInt64(self.interval_milliseconds())
2108
return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
2109
self.interval = datetime.timedelta(0, 0, 0, value)
1596
2110
if getattr(self, "checker_initiator_tag", None) is None:
1598
2112
if self.enabled:
1599
2113
# 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
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
1605
2119
# Checker - property
1606
@dbus_service_property(_interface, signature="s",
2120
@dbus_service_property(_interface,
1607
2122
access="readwrite")
1608
2123
def Checker_dbus_property(self, value=None):
1609
2124
if value is None: # get
1610
2125
return dbus.String(self.checker_command)
1611
self.checker_command = unicode(value)
2126
self.checker_command = str(value)
1613
2128
# CheckerRunning - property
1614
@dbus_service_property(_interface, signature="b",
2129
@dbus_service_property(_interface,
1615
2131
access="readwrite")
1616
2132
def CheckerRunning_dbus_property(self, value=None):
1617
2133
if value is None: # get
1664
2190
class ClientHandler(socketserver.BaseRequestHandler, object):
1665
2191
"""A class to handle client connections.
1667
2193
Instantiated once for each connection to handle it.
1668
2194
Note: This will run in its own forked process."""
1670
2196
def handle(self):
1671
2197
with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
2198
logger.info("TCP connection from: %s",
1673
unicode(self.client_address))
2199
str(self.client_address))
1674
2200
logger.debug("Pipe FD: %d",
1675
2201
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",
2203
session = gnutls.ClientSession(self.request)
2205
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2206
# "+AES-256-CBC", "+SHA1",
2207
# "+COMP-NULL", "+CTYPE-OPENPGP",
1691
2209
# Use a fallback default, since this MUST be set.
1692
2210
priority = self.server.gnutls_priority
1693
2211
if priority is None:
1694
2212
priority = "NORMAL"
1695
(gnutls.library.functions
1696
.gnutls_priority_set_direct(session._c_object,
2213
gnutls.priority_set_direct(session._c_object,
2214
priority.encode("utf-8"),
1699
2217
# Start communication using the Mandos protocol
1700
2218
# Get protocol number
1701
2219
line = self.request.makefile().readline()
1702
2220
logger.debug("Protocol version: %r", line)
1704
2222
if int(line.strip().split()[0]) > 1:
2223
raise RuntimeError(line)
1706
2224
except (ValueError, IndexError, RuntimeError) as error:
1707
2225
logger.error("Unknown protocol version: %s", error)
1710
2228
# Start GnuTLS connection
1712
2230
session.handshake()
1713
except gnutls.errors.GNUTLSError as error:
2231
except gnutls.Error as error:
1714
2232
logger.warning("Handshake failed: %s", error)
1715
2233
# Do not run session.bye() here: the session is not
1716
2234
# established. Just abandon the request.
1718
2236
logger.debug("Handshake succeeded")
1720
2238
approval_required = False
1723
fpr = self.fingerprint(self.peer_certificate
1726
gnutls.errors.GNUTLSError) as error:
2241
fpr = self.fingerprint(
2242
self.peer_certificate(session))
2243
except (TypeError, gnutls.Error) as error:
1727
2244
logger.warning("Bad certificate: %s", error)
1729
2246
logger.debug("Fingerprint: %s", fpr)
1732
2249
client = ProxyClient(child_pipe, fpr,
1733
2250
self.client_address)
1734
2251
except KeyError:
1737
2254
if client.approval_delay:
1738
2255
delay = client.approval_delay
1739
2256
client.approvals_pending += 1
1740
2257
approval_required = True
1743
2260
if not client.enabled:
1744
2261
logger.info("Client %s is disabled",
1746
2263
if self.server.use_dbus:
1747
2264
# Emit D-Bus signal
1748
2265
client.Rejected("Disabled")
1751
2268
if client.approved or not client.approval_delay:
1752
#We are approved or approval is disabled
2269
# We are approved or approval is disabled
1754
2271
elif client.approved is None:
1755
2272
logger.info("Client %s needs approval",
1790
2305
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))
2308
session.send(client.secret)
2309
except gnutls.Error as error:
2310
logger.warning("gnutls send failed",
1805
2314
logger.info("Sending secret to %s", client.name)
1806
2315
# bump the timeout using extended_timeout
1807
2316
client.bump_timeout(client.extended_timeout)
1808
2317
if self.server.use_dbus:
1809
2318
# Emit D-Bus signal
1810
2319
client.GotSecret()
1813
2322
if approval_required:
1814
2323
client.approvals_pending -= 1
1817
except gnutls.errors.GNUTLSError as error:
2326
except gnutls.Error as error:
1818
2327
logger.warning("GnuTLS bye failed",
1819
2328
exc_info=error)
1822
2331
def peer_certificate(session):
1823
2332
"Return the peer's OpenPGP certificate as a bytestring"
1824
2333
# 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
2334
if (gnutls.certificate_type_get(session._c_object)
2335
!= gnutls.CRT_OPENPGP):
2336
# ...return invalid data
1830
2338
list_size = ctypes.c_uint(1)
1831
cert_list = (gnutls.library.functions
1832
.gnutls_certificate_get_peers
2339
cert_list = (gnutls.certificate_get_peers
1833
2340
(session._c_object, ctypes.byref(list_size)))
1834
2341
if not bool(cert_list) and list_size.value != 0:
1835
raise gnutls.errors.GNUTLSError("error getting peer"
2342
raise gnutls.Error("error getting peer certificate")
1837
2343
if list_size.value == 0:
1839
2345
cert = cert_list[0]
1840
2346
return ctypes.string_at(cert.data, cert.size)
1843
2349
def fingerprint(openpgp):
1844
2350
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1845
2351
# 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))))
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)))
1851
2356
# 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)))
2357
crt = gnutls.openpgp_crt_t()
2358
gnutls.openpgp_crt_init(ctypes.byref(crt))
1855
2359
# 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))
2360
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2361
gnutls.OPENPGP_FMT_RAW)
1860
2362
# Verify the self signature in the key
1861
2363
crtverify = ctypes.c_uint()
1862
(gnutls.library.functions
1863
.gnutls_openpgp_crt_verify_self(crt, 0,
1864
ctypes.byref(crtverify)))
2364
gnutls.openpgp_crt_verify_self(crt, 0,
2365
ctypes.byref(crtverify))
1865
2366
if crtverify.value != 0:
1866
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1867
raise (gnutls.errors.CertificateSecurityError
2367
gnutls.openpgp_crt_deinit(crt)
2368
raise gnutls.CertificateSecurityError(code
1869
2370
# New buffer for the fingerprint
1870
2371
buf = ctypes.create_string_buffer(20)
1871
2372
buf_len = ctypes.c_size_t()
1872
2373
# 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)))
2374
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2375
ctypes.byref(buf_len))
1876
2376
# Deinit the certificate
1877
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2377
gnutls.openpgp_crt_deinit(crt)
1878
2378
# Convert the buffer to a Python bytestring
1879
2379
fpr = ctypes.string_at(buf, buf_len.value)
1880
2380
# Convert the bytestring to hexadecimal notation
1885
2385
class MultiprocessingMixIn(object):
1886
2386
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1887
2388
def sub_process_main(self, request, address):
1889
2390
self.finish_request(request, address)
1890
2391
except Exception:
1891
2392
self.handle_error(request, address)
1892
2393
self.close_request(request)
1894
2395
def process_request(self, request, address):
1895
2396
"""Start a new process to process the request."""
1896
proc = multiprocessing.Process(target = self.sub_process_main,
1897
args = (request, address))
2397
proc = multiprocessing.Process(target=self.sub_process_main,
2398
args=(request, address))
1902
2403
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1903
2404
""" adds a pipe to the MixIn """
1904
2406
def process_request(self, request, client_address):
1905
2407
"""Overrides and wraps the original process_request().
1907
2409
This function creates a new pipe in self.pipe
1909
2411
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1911
2413
proc = MultiprocessingMixIn.process_request(self, request,
1912
2414
client_address)
1913
2415
self.child_pipe.close()
1914
2416
self.add_pipe(parent_pipe, proc)
1916
2418
def add_pipe(self, parent_pipe, proc):
1917
2419
"""Dummy function; override as necessary"""
1918
raise NotImplementedError
2420
raise NotImplementedError()
1921
2423
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1922
2424
socketserver.TCPServer, object):
1923
2425
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1926
2428
enabled: Boolean; whether this server is activated yet
1927
2429
interface: None or a network interface name (string)
1928
2430
use_ipv6: Boolean; to use IPv6 or not
1930
2433
def __init__(self, server_address, RequestHandlerClass,
1931
interface=None, use_ipv6=True, socketfd=None):
1932
2437
"""If socketfd is set, use that file descriptor instead of
1933
2438
creating a new one with socket.socket().
1963
2469
# socket_wrapper(), if socketfd was set.
1964
2470
socketserver.TCPServer.__init__(self, server_address,
1965
2471
RequestHandlerClass)
1967
2473
def server_bind(self):
1968
2474
"""This overrides the normal server_bind() function
1969
2475
to bind to an interface if one was specified, and also NOT to
1970
2476
bind to an address or port if they were not specified."""
2477
global SO_BINDTODEVICE
1971
2478
if self.interface is not None:
1972
2479
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)
2480
# Fall back to a hard-coded value which seems to be
2482
logger.warning("SO_BINDTODEVICE not found, trying 25")
2483
SO_BINDTODEVICE = 25
2485
self.socket.setsockopt(
2486
socket.SOL_SOCKET, SO_BINDTODEVICE,
2487
(self.interface + "\0").encode("utf-8"))
2488
except socket.error as error:
2489
if error.errno == errno.EPERM:
2490
logger.error("No permission to bind to"
2491
" interface %s", self.interface)
2492
elif error.errno == errno.ENOPROTOOPT:
2493
logger.error("SO_BINDTODEVICE not available;"
2494
" cannot bind to interface %s",
2496
elif error.errno == errno.ENODEV:
2497
logger.error("Interface %s does not exist,"
2498
" cannot bind", self.interface)
1994
2501
# Only bind(2) the socket if we really need to.
1995
2502
if self.server_address[0] or self.server_address[1]:
1996
2503
if not self.server_address[0]:
1997
2504
if self.address_family == socket.AF_INET6:
1998
any_address = "::" # in6addr_any
2505
any_address = "::" # in6addr_any
2000
any_address = "0.0.0.0" # INADDR_ANY
2507
any_address = "0.0.0.0" # INADDR_ANY
2001
2508
self.server_address = (any_address,
2002
2509
self.server_address[1])
2003
2510
elif not self.server_address[1]:
2004
self.server_address = (self.server_address[0],
2511
self.server_address = (self.server_address[0], 0)
2006
2512
# if self.interface:
2007
2513
# self.server_address = (self.server_address[0],
2384
2902
server_settings["socket"] = os.dup(server_settings
2386
2904
del server_config
2388
2906
# Override the settings from the config file with command line
2389
2907
# options, if set.
2390
2908
for option in ("interface", "address", "port", "debug",
2391
"priority", "servicename", "configdir",
2392
"use_dbus", "use_ipv6", "debuglevel", "restore",
2393
"statedir", "socket", "foreground"):
2909
"priority", "servicename", "configdir", "use_dbus",
2910
"use_ipv6", "debuglevel", "restore", "statedir",
2911
"socket", "foreground", "zeroconf"):
2394
2912
value = getattr(options, option)
2395
2913
if value is not None:
2396
2914
server_settings[option] = value
2398
2916
# Force all strings to be unicode
2399
2917
for option in server_settings.keys():
2400
if type(server_settings[option]) is str:
2401
server_settings[option] = unicode(server_settings[option])
2918
if isinstance(server_settings[option], bytes):
2919
server_settings[option] = (server_settings[option]
2402
2921
# Force all boolean options to be boolean
2403
2922
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2923
"foreground", "zeroconf"):
2405
2924
server_settings[option] = bool(server_settings[option])
2406
2925
# Debug implies foreground
2407
2926
if server_settings["debug"]:
2408
2927
server_settings["foreground"] = True
2409
2928
# Now we have our good server settings in "server_settings"
2411
2930
##################################################################
2932
if (not server_settings["zeroconf"]
2933
and not (server_settings["port"]
2934
or server_settings["socket"] != "")):
2935
parser.error("Needs port or socket to work without Zeroconf")
2413
2937
# For convenience
2414
2938
debug = server_settings["debug"]
2415
2939
debuglevel = server_settings["debuglevel"]
2428
2953
level = getattr(logging, debuglevel.upper())
2429
2954
initlogger(debug, level)
2431
2956
if server_settings["servicename"] != "Mandos":
2432
syslogger.setFormatter(logging.Formatter
2433
('Mandos ({0}) [%(process)d]:'
2434
' %(levelname)s: %(message)s'
2435
.format(server_settings
2957
syslogger.setFormatter(
2958
logging.Formatter('Mandos ({}) [%(process)d]:'
2959
' %(levelname)s: %(message)s'.format(
2960
server_settings["servicename"])))
2438
2962
# Parse config file with clients
2439
2963
client_config = configparser.SafeConfigParser(Client
2440
2964
.client_defaults)
2441
2965
client_config.read(os.path.join(server_settings["configdir"],
2442
2966
"clients.conf"))
2444
2968
global mandos_dbus_service
2445
2969
mandos_dbus_service = None
2447
tcp_server = MandosServer((server_settings["address"],
2448
server_settings["port"]),
2450
interface=(server_settings["interface"]
2454
server_settings["priority"],
2456
socketfd=(server_settings["socket"]
2972
if server_settings["socket"] != "":
2973
socketfd = server_settings["socket"]
2974
tcp_server = MandosServer(
2975
(server_settings["address"], server_settings["port"]),
2977
interface=(server_settings["interface"] or None),
2979
gnutls_priority=server_settings["priority"],
2458
2982
if not foreground:
2459
2983
pidfilename = "/run/mandos.pid"
2984
if not os.path.isdir("/run/."):
2985
pidfilename = "/var/run/mandos.pid"
2462
pidfile = open(pidfilename, "w")
2988
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2463
2989
except IOError as e:
2464
2990
logger.error("Could not open file %r", pidfilename,
2467
for name in ("_mandos", "mandos", "nobody"):
2993
for name, group in (("_mandos", "_mandos"),
2994
("mandos", "mandos"),
2995
("nobody", "nogroup")):
2469
2997
uid = pwd.getpwnam(name).pw_uid
2470
gid = pwd.getpwnam(name).pw_gid
2998
gid = pwd.getpwnam(group).pw_gid
2472
3000
except KeyError:
3009
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2480
3011
except OSError as error:
3012
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3013
.format(uid, gid, os.strerror(error.errno)))
2481
3014
if error.errno != errno.EPERM:
2485
3018
# Enable all possible GnuTLS debugging
2487
3020
# "Use a log level over 10 to enable all debugging options."
2488
3021
# - GnuTLS manual
2489
gnutls.library.functions.gnutls_global_set_log_level(11)
2491
@gnutls.library.types.gnutls_log_func
3022
gnutls.global_set_log_level(11)
2492
3025
def debug_gnutls(level, string):
2493
3026
logger.debug("GnuTLS: %s", string[:-1])
2495
(gnutls.library.functions
2496
.gnutls_global_set_log_function(debug_gnutls))
3028
gnutls.global_set_log_function(debug_gnutls)
2498
3030
# Redirect stdin so all checkers get /dev/null
2499
3031
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2500
3032
os.dup2(null, sys.stdin.fileno())
2504
3036
# Need to fork before connecting to D-Bus
2505
3037
if not foreground:
2506
3038
# 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()
3041
# multiprocessing will use threads, so before we use GLib we need
3042
# to inform GLib that threads will be used.
2513
3045
global main_loop
2514
3046
# From the Avahi example code
2515
3047
DBusGMainLoop(set_as_default=True)
2516
main_loop = gobject.MainLoop()
3048
main_loop = GLib.MainLoop()
2517
3049
bus = dbus.SystemBus()
2518
3050
# End of Avahi example code
2521
3053
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:
3056
old_bus_name = dbus.service.BusName(
3057
"se.bsnet.fukt.Mandos", bus,
3059
except dbus.exceptions.DBusException as e:
2527
3060
logger.error("Disabling D-Bus:", exc_info=e)
2528
3061
use_dbus = False
2529
3062
server_settings["use_dbus"] = False
2530
3063
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"])))
3065
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3066
service = AvahiServiceToSyslog(
3067
name=server_settings["servicename"],
3068
servicetype="_mandos._tcp",
3071
if server_settings["interface"]:
3072
service.interface = if_nametoindex(
3073
server_settings["interface"].encode("utf-8"))
2540
3075
global multiprocessing_manager
2541
3076
multiprocessing_manager = multiprocessing.Manager()
2543
3078
client_class = Client
2545
client_class = functools.partial(ClientDBus, bus = bus)
3080
client_class = functools.partial(ClientDBus, bus=bus)
2547
3082
client_settings = Client.config_parser(client_config)
2548
3083
old_client_settings = {}
2549
3084
clients_data = {}
2551
3086
# This is used to redirect stdout and stderr for checker processes
2553
wnull = open(os.devnull, "w") # A writable /dev/null
3088
wnull = open(os.devnull, "w") # A writable /dev/null
2554
3089
# Only used if server is running in foreground but not in debug
2556
3091
if debug or not foreground:
2559
3094
# Get client data and settings from last running state.
2560
3095
if server_settings["restore"]:
2562
3097
with open(stored_state_path, "rb") as stored_state:
2563
clients_data, old_client_settings = (pickle.load
3098
if sys.version_info.major == 2:
3099
clients_data, old_client_settings = pickle.load(
3102
bytes_clients_data, bytes_old_client_settings = (
3103
pickle.load(stored_state, encoding="bytes"))
3104
# Fix bytes to strings
3107
clients_data = {(key.decode("utf-8")
3108
if isinstance(key, bytes)
3111
bytes_clients_data.items()}
3112
del bytes_clients_data
3113
for key in clients_data:
3114
value = {(k.decode("utf-8")
3115
if isinstance(k, bytes) else k): v
3117
clients_data[key].items()}
3118
clients_data[key] = value
3120
value["client_structure"] = [
3122
if isinstance(s, bytes)
3124
value["client_structure"]]
3126
for k in ("name", "host"):
3127
if isinstance(value[k], bytes):
3128
value[k] = value[k].decode("utf-8")
3129
# old_client_settings
3131
old_client_settings = {
3132
(key.decode("utf-8")
3133
if isinstance(key, bytes)
3136
bytes_old_client_settings.items()}
3137
del bytes_old_client_settings
3139
for value in old_client_settings.values():
3140
if isinstance(value["host"], bytes):
3141
value["host"] = (value["host"]
2565
3143
os.remove(stored_state_path)
2566
3144
except IOError as e:
2567
3145
if e.errno == errno.ENOENT:
2568
logger.warning("Could not load persistent state: {0}"
2569
.format(os.strerror(e.errno)))
3146
logger.warning("Could not load persistent state:"
3147
" {}".format(os.strerror(e.errno)))
2571
3149
logger.critical("Could not load persistent state:",
2574
3152
except EOFError as e:
2575
3153
logger.warning("Could not load persistent state: "
2576
"EOFError:", exc_info=e)
2578
3157
with PGPEngine() as pgp:
2579
for client_name, client in clients_data.iteritems():
3158
for client_name, client in clients_data.items():
2580
3159
# Skip removed clients
2581
3160
if client_name not in client_settings:
2584
3163
# Decide which value to use after restoring saved state.
2585
3164
# We have three different values: Old config file,
2586
3165
# new config file, and saved state.
2644
3223
for client_name in (set(client_settings)
2645
3224
- set(old_client_settings)):
2646
3225
clients_data[client_name] = client_settings[client_name]
2648
3227
# Create all client objects
2649
for client_name, client in clients_data.iteritems():
3228
for client_name, client in clients_data.items():
2650
3229
tcp_server.clients[client_name] = client_class(
2651
name = client_name, settings = client,
2652
server_settings = server_settings)
3232
server_settings=server_settings)
2654
3234
if not tcp_server.clients:
2655
3235
logger.warning("No clients defined")
2657
3237
if not foreground:
2658
3238
if pidfile is not None:
2662
pidfile.write(str(pid) + "\n".encode("utf-8"))
3242
print(pid, file=pidfile)
2663
3243
except IOError:
2664
3244
logger.error("Could not write to file %r with PID %d",
2665
3245
pidfilename, pid)
2667
3247
del pidfilename
2669
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2670
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3249
for termsig in (signal.SIGHUP, signal.SIGTERM):
3250
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3251
lambda: main_loop.quit() and False)
2673
@alternate_dbus_interfaces({"se.recompile.Mandos":
2674
"se.bsnet.fukt.Mandos"})
2675
class MandosDBusService(DBusObjectWithProperties):
3255
@alternate_dbus_interfaces(
3256
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3257
class MandosDBusService(DBusObjectWithObjectManager):
2676
3258
"""A D-Bus proxy object"""
2677
3260
def __init__(self):
2678
3261
dbus.service.Object.__init__(self, bus, "/")
2679
3263
_interface = "se.recompile.Mandos"
2681
@dbus_interface_annotations(_interface)
2683
return { "org.freedesktop.DBus.Property"
2684
".EmitsChangedSignal":
2687
3265
@dbus.service.signal(_interface, signature="o")
2688
3266
def ClientAdded(self, objpath):
2692
3270
@dbus.service.signal(_interface, signature="ss")
2693
3271
def ClientNotFound(self, fingerprint, address):
3275
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2697
3277
@dbus.service.signal(_interface, signature="os")
2698
3278
def ClientRemoved(self, objpath, name):
3282
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2702
3284
@dbus.service.method(_interface, out_signature="ao")
2703
3285
def GetAllClients(self):
2705
return dbus.Array(c.dbus_object_path
2707
tcp_server.clients.itervalues())
3287
return dbus.Array(c.dbus_object_path for c in
3288
tcp_server.clients.values())
3290
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2709
3292
@dbus.service.method(_interface,
2710
3293
out_signature="a{oa{sv}}")
2711
3294
def GetAllClientsWithProperties(self):
2713
3296
return dbus.Dictionary(
2714
((c.dbus_object_path, c.GetAll(""))
2715
for c in tcp_server.clients.itervalues()),
3297
{c.dbus_object_path: c.GetAll(
3298
"se.recompile.Mandos.Client")
3299
for c in tcp_server.clients.values()},
2716
3300
signature="oa{sv}")
2718
3302
@dbus.service.method(_interface, in_signature="o")
2719
3303
def RemoveClient(self, object_path):
2721
for c in tcp_server.clients.itervalues():
3305
for c in tcp_server.clients.values():
2722
3306
if c.dbus_object_path == object_path:
2723
3307
del tcp_server.clients[c.name]
2724
3308
c.remove_from_connection()
2725
# Don't signal anything except ClientRemoved
3309
# Don't signal the disabling
2726
3310
c.disable(quiet=True)
2728
self.ClientRemoved(object_path, c.name)
3311
# Emit D-Bus signal for removal
3312
self.client_removed_signal(c)
2730
3314
raise KeyError(object_path)
3318
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3319
out_signature="a{oa{sa{sv}}}")
3320
def GetManagedObjects(self):
3322
return dbus.Dictionary(
3323
{client.dbus_object_path:
3325
{interface: client.GetAll(interface)
3327
client._get_all_interface_names()})
3328
for client in tcp_server.clients.values()})
3330
def client_added_signal(self, client):
3331
"""Send the new standard signal and the old signal"""
3333
# New standard signal
3334
self.InterfacesAdded(
3335
client.dbus_object_path,
3337
{interface: client.GetAll(interface)
3339
client._get_all_interface_names()}))
3341
self.ClientAdded(client.dbus_object_path)
3343
def client_removed_signal(self, client):
3344
"""Send the new standard signal and the old signal"""
3346
# New standard signal
3347
self.InterfacesRemoved(
3348
client.dbus_object_path,
3349
client._get_all_interface_names())
3351
self.ClientRemoved(client.dbus_object_path,
2734
3354
mandos_dbus_service = MandosDBusService()
3356
# Save modules to variables to exempt the modules from being
3357
# unloaded before the function registered with atexit() is run.
3358
mp = multiprocessing
2737
3362
"Cleanup function; run on exit"
2740
multiprocessing.active_children()
3366
mp.active_children()
2742
3368
if not (tcp_server.clients or client_settings):
2745
3371
# Store client before exiting. Secrets are encrypted with key
2746
3372
# based on what config file has. If config file is
2747
3373
# removed/edited, old secret will thus be unrecovable.
2749
3375
with PGPEngine() as pgp:
2750
for client in tcp_server.clients.itervalues():
3376
for client in tcp_server.clients.values():
2751
3377
key = client_settings[client.name]["secret"]
2752
3378
client.encrypted_secret = pgp.encrypt(client.secret,
2754
3380
client_dict = {}
2756
3382
# 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)):
3384
exclude = {"bus", "changedstate", "secret",
3385
"checker", "server_settings"}
3386
for name, typ in inspect.getmembers(dbus.service
2762
3388
exclude.add(name)
2764
3390
client_dict["encrypted_secret"] = (client
2765
3391
.encrypted_secret)
2766
3392
for attr in client.client_structure:
2767
3393
if attr not in exclude:
2768
3394
client_dict[attr] = getattr(client, attr)
2770
3396
clients[client.name] = client_dict
2771
3397
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
3400
with tempfile.NamedTemporaryFile(
3404
dir=os.path.dirname(stored_state_path),
3405
delete=False) as stored_state:
3406
pickle.dump((clients, client_settings), stored_state,
3408
tempname = stored_state.name
2780
3409
os.rename(tempname, stored_state_path)
2781
3410
except (IOError, OSError) as e: