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-2017 Teddy Hogeborn
15
# Copyright © 2008-2017 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2013 Teddy Hogeborn
15
# Copyright © 2008-2013 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
35
34
from __future__ import (division, absolute_import, print_function,
39
from future_builtins import *
37
from future_builtins import *
44
import SocketServer as socketserver
39
import SocketServer as socketserver
52
import ConfigParser as configparser
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
82
74
import dbus.service
83
from gi.repository import GLib
84
77
from dbus.mainloop.glib import DBusGMainLoop
87
80
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
94
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
85
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
99
87
from IN import SO_BINDTODEVICE
100
88
except ImportError:
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
115
if sys.version_info.major == 2:
89
SO_BINDTODEVICE = None
119
92
stored_state_file = "clients.pickle"
121
94
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
127
103
except (OSError, AttributeError):
129
104
def if_nametoindex(interface):
130
105
"Get an interface index the hard way, i.e. using fcntl()"
131
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
132
107
with contextlib.closing(socket.socket()) as s:
133
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
136
113
return interface_index
139
def copy_function(func):
140
"""Make a copy of a function"""
141
if sys.version_info.major == 2:
142
return types.FunctionType(func.func_code,
148
return types.FunctionType(func.__code__,
155
116
def initlogger(debug, level=logging.WARNING):
156
117
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
162
119
syslogger.setFormatter(logging.Formatter
163
120
('Mandos [%(process)d]: %(levelname)s:'
165
122
logger.addHandler(syslogger)
168
125
console = logging.StreamHandler()
169
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
226
169
os.rmdir(self.tempdir)
227
170
self.tempdir = None
229
172
def password_encode(self, password):
230
173
# Passphrase can not be empty and can not contain newlines or
231
174
# NUL bytes. So we prefix it and hex encode it.
232
encoded = b"mandos" + binascii.hexlify(password)
233
if len(encoded) > 2048:
234
# GnuPG can't handle long passwords, so encode differently
235
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
236
.replace(b"\n", b"\\n")
237
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
240
177
def encrypt(self, data, password):
241
178
passphrase = self.password_encode(password)
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
244
181
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
183
proc = subprocess.Popen(['gpg', '--symmetric',
247
184
'--passphrase-file',
249
186
+ self.gnupgargs,
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
187
stdin = subprocess.PIPE,
188
stdout = subprocess.PIPE,
189
stderr = subprocess.PIPE)
190
ciphertext, err = proc.communicate(input = data)
254
191
if proc.returncode != 0:
255
192
raise PGPError(err)
256
193
return ciphertext
258
195
def decrypt(self, data, password):
259
196
passphrase = self.password_encode(password)
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
262
199
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
201
proc = subprocess.Popen(['gpg', '--decrypt',
265
202
'--passphrase-file',
267
204
+ self.gnupgargs,
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
205
stdin = subprocess.PIPE,
206
stdout = subprocess.PIPE,
207
stderr = subprocess.PIPE)
208
decrypted_plaintext, err = proc.communicate(input
272
210
if proc.returncode != 0:
273
211
raise PGPError(err)
274
212
return decrypted_plaintext
277
# Pretend that we have an Avahi module
279
"""This isn't so much a class as it is a module-like namespace.
280
It is instantiated once, and simulates having an Avahi module."""
281
IF_UNSPEC = -1 # avahi-common/address.h
282
PROTO_UNSPEC = -1 # avahi-common/address.h
283
PROTO_INET = 0 # avahi-common/address.h
284
PROTO_INET6 = 1 # avahi-common/address.h
285
DBUS_NAME = "org.freedesktop.Avahi"
286
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
287
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
288
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(self, t):
291
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
for s in t), signature="ay")
293
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
294
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
295
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
296
SERVER_INVALID = 0 # avahi-common/defs.h
297
SERVER_REGISTERING = 1 # avahi-common/defs.h
298
SERVER_RUNNING = 2 # avahi-common/defs.h
299
SERVER_COLLISION = 3 # avahi-common/defs.h
300
SERVER_FAILURE = 4 # avahi-common/defs.h
304
215
class AvahiError(Exception):
305
216
def __init__(self, value, *args, **kwargs):
306
217
self.value = value
307
return super(AvahiError, self).__init__(value, *args,
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
311
222
class AvahiServiceError(AvahiError):
315
225
class AvahiGroupError(AvahiError):
319
229
class AvahiService(object):
320
230
"""An Avahi (Zeroconf) service.
323
233
interface: integer; avahi.IF_UNSPEC or an interface index.
324
234
Used to optionally bind to the specified interface.
489
377
follow_name_owner_changes=True),
490
378
avahi.DBUS_INTERFACE_SERVER)
491
379
self.server.connect_to_signal("StateChanged",
492
self.server_state_changed)
380
self.server_state_changed)
493
381
self.server_state_changed(self.server.GetState())
496
384
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
498
386
"""Add the new name to the syslog messages"""
499
ret = super(AvahiServiceToSyslog, self).rename(self, *args,
501
syslogger.setFormatter(logging.Formatter(
502
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
507
# Pretend that we have a GnuTLS module
508
class GnuTLS(object):
509
"""This isn't so much a class as it is a module-like namespace.
510
It is instantiated once, and simulates having a GnuTLS module."""
512
library = ctypes.util.find_library("gnutls")
514
library = ctypes.util.find_library("gnutls-deb0")
515
_library = ctypes.cdll.LoadLibrary(library)
517
_need_version = b"3.3.0"
520
# Need to use "self" here, since this method is called before
521
# the assignment to the "gnutls" global variable happens.
522
if self.check_version(self._need_version) is None:
523
raise self.Error("Needs GnuTLS {} or later"
524
.format(self._need_version))
526
# Unless otherwise indicated, the constants and types below are
527
# all from the gnutls/gnutls.h C header file.
537
E_NO_CERTIFICATE_FOUND = -49
538
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
541
class session_int(ctypes.Structure):
543
session_t = ctypes.POINTER(session_int)
545
class certificate_credentials_st(ctypes.Structure):
547
certificate_credentials_t = ctypes.POINTER(
548
certificate_credentials_st)
549
certificate_type_t = ctypes.c_int
551
class datum_t(ctypes.Structure):
552
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
553
('size', ctypes.c_uint)]
555
class openpgp_crt_int(ctypes.Structure):
557
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
558
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
559
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
560
credentials_type_t = ctypes.c_int
561
transport_ptr_t = ctypes.c_void_p
562
close_request_t = ctypes.c_int
565
class Error(Exception):
566
# We need to use the class name "GnuTLS" here, since this
567
# exception might be raised from within GnuTLS.__init__,
568
# which is called before the assignment to the "gnutls"
569
# global variable has happened.
570
def __init__(self, message=None, code=None, args=()):
571
# Default usage is by a message string, but if a return
572
# code is passed, convert it to a string with
575
if message is None and code is not None:
576
message = GnuTLS.strerror(code)
577
return super(GnuTLS.Error, self).__init__(
580
class CertificateSecurityError(Error):
584
class Credentials(object):
586
self._c_object = gnutls.certificate_credentials_t()
587
gnutls.certificate_allocate_credentials(
588
ctypes.byref(self._c_object))
589
self.type = gnutls.CRD_CERTIFICATE
592
gnutls.certificate_free_credentials(self._c_object)
594
class ClientSession(object):
595
def __init__(self, socket, credentials=None):
596
self._c_object = gnutls.session_t()
597
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
598
gnutls.set_default_priority(self._c_object)
599
gnutls.transport_set_ptr(self._c_object, socket.fileno())
600
gnutls.handshake_set_private_extensions(self._c_object,
603
if credentials is None:
604
credentials = gnutls.Credentials()
605
gnutls.credentials_set(self._c_object, credentials.type,
606
ctypes.cast(credentials._c_object,
608
self.credentials = credentials
611
gnutls.deinit(self._c_object)
614
return gnutls.handshake(self._c_object)
616
def send(self, data):
620
data_len -= gnutls.record_send(self._c_object,
625
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
627
# Error handling functions
628
def _error_code(result):
629
"""A function to raise exceptions on errors, suitable
630
for the 'restype' attribute on ctypes functions"""
633
if result == gnutls.E_NO_CERTIFICATE_FOUND:
634
raise gnutls.CertificateSecurityError(code=result)
635
raise gnutls.Error(code=result)
637
def _retry_on_error(result, func, arguments):
638
"""A function to retry on some errors, suitable
639
for the 'errcheck' attribute on ctypes functions"""
641
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
642
return _error_code(result)
643
result = func(*arguments)
646
# Unless otherwise indicated, the function declarations below are
647
# all from the gnutls/gnutls.h C header file.
650
priority_set_direct = _library.gnutls_priority_set_direct
651
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
652
ctypes.POINTER(ctypes.c_char_p)]
653
priority_set_direct.restype = _error_code
655
init = _library.gnutls_init
656
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
657
init.restype = _error_code
659
set_default_priority = _library.gnutls_set_default_priority
660
set_default_priority.argtypes = [session_t]
661
set_default_priority.restype = _error_code
663
record_send = _library.gnutls_record_send
664
record_send.argtypes = [session_t, ctypes.c_void_p,
666
record_send.restype = ctypes.c_ssize_t
667
record_send.errcheck = _retry_on_error
669
certificate_allocate_credentials = (
670
_library.gnutls_certificate_allocate_credentials)
671
certificate_allocate_credentials.argtypes = [
672
ctypes.POINTER(certificate_credentials_t)]
673
certificate_allocate_credentials.restype = _error_code
675
certificate_free_credentials = (
676
_library.gnutls_certificate_free_credentials)
677
certificate_free_credentials.argtypes = [
678
certificate_credentials_t]
679
certificate_free_credentials.restype = None
681
handshake_set_private_extensions = (
682
_library.gnutls_handshake_set_private_extensions)
683
handshake_set_private_extensions.argtypes = [session_t,
685
handshake_set_private_extensions.restype = None
687
credentials_set = _library.gnutls_credentials_set
688
credentials_set.argtypes = [session_t, credentials_type_t,
690
credentials_set.restype = _error_code
692
strerror = _library.gnutls_strerror
693
strerror.argtypes = [ctypes.c_int]
694
strerror.restype = ctypes.c_char_p
696
certificate_type_get = _library.gnutls_certificate_type_get
697
certificate_type_get.argtypes = [session_t]
698
certificate_type_get.restype = _error_code
700
certificate_get_peers = _library.gnutls_certificate_get_peers
701
certificate_get_peers.argtypes = [session_t,
702
ctypes.POINTER(ctypes.c_uint)]
703
certificate_get_peers.restype = ctypes.POINTER(datum_t)
705
global_set_log_level = _library.gnutls_global_set_log_level
706
global_set_log_level.argtypes = [ctypes.c_int]
707
global_set_log_level.restype = None
709
global_set_log_function = _library.gnutls_global_set_log_function
710
global_set_log_function.argtypes = [log_func]
711
global_set_log_function.restype = None
713
deinit = _library.gnutls_deinit
714
deinit.argtypes = [session_t]
715
deinit.restype = None
717
handshake = _library.gnutls_handshake
718
handshake.argtypes = [session_t]
719
handshake.restype = _error_code
720
handshake.errcheck = _retry_on_error
722
transport_set_ptr = _library.gnutls_transport_set_ptr
723
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
724
transport_set_ptr.restype = None
726
bye = _library.gnutls_bye
727
bye.argtypes = [session_t, close_request_t]
728
bye.restype = _error_code
729
bye.errcheck = _retry_on_error
731
check_version = _library.gnutls_check_version
732
check_version.argtypes = [ctypes.c_char_p]
733
check_version.restype = ctypes.c_char_p
735
# All the function declarations below are from gnutls/openpgp.h
737
openpgp_crt_init = _library.gnutls_openpgp_crt_init
738
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
739
openpgp_crt_init.restype = _error_code
741
openpgp_crt_import = _library.gnutls_openpgp_crt_import
742
openpgp_crt_import.argtypes = [openpgp_crt_t,
743
ctypes.POINTER(datum_t),
745
openpgp_crt_import.restype = _error_code
747
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
748
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
749
ctypes.POINTER(ctypes.c_uint)]
750
openpgp_crt_verify_self.restype = _error_code
752
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
753
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
754
openpgp_crt_deinit.restype = None
756
openpgp_crt_get_fingerprint = (
757
_library.gnutls_openpgp_crt_get_fingerprint)
758
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
762
openpgp_crt_get_fingerprint.restype = _error_code
764
# Remove non-public functions
765
del _error_code, _retry_on_error
766
# Create the global "gnutls" object, simulating a module
770
def call_pipe(connection, # : multiprocessing.Connection
771
func, *args, **kwargs):
772
"""This function is meant to be called by multiprocessing.Process
774
This function runs func(*args, **kwargs), and writes the resulting
775
return value on the provided multiprocessing.Connection.
777
connection.send(func(*args, **kwargs))
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
781
402
class Client(object):
782
403
"""A representation of a client host served by this server.
785
406
approved: bool(); 'None' if not yet approved/disapproved
786
407
approval_delay: datetime.timedelta(); Time to wait for approval
961
595
logger.info("Disabling client %s", self.name)
962
596
if getattr(self, "disable_initiator_tag", None) is not None:
963
GLib.source_remove(self.disable_initiator_tag)
597
gobject.source_remove(self.disable_initiator_tag)
964
598
self.disable_initiator_tag = None
965
599
self.expires = None
966
600
if getattr(self, "checker_initiator_tag", None) is not None:
967
GLib.source_remove(self.checker_initiator_tag)
601
gobject.source_remove(self.checker_initiator_tag)
968
602
self.checker_initiator_tag = None
969
603
self.stop_checker()
970
604
self.enabled = False
972
606
self.send_changedstate()
973
# Do not run this again if called by a GLib.timeout_add
607
# Do not run this again if called by a gobject.timeout_add
976
610
def __del__(self):
979
613
def init_checker(self):
980
614
# Schedule a new checker to be started an 'interval' from now,
981
615
# and every interval from then on.
982
616
if self.checker_initiator_tag is not None:
983
GLib.source_remove(self.checker_initiator_tag)
984
self.checker_initiator_tag = GLib.timeout_add(
985
int(self.interval.total_seconds() * 1000),
617
gobject.source_remove(self.checker_initiator_tag)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
987
621
# Schedule a disable() when 'timeout' has passed
988
622
if self.disable_initiator_tag is not None:
989
GLib.source_remove(self.disable_initiator_tag)
990
self.disable_initiator_tag = GLib.timeout_add(
991
int(self.timeout.total_seconds() * 1000), self.disable)
623
gobject.source_remove(self.disable_initiator_tag)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
992
627
# Also start a new checker *right now*.
993
628
self.start_checker()
995
def checker_callback(self, source, condition, connection,
630
def checker_callback(self, pid, condition, command):
997
631
"""The checker has completed, so take appropriate actions."""
998
632
self.checker_callback_tag = None
999
633
self.checker = None
1000
# Read return code from connection (see call_pipe)
1001
returncode = connection.recv()
1005
self.last_checker_status = returncode
1006
self.last_checker_signal = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
1007
636
if self.last_checker_status == 0:
1008
637
logger.info("Checker for %(name)s succeeded",
1010
639
self.checked_ok()
1012
logger.info("Checker for %(name)s failed", vars(self))
641
logger.info("Checker for %(name)s failed",
1014
644
self.last_checker_status = -1
1015
self.last_checker_signal = -returncode
1016
645
logger.warning("Checker for %(name)s crashed?",
1020
648
def checked_ok(self):
1021
649
"""Assert that the client has been seen, alive and well."""
1022
650
self.last_checked_ok = datetime.datetime.utcnow()
1023
651
self.last_checker_status = 0
1024
self.last_checker_signal = None
1025
652
self.bump_timeout()
1027
654
def bump_timeout(self, timeout=None):
1028
655
"""Bump up the timeout for this client."""
1029
656
if timeout is None:
1030
657
timeout = self.timeout
1031
658
if self.disable_initiator_tag is not None:
1032
GLib.source_remove(self.disable_initiator_tag)
659
gobject.source_remove(self.disable_initiator_tag)
1033
660
self.disable_initiator_tag = None
1034
661
if getattr(self, "enabled", False):
1035
self.disable_initiator_tag = GLib.timeout_add(
1036
int(timeout.total_seconds() * 1000), self.disable)
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
1037
665
self.expires = datetime.datetime.utcnow() + timeout
1039
667
def need_approval(self):
1040
668
self.last_approval_request = datetime.datetime.utcnow()
1042
670
def start_checker(self):
1043
671
"""Start a new checker subprocess if one is not running.
1045
673
If a checker already exists, leave it running and do
1047
675
# The reason for not killing a running checker is that if we
1052
680
# checkers alone, the checker would have to take more time
1053
681
# than 'timeout' for the client to be disabled, which is as it
1056
if self.checker is not None and not self.checker.is_alive():
1057
logger.warning("Checker was not alive; joining")
684
# If a checker exists, make sure it is not a zombie
686
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
693
logger.warning("Checker was a zombie")
694
gobject.source_remove(self.checker_callback_tag)
695
self.checker_callback(pid, status,
696
self.current_checker_command)
1060
697
# Start a new checker if needed
1061
698
if self.checker is None:
1062
699
# Escape attributes for the shell
1064
attr: re.escape(str(getattr(self, attr)))
1065
for attr in self.runtime_expansions}
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
703
self.runtime_expansions)
1067
705
command = self.checker_command % escaped_attrs
1068
706
except TypeError as error:
1069
707
logger.error('Could not format string "%s"',
1070
self.checker_command,
708
self.checker_command, exc_info=error)
709
return True # Try again later
710
self.current_checker_command = command
712
logger.info("Starting checker %r for %s",
714
# We don't need to redirect stdout and stderr, since
715
# in normal mode, that is already done by daemon(),
716
# and in debug mode we don't want to. (Stdin is
717
# always replaced by /dev/null.)
718
# The exception is when not debugging but nevertheless
719
# running in the foreground; use the previously
722
if (not self.server_settings["debug"]
723
and self.server_settings["foreground"]):
724
popen_args.update({"stdout": wnull,
726
self.checker = subprocess.Popen(command,
730
except OSError as error:
731
logger.error("Failed to start subprocess",
1072
return True # Try again later
1073
self.current_checker_command = command
1074
logger.info("Starting checker %r for %s", command,
1076
# We don't need to redirect stdout and stderr, since
1077
# in normal mode, that is already done by daemon(),
1078
# and in debug mode we don't want to. (Stdin is
1079
# always replaced by /dev/null.)
1080
# The exception is when not debugging but nevertheless
1081
# running in the foreground; use the previously
1083
popen_args = {"close_fds": True,
1086
if (not self.server_settings["debug"]
1087
and self.server_settings["foreground"]):
1088
popen_args.update({"stdout": wnull,
1090
pipe = multiprocessing.Pipe(duplex=False)
1091
self.checker = multiprocessing.Process(
1093
args=(pipe[1], subprocess.call, command),
1095
self.checker.start()
1096
self.checker_callback_tag = GLib.io_add_watch(
1097
pipe[0].fileno(), GLib.IO_IN,
1098
self.checker_callback, pipe[0], command)
1099
# Re-run this periodically if run by GLib.timeout_add
734
self.checker_callback_tag = (gobject.child_watch_add
736
self.checker_callback,
738
# The checker may have completed before the gobject
739
# watch was added. Check for this.
741
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
742
except OSError as error:
743
if error.errno == errno.ECHILD:
744
# This should never happen
745
logger.error("Child process vanished",
750
gobject.source_remove(self.checker_callback_tag)
751
self.checker_callback(pid, status, command)
752
# Re-run this periodically if run by gobject.timeout_add
1102
755
def stop_checker(self):
1103
756
"""Force the checker process, if any, to stop."""
1104
757
if self.checker_callback_tag:
1105
GLib.source_remove(self.checker_callback_tag)
758
gobject.source_remove(self.checker_callback_tag)
1106
759
self.checker_callback_tag = None
1107
760
if getattr(self, "checker", None) is None:
1109
762
logger.debug("Stopping checker for %(name)s", vars(self))
1110
self.checker.terminate()
764
self.checker.terminate()
766
#if self.checker.poll() is None:
767
# self.checker.kill()
768
except OSError as error:
769
if error.errno != errno.ESRCH: # No such process
1111
771
self.checker = None
1114
def dbus_service_property(dbus_interface,
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
1118
776
"""Decorators for marking methods of a DBusObjectWithProperties to
1119
777
become properties on the D-Bus.
1121
779
The decorated method will be called with no arguments by "Get"
1122
780
and with one argument by "Set".
1124
782
The parameters, where they are supported, are the same as
1125
783
dbus.service.method, except there is only "signature", since the
1126
784
type from Get() and the type sent to Set() is the same.
1209
class DBusObjectWithAnnotations(dbus.service.Object):
1210
"""A D-Bus object with annotations.
1212
Classes inheriting from this can use the dbus_annotations
1213
decorator to add annotations to methods or signals.
860
class DBusObjectWithProperties(dbus.service.Object):
861
"""A D-Bus object with properties.
863
Classes inheriting from this can use the dbus_service_property
864
decorator to expose methods as D-Bus properties. It exposes the
865
standard Get(), Set(), and GetAll() methods on the D-Bus.
1217
869
def _is_dbus_thing(thing):
1218
870
"""Returns a function testing if an attribute is a D-Bus thing
1220
872
If called like _is_dbus_thing("method") it returns a function
1221
873
suitable for use as predicate to inspect.getmembers().
1223
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1226
878
def _get_all_dbus_things(self, thing):
1227
879
"""Returns a generator of (name, attribute) pairs
1229
return ((getattr(athing.__get__(self), "_dbus_name", name),
881
return ((getattr(athing.__get__(self), "_dbus_name",
1230
883
athing.__get__(self))
1231
884
for cls in self.__class__.__mro__
1232
885
for name, athing in
1233
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1235
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1237
path_keyword='object_path',
1238
connection_keyword='connection')
1239
def Introspect(self, object_path, connection):
1240
"""Overloading of standard D-Bus method.
1242
Inserts annotation tags on methods and signals.
1244
xmlstring = dbus.service.Object.Introspect(self, object_path,
1247
document = xml.dom.minidom.parseString(xmlstring)
1249
for if_tag in document.getElementsByTagName("interface"):
1250
# Add annotation tags
1251
for typ in ("method", "signal"):
1252
for tag in if_tag.getElementsByTagName(typ):
1254
for name, prop in (self.
1255
_get_all_dbus_things(typ)):
1256
if (name == tag.getAttribute("name")
1257
and prop._dbus_interface
1258
== if_tag.getAttribute("name")):
1259
annots.update(getattr(
1260
prop, "_dbus_annotations", {}))
1261
for name, value in annots.items():
1262
ann_tag = document.createElement(
1264
ann_tag.setAttribute("name", name)
1265
ann_tag.setAttribute("value", value)
1266
tag.appendChild(ann_tag)
1267
# Add interface annotation tags
1268
for annotation, value in dict(
1269
itertools.chain.from_iterable(
1270
annotations().items()
1271
for name, annotations
1272
in self._get_all_dbus_things("interface")
1273
if name == if_tag.getAttribute("name")
1275
ann_tag = document.createElement("annotation")
1276
ann_tag.setAttribute("name", annotation)
1277
ann_tag.setAttribute("value", value)
1278
if_tag.appendChild(ann_tag)
1279
# Fix argument name for the Introspect method itself
1280
if (if_tag.getAttribute("name")
1281
== dbus.INTROSPECTABLE_IFACE):
1282
for cn in if_tag.getElementsByTagName("method"):
1283
if cn.getAttribute("name") == "Introspect":
1284
for arg in cn.getElementsByTagName("arg"):
1285
if (arg.getAttribute("direction")
1287
arg.setAttribute("name",
1289
xmlstring = document.toxml("utf-8")
1291
except (AttributeError, xml.dom.DOMException,
1292
xml.parsers.expat.ExpatError) as error:
1293
logger.error("Failed to override Introspection method",
1298
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1299
"""A D-Bus object with properties.
1301
Classes inheriting from this can use the dbus_service_property
1302
decorator to expose methods as D-Bus properties. It exposes the
1303
standard Get(), Set(), and GetAll() methods on the D-Bus.
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
1306
889
def _get_dbus_property(self, interface_name, property_name):
1307
890
"""Returns a bound method if one exists which is a D-Bus
1308
891
property with the specified name and interface.
1310
for cls in self.__class__.__mro__:
1311
for name, value in inspect.getmembers(
1312
cls, self._is_dbus_thing("property")):
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
896
self._is_dbus_thing("property"))):
1313
897
if (value._dbus_name == property_name
1314
898
and value._dbus_interface == interface_name):
1315
899
return value.__get__(self)
1317
901
# No such property
1318
raise DBusPropertyNotFound("{}:{}.{}".format(
1319
self.dbus_object_path, interface_name, property_name))
1322
def _get_all_interface_names(cls):
1323
"""Get a sequence of all interfaces supported by an object"""
1324
return (name for name in set(getattr(getattr(x, attr),
1325
"_dbus_interface", None)
1326
for x in (inspect.getmro(cls))
1328
if name is not None)
1330
@dbus.service.method(dbus.PROPERTIES_IFACE,
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1332
907
out_signature="v")
1333
908
def Get(self, interface_name, property_name):
1334
909
"""Standard D-Bus property Get() method, see D-Bus standard.
1463
1039
return xmlstring
1467
dbus.OBJECT_MANAGER_IFACE
1468
except AttributeError:
1469
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1472
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1473
"""A D-Bus object with an ObjectManager.
1475
Classes inheriting from this exposes the standard
1476
GetManagedObjects call and the InterfacesAdded and
1477
InterfacesRemoved signals on the standard
1478
"org.freedesktop.DBus.ObjectManager" interface.
1480
Note: No signals are sent automatically; they must be sent
1483
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1484
out_signature="a{oa{sa{sv}}}")
1485
def GetManagedObjects(self):
1486
"""This function must be overridden"""
1487
raise NotImplementedError()
1489
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1490
signature="oa{sa{sv}}")
1491
def InterfacesAdded(self, object_path, interfaces_and_properties):
1494
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1495
def InterfacesRemoved(self, object_path, interfaces):
1498
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1500
path_keyword='object_path',
1501
connection_keyword='connection')
1502
def Introspect(self, object_path, connection):
1503
"""Overloading of standard D-Bus method.
1505
Override return argument name of GetManagedObjects to be
1506
"objpath_interfaces_and_properties"
1508
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1512
document = xml.dom.minidom.parseString(xmlstring)
1514
for if_tag in document.getElementsByTagName("interface"):
1515
# Fix argument name for the GetManagedObjects method
1516
if (if_tag.getAttribute("name")
1517
== dbus.OBJECT_MANAGER_IFACE):
1518
for cn in if_tag.getElementsByTagName("method"):
1519
if (cn.getAttribute("name")
1520
== "GetManagedObjects"):
1521
for arg in cn.getElementsByTagName("arg"):
1522
if (arg.getAttribute("direction")
1526
"objpath_interfaces"
1528
xmlstring = document.toxml("utf-8")
1530
except (AttributeError, xml.dom.DOMException,
1531
xml.parsers.expat.ExpatError) as error:
1532
logger.error("Failed to override Introspection method",
1537
1042
def datetime_to_dbus(dt, variant_level=0):
1538
1043
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1540
return dbus.String("", variant_level=variant_level)
1541
return dbus.String(dt.isoformat(), variant_level=variant_level)
1045
return dbus.String("", variant_level = variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1544
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1575
1080
# Ignore non-D-Bus attributes, and D-Bus attributes
1576
1081
# with the wrong interface name
1577
1082
if (not hasattr(attribute, "_dbus_interface")
1578
or not attribute._dbus_interface.startswith(
1579
orig_interface_name)):
1083
or not attribute._dbus_interface
1084
.startswith(orig_interface_name)):
1581
1086
# Create an alternate D-Bus interface name based on
1582
1087
# the current name
1583
alt_interface = attribute._dbus_interface.replace(
1584
orig_interface_name, alt_interface_name)
1088
alt_interface = (attribute._dbus_interface
1089
.replace(orig_interface_name,
1090
alt_interface_name))
1585
1091
interface_names.add(alt_interface)
1586
1092
# Is this a D-Bus signal?
1587
1093
if getattr(attribute, "_dbus_is_signal", False):
1588
1094
# Extract the original non-method undecorated
1589
1095
# function by black magic
1590
if sys.version_info.major == 2:
1591
nonmethod_func = (dict(
1096
nonmethod_func = (dict(
1592
1097
zip(attribute.func_code.co_freevars,
1593
attribute.__closure__))
1594
["func"].cell_contents)
1596
nonmethod_func = (dict(
1597
zip(attribute.__code__.co_freevars,
1598
attribute.__closure__))
1599
["func"].cell_contents)
1098
attribute.__closure__))["func"]
1600
1100
# Create a new, but exactly alike, function
1601
1101
# object, and decorate it to be a new D-Bus signal
1602
1102
# with the alternate D-Bus interface name
1603
new_function = copy_function(nonmethod_func)
1604
new_function = (dbus.service.signal(
1606
attribute._dbus_signature)(new_function))
1103
new_function = (dbus.service.signal
1105
attribute._dbus_signature)
1106
(types.FunctionType(
1107
nonmethod_func.func_code,
1108
nonmethod_func.func_globals,
1109
nonmethod_func.func_name,
1110
nonmethod_func.func_defaults,
1111
nonmethod_func.func_closure)))
1607
1112
# Copy annotations, if any
1609
new_function._dbus_annotations = dict(
1610
attribute._dbus_annotations)
1114
new_function._dbus_annotations = (
1115
dict(attribute._dbus_annotations))
1611
1116
except AttributeError:
1614
1118
# Define a creator of a function to call both the
1615
1119
# original and alternate functions, so both the
1616
1120
# original and alternate signals gets sent when
1699
1210
if interface_names:
1700
1211
# Replace the class with a new subclass of it with
1701
1212
# methods, signals, etc. as created above.
1702
if sys.version_info.major == 2:
1703
cls = type(b"{}Alternate".format(cls.__name__),
1706
cls = type("{}Alternate".format(cls.__name__),
1213
cls = type(b"{0}Alternate".format(cls.__name__),
1713
1219
@alternate_dbus_interfaces({"se.recompile.Mandos":
1714
"se.bsnet.fukt.Mandos"})
1220
"se.bsnet.fukt.Mandos"})
1715
1221
class ClientDBus(Client, DBusObjectWithProperties):
1716
1222
"""A Client class using D-Bus
1719
1225
dbus_object_path: dbus.ObjectPath
1720
1226
bus: dbus.SystemBus()
1723
1229
runtime_expansions = (Client.runtime_expansions
1724
+ ("dbus_object_path", ))
1726
_interface = "se.recompile.Mandos.Client"
1230
+ ("dbus_object_path",))
1728
1232
# dbus.service.Object doesn't use super(), so we can't either.
1730
def __init__(self, bus=None, *args, **kwargs):
1234
def __init__(self, bus = None, *args, **kwargs):
1732
1236
Client.__init__(self, *args, **kwargs)
1733
1237
# Only now, when this client is initialized, can it show up on
1735
client_object_name = str(self.name).translate(
1239
client_object_name = unicode(self.name).translate(
1736
1240
{ord("."): ord("_"),
1737
1241
ord("-"): ord("_")})
1738
self.dbus_object_path = dbus.ObjectPath(
1739
"/clients/" + client_object_name)
1242
self.dbus_object_path = (dbus.ObjectPath
1243
("/clients/" + client_object_name))
1740
1244
DBusObjectWithProperties.__init__(self, self.bus,
1741
1245
self.dbus_object_path)
1743
def notifychangeproperty(transform_func, dbus_name,
1744
type_func=lambda x: x,
1746
invalidate_only=False,
1747
_interface=_interface):
1247
def notifychangeproperty(transform_func,
1248
dbus_name, type_func=lambda x: x,
1748
1250
""" Modify a variable so that it's a property which announces
1749
1251
its changes to DBus.
1751
1253
transform_fun: Function that takes a value and a variant_level
1752
1254
and transforms it to a D-Bus type.
1753
1255
dbus_name: D-Bus name of the variable
1829
1320
if hasattr(DBusObjectWithProperties, "__del__"):
1830
1321
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1831
1322
Client.__del__(self, *args, **kwargs)
1833
def checker_callback(self, source, condition,
1834
connection, command, *args, **kwargs):
1835
ret = Client.checker_callback(self, source, condition,
1836
connection, command, *args,
1838
exitstatus = self.last_checker_status
1324
def checker_callback(self, pid, condition, command,
1326
self.checker_callback_tag = None
1328
if os.WIFEXITED(condition):
1329
exitstatus = os.WEXITSTATUS(condition)
1840
1330
# Emit D-Bus signal
1841
1331
self.CheckerCompleted(dbus.Int16(exitstatus),
1842
# This is specific to GNU libC
1843
dbus.Int64(exitstatus << 8),
1332
dbus.Int64(condition),
1844
1333
dbus.String(command))
1846
1335
# Emit D-Bus signal
1847
1336
self.CheckerCompleted(dbus.Int16(-1),
1849
# This is specific to GNU libC
1851
| self.last_checker_signal),
1337
dbus.Int64(condition),
1852
1338
dbus.String(command))
1340
return Client.checker_callback(self, pid, condition, command,
1855
1343
def start_checker(self, *args, **kwargs):
1856
old_checker_pid = getattr(self.checker, "pid", None)
1344
old_checker = self.checker
1345
if self.checker is not None:
1346
old_checker_pid = self.checker.pid
1348
old_checker_pid = None
1857
1349
r = Client.start_checker(self, *args, **kwargs)
1858
1350
# Only if new checker process was started
1859
1351
if (self.checker is not None
1905
1403
server to mandos-client
1909
1407
# Rejected - signal
1910
1408
@dbus.service.signal(_interface, signature="s")
1911
1409
def Rejected(self, reason):
1915
1413
# NeedApproval - signal
1916
1414
@dbus.service.signal(_interface, signature="tb")
1917
1415
def NeedApproval(self, timeout, default):
1919
1417
return self.need_approval()
1923
1421
# Approve - method
1924
1422
@dbus.service.method(_interface, in_signature="b")
1925
1423
def Approve(self, value):
1926
1424
self.approve(value)
1928
1426
# CheckedOK - method
1929
1427
@dbus.service.method(_interface)
1930
1428
def CheckedOK(self):
1931
1429
self.checked_ok()
1933
1431
# Enable - method
1934
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1935
1432
@dbus.service.method(_interface)
1936
1433
def Enable(self):
1940
1437
# StartChecker - method
1941
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1942
1438
@dbus.service.method(_interface)
1943
1439
def StartChecker(self):
1945
1441
self.start_checker()
1947
1443
# Disable - method
1948
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1949
1444
@dbus.service.method(_interface)
1950
1445
def Disable(self):
1954
1449
# StopChecker - method
1955
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1956
1450
@dbus.service.method(_interface)
1957
1451
def StopChecker(self):
1958
1452
self.stop_checker()
1962
1456
# ApprovalPending - property
1963
1457
@dbus_service_property(_interface, signature="b", access="read")
1964
1458
def ApprovalPending_dbus_property(self):
1965
1459
return dbus.Boolean(bool(self.approvals_pending))
1967
1461
# ApprovedByDefault - property
1968
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="b",
1970
1463
access="readwrite")
1971
1464
def ApprovedByDefault_dbus_property(self, value=None):
1972
1465
if value is None: # get
1973
1466
return dbus.Boolean(self.approved_by_default)
1974
1467
self.approved_by_default = bool(value)
1976
1469
# ApprovalDelay - property
1977
@dbus_service_property(_interface,
1470
@dbus_service_property(_interface, signature="t",
1979
1471
access="readwrite")
1980
1472
def ApprovalDelay_dbus_property(self, value=None):
1981
1473
if value is None: # get
1982
return dbus.UInt64(self.approval_delay.total_seconds()
1474
return dbus.UInt64(self.approval_delay_milliseconds())
1984
1475
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1986
1477
# ApprovalDuration - property
1987
@dbus_service_property(_interface,
1478
@dbus_service_property(_interface, signature="t",
1989
1479
access="readwrite")
1990
1480
def ApprovalDuration_dbus_property(self, value=None):
1991
1481
if value is None: # get
1992
return dbus.UInt64(self.approval_duration.total_seconds()
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
1994
1484
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1996
1486
# Name - property
1998
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1999
1487
@dbus_service_property(_interface, signature="s", access="read")
2000
1488
def Name_dbus_property(self):
2001
1489
return dbus.String(self.name)
2003
1491
# Fingerprint - property
2005
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2006
1492
@dbus_service_property(_interface, signature="s", access="read")
2007
1493
def Fingerprint_dbus_property(self):
2008
1494
return dbus.String(self.fingerprint)
2010
1496
# Host - property
2011
@dbus_service_property(_interface,
1497
@dbus_service_property(_interface, signature="s",
2013
1498
access="readwrite")
2014
1499
def Host_dbus_property(self, value=None):
2015
1500
if value is None: # get
2016
1501
return dbus.String(self.host)
2017
self.host = str(value)
1502
self.host = unicode(value)
2019
1504
# Created - property
2021
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2022
1505
@dbus_service_property(_interface, signature="s", access="read")
2023
1506
def Created_dbus_property(self):
2024
1507
return datetime_to_dbus(self.created)
2026
1509
# LastEnabled - property
2027
1510
@dbus_service_property(_interface, signature="s", access="read")
2028
1511
def LastEnabled_dbus_property(self):
2029
1512
return datetime_to_dbus(self.last_enabled)
2031
1514
# Enabled - property
2032
@dbus_service_property(_interface,
1515
@dbus_service_property(_interface, signature="b",
2034
1516
access="readwrite")
2035
1517
def Enabled_dbus_property(self, value=None):
2036
1518
if value is None: # get
2085
1566
if (getattr(self, "disable_initiator_tag", None)
2088
GLib.source_remove(self.disable_initiator_tag)
2089
self.disable_initiator_tag = GLib.timeout_add(
2090
int((self.expires - now).total_seconds() * 1000),
1569
gobject.source_remove(self.disable_initiator_tag)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
2093
1575
# ExtendedTimeout - property
2094
@dbus_service_property(_interface,
1576
@dbus_service_property(_interface, signature="t",
2096
1577
access="readwrite")
2097
1578
def ExtendedTimeout_dbus_property(self, value=None):
2098
1579
if value is None: # get
2099
return dbus.UInt64(self.extended_timeout.total_seconds()
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
2101
1581
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2103
1583
# Interval - property
2104
@dbus_service_property(_interface,
1584
@dbus_service_property(_interface, signature="t",
2106
1585
access="readwrite")
2107
1586
def Interval_dbus_property(self, value=None):
2108
1587
if value is None: # get
2109
return dbus.UInt64(self.interval.total_seconds() * 1000)
1588
return dbus.UInt64(self.interval_milliseconds())
2110
1589
self.interval = datetime.timedelta(0, 0, 0, value)
2111
1590
if getattr(self, "checker_initiator_tag", None) is None:
2113
1592
if self.enabled:
2114
1593
# Reschedule checker run
2115
GLib.source_remove(self.checker_initiator_tag)
2116
self.checker_initiator_tag = GLib.timeout_add(
2117
value, self.start_checker)
2118
self.start_checker() # Start one now, too
1594
gobject.source_remove(self.checker_initiator_tag)
1595
self.checker_initiator_tag = (gobject.timeout_add
1596
(value, self.start_checker))
1597
self.start_checker() # Start one now, too
2120
1599
# Checker - property
2121
@dbus_service_property(_interface,
1600
@dbus_service_property(_interface, signature="s",
2123
1601
access="readwrite")
2124
1602
def Checker_dbus_property(self, value=None):
2125
1603
if value is None: # get
2126
1604
return dbus.String(self.checker_command)
2127
self.checker_command = str(value)
1605
self.checker_command = unicode(value)
2129
1607
# CheckerRunning - property
2130
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="b",
2132
1609
access="readwrite")
2133
1610
def CheckerRunning_dbus_property(self, value=None):
2134
1611
if value is None: # get
2191
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
2192
1659
"""A class to handle client connections.
2194
1661
Instantiated once for each connection to handle it.
2195
1662
Note: This will run in its own forked process."""
2197
1664
def handle(self):
2198
1665
with contextlib.closing(self.server.child_pipe) as child_pipe:
2199
1666
logger.info("TCP connection from: %s",
2200
str(self.client_address))
1667
unicode(self.client_address))
2201
1668
logger.debug("Pipe FD: %d",
2202
1669
self.server.child_pipe.fileno())
2204
session = gnutls.ClientSession(self.request)
2206
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2207
# "+AES-256-CBC", "+SHA1",
2208
# "+COMP-NULL", "+CTYPE-OPENPGP",
1671
session = (gnutls.connection
1672
.ClientSession(self.request,
1674
.X509Credentials()))
1676
# Note: gnutls.connection.X509Credentials is really a
1677
# generic GnuTLS certificate credentials object so long as
1678
# no X.509 keys are added to it. Therefore, we can use it
1679
# here despite using OpenPGP certificates.
1681
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1682
# "+AES-256-CBC", "+SHA1",
1683
# "+COMP-NULL", "+CTYPE-OPENPGP",
2210
1685
# Use a fallback default, since this MUST be set.
2211
1686
priority = self.server.gnutls_priority
2212
1687
if priority is None:
2213
1688
priority = "NORMAL"
2214
gnutls.priority_set_direct(session._c_object,
2215
priority.encode("utf-8"),
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
2218
1693
# Start communication using the Mandos protocol
2219
1694
# Get protocol number
2220
1695
line = self.request.makefile().readline()
2221
1696
logger.debug("Protocol version: %r", line)
2223
1698
if int(line.strip().split()[0]) > 1:
2224
raise RuntimeError(line)
2225
1700
except (ValueError, IndexError, RuntimeError) as error:
2226
1701
logger.error("Unknown protocol version: %s", error)
2229
1704
# Start GnuTLS connection
2231
1706
session.handshake()
2232
except gnutls.Error as error:
1707
except gnutls.errors.GNUTLSError as error:
2233
1708
logger.warning("Handshake failed: %s", error)
2234
1709
# Do not run session.bye() here: the session is not
2235
1710
# established. Just abandon the request.
2237
1712
logger.debug("Handshake succeeded")
2239
1714
approval_required = False
2242
fpr = self.fingerprint(
2243
self.peer_certificate(session))
2244
except (TypeError, gnutls.Error) as error:
1717
fpr = self.fingerprint(self.peer_certificate
1720
gnutls.errors.GNUTLSError) as error:
2245
1721
logger.warning("Bad certificate: %s", error)
2247
1723
logger.debug("Fingerprint: %s", fpr)
2250
1726
client = ProxyClient(child_pipe, fpr,
2251
1727
self.client_address)
2252
1728
except KeyError:
2255
1731
if client.approval_delay:
2256
1732
delay = client.approval_delay
2257
1733
client.approvals_pending += 1
2258
1734
approval_required = True
2261
1737
if not client.enabled:
2262
1738
logger.info("Client %s is disabled",
2264
1740
if self.server.use_dbus:
2265
1741
# Emit D-Bus signal
2266
1742
client.Rejected("Disabled")
2269
1745
if client.approved or not client.approval_delay:
2270
# We are approved or approval is disabled
1746
#We are approved or approval is disabled
2272
1748
elif client.approved is None:
2273
1749
logger.info("Client %s needs approval",
2306
1784
delay -= time2 - time
2309
session.send(client.secret)
2310
except gnutls.Error as error:
2311
logger.warning("gnutls send failed",
1787
while sent_size < len(client.secret):
1789
sent = session.send(client.secret[sent_size:])
1790
except gnutls.errors.GNUTLSError as error:
1791
logger.warning("gnutls send failed",
1794
logger.debug("Sent: %d, remaining: %d",
1795
sent, len(client.secret)
1796
- (sent_size + sent))
2315
1799
logger.info("Sending secret to %s", client.name)
2316
1800
# bump the timeout using extended_timeout
2317
1801
client.bump_timeout(client.extended_timeout)
2318
1802
if self.server.use_dbus:
2319
1803
# Emit D-Bus signal
2320
1804
client.GotSecret()
2323
1807
if approval_required:
2324
1808
client.approvals_pending -= 1
2327
except gnutls.Error as error:
1811
except gnutls.errors.GNUTLSError as error:
2328
1812
logger.warning("GnuTLS bye failed",
2329
1813
exc_info=error)
2332
1816
def peer_certificate(session):
2333
1817
"Return the peer's OpenPGP certificate as a bytestring"
2334
1818
# If not an OpenPGP certificate...
2335
if (gnutls.certificate_type_get(session._c_object)
2336
!= gnutls.CRT_OPENPGP):
2337
# ...return invalid data
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
2339
1824
list_size = ctypes.c_uint(1)
2340
cert_list = (gnutls.certificate_get_peers
1825
cert_list = (gnutls.library.functions
1826
.gnutls_certificate_get_peers
2341
1827
(session._c_object, ctypes.byref(list_size)))
2342
1828
if not bool(cert_list) and list_size.value != 0:
2343
raise gnutls.Error("error getting peer certificate")
1829
raise gnutls.errors.GNUTLSError("error getting peer"
2344
1831
if list_size.value == 0:
2346
1833
cert = cert_list[0]
2347
1834
return ctypes.string_at(cert.data, cert.size)
2350
1837
def fingerprint(openpgp):
2351
1838
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2352
1839
# New GnuTLS "datum" with the OpenPGP public key
2353
datum = gnutls.datum_t(
2354
ctypes.cast(ctypes.c_char_p(openpgp),
2355
ctypes.POINTER(ctypes.c_ubyte)),
2356
ctypes.c_uint(len(openpgp)))
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1844
ctypes.c_uint(len(openpgp))))
2357
1845
# New empty GnuTLS certificate
2358
crt = gnutls.openpgp_crt_t()
2359
gnutls.openpgp_crt_init(ctypes.byref(crt))
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2360
1849
# Import the OpenPGP public key into the certificate
2361
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2362
gnutls.OPENPGP_FMT_RAW)
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
2363
1854
# Verify the self signature in the key
2364
1855
crtverify = ctypes.c_uint()
2365
gnutls.openpgp_crt_verify_self(crt, 0,
2366
ctypes.byref(crtverify))
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
2367
1859
if crtverify.value != 0:
2368
gnutls.openpgp_crt_deinit(crt)
2369
raise gnutls.CertificateSecurityError("Verify failed")
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1861
raise (gnutls.errors.CertificateSecurityError
2370
1863
# New buffer for the fingerprint
2371
1864
buf = ctypes.create_string_buffer(20)
2372
1865
buf_len = ctypes.c_size_t()
2373
1866
# Get the fingerprint from the certificate into the buffer
2374
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2375
ctypes.byref(buf_len))
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
2376
1870
# Deinit the certificate
2377
gnutls.openpgp_crt_deinit(crt)
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2378
1872
# Convert the buffer to a Python bytestring
2379
1873
fpr = ctypes.string_at(buf, buf_len.value)
2380
1874
# Convert the bytestring to hexadecimal notation
2385
1879
class MultiprocessingMixIn(object):
2386
1880
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2388
1881
def sub_process_main(self, request, address):
2390
1883
self.finish_request(request, address)
2391
1884
except Exception:
2392
1885
self.handle_error(request, address)
2393
1886
self.close_request(request)
2395
1888
def process_request(self, request, address):
2396
1889
"""Start a new process to process the request."""
2397
proc = multiprocessing.Process(target=self.sub_process_main,
2398
args=(request, address))
1890
proc = multiprocessing.Process(target = self.sub_process_main,
1891
args = (request, address))
2403
1896
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2404
1897
""" adds a pipe to the MixIn """
2406
1898
def process_request(self, request, client_address):
2407
1899
"""Overrides and wraps the original process_request().
2409
1901
This function creates a new pipe in self.pipe
2411
1903
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2413
1905
proc = MultiprocessingMixIn.process_request(self, request,
2414
1906
client_address)
2415
1907
self.child_pipe.close()
2416
1908
self.add_pipe(parent_pipe, proc)
2418
1910
def add_pipe(self, parent_pipe, proc):
2419
1911
"""Dummy function; override as necessary"""
2420
raise NotImplementedError()
1912
raise NotImplementedError
2423
1915
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2424
1916
socketserver.TCPServer, object):
2425
1917
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2428
1920
enabled: Boolean; whether this server is activated yet
2429
1921
interface: None or a network interface name (string)
2430
1922
use_ipv6: Boolean; to use IPv6 or not
2433
1924
def __init__(self, server_address, RequestHandlerClass,
1925
interface=None, use_ipv6=True, socketfd=None):
2437
1926
"""If socketfd is set, use that file descriptor instead of
2438
1927
creating a new one with socket.socket().
2469
1957
# socket_wrapper(), if socketfd was set.
2470
1958
socketserver.TCPServer.__init__(self, server_address,
2471
1959
RequestHandlerClass)
2473
1961
def server_bind(self):
2474
1962
"""This overrides the normal server_bind() function
2475
1963
to bind to an interface if one was specified, and also NOT to
2476
1964
bind to an address or port if they were not specified."""
2477
global SO_BINDTODEVICE
2478
1965
if self.interface is not None:
2479
1966
if SO_BINDTODEVICE is None:
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)
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)
2501
1988
# Only bind(2) the socket if we really need to.
2502
1989
if self.server_address[0] or self.server_address[1]:
2503
1990
if not self.server_address[0]:
2504
1991
if self.address_family == socket.AF_INET6:
2505
any_address = "::" # in6addr_any
1992
any_address = "::" # in6addr_any
2507
any_address = "0.0.0.0" # INADDR_ANY
1994
any_address = "0.0.0.0" # INADDR_ANY
2508
1995
self.server_address = (any_address,
2509
1996
self.server_address[1])
2510
1997
elif not self.server_address[1]:
2511
self.server_address = (self.server_address[0], 0)
1998
self.server_address = (self.server_address[0],
2512
2000
# if self.interface:
2513
2001
# self.server_address = (self.server_address[0],
2902
2378
server_settings["socket"] = os.dup(server_settings
2904
2380
del server_config
2906
2382
# Override the settings from the config file with command line
2907
2383
# options, if set.
2908
2384
for option in ("interface", "address", "port", "debug",
2909
"priority", "servicename", "configdir", "use_dbus",
2910
"use_ipv6", "debuglevel", "restore", "statedir",
2911
"socket", "foreground", "zeroconf"):
2385
"priority", "servicename", "configdir",
2386
"use_dbus", "use_ipv6", "debuglevel", "restore",
2387
"statedir", "socket", "foreground"):
2912
2388
value = getattr(options, option)
2913
2389
if value is not None:
2914
2390
server_settings[option] = value
2916
2392
# Force all strings to be unicode
2917
2393
for option in server_settings.keys():
2918
if isinstance(server_settings[option], bytes):
2919
server_settings[option] = (server_settings[option]
2394
if type(server_settings[option]) is str:
2395
server_settings[option] = unicode(server_settings[option])
2921
2396
# Force all boolean options to be boolean
2922
2397
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2923
"foreground", "zeroconf"):
2924
2399
server_settings[option] = bool(server_settings[option])
2925
2400
# Debug implies foreground
2926
2401
if server_settings["debug"]:
2927
2402
server_settings["foreground"] = True
2928
2403
# Now we have our good server settings in "server_settings"
2930
2405
##################################################################
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")
2937
2407
# For convenience
2938
2408
debug = server_settings["debug"]
2939
2409
debuglevel = server_settings["debuglevel"]
2953
2422
level = getattr(logging, debuglevel.upper())
2954
2423
initlogger(debug, level)
2956
2425
if server_settings["servicename"] != "Mandos":
2957
syslogger.setFormatter(
2958
logging.Formatter('Mandos ({}) [%(process)d]:'
2959
' %(levelname)s: %(message)s'.format(
2960
server_settings["servicename"])))
2426
syslogger.setFormatter(logging.Formatter
2427
('Mandos ({0}) [%(process)d]:'
2428
' %(levelname)s: %(message)s'
2429
.format(server_settings
2962
2432
# Parse config file with clients
2963
2433
client_config = configparser.SafeConfigParser(Client
2964
2434
.client_defaults)
2965
2435
client_config.read(os.path.join(server_settings["configdir"],
2966
2436
"clients.conf"))
2968
2438
global mandos_dbus_service
2969
2439
mandos_dbus_service = None
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"],
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"]
2982
2452
if not foreground:
2983
2453
pidfilename = "/run/mandos.pid"
2984
if not os.path.isdir("/run/."):
2985
pidfilename = "/var/run/mandos.pid"
2988
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2456
pidfile = open(pidfilename, "w")
2989
2457
except IOError as e:
2990
2458
logger.error("Could not open file %r", pidfilename,
2993
for name, group in (("_mandos", "_mandos"),
2994
("mandos", "mandos"),
2995
("nobody", "nogroup")):
2461
for name in ("_mandos", "mandos", "nobody"):
2997
2463
uid = pwd.getpwnam(name).pw_uid
2998
gid = pwd.getpwnam(group).pw_gid
2464
gid = pwd.getpwnam(name).pw_gid
3000
2466
except KeyError:
3009
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3011
2474
except OSError as error:
3012
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3013
.format(uid, gid, os.strerror(error.errno)))
3014
2475
if error.errno != errno.EPERM:
3018
2479
# Enable all possible GnuTLS debugging
3020
2481
# "Use a log level over 10 to enable all debugging options."
3021
2482
# - GnuTLS manual
3022
gnutls.global_set_log_level(11)
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
2485
@gnutls.library.types.gnutls_log_func
3025
2486
def debug_gnutls(level, string):
3026
2487
logger.debug("GnuTLS: %s", string[:-1])
3028
gnutls.global_set_log_function(debug_gnutls)
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
3030
2492
# Redirect stdin so all checkers get /dev/null
3031
2493
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3032
2494
os.dup2(null, sys.stdin.fileno())
3036
2498
# Need to fork before connecting to D-Bus
3037
2499
if not foreground:
3038
2500
# Close all input and output, do double fork, etc.
3041
# multiprocessing will use threads, so before we use GLib we need
3042
# to inform GLib that threads will be used.
2503
# multiprocessing will use threads, so before we use gobject we
2504
# need to inform gobject that threads will be used.
2505
gobject.threads_init()
3045
2507
global main_loop
3046
2508
# From the Avahi example code
3047
2509
DBusGMainLoop(set_as_default=True)
3048
main_loop = GLib.MainLoop()
2510
main_loop = gobject.MainLoop()
3049
2511
bus = dbus.SystemBus()
3050
2512
# End of Avahi example code
3053
2515
bus_name = dbus.service.BusName("se.recompile.Mandos",
3056
old_bus_name = dbus.service.BusName(
3057
"se.bsnet.fukt.Mandos", bus,
3059
except dbus.exceptions.DBusException as e:
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2520
except dbus.exceptions.NameExistsException as e:
3060
2521
logger.error("Disabling D-Bus:", exc_info=e)
3061
2522
use_dbus = False
3062
2523
server_settings["use_dbus"] = False
3063
2524
tcp_server.use_dbus = False
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"))
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"])))
3075
2534
global multiprocessing_manager
3076
2535
multiprocessing_manager = multiprocessing.Manager()
3078
2537
client_class = Client
3080
client_class = functools.partial(ClientDBus, bus=bus)
2539
client_class = functools.partial(ClientDBus, bus = bus)
3082
2541
client_settings = Client.config_parser(client_config)
3083
2542
old_client_settings = {}
3084
2543
clients_data = {}
3086
2545
# This is used to redirect stdout and stderr for checker processes
3088
wnull = open(os.devnull, "w") # A writable /dev/null
2547
wnull = open(os.devnull, "w") # A writable /dev/null
3089
2548
# Only used if server is running in foreground but not in debug
3091
2550
if debug or not foreground:
3094
2553
# Get client data and settings from last running state.
3095
2554
if server_settings["restore"]:
3097
2556
with open(stored_state_path, "rb") as stored_state:
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"]
2557
clients_data, old_client_settings = (pickle.load
3143
2559
os.remove(stored_state_path)
3144
2560
except IOError as e:
3145
2561
if e.errno == errno.ENOENT:
3146
logger.warning("Could not load persistent state:"
3147
" {}".format(os.strerror(e.errno)))
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
3149
2565
logger.critical("Could not load persistent state:",
3152
2568
except EOFError as e:
3153
2569
logger.warning("Could not load persistent state: "
2570
"EOFError:", exc_info=e)
3157
2572
with PGPEngine() as pgp:
3158
for client_name, client in clients_data.items():
2573
for client_name, client in clients_data.iteritems():
3159
2574
# Skip removed clients
3160
2575
if client_name not in client_settings:
3163
2578
# Decide which value to use after restoring saved state.
3164
2579
# We have three different values: Old config file,
3165
2580
# new config file, and saved state.
3223
2638
for client_name in (set(client_settings)
3224
2639
- set(old_client_settings)):
3225
2640
clients_data[client_name] = client_settings[client_name]
3227
2642
# Create all client objects
3228
for client_name, client in clients_data.items():
2643
for client_name, client in clients_data.iteritems():
3229
2644
tcp_server.clients[client_name] = client_class(
3232
server_settings=server_settings)
2645
name = client_name, settings = client,
2646
server_settings = server_settings)
3234
2648
if not tcp_server.clients:
3235
2649
logger.warning("No clients defined")
3237
2651
if not foreground:
3238
2652
if pidfile is not None:
3242
print(pid, file=pidfile)
2656
pidfile.write(str(pid) + "\n".encode("utf-8"))
3243
2657
except IOError:
3244
2658
logger.error("Could not write to file %r with PID %d",
3245
2659
pidfilename, pid)
3247
2661
del pidfilename
3249
for termsig in (signal.SIGHUP, signal.SIGTERM):
3250
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3251
lambda: main_loop.quit() and False)
2663
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3255
@alternate_dbus_interfaces(
3256
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3257
class MandosDBusService(DBusObjectWithObjectManager):
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2669
class MandosDBusService(DBusObjectWithProperties):
3258
2670
"""A D-Bus proxy object"""
3260
2671
def __init__(self):
3261
2672
dbus.service.Object.__init__(self, bus, "/")
3263
2673
_interface = "se.recompile.Mandos"
2675
@dbus_interface_annotations(_interface)
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
3265
2681
@dbus.service.signal(_interface, signature="o")
3266
2682
def ClientAdded(self, objpath):
3270
2686
@dbus.service.signal(_interface, signature="ss")
3271
2687
def ClientNotFound(self, fingerprint, address):
3275
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3277
2691
@dbus.service.signal(_interface, signature="os")
3278
2692
def ClientRemoved(self, objpath, name):
3282
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3284
2696
@dbus.service.method(_interface, out_signature="ao")
3285
2697
def GetAllClients(self):
3287
return dbus.Array(c.dbus_object_path for c in
3288
tcp_server.clients.values())
3290
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2699
return dbus.Array(c.dbus_object_path
2701
tcp_server.clients.itervalues())
3292
2703
@dbus.service.method(_interface,
3293
2704
out_signature="a{oa{sv}}")
3294
2705
def GetAllClientsWithProperties(self):
3296
2707
return dbus.Dictionary(
3297
{c.dbus_object_path: c.GetAll(
3298
"se.recompile.Mandos.Client")
3299
for c in tcp_server.clients.values()},
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
3300
2710
signature="oa{sv}")
3302
2712
@dbus.service.method(_interface, in_signature="o")
3303
2713
def RemoveClient(self, object_path):
3305
for c in tcp_server.clients.values():
2715
for c in tcp_server.clients.itervalues():
3306
2716
if c.dbus_object_path == object_path:
3307
2717
del tcp_server.clients[c.name]
3308
2718
c.remove_from_connection()
3309
# Don't signal the disabling
2719
# Don't signal anything except ClientRemoved
3310
2720
c.disable(quiet=True)
3311
# Emit D-Bus signal for removal
3312
self.client_removed_signal(c)
2722
self.ClientRemoved(object_path, c.name)
3314
2724
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,
3354
2728
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
3362
2731
"Cleanup function; run on exit"
3366
mp.active_children()
2734
multiprocessing.active_children()
3368
2736
if not (tcp_server.clients or client_settings):
3371
2739
# Store client before exiting. Secrets are encrypted with key
3372
2740
# based on what config file has. If config file is
3373
2741
# removed/edited, old secret will thus be unrecovable.
3375
2743
with PGPEngine() as pgp:
3376
for client in tcp_server.clients.values():
2744
for client in tcp_server.clients.itervalues():
3377
2745
key = client_settings[client.name]["secret"]
3378
2746
client.encrypted_secret = pgp.encrypt(client.secret,
3380
2748
client_dict = {}
3382
2750
# A list of attributes that can not be pickled
3384
exclude = {"bus", "changedstate", "secret",
3385
"checker", "server_settings"}
3386
for name, typ in inspect.getmembers(dbus.service
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
3388
2756
exclude.add(name)
3390
2758
client_dict["encrypted_secret"] = (client
3391
2759
.encrypted_secret)
3392
2760
for attr in client.client_structure:
3393
2761
if attr not in exclude:
3394
2762
client_dict[attr] = getattr(client, attr)
3396
2764
clients[client.name] = client_dict
3397
2765
del client_settings[client.name]["secret"]
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
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
3409
2774
os.rename(tempname, stored_state_path)
3410
2775
except (IOError, OSError) as e: