2
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
19
21
# the Free Software Foundation, either version 3 of the License, or
20
22
# (at your option) any later version.
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
24
26
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25
27
# GNU General Public License for more details.
27
29
# You should have received a copy of the GNU General Public License
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
31
32
# Contact the authors at <mandos@recompile.se>.
34
35
from __future__ import (division, absolute_import, print_function,
37
import SocketServer as socketserver
39
from future_builtins import *
44
import SocketServer as socketserver
43
import gnutls.connection
45
import gnutls.library.functions
46
import gnutls.library.constants
47
import gnutls.library.types
48
import ConfigParser as configparser
52
import ConfigParser as configparser
63
import cPickle as pickle
70
import cPickle as pickle
64
73
import multiprocessing
71
82
import dbus.service
83
from gi.repository import GLib
74
84
from dbus.mainloop.glib import DBusGMainLoop
77
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:
82
94
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
83
95
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
85
99
from IN import SO_BINDTODEVICE
86
100
except ImportError:
87
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:
90
119
stored_state_file = "clients.pickle"
92
121
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
101
127
except (OSError, AttributeError):
102
129
def if_nametoindex(interface):
103
130
"Get an interface index the hard way, i.e. using fcntl()"
104
131
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
132
with contextlib.closing(socket.socket()) as s:
106
133
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
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__,
114
155
def initlogger(debug, level=logging.WARNING):
115
156
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
117
162
syslogger.setFormatter(logging.Formatter
118
163
('Mandos [%(process)d]: %(levelname)s:'
120
165
logger.addHandler(syslogger)
123
168
console = logging.StreamHandler()
124
169
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
169
226
os.rmdir(self.tempdir)
170
227
self.tempdir = None
172
229
def password_encode(self, password):
173
230
# Passphrase can not be empty and can not contain newlines or
174
231
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
232
encoded = b"mandos" + binascii.hexlify(password)
233
if len(encoded) > 2048:
234
# GnuPG can't handle long passwords, so encode differently
235
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
236
.replace(b"\n", b"\\n")
237
.replace(b"\0", b"\\x00"))
177
240
def encrypt(self, data, password):
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
191
self.gnupg.passphrase = None
241
passphrase = self.password_encode(password)
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
244
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
254
if proc.returncode != 0:
192
256
return ciphertext
194
258
def decrypt(self, data, password):
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
208
self.gnupg.passphrase = None
259
passphrase = self.password_encode(password)
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
262
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
272
if proc.returncode != 0:
209
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
212
304
class AvahiError(Exception):
213
305
def __init__(self, value, *args, **kwargs):
214
306
self.value = value
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
307
return super(AvahiError, self).__init__(value, *args,
219
311
class AvahiServiceError(AvahiError):
222
315
class AvahiGroupError(AvahiError):
226
319
class AvahiService(object):
227
320
"""An Avahi (Zeroconf) service.
230
323
interface: integer; avahi.IF_UNSPEC or an interface index.
231
324
Used to optionally bind to the specified interface.
232
325
name: string; Example: 'Mandos'
233
326
type: string; Example: '_mandos._tcp'.
234
See <http://www.dns-sd.org/ServiceTypes.html>
327
See <https://www.iana.org/assignments/service-names-port-numbers>
235
328
port: integer; what port to announce
236
329
TXT: list of strings; TXT record for the service
237
330
domain: string; Domain to publish on, default to .local if empty.
374
489
follow_name_owner_changes=True),
375
490
avahi.DBUS_INTERFACE_SERVER)
376
491
self.server.connect_to_signal("StateChanged",
377
self.server_state_changed)
492
self.server_state_changed)
378
493
self.server_state_changed(self.server.GetState())
380
496
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
382
498
"""Add the new name to the syslog messages"""
383
ret = AvahiService.rename(self)
384
syslogger.setFormatter(logging.Formatter
385
('Mandos ({0}) [%(process)d]:'
386
' %(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'
390
def timedelta_to_milliseconds(td):
391
"Convert a datetime.timedelta() to milliseconds"
392
return ((td.days * 24 * 60 * 60 * 1000)
393
+ (td.seconds * 1000)
394
+ (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"
517
_tls_rawpk_version = b"3.6.6"
520
# Need to use "self" here, since this method is called before
521
# the assignment to the "gnutls" global variable happens.
522
if self.check_version(self._need_version) is None:
523
raise self.Error("Needs GnuTLS {} or later"
524
.format(self._need_version))
526
# Unless otherwise indicated, the constants and types below are
527
# all from the gnutls/gnutls.h C header file.
538
E_NO_CERTIFICATE_FOUND = -49
543
KEYID_USE_SHA256 = 1 # gnutls/x509.h
544
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
547
class session_int(ctypes.Structure):
549
session_t = ctypes.POINTER(session_int)
551
class certificate_credentials_st(ctypes.Structure):
553
certificate_credentials_t = ctypes.POINTER(
554
certificate_credentials_st)
555
certificate_type_t = ctypes.c_int
557
class datum_t(ctypes.Structure):
558
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
559
('size', ctypes.c_uint)]
561
class openpgp_crt_int(ctypes.Structure):
563
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
564
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
565
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
566
credentials_type_t = ctypes.c_int
567
transport_ptr_t = ctypes.c_void_p
568
close_request_t = ctypes.c_int
571
class Error(Exception):
572
# We need to use the class name "GnuTLS" here, since this
573
# exception might be raised from within GnuTLS.__init__,
574
# which is called before the assignment to the "gnutls"
575
# global variable has happened.
576
def __init__(self, message=None, code=None, args=()):
577
# Default usage is by a message string, but if a return
578
# code is passed, convert it to a string with
581
if message is None and code is not None:
582
message = GnuTLS.strerror(code)
583
return super(GnuTLS.Error, self).__init__(
586
class CertificateSecurityError(Error):
590
class Credentials(object):
592
self._c_object = gnutls.certificate_credentials_t()
593
gnutls.certificate_allocate_credentials(
594
ctypes.byref(self._c_object))
595
self.type = gnutls.CRD_CERTIFICATE
598
gnutls.certificate_free_credentials(self._c_object)
600
class ClientSession(object):
601
def __init__(self, socket, credentials=None):
602
self._c_object = gnutls.session_t()
603
gnutls_flags = gnutls.CLIENT
604
if gnutls.check_version("3.5.6"):
605
gnutls_flags |= gnutls.NO_TICKETS
607
gnutls_flags |= gnutls.ENABLE_RAWPK
608
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
610
gnutls.set_default_priority(self._c_object)
611
gnutls.transport_set_ptr(self._c_object, socket.fileno())
612
gnutls.handshake_set_private_extensions(self._c_object,
615
if credentials is None:
616
credentials = gnutls.Credentials()
617
gnutls.credentials_set(self._c_object, credentials.type,
618
ctypes.cast(credentials._c_object,
620
self.credentials = credentials
623
gnutls.deinit(self._c_object)
626
return gnutls.handshake(self._c_object)
628
def send(self, data):
632
data_len -= gnutls.record_send(self._c_object,
637
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
639
# Error handling functions
640
def _error_code(result):
641
"""A function to raise exceptions on errors, suitable
642
for the 'restype' attribute on ctypes functions"""
645
if result == gnutls.E_NO_CERTIFICATE_FOUND:
646
raise gnutls.CertificateSecurityError(code=result)
647
raise gnutls.Error(code=result)
649
def _retry_on_error(result, func, arguments):
650
"""A function to retry on some errors, suitable
651
for the 'errcheck' attribute on ctypes functions"""
653
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
654
return _error_code(result)
655
result = func(*arguments)
658
# Unless otherwise indicated, the function declarations below are
659
# all from the gnutls/gnutls.h C header file.
662
priority_set_direct = _library.gnutls_priority_set_direct
663
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
664
ctypes.POINTER(ctypes.c_char_p)]
665
priority_set_direct.restype = _error_code
667
init = _library.gnutls_init
668
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
669
init.restype = _error_code
671
set_default_priority = _library.gnutls_set_default_priority
672
set_default_priority.argtypes = [session_t]
673
set_default_priority.restype = _error_code
675
record_send = _library.gnutls_record_send
676
record_send.argtypes = [session_t, ctypes.c_void_p,
678
record_send.restype = ctypes.c_ssize_t
679
record_send.errcheck = _retry_on_error
681
certificate_allocate_credentials = (
682
_library.gnutls_certificate_allocate_credentials)
683
certificate_allocate_credentials.argtypes = [
684
ctypes.POINTER(certificate_credentials_t)]
685
certificate_allocate_credentials.restype = _error_code
687
certificate_free_credentials = (
688
_library.gnutls_certificate_free_credentials)
689
certificate_free_credentials.argtypes = [
690
certificate_credentials_t]
691
certificate_free_credentials.restype = None
693
handshake_set_private_extensions = (
694
_library.gnutls_handshake_set_private_extensions)
695
handshake_set_private_extensions.argtypes = [session_t,
697
handshake_set_private_extensions.restype = None
699
credentials_set = _library.gnutls_credentials_set
700
credentials_set.argtypes = [session_t, credentials_type_t,
702
credentials_set.restype = _error_code
704
strerror = _library.gnutls_strerror
705
strerror.argtypes = [ctypes.c_int]
706
strerror.restype = ctypes.c_char_p
708
certificate_type_get = _library.gnutls_certificate_type_get
709
certificate_type_get.argtypes = [session_t]
710
certificate_type_get.restype = _error_code
712
certificate_get_peers = _library.gnutls_certificate_get_peers
713
certificate_get_peers.argtypes = [session_t,
714
ctypes.POINTER(ctypes.c_uint)]
715
certificate_get_peers.restype = ctypes.POINTER(datum_t)
717
global_set_log_level = _library.gnutls_global_set_log_level
718
global_set_log_level.argtypes = [ctypes.c_int]
719
global_set_log_level.restype = None
721
global_set_log_function = _library.gnutls_global_set_log_function
722
global_set_log_function.argtypes = [log_func]
723
global_set_log_function.restype = None
725
deinit = _library.gnutls_deinit
726
deinit.argtypes = [session_t]
727
deinit.restype = None
729
handshake = _library.gnutls_handshake
730
handshake.argtypes = [session_t]
731
handshake.restype = _error_code
732
handshake.errcheck = _retry_on_error
734
transport_set_ptr = _library.gnutls_transport_set_ptr
735
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
736
transport_set_ptr.restype = None
738
bye = _library.gnutls_bye
739
bye.argtypes = [session_t, close_request_t]
740
bye.restype = _error_code
741
bye.errcheck = _retry_on_error
743
check_version = _library.gnutls_check_version
744
check_version.argtypes = [ctypes.c_char_p]
745
check_version.restype = ctypes.c_char_p
747
has_rawpk = bool(check_version(_tls_rawpk_version))
751
class pubkey_st(ctypes.Structure):
753
pubkey_t = ctypes.POINTER(pubkey_st)
755
x509_crt_fmt_t = ctypes.c_int
757
# All the function declarations below are from gnutls/abstract.h
758
pubkey_init = _library.gnutls_pubkey_init
759
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
760
pubkey_init.restype = _error_code
762
pubkey_import = _library.gnutls_pubkey_import
763
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
765
pubkey_import.restype = _error_code
767
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
768
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
769
ctypes.POINTER(ctypes.c_ubyte),
770
ctypes.POINTER(ctypes.c_size_t)]
771
pubkey_get_key_id.restype = _error_code
773
pubkey_deinit = _library.gnutls_pubkey_deinit
774
pubkey_deinit.argtypes = [pubkey_t]
775
pubkey_deinit.restype = None
777
# All the function declarations below are from gnutls/openpgp.h
779
openpgp_crt_init = _library.gnutls_openpgp_crt_init
780
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
781
openpgp_crt_init.restype = _error_code
783
openpgp_crt_import = _library.gnutls_openpgp_crt_import
784
openpgp_crt_import.argtypes = [openpgp_crt_t,
785
ctypes.POINTER(datum_t),
787
openpgp_crt_import.restype = _error_code
789
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
790
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
791
ctypes.POINTER(ctypes.c_uint)]
792
openpgp_crt_verify_self.restype = _error_code
794
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
795
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
796
openpgp_crt_deinit.restype = None
798
openpgp_crt_get_fingerprint = (
799
_library.gnutls_openpgp_crt_get_fingerprint)
800
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
804
openpgp_crt_get_fingerprint.restype = _error_code
806
if check_version("3.6.4"):
807
certificate_type_get2 = _library.gnutls_certificate_type_get2
808
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
809
certificate_type_get2.restype = _error_code
811
# Remove non-public functions
812
del _error_code, _retry_on_error
813
# Create the global "gnutls" object, simulating a module
817
def call_pipe(connection, # : multiprocessing.Connection
818
func, *args, **kwargs):
819
"""This function is meant to be called by multiprocessing.Process
821
This function runs func(*args, **kwargs), and writes the resulting
822
return value on the provided multiprocessing.Connection.
824
connection.send(func(*args, **kwargs))
396
828
class Client(object):
397
829
"""A representation of a client host served by this server.
400
832
approved: bool(); 'None' if not yet approved/disapproved
401
833
approval_delay: datetime.timedelta(); Time to wait for approval
545
977
self.current_checker_command = None
546
978
self.approved = None
547
979
self.approvals_pending = 0
548
self.changedstate = (multiprocessing_manager
549
.Condition(multiprocessing_manager
551
self.client_structure = [attr for attr in
552
self.__dict__.iterkeys()
980
self.changedstate = multiprocessing_manager.Condition(
981
multiprocessing_manager.Lock())
982
self.client_structure = [attr
983
for attr in self.__dict__.keys()
553
984
if not attr.startswith("_")]
554
985
self.client_structure.append("client_structure")
556
for name, t in inspect.getmembers(type(self),
987
for name, t in inspect.getmembers(
988
type(self), lambda obj: isinstance(obj, property)):
560
989
if not name.startswith("_"):
561
990
self.client_structure.append(name)
563
992
# Send notice to process children that client state has changed
564
993
def send_changedstate(self):
565
994
with self.changedstate:
566
995
self.changedstate.notify_all()
568
997
def enable(self):
569
998
"""Start this client's checker and timeout hooks"""
570
999
if getattr(self, "enabled", False):
571
1000
# Already enabled
573
self.send_changedstate()
574
1002
self.expires = datetime.datetime.utcnow() + self.timeout
575
1003
self.enabled = True
576
1004
self.last_enabled = datetime.datetime.utcnow()
577
1005
self.init_checker()
1006
self.send_changedstate()
579
1008
def disable(self, quiet=True):
580
1009
"""Disable this client."""
581
1010
if not getattr(self, "enabled", False):
584
self.send_changedstate()
586
1013
logger.info("Disabling client %s", self.name)
587
if getattr(self, "disable_initiator_tag", False):
588
gobject.source_remove(self.disable_initiator_tag)
1014
if getattr(self, "disable_initiator_tag", None) is not None:
1015
GLib.source_remove(self.disable_initiator_tag)
589
1016
self.disable_initiator_tag = None
590
1017
self.expires = None
591
if getattr(self, "checker_initiator_tag", False):
592
gobject.source_remove(self.checker_initiator_tag)
1018
if getattr(self, "checker_initiator_tag", None) is not None:
1019
GLib.source_remove(self.checker_initiator_tag)
593
1020
self.checker_initiator_tag = None
594
1021
self.stop_checker()
595
1022
self.enabled = False
596
# Do not run this again if called by a gobject.timeout_add
1024
self.send_changedstate()
1025
# Do not run this again if called by a GLib.timeout_add
599
1028
def __del__(self):
602
1031
def init_checker(self):
603
1032
# Schedule a new checker to be started an 'interval' from now,
604
1033
# and every interval from then on.
605
self.checker_initiator_tag = (gobject.timeout_add
606
(self.interval_milliseconds(),
1034
if self.checker_initiator_tag is not None:
1035
GLib.source_remove(self.checker_initiator_tag)
1036
self.checker_initiator_tag = GLib.timeout_add(
1037
int(self.interval.total_seconds() * 1000),
608
1039
# Schedule a disable() when 'timeout' has passed
609
self.disable_initiator_tag = (gobject.timeout_add
610
(self.timeout_milliseconds(),
1040
if self.disable_initiator_tag is not None:
1041
GLib.source_remove(self.disable_initiator_tag)
1042
self.disable_initiator_tag = GLib.timeout_add(
1043
int(self.timeout.total_seconds() * 1000), self.disable)
612
1044
# Also start a new checker *right now*.
613
1045
self.start_checker()
615
def checker_callback(self, pid, condition, command):
1047
def checker_callback(self, source, condition, connection,
616
1049
"""The checker has completed, so take appropriate actions."""
617
1050
self.checker_callback_tag = None
618
1051
self.checker = None
619
if os.WIFEXITED(condition):
620
self.last_checker_status = os.WEXITSTATUS(condition)
1052
# Read return code from connection (see call_pipe)
1053
returncode = connection.recv()
1057
self.last_checker_status = returncode
1058
self.last_checker_signal = None
621
1059
if self.last_checker_status == 0:
622
1060
logger.info("Checker for %(name)s succeeded",
624
1062
self.checked_ok()
626
logger.info("Checker for %(name)s failed",
1064
logger.info("Checker for %(name)s failed", vars(self))
629
1066
self.last_checker_status = -1
1067
self.last_checker_signal = -returncode
630
1068
logger.warning("Checker for %(name)s crashed?",
633
1072
def checked_ok(self):
634
1073
"""Assert that the client has been seen, alive and well."""
635
1074
self.last_checked_ok = datetime.datetime.utcnow()
636
1075
self.last_checker_status = 0
1076
self.last_checker_signal = None
637
1077
self.bump_timeout()
639
1079
def bump_timeout(self, timeout=None):
640
1080
"""Bump up the timeout for this client."""
641
1081
if timeout is None:
642
1082
timeout = self.timeout
643
1083
if self.disable_initiator_tag is not None:
644
gobject.source_remove(self.disable_initiator_tag)
1084
GLib.source_remove(self.disable_initiator_tag)
1085
self.disable_initiator_tag = None
645
1086
if getattr(self, "enabled", False):
646
self.disable_initiator_tag = (gobject.timeout_add
647
(timedelta_to_milliseconds
648
(timeout), self.disable))
1087
self.disable_initiator_tag = GLib.timeout_add(
1088
int(timeout.total_seconds() * 1000), self.disable)
649
1089
self.expires = datetime.datetime.utcnow() + timeout
651
1091
def need_approval(self):
652
1092
self.last_approval_request = datetime.datetime.utcnow()
654
1094
def start_checker(self):
655
1095
"""Start a new checker subprocess if one is not running.
657
1097
If a checker already exists, leave it running and do
659
1099
# The reason for not killing a running checker is that if we
660
# did that, then if a checker (for some reason) started
661
# running slowly and taking more than 'interval' time, the
662
# client would inevitably timeout, since no checker would get
663
# a chance to run to completion. If we instead leave running
1100
# did that, and if a checker (for some reason) started running
1101
# slowly and taking more than 'interval' time, then the client
1102
# would inevitably timeout, since no checker would get a
1103
# chance to run to completion. If we instead leave running
664
1104
# checkers alone, the checker would have to take more time
665
1105
# than 'timeout' for the client to be disabled, which is as it
668
# If a checker exists, make sure it is not a zombie
670
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
except (AttributeError, OSError) as error:
672
if (isinstance(error, OSError)
673
and error.errno != errno.ECHILD):
677
logger.warning("Checker was a zombie")
678
gobject.source_remove(self.checker_callback_tag)
679
self.checker_callback(pid, status,
680
self.current_checker_command)
1108
if self.checker is not None and not self.checker.is_alive():
1109
logger.warning("Checker was not alive; joining")
681
1112
# Start a new checker if needed
682
1113
if self.checker is None:
1114
# Escape attributes for the shell
1116
attr: re.escape(str(getattr(self, attr)))
1117
for attr in self.runtime_expansions}
684
# In case checker_command has exactly one % operator
685
command = self.checker_command % self.host
687
# Escape attributes for the shell
688
escaped_attrs = dict(
690
re.escape(unicode(str(getattr(self, attr, "")),
694
self.runtime_expansions)
697
command = self.checker_command % escaped_attrs
698
except TypeError as error:
699
logger.error('Could not format string "%s"',
700
self.checker_command, exc_info=error)
701
return True # Try again later
1119
command = self.checker_command % escaped_attrs
1120
except TypeError as error:
1121
logger.error('Could not format string "%s"',
1122
self.checker_command,
1124
return True # Try again later
702
1125
self.current_checker_command = command
704
logger.info("Starting checker %r for %s",
706
# We don't need to redirect stdout and stderr, since
707
# in normal mode, that is already done by daemon(),
708
# and in debug mode we don't want to. (Stdin is
709
# always replaced by /dev/null.)
710
self.checker = subprocess.Popen(command,
713
self.checker_callback_tag = (gobject.child_watch_add
715
self.checker_callback,
717
# The checker may have completed before the gobject
718
# watch was added. Check for this.
719
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
721
gobject.source_remove(self.checker_callback_tag)
722
self.checker_callback(pid, status, command)
723
except OSError as error:
724
logger.error("Failed to start subprocess",
726
# Re-run this periodically if run by gobject.timeout_add
1126
logger.info("Starting checker %r for %s", command,
1128
# We don't need to redirect stdout and stderr, since
1129
# in normal mode, that is already done by daemon(),
1130
# and in debug mode we don't want to. (Stdin is
1131
# always replaced by /dev/null.)
1132
# The exception is when not debugging but nevertheless
1133
# running in the foreground; use the previously
1135
popen_args = {"close_fds": True,
1138
if (not self.server_settings["debug"]
1139
and self.server_settings["foreground"]):
1140
popen_args.update({"stdout": wnull,
1142
pipe = multiprocessing.Pipe(duplex=False)
1143
self.checker = multiprocessing.Process(
1145
args=(pipe[1], subprocess.call, command),
1147
self.checker.start()
1148
self.checker_callback_tag = GLib.io_add_watch(
1149
pipe[0].fileno(), GLib.IO_IN,
1150
self.checker_callback, pipe[0], command)
1151
# Re-run this periodically if run by GLib.timeout_add
729
1154
def stop_checker(self):
730
1155
"""Force the checker process, if any, to stop."""
731
1156
if self.checker_callback_tag:
732
gobject.source_remove(self.checker_callback_tag)
1157
GLib.source_remove(self.checker_callback_tag)
733
1158
self.checker_callback_tag = None
734
1159
if getattr(self, "checker", None) is None:
736
1161
logger.debug("Stopping checker for %(name)s", vars(self))
738
self.checker.terminate()
740
#if self.checker.poll() is None:
741
# self.checker.kill()
742
except OSError as error:
743
if error.errno != errno.ESRCH: # No such process
1162
self.checker.terminate()
745
1163
self.checker = None
748
def dbus_service_property(dbus_interface, signature="v",
749
access="readwrite", byte_arrays=False):
1166
def dbus_service_property(dbus_interface,
750
1170
"""Decorators for marking methods of a DBusObjectWithProperties to
751
1171
become properties on the D-Bus.
753
1173
The decorated method will be called with no arguments by "Get"
754
1174
and with one argument by "Set".
756
1176
The parameters, where they are supported, are the same as
757
1177
dbus.service.method, except there is only "signature", since the
758
1178
type from Get() and the type sent to Set() is the same.
834
class DBusObjectWithProperties(dbus.service.Object):
835
"""A D-Bus object with properties.
837
Classes inheriting from this can use the dbus_service_property
838
decorator to expose methods as D-Bus properties. It exposes the
839
standard Get(), Set(), and GetAll() methods on the D-Bus.
1261
class DBusObjectWithAnnotations(dbus.service.Object):
1262
"""A D-Bus object with annotations.
1264
Classes inheriting from this can use the dbus_annotations
1265
decorator to add annotations to methods or signals.
843
1269
def _is_dbus_thing(thing):
844
1270
"""Returns a function testing if an attribute is a D-Bus thing
846
1272
If called like _is_dbus_thing("method") it returns a function
847
1273
suitable for use as predicate to inspect.getmembers().
849
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1275
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
852
1278
def _get_all_dbus_things(self, thing):
853
1279
"""Returns a generator of (name, attribute) pairs
855
return ((getattr(athing.__get__(self), "_dbus_name",
1281
return ((getattr(athing.__get__(self), "_dbus_name", name),
857
1282
athing.__get__(self))
858
1283
for cls in self.__class__.__mro__
859
1284
for name, athing in
860
inspect.getmembers(cls,
861
self._is_dbus_thing(thing)))
1285
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1287
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1289
path_keyword='object_path',
1290
connection_keyword='connection')
1291
def Introspect(self, object_path, connection):
1292
"""Overloading of standard D-Bus method.
1294
Inserts annotation tags on methods and signals.
1296
xmlstring = dbus.service.Object.Introspect(self, object_path,
1299
document = xml.dom.minidom.parseString(xmlstring)
1301
for if_tag in document.getElementsByTagName("interface"):
1302
# Add annotation tags
1303
for typ in ("method", "signal"):
1304
for tag in if_tag.getElementsByTagName(typ):
1306
for name, prop in (self.
1307
_get_all_dbus_things(typ)):
1308
if (name == tag.getAttribute("name")
1309
and prop._dbus_interface
1310
== if_tag.getAttribute("name")):
1311
annots.update(getattr(
1312
prop, "_dbus_annotations", {}))
1313
for name, value in annots.items():
1314
ann_tag = document.createElement(
1316
ann_tag.setAttribute("name", name)
1317
ann_tag.setAttribute("value", value)
1318
tag.appendChild(ann_tag)
1319
# Add interface annotation tags
1320
for annotation, value in dict(
1321
itertools.chain.from_iterable(
1322
annotations().items()
1323
for name, annotations
1324
in self._get_all_dbus_things("interface")
1325
if name == if_tag.getAttribute("name")
1327
ann_tag = document.createElement("annotation")
1328
ann_tag.setAttribute("name", annotation)
1329
ann_tag.setAttribute("value", value)
1330
if_tag.appendChild(ann_tag)
1331
# Fix argument name for the Introspect method itself
1332
if (if_tag.getAttribute("name")
1333
== dbus.INTROSPECTABLE_IFACE):
1334
for cn in if_tag.getElementsByTagName("method"):
1335
if cn.getAttribute("name") == "Introspect":
1336
for arg in cn.getElementsByTagName("arg"):
1337
if (arg.getAttribute("direction")
1339
arg.setAttribute("name",
1341
xmlstring = document.toxml("utf-8")
1343
except (AttributeError, xml.dom.DOMException,
1344
xml.parsers.expat.ExpatError) as error:
1345
logger.error("Failed to override Introspection method",
1350
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1351
"""A D-Bus object with properties.
1353
Classes inheriting from this can use the dbus_service_property
1354
decorator to expose methods as D-Bus properties. It exposes the
1355
standard Get(), Set(), and GetAll() methods on the D-Bus.
863
1358
def _get_dbus_property(self, interface_name, property_name):
864
1359
"""Returns a bound method if one exists which is a D-Bus
865
1360
property with the specified name and interface.
867
for cls in self.__class__.__mro__:
868
for name, value in (inspect.getmembers
870
self._is_dbus_thing("property"))):
1362
for cls in self.__class__.__mro__:
1363
for name, value in inspect.getmembers(
1364
cls, self._is_dbus_thing("property")):
871
1365
if (value._dbus_name == property_name
872
1366
and value._dbus_interface == interface_name):
873
1367
return value.__get__(self)
875
1369
# No such property
876
raise DBusPropertyNotFound(self.dbus_object_path + ":"
877
+ interface_name + "."
880
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1370
raise DBusPropertyNotFound("{}:{}.{}".format(
1371
self.dbus_object_path, interface_name, property_name))
1374
def _get_all_interface_names(cls):
1375
"""Get a sequence of all interfaces supported by an object"""
1376
return (name for name in set(getattr(getattr(x, attr),
1377
"_dbus_interface", None)
1378
for x in (inspect.getmro(cls))
1380
if name is not None)
1382
@dbus.service.method(dbus.PROPERTIES_IFACE,
881
1384
out_signature="v")
882
1385
def Get(self, interface_name, property_name):
883
1386
"""Standard D-Bus property Get() method, see D-Bus standard.
1013
1515
return xmlstring
1016
def datetime_to_dbus (dt, variant_level=0):
1519
dbus.OBJECT_MANAGER_IFACE
1520
except AttributeError:
1521
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1524
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1525
"""A D-Bus object with an ObjectManager.
1527
Classes inheriting from this exposes the standard
1528
GetManagedObjects call and the InterfacesAdded and
1529
InterfacesRemoved signals on the standard
1530
"org.freedesktop.DBus.ObjectManager" interface.
1532
Note: No signals are sent automatically; they must be sent
1535
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1536
out_signature="a{oa{sa{sv}}}")
1537
def GetManagedObjects(self):
1538
"""This function must be overridden"""
1539
raise NotImplementedError()
1541
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1542
signature="oa{sa{sv}}")
1543
def InterfacesAdded(self, object_path, interfaces_and_properties):
1546
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1547
def InterfacesRemoved(self, object_path, interfaces):
1550
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1552
path_keyword='object_path',
1553
connection_keyword='connection')
1554
def Introspect(self, object_path, connection):
1555
"""Overloading of standard D-Bus method.
1557
Override return argument name of GetManagedObjects to be
1558
"objpath_interfaces_and_properties"
1560
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1564
document = xml.dom.minidom.parseString(xmlstring)
1566
for if_tag in document.getElementsByTagName("interface"):
1567
# Fix argument name for the GetManagedObjects method
1568
if (if_tag.getAttribute("name")
1569
== dbus.OBJECT_MANAGER_IFACE):
1570
for cn in if_tag.getElementsByTagName("method"):
1571
if (cn.getAttribute("name")
1572
== "GetManagedObjects"):
1573
for arg in cn.getElementsByTagName("arg"):
1574
if (arg.getAttribute("direction")
1578
"objpath_interfaces"
1580
xmlstring = document.toxml("utf-8")
1582
except (AttributeError, xml.dom.DOMException,
1583
xml.parsers.expat.ExpatError) as error:
1584
logger.error("Failed to override Introspection method",
1589
def datetime_to_dbus(dt, variant_level=0):
1017
1590
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1019
return dbus.String("", variant_level = variant_level)
1020
return dbus.String(dt.isoformat(),
1021
variant_level=variant_level)
1024
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1026
"""Applied to an empty subclass of a D-Bus object, this metaclass
1027
will add additional D-Bus attributes matching a certain pattern.
1592
return dbus.String("", variant_level=variant_level)
1593
return dbus.String(dt.isoformat(), variant_level=variant_level)
1596
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1597
"""A class decorator; applied to a subclass of
1598
dbus.service.Object, it will add alternate D-Bus attributes with
1599
interface names according to the "alt_interface_names" mapping.
1602
@alternate_dbus_interfaces({"org.example.Interface":
1603
"net.example.AlternateInterface"})
1604
class SampleDBusObject(dbus.service.Object):
1605
@dbus.service.method("org.example.Interface")
1606
def SampleDBusMethod():
1609
The above "SampleDBusMethod" on "SampleDBusObject" will be
1610
reachable via two interfaces: "org.example.Interface" and
1611
"net.example.AlternateInterface", the latter of which will have
1612
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1613
"true", unless "deprecate" is passed with a False value.
1615
This works for methods and signals, and also for D-Bus properties
1616
(from DBusObjectWithProperties) and interfaces (from the
1617
dbus_interface_annotations decorator).
1029
def __new__(mcs, name, bases, attr):
1030
# Go through all the base classes which could have D-Bus
1031
# methods, signals, or properties in them
1032
old_interface_names = []
1033
for base in (b for b in bases
1034
if issubclass(b, dbus.service.Object)):
1035
# Go though all attributes of the base class
1036
for attrname, attribute in inspect.getmembers(base):
1621
for orig_interface_name, alt_interface_name in (
1622
alt_interface_names.items()):
1624
interface_names = set()
1625
# Go though all attributes of the class
1626
for attrname, attribute in inspect.getmembers(cls):
1037
1627
# Ignore non-D-Bus attributes, and D-Bus attributes
1038
1628
# with the wrong interface name
1039
1629
if (not hasattr(attribute, "_dbus_interface")
1040
or not attribute._dbus_interface
1041
.startswith("se.recompile.Mandos")):
1630
or not attribute._dbus_interface.startswith(
1631
orig_interface_name)):
1043
1633
# Create an alternate D-Bus interface name based on
1044
1634
# the current name
1045
alt_interface = (attribute._dbus_interface
1046
.replace("se.recompile.Mandos",
1047
"se.bsnet.fukt.Mandos"))
1048
if alt_interface != attribute._dbus_interface:
1049
old_interface_names.append(alt_interface)
1635
alt_interface = attribute._dbus_interface.replace(
1636
orig_interface_name, alt_interface_name)
1637
interface_names.add(alt_interface)
1050
1638
# Is this a D-Bus signal?
1051
1639
if getattr(attribute, "_dbus_is_signal", False):
1052
# Extract the original non-method function by
1054
nonmethod_func = (dict(
1640
# Extract the original non-method undecorated
1641
# function by black magic
1642
if sys.version_info.major == 2:
1643
nonmethod_func = (dict(
1055
1644
zip(attribute.func_code.co_freevars,
1056
attribute.__closure__))["func"]
1645
attribute.__closure__))
1646
["func"].cell_contents)
1648
nonmethod_func = (dict(
1649
zip(attribute.__code__.co_freevars,
1650
attribute.__closure__))
1651
["func"].cell_contents)
1058
1652
# Create a new, but exactly alike, function
1059
1653
# object, and decorate it to be a new D-Bus signal
1060
1654
# with the alternate D-Bus interface name
1061
new_function = (dbus.service.signal
1063
attribute._dbus_signature)
1064
(types.FunctionType(
1065
nonmethod_func.func_code,
1066
nonmethod_func.func_globals,
1067
nonmethod_func.func_name,
1068
nonmethod_func.func_defaults,
1069
nonmethod_func.func_closure)))
1655
new_function = copy_function(nonmethod_func)
1656
new_function = (dbus.service.signal(
1658
attribute._dbus_signature)(new_function))
1070
1659
# Copy annotations, if any
1072
new_function._dbus_annotations = (
1073
dict(attribute._dbus_annotations))
1661
new_function._dbus_annotations = dict(
1662
attribute._dbus_annotations)
1074
1663
except AttributeError:
1076
1666
# Define a creator of a function to call both the
1077
# old and new functions, so both the old and new
1078
# signals gets sent when the function is called
1667
# original and alternate functions, so both the
1668
# original and alternate signals gets sent when
1669
# the function is called
1079
1670
def fixscope(func1, func2):
1080
1671
"""This function is a scope container to pass
1081
1672
func1 and func2 to the "call_both" function
1082
1673
outside of its arguments"""
1675
@functools.wraps(func2)
1083
1676
def call_both(*args, **kwargs):
1084
1677
"""This function will emit two D-Bus
1085
1678
signals by calling func1 and func2"""
1086
1679
func1(*args, **kwargs)
1087
1680
func2(*args, **kwargs)
1681
# Make wrapper function look like a D-Bus
1683
for name, attr in inspect.getmembers(func2):
1684
if name.startswith("_dbus_"):
1685
setattr(call_both, name, attr)
1088
1687
return call_both
1089
1688
# Create the "call_both" function and add it to
1091
attr[attrname] = fixscope(attribute,
1690
attr[attrname] = fixscope(attribute, new_function)
1093
1691
# Is this a D-Bus method?
1094
1692
elif getattr(attribute, "_dbus_is_method", False):
1095
1693
# Create a new, but exactly alike, function
1096
1694
# object. Decorate it to be a new D-Bus method
1097
1695
# with the alternate D-Bus interface name. Add it
1098
1696
# to the class.
1099
attr[attrname] = (dbus.service.method
1101
attribute._dbus_in_signature,
1102
attribute._dbus_out_signature)
1104
(attribute.func_code,
1105
attribute.func_globals,
1106
attribute.func_name,
1107
attribute.func_defaults,
1108
attribute.func_closure)))
1698
dbus.service.method(
1700
attribute._dbus_in_signature,
1701
attribute._dbus_out_signature)
1702
(copy_function(attribute)))
1109
1703
# Copy annotations, if any
1111
attr[attrname]._dbus_annotations = (
1112
dict(attribute._dbus_annotations))
1705
attr[attrname]._dbus_annotations = dict(
1706
attribute._dbus_annotations)
1113
1707
except AttributeError:
1115
1709
# Is this a D-Bus property?
1143
1730
# object. Decorate it to be a new D-Bus interface
1144
1731
# with the alternate D-Bus interface name. Add it
1145
1732
# to the class.
1146
attr[attrname] = (dbus_interface_annotations
1149
(attribute.func_code,
1150
attribute.func_globals,
1151
attribute.func_name,
1152
attribute.func_defaults,
1153
attribute.func_closure)))
1154
# Deprecate all old interfaces
1155
iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1156
for old_interface_name in old_interface_names:
1157
@dbus_interface_annotations(old_interface_name)
1159
return { "org.freedesktop.DBus.Deprecated": "true" }
1160
# Find an unused name
1161
for aname in (iname.format(i) for i in itertools.count()):
1162
if aname not in attr:
1165
return type.__new__(mcs, name, bases, attr)
1734
dbus_interface_annotations(alt_interface)
1735
(copy_function(attribute)))
1737
# Deprecate all alternate interfaces
1738
iname = "_AlternateDBusNames_interface_annotation{}"
1739
for interface_name in interface_names:
1741
@dbus_interface_annotations(interface_name)
1743
return {"org.freedesktop.DBus.Deprecated":
1745
# Find an unused name
1746
for aname in (iname.format(i)
1747
for i in itertools.count()):
1748
if aname not in attr:
1752
# Replace the class with a new subclass of it with
1753
# methods, signals, etc. as created above.
1754
if sys.version_info.major == 2:
1755
cls = type(b"{}Alternate".format(cls.__name__),
1758
cls = type("{}Alternate".format(cls.__name__),
1765
@alternate_dbus_interfaces({"se.recompile.Mandos":
1766
"se.bsnet.fukt.Mandos"})
1168
1767
class ClientDBus(Client, DBusObjectWithProperties):
1169
1768
"""A Client class using D-Bus
1172
1771
dbus_object_path: dbus.ObjectPath
1173
1772
bus: dbus.SystemBus()
1176
1775
runtime_expansions = (Client.runtime_expansions
1177
+ ("dbus_object_path",))
1776
+ ("dbus_object_path", ))
1778
_interface = "se.recompile.Mandos.Client"
1179
1780
# dbus.service.Object doesn't use super(), so we can't either.
1181
def __init__(self, bus = None, *args, **kwargs):
1782
def __init__(self, bus=None, *args, **kwargs):
1183
1784
Client.__init__(self, *args, **kwargs)
1184
1785
# Only now, when this client is initialized, can it show up on
1186
client_object_name = unicode(self.name).translate(
1787
client_object_name = str(self.name).translate(
1187
1788
{ord("."): ord("_"),
1188
1789
ord("-"): ord("_")})
1189
self.dbus_object_path = (dbus.ObjectPath
1190
("/clients/" + client_object_name))
1790
self.dbus_object_path = dbus.ObjectPath(
1791
"/clients/" + client_object_name)
1191
1792
DBusObjectWithProperties.__init__(self, self.bus,
1192
1793
self.dbus_object_path)
1194
def notifychangeproperty(transform_func,
1195
dbus_name, type_func=lambda x: x,
1795
def notifychangeproperty(transform_func, dbus_name,
1796
type_func=lambda x: x,
1798
invalidate_only=False,
1799
_interface=_interface):
1197
1800
""" Modify a variable so that it's a property which announces
1198
1801
its changes to DBus.
1200
1803
transform_fun: Function that takes a value and a variant_level
1201
1804
and transforms it to a D-Bus type.
1202
1805
dbus_name: D-Bus name of the variable
1350
1957
server to mandos-client
1354
1961
# Rejected - signal
1355
1962
@dbus.service.signal(_interface, signature="s")
1356
1963
def Rejected(self, reason):
1360
1967
# NeedApproval - signal
1361
1968
@dbus.service.signal(_interface, signature="tb")
1362
1969
def NeedApproval(self, timeout, default):
1364
1971
return self.need_approval()
1368
1975
# Approve - method
1369
1976
@dbus.service.method(_interface, in_signature="b")
1370
1977
def Approve(self, value):
1371
1978
self.approve(value)
1373
1980
# CheckedOK - method
1374
1981
@dbus.service.method(_interface)
1375
1982
def CheckedOK(self):
1376
1983
self.checked_ok()
1378
1985
# Enable - method
1986
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1379
1987
@dbus.service.method(_interface)
1380
1988
def Enable(self):
1384
1992
# StartChecker - method
1993
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1385
1994
@dbus.service.method(_interface)
1386
1995
def StartChecker(self):
1388
1997
self.start_checker()
1390
1999
# Disable - method
2000
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1391
2001
@dbus.service.method(_interface)
1392
2002
def Disable(self):
1396
2006
# StopChecker - method
2007
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
2008
@dbus.service.method(_interface)
1398
2009
def StopChecker(self):
1399
2010
self.stop_checker()
1403
2014
# ApprovalPending - property
1404
2015
@dbus_service_property(_interface, signature="b", access="read")
1405
2016
def ApprovalPending_dbus_property(self):
1406
2017
return dbus.Boolean(bool(self.approvals_pending))
1408
2019
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
2020
@dbus_service_property(_interface,
1410
2022
access="readwrite")
1411
2023
def ApprovedByDefault_dbus_property(self, value=None):
1412
2024
if value is None: # get
1413
2025
return dbus.Boolean(self.approved_by_default)
1414
2026
self.approved_by_default = bool(value)
1416
2028
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
2029
@dbus_service_property(_interface,
1418
2031
access="readwrite")
1419
2032
def ApprovalDelay_dbus_property(self, value=None):
1420
2033
if value is None: # get
1421
return dbus.UInt64(self.approval_delay_milliseconds())
2034
return dbus.UInt64(self.approval_delay.total_seconds()
1422
2036
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1424
2038
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
2039
@dbus_service_property(_interface,
1426
2041
access="readwrite")
1427
2042
def ApprovalDuration_dbus_property(self, value=None):
1428
2043
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
2044
return dbus.UInt64(self.approval_duration.total_seconds()
1431
2046
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1433
2048
# Name - property
2050
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1434
2051
@dbus_service_property(_interface, signature="s", access="read")
1435
2052
def Name_dbus_property(self):
1436
2053
return dbus.String(self.name)
2057
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2058
@dbus_service_property(_interface, signature="s", access="read")
2059
def KeyID_dbus_property(self):
2060
return dbus.String(self.key_id)
1438
2062
# Fingerprint - property
2064
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1439
2065
@dbus_service_property(_interface, signature="s", access="read")
1440
2066
def Fingerprint_dbus_property(self):
1441
2067
return dbus.String(self.fingerprint)
1443
2069
# Host - property
1444
@dbus_service_property(_interface, signature="s",
2070
@dbus_service_property(_interface,
1445
2072
access="readwrite")
1446
2073
def Host_dbus_property(self, value=None):
1447
2074
if value is None: # get
1448
2075
return dbus.String(self.host)
1449
self.host = unicode(value)
2076
self.host = str(value)
1451
2078
# Created - property
2080
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1452
2081
@dbus_service_property(_interface, signature="s", access="read")
1453
2082
def Created_dbus_property(self):
1454
2083
return datetime_to_dbus(self.created)
1456
2085
# LastEnabled - property
1457
2086
@dbus_service_property(_interface, signature="s", access="read")
1458
2087
def LastEnabled_dbus_property(self):
1459
2088
return datetime_to_dbus(self.last_enabled)
1461
2090
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
2091
@dbus_service_property(_interface,
1463
2093
access="readwrite")
1464
2094
def Enabled_dbus_property(self, value=None):
1465
2095
if value is None: # get
1472
2102
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
2103
@dbus_service_property(_interface,
1474
2105
access="readwrite")
1475
2106
def LastCheckedOK_dbus_property(self, value=None):
1476
2107
if value is not None:
1477
2108
self.checked_ok()
1479
2110
return datetime_to_dbus(self.last_checked_ok)
1481
2112
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
2113
@dbus_service_property(_interface, signature="n", access="read")
1484
2114
def LastCheckerStatus_dbus_property(self):
1485
2115
return dbus.Int16(self.last_checker_status)
1487
2117
# Expires - property
1488
2118
@dbus_service_property(_interface, signature="s", access="read")
1489
2119
def Expires_dbus_property(self):
1490
2120
return datetime_to_dbus(self.expires)
1492
2122
# LastApprovalRequest - property
1493
2123
@dbus_service_property(_interface, signature="s", access="read")
1494
2124
def LastApprovalRequest_dbus_property(self):
1495
2125
return datetime_to_dbus(self.last_approval_request)
1497
2127
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
2128
@dbus_service_property(_interface,
1499
2130
access="readwrite")
1500
2131
def Timeout_dbus_property(self, value=None):
1501
2132
if value is None: # get
1502
return dbus.UInt64(self.timeout_milliseconds())
2133
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2134
old_timeout = self.timeout
1503
2135
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
2136
# Reschedule disabling
1505
2137
if self.enabled:
1506
2138
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
2139
self.expires += self.timeout - old_timeout
2140
if self.expires <= now:
1510
2141
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
2144
if (getattr(self, "disable_initiator_tag", None)
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2147
GLib.source_remove(self.disable_initiator_tag)
2148
self.disable_initiator_tag = GLib.timeout_add(
2149
int((self.expires - now).total_seconds() * 1000),
1524
2152
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
2153
@dbus_service_property(_interface,
1526
2155
access="readwrite")
1527
2156
def ExtendedTimeout_dbus_property(self, value=None):
1528
2157
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2158
return dbus.UInt64(self.extended_timeout.total_seconds()
1530
2160
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1532
2162
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
2163
@dbus_service_property(_interface,
1534
2165
access="readwrite")
1535
2166
def Interval_dbus_property(self, value=None):
1536
2167
if value is None: # get
1537
return dbus.UInt64(self.interval_milliseconds())
2168
return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
2169
self.interval = datetime.timedelta(0, 0, 0, value)
1539
2170
if getattr(self, "checker_initiator_tag", None) is None:
1541
2172
if self.enabled:
1542
2173
# Reschedule checker run
1543
gobject.source_remove(self.checker_initiator_tag)
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
2174
GLib.source_remove(self.checker_initiator_tag)
2175
self.checker_initiator_tag = GLib.timeout_add(
2176
value, self.start_checker)
2177
self.start_checker() # Start one now, too
1548
2179
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
2180
@dbus_service_property(_interface,
1550
2182
access="readwrite")
1551
2183
def Checker_dbus_property(self, value=None):
1552
2184
if value is None: # get
1553
2185
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
2186
self.checker_command = str(value)
1556
2188
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
2189
@dbus_service_property(_interface,
1558
2191
access="readwrite")
1559
2192
def CheckerRunning_dbus_property(self, value=None):
1560
2193
if value is None: # get
1593
2234
if data[0] == 'data':
1595
2236
if data[0] == 'function':
1596
2238
def func(*args, **kwargs):
1597
2239
self._pipe.send(('funcall', name, args, kwargs))
1598
2240
return self._pipe.recv()[1]
1601
2244
def __setattr__(self, name, value):
1602
2245
if name == '_pipe':
1603
2246
return super(ProxyClient, self).__setattr__(name, value)
1604
2247
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1611
2250
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
2251
"""A class to handle client connections.
1614
2253
Instantiated once for each connection to handle it.
1615
2254
Note: This will run in its own forked process."""
1617
2256
def handle(self):
1618
2257
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
2258
logger.info("TCP connection from: %s",
1620
unicode(self.client_address))
2259
str(self.client_address))
1621
2260
logger.debug("Pipe FD: %d",
1622
2261
self.server.child_pipe.fileno())
1624
session = (gnutls.connection
1625
.ClientSession(self.request,
1627
.X509Credentials()))
1629
# Note: gnutls.connection.X509Credentials is really a
1630
# generic GnuTLS certificate credentials object so long as
1631
# no X.509 keys are added to it. Therefore, we can use it
1632
# here despite using OpenPGP certificates.
1634
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
# "+AES-256-CBC", "+SHA1",
1636
# "+COMP-NULL", "+CTYPE-OPENPGP",
2263
session = gnutls.ClientSession(self.request)
2265
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2266
# "+AES-256-CBC", "+SHA1",
2267
# "+COMP-NULL", "+CTYPE-OPENPGP",
1638
2269
# Use a fallback default, since this MUST be set.
1639
2270
priority = self.server.gnutls_priority
1640
2271
if priority is None:
1641
2272
priority = "NORMAL"
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2273
gnutls.priority_set_direct(session._c_object,
2274
priority.encode("utf-8"),
1646
2277
# Start communication using the Mandos protocol
1647
2278
# Get protocol number
1648
2279
line = self.request.makefile().readline()
1649
2280
logger.debug("Protocol version: %r", line)
1651
2282
if int(line.strip().split()[0]) > 1:
2283
raise RuntimeError(line)
1653
2284
except (ValueError, IndexError, RuntimeError) as error:
1654
2285
logger.error("Unknown protocol version: %s", error)
1657
2288
# Start GnuTLS connection
1659
2290
session.handshake()
1660
except gnutls.errors.GNUTLSError as error:
2291
except gnutls.Error as error:
1661
2292
logger.warning("Handshake failed: %s", error)
1662
2293
# Do not run session.bye() here: the session is not
1663
2294
# established. Just abandon the request.
1665
2296
logger.debug("Handshake succeeded")
1667
2298
approval_required = False
1670
fpr = self.fingerprint(self.peer_certificate
1673
gnutls.errors.GNUTLSError) as error:
1674
logger.warning("Bad certificate: %s", error)
1676
logger.debug("Fingerprint: %s", fpr)
1679
client = ProxyClient(child_pipe, fpr,
2300
if gnutls.has_rawpk:
2303
key_id = self.key_id(
2304
self.peer_certificate(session))
2305
except (TypeError, gnutls.Error) as error:
2306
logger.warning("Bad certificate: %s", error)
2308
logger.debug("Key ID: %s", key_id)
2313
fpr = self.fingerprint(
2314
self.peer_certificate(session))
2315
except (TypeError, gnutls.Error) as error:
2316
logger.warning("Bad certificate: %s", error)
2318
logger.debug("Fingerprint: %s", fpr)
2321
client = ProxyClient(child_pipe, key_id, fpr,
1680
2322
self.client_address)
1681
2323
except KeyError:
1684
2326
if client.approval_delay:
1685
2327
delay = client.approval_delay
1686
2328
client.approvals_pending += 1
1687
2329
approval_required = True
1690
2332
if not client.enabled:
1691
2333
logger.info("Client %s is disabled",
1693
2335
if self.server.use_dbus:
1694
2336
# Emit D-Bus signal
1695
2337
client.Rejected("Disabled")
1698
2340
if client.approved or not client.approval_delay:
1699
#We are approved or approval is disabled
2341
# We are approved or approval is disabled
1701
2343
elif client.approved is None:
1702
2344
logger.info("Client %s needs approval",
1737
2377
delay -= time2 - time
1740
while sent_size < len(client.secret):
1742
sent = session.send(client.secret[sent_size:])
1743
except gnutls.errors.GNUTLSError as error:
1744
logger.warning("gnutls send failed",
1747
logger.debug("Sent: %d, remaining: %d",
1748
sent, len(client.secret)
1749
- (sent_size + sent))
2380
session.send(client.secret)
2381
except gnutls.Error as error:
2382
logger.warning("gnutls send failed",
1752
2386
logger.info("Sending secret to %s", client.name)
1753
2387
# bump the timeout using extended_timeout
1754
2388
client.bump_timeout(client.extended_timeout)
1755
2389
if self.server.use_dbus:
1756
2390
# Emit D-Bus signal
1757
2391
client.GotSecret()
1760
2394
if approval_required:
1761
2395
client.approvals_pending -= 1
1764
except gnutls.errors.GNUTLSError as error:
2398
except gnutls.Error as error:
1765
2399
logger.warning("GnuTLS bye failed",
1766
2400
exc_info=error)
1769
2403
def peer_certificate(session):
1770
"Return the peer's OpenPGP certificate as a bytestring"
1771
# If not an OpenPGP certificate...
1772
if (gnutls.library.functions
1773
.gnutls_certificate_type_get(session._c_object)
1774
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1775
# ...do the normal thing
1776
return session.peer_certificate
2404
"Return the peer's certificate as a bytestring"
2406
cert_type = gnutls.certificate_type_get2(session._c_object,
2408
except AttributeError:
2409
cert_type = gnutls.certificate_type_get(session._c_object)
2410
if gnutls.has_rawpk:
2411
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2413
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2414
# If not a valid certificate type...
2415
if cert_type not in valid_cert_types:
2416
logger.info("Cert type %r not in %r", cert_type,
2418
# ...return invalid data
1777
2420
list_size = ctypes.c_uint(1)
1778
cert_list = (gnutls.library.functions
1779
.gnutls_certificate_get_peers
2421
cert_list = (gnutls.certificate_get_peers
1780
2422
(session._c_object, ctypes.byref(list_size)))
1781
2423
if not bool(cert_list) and list_size.value != 0:
1782
raise gnutls.errors.GNUTLSError("error getting peer"
2424
raise gnutls.Error("error getting peer certificate")
1784
2425
if list_size.value == 0:
1786
2427
cert = cert_list[0]
1787
2428
return ctypes.string_at(cert.data, cert.size)
2431
def key_id(certificate):
2432
"Convert a certificate bytestring to a hexdigit key ID"
2433
# New GnuTLS "datum" with the public key
2434
datum = gnutls.datum_t(
2435
ctypes.cast(ctypes.c_char_p(certificate),
2436
ctypes.POINTER(ctypes.c_ubyte)),
2437
ctypes.c_uint(len(certificate)))
2438
# XXX all these need to be created in the gnutls "module"
2439
# New empty GnuTLS certificate
2440
pubkey = gnutls.pubkey_t()
2441
gnutls.pubkey_init(ctypes.byref(pubkey))
2442
# Import the raw public key into the certificate
2443
gnutls.pubkey_import(pubkey,
2444
ctypes.byref(datum),
2445
gnutls.X509_FMT_DER)
2446
# New buffer for the key ID
2447
buf = ctypes.create_string_buffer(32)
2448
buf_len = ctypes.c_size_t(len(buf))
2449
# Get the key ID from the raw public key into the buffer
2450
gnutls.pubkey_get_key_id(pubkey,
2451
gnutls.KEYID_USE_SHA256,
2452
ctypes.cast(ctypes.byref(buf),
2453
ctypes.POINTER(ctypes.c_ubyte)),
2454
ctypes.byref(buf_len))
2455
# Deinit the certificate
2456
gnutls.pubkey_deinit(pubkey)
2458
# Convert the buffer to a Python bytestring
2459
key_id = ctypes.string_at(buf, buf_len.value)
2460
# Convert the bytestring to hexadecimal notation
2461
hex_key_id = binascii.hexlify(key_id).upper()
1790
2465
def fingerprint(openpgp):
1791
2466
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1792
2467
# New GnuTLS "datum" with the OpenPGP public key
1793
datum = (gnutls.library.types
1794
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1797
ctypes.c_uint(len(openpgp))))
2468
datum = gnutls.datum_t(
2469
ctypes.cast(ctypes.c_char_p(openpgp),
2470
ctypes.POINTER(ctypes.c_ubyte)),
2471
ctypes.c_uint(len(openpgp)))
1798
2472
# New empty GnuTLS certificate
1799
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1800
(gnutls.library.functions
1801
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2473
crt = gnutls.openpgp_crt_t()
2474
gnutls.openpgp_crt_init(ctypes.byref(crt))
1802
2475
# Import the OpenPGP public key into the certificate
1803
(gnutls.library.functions
1804
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1805
gnutls.library.constants
1806
.GNUTLS_OPENPGP_FMT_RAW))
2476
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2477
gnutls.OPENPGP_FMT_RAW)
1807
2478
# Verify the self signature in the key
1808
2479
crtverify = ctypes.c_uint()
1809
(gnutls.library.functions
1810
.gnutls_openpgp_crt_verify_self(crt, 0,
1811
ctypes.byref(crtverify)))
2480
gnutls.openpgp_crt_verify_self(crt, 0,
2481
ctypes.byref(crtverify))
1812
2482
if crtverify.value != 0:
1813
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1814
raise (gnutls.errors.CertificateSecurityError
2483
gnutls.openpgp_crt_deinit(crt)
2484
raise gnutls.CertificateSecurityError(code
1816
2486
# New buffer for the fingerprint
1817
2487
buf = ctypes.create_string_buffer(20)
1818
2488
buf_len = ctypes.c_size_t()
1819
2489
# Get the fingerprint from the certificate into the buffer
1820
(gnutls.library.functions
1821
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1822
ctypes.byref(buf_len)))
2490
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2491
ctypes.byref(buf_len))
1823
2492
# Deinit the certificate
1824
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2493
gnutls.openpgp_crt_deinit(crt)
1825
2494
# Convert the buffer to a Python bytestring
1826
2495
fpr = ctypes.string_at(buf, buf_len.value)
1827
2496
# Convert the bytestring to hexadecimal notation
1832
2501
class MultiprocessingMixIn(object):
1833
2502
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1834
2504
def sub_process_main(self, request, address):
1836
2506
self.finish_request(request, address)
1837
2507
except Exception:
1838
2508
self.handle_error(request, address)
1839
2509
self.close_request(request)
1841
2511
def process_request(self, request, address):
1842
2512
"""Start a new process to process the request."""
1843
proc = multiprocessing.Process(target = self.sub_process_main,
2513
proc = multiprocessing.Process(target=self.sub_process_main,
2514
args=(request, address))
1850
2519
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1851
2520
""" adds a pipe to the MixIn """
1852
2522
def process_request(self, request, client_address):
1853
2523
"""Overrides and wraps the original process_request().
1855
2525
This function creates a new pipe in self.pipe
1857
2527
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1859
2529
proc = MultiprocessingMixIn.process_request(self, request,
1860
2530
client_address)
1861
2531
self.child_pipe.close()
1862
2532
self.add_pipe(parent_pipe, proc)
1864
2534
def add_pipe(self, parent_pipe, proc):
1865
2535
"""Dummy function; override as necessary"""
1866
raise NotImplementedError
2536
raise NotImplementedError()
1869
2539
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1870
2540
socketserver.TCPServer, object):
1871
2541
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1874
2544
enabled: Boolean; whether this server is activated yet
1875
2545
interface: None or a network interface name (string)
1876
2546
use_ipv6: Boolean; to use IPv6 or not
1878
2549
def __init__(self, server_address, RequestHandlerClass,
1879
interface=None, use_ipv6=True):
2553
"""If socketfd is set, use that file descriptor instead of
2554
creating a new one with socket.socket().
1880
2556
self.interface = interface
1882
2558
self.address_family = socket.AF_INET6
2559
if socketfd is not None:
2560
# Save the file descriptor
2561
self.socketfd = socketfd
2562
# Save the original socket.socket() function
2563
self.socket_socket = socket.socket
2565
# To implement --socket, we monkey patch socket.socket.
2567
# (When socketserver.TCPServer is a new-style class, we
2568
# could make self.socket into a property instead of monkey
2569
# patching socket.socket.)
2571
# Create a one-time-only replacement for socket.socket()
2572
@functools.wraps(socket.socket)
2573
def socket_wrapper(*args, **kwargs):
2574
# Restore original function so subsequent calls are
2576
socket.socket = self.socket_socket
2577
del self.socket_socket
2578
# This time only, return a new socket object from the
2579
# saved file descriptor.
2580
return socket.fromfd(self.socketfd, *args, **kwargs)
2581
# Replace socket.socket() function with wrapper
2582
socket.socket = socket_wrapper
2583
# The socketserver.TCPServer.__init__ will call
2584
# socket.socket(), which might be our replacement,
2585
# socket_wrapper(), if socketfd was set.
1883
2586
socketserver.TCPServer.__init__(self, server_address,
1884
2587
RequestHandlerClass)
1885
2589
def server_bind(self):
1886
2590
"""This overrides the normal server_bind() function
1887
2591
to bind to an interface if one was specified, and also NOT to
1888
2592
bind to an address or port if they were not specified."""
2593
global SO_BINDTODEVICE
1889
2594
if self.interface is not None:
1890
2595
if SO_BINDTODEVICE is None:
1891
logger.error("SO_BINDTODEVICE does not exist;"
1892
" cannot bind to interface %s",
1896
self.socket.setsockopt(socket.SOL_SOCKET,
1900
except socket.error as error:
1901
if error[0] == errno.EPERM:
1902
logger.error("No permission to"
1903
" bind to interface %s",
1905
elif error[0] == errno.ENOPROTOOPT:
1906
logger.error("SO_BINDTODEVICE not available;"
1907
" cannot bind to interface %s",
2596
# Fall back to a hard-coded value which seems to be
2598
logger.warning("SO_BINDTODEVICE not found, trying 25")
2599
SO_BINDTODEVICE = 25
2601
self.socket.setsockopt(
2602
socket.SOL_SOCKET, SO_BINDTODEVICE,
2603
(self.interface + "\0").encode("utf-8"))
2604
except socket.error as error:
2605
if error.errno == errno.EPERM:
2606
logger.error("No permission to bind to"
2607
" interface %s", self.interface)
2608
elif error.errno == errno.ENOPROTOOPT:
2609
logger.error("SO_BINDTODEVICE not available;"
2610
" cannot bind to interface %s",
2612
elif error.errno == errno.ENODEV:
2613
logger.error("Interface %s does not exist,"
2614
" cannot bind", self.interface)
1911
2617
# Only bind(2) the socket if we really need to.
1912
2618
if self.server_address[0] or self.server_address[1]:
1913
2619
if not self.server_address[0]:
1914
2620
if self.address_family == socket.AF_INET6:
1915
any_address = "::" # in6addr_any
2621
any_address = "::" # in6addr_any
1917
any_address = socket.INADDR_ANY
2623
any_address = "0.0.0.0" # INADDR_ANY
1918
2624
self.server_address = (any_address,
1919
2625
self.server_address[1])
1920
2626
elif not self.server_address[1]:
1921
self.server_address = (self.server_address[0],
2627
self.server_address = (self.server_address[0], 0)
1923
2628
# if self.interface:
1924
2629
# self.server_address = (self.server_address[0],
1950
2660
self.gnutls_priority = gnutls_priority
1951
2661
IPv6_TCPServer.__init__(self, server_address,
1952
2662
RequestHandlerClass,
1953
interface = interface,
1954
use_ipv6 = use_ipv6)
2663
interface=interface,
1955
2667
def server_activate(self):
1956
2668
if self.enabled:
1957
2669
return socketserver.TCPServer.server_activate(self)
1959
2671
def enable(self):
1960
2672
self.enabled = True
1962
2674
def add_pipe(self, parent_pipe, proc):
1963
2675
# Call "handle_ipc" for both data and EOF events
1964
gobject.io_add_watch(parent_pipe.fileno(),
1965
gobject.IO_IN | gobject.IO_HUP,
1966
functools.partial(self.handle_ipc,
1971
def handle_ipc(self, source, condition, parent_pipe=None,
1972
proc = None, client_object=None):
1974
gobject.IO_IN: "IN", # There is data to read.
1975
gobject.IO_OUT: "OUT", # Data can be written (without
1977
gobject.IO_PRI: "PRI", # There is urgent data to read.
1978
gobject.IO_ERR: "ERR", # Error condition.
1979
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1980
# broken, usually for pipes and
1983
conditions_string = ' | '.join(name
1985
condition_names.iteritems()
1986
if cond & condition)
2677
parent_pipe.fileno(),
2678
GLib.IO_IN | GLib.IO_HUP,
2679
functools.partial(self.handle_ipc,
2680
parent_pipe=parent_pipe,
2683
def handle_ipc(self, source, condition,
2686
client_object=None):
1987
2687
# error, or the other end of multiprocessing.Pipe has closed
1988
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2688
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1989
2689
# Wait for other process to exit
1993
2693
# Read a request from the child
1994
2694
request = parent_pipe.recv()
1995
2695
command = request[0]
1997
2697
if command == 'init':
1999
address = request[2]
2001
for c in self.clients.itervalues():
2002
if c.fingerprint == fpr:
2698
key_id = request[1].decode("ascii")
2699
fpr = request[2].decode("ascii")
2700
address = request[3]
2702
for c in self.clients.values():
2703
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2705
if key_id and c.key_id == key_id:
2708
if fpr and c.fingerprint == fpr:
2006
logger.info("Client not found for fingerprint: %s, ad"
2007
"dress: %s", fpr, address)
2712
logger.info("Client not found for key ID: %s, address"
2713
": %s", key_id or fpr, address)
2008
2714
if self.use_dbus:
2009
2715
# Emit D-Bus signal
2010
mandos_dbus_service.ClientNotFound(fpr,
2716
mandos_dbus_service.ClientNotFound(key_id or fpr,
2012
2718
parent_pipe.send(False)
2015
gobject.io_add_watch(parent_pipe.fileno(),
2016
gobject.IO_IN | gobject.IO_HUP,
2017
functools.partial(self.handle_ipc,
2722
parent_pipe.fileno(),
2723
GLib.IO_IN | GLib.IO_HUP,
2724
functools.partial(self.handle_ipc,
2725
parent_pipe=parent_pipe,
2727
client_object=client))
2023
2728
parent_pipe.send(True)
2024
2729
# remove the old hook in favor of the new above hook on
2028
2733
funcname = request[1]
2029
2734
args = request[2]
2030
2735
kwargs = request[3]
2032
2737
parent_pipe.send(('data', getattr(client_object,
2033
2738
funcname)(*args,
2036
2741
if command == 'getattr':
2037
2742
attrname = request[1]
2038
if callable(client_object.__getattribute__(attrname)):
2039
parent_pipe.send(('function',))
2743
if isinstance(client_object.__getattribute__(attrname),
2744
collections.Callable):
2745
parent_pipe.send(('function', ))
2041
parent_pipe.send(('data', client_object
2042
.__getattribute__(attrname)))
2748
'data', client_object.__getattribute__(attrname)))
2044
2750
if command == 'setattr':
2045
2751
attrname = request[1]
2046
2752
value = request[2]
2047
2753
setattr(client_object, attrname, value)
2758
def rfc3339_duration_to_delta(duration):
2759
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2761
>>> rfc3339_duration_to_delta("P7D")
2762
datetime.timedelta(7)
2763
>>> rfc3339_duration_to_delta("PT60S")
2764
datetime.timedelta(0, 60)
2765
>>> rfc3339_duration_to_delta("PT60M")
2766
datetime.timedelta(0, 3600)
2767
>>> rfc3339_duration_to_delta("PT24H")
2768
datetime.timedelta(1)
2769
>>> rfc3339_duration_to_delta("P1W")
2770
datetime.timedelta(7)
2771
>>> rfc3339_duration_to_delta("PT5M30S")
2772
datetime.timedelta(0, 330)
2773
>>> rfc3339_duration_to_delta("P1DT3M20S")
2774
datetime.timedelta(1, 200)
2777
# Parsing an RFC 3339 duration with regular expressions is not
2778
# possible - there would have to be multiple places for the same
2779
# values, like seconds. The current code, while more esoteric, is
2780
# cleaner without depending on a parsing library. If Python had a
2781
# built-in library for parsing we would use it, but we'd like to
2782
# avoid excessive use of external libraries.
2784
# New type for defining tokens, syntax, and semantics all-in-one
2785
Token = collections.namedtuple("Token", (
2786
"regexp", # To match token; if "value" is not None, must have
2787
# a "group" containing digits
2788
"value", # datetime.timedelta or None
2789
"followers")) # Tokens valid after this token
2790
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2791
# the "duration" ABNF definition in RFC 3339, Appendix A.
2792
token_end = Token(re.compile(r"$"), None, frozenset())
2793
token_second = Token(re.compile(r"(\d+)S"),
2794
datetime.timedelta(seconds=1),
2795
frozenset((token_end, )))
2796
token_minute = Token(re.compile(r"(\d+)M"),
2797
datetime.timedelta(minutes=1),
2798
frozenset((token_second, token_end)))
2799
token_hour = Token(re.compile(r"(\d+)H"),
2800
datetime.timedelta(hours=1),
2801
frozenset((token_minute, token_end)))
2802
token_time = Token(re.compile(r"T"),
2804
frozenset((token_hour, token_minute,
2806
token_day = Token(re.compile(r"(\d+)D"),
2807
datetime.timedelta(days=1),
2808
frozenset((token_time, token_end)))
2809
token_month = Token(re.compile(r"(\d+)M"),
2810
datetime.timedelta(weeks=4),
2811
frozenset((token_day, token_end)))
2812
token_year = Token(re.compile(r"(\d+)Y"),
2813
datetime.timedelta(weeks=52),
2814
frozenset((token_month, token_end)))
2815
token_week = Token(re.compile(r"(\d+)W"),
2816
datetime.timedelta(weeks=1),
2817
frozenset((token_end, )))
2818
token_duration = Token(re.compile(r"P"), None,
2819
frozenset((token_year, token_month,
2820
token_day, token_time,
2822
# Define starting values:
2824
value = datetime.timedelta()
2826
# Following valid tokens
2827
followers = frozenset((token_duration, ))
2828
# String left to parse
2830
# Loop until end token is found
2831
while found_token is not token_end:
2832
# Search for any currently valid tokens
2833
for token in followers:
2834
match = token.regexp.match(s)
2835
if match is not None:
2837
if token.value is not None:
2838
# Value found, parse digits
2839
factor = int(match.group(1), 10)
2840
# Add to value so far
2841
value += factor * token.value
2842
# Strip token from string
2843
s = token.regexp.sub("", s, 1)
2846
# Set valid next tokens
2847
followers = found_token.followers
2850
# No currently valid tokens were found
2851
raise ValueError("Invalid RFC 3339 duration: {!r}"
2052
2857
def string_to_delta(interval):
2053
2858
"""Parse a string and return a datetime.timedelta
2055
2860
>>> string_to_delta('7d')
2056
2861
datetime.timedelta(7)
2057
2862
>>> string_to_delta('60s')
2147
2957
parser.add_argument("--no-dbus", action="store_false",
2148
2958
dest="use_dbus", help="Do not provide D-Bus"
2149
" system bus interface")
2959
" system bus interface", default=None)
2150
2960
parser.add_argument("--no-ipv6", action="store_false",
2151
dest="use_ipv6", help="Do not use IPv6")
2961
dest="use_ipv6", help="Do not use IPv6",
2152
2963
parser.add_argument("--no-restore", action="store_false",
2153
2964
dest="restore", help="Do not restore stored"
2965
" state", default=None)
2966
parser.add_argument("--socket", type=int,
2967
help="Specify a file descriptor to a network"
2968
" socket to use instead of creating one")
2155
2969
parser.add_argument("--statedir", metavar="DIR",
2156
2970
help="Directory to save/restore state in")
2971
parser.add_argument("--foreground", action="store_true",
2972
help="Run in foreground", default=None)
2973
parser.add_argument("--no-zeroconf", action="store_false",
2974
dest="zeroconf", help="Do not use Zeroconf",
2158
2977
options = parser.parse_args()
2160
2979
if options.check:
2981
fail_count, test_count = doctest.testmod()
2982
sys.exit(os.EX_OK if fail_count == 0 else 1)
2165
2984
# Default values for config file for server-global settings
2166
server_defaults = { "interface": "",
2171
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2172
"servicename": "Mandos",
2177
"statedir": "/var/lib/mandos"
2985
if gnutls.has_rawpk:
2986
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2987
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2989
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2990
":+SIGN-DSA-SHA256")
2991
server_defaults = {"interface": "",
2995
"priority": priority,
2996
"servicename": "Mandos",
3002
"statedir": "/var/lib/mandos",
3003
"foreground": "False",
2180
3008
# Parse config file for server-global settings
2181
3009
server_config = configparser.SafeConfigParser(server_defaults)
2182
3010
del server_defaults
2183
server_config.read(os.path.join(options.configdir,
3011
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2185
3012
# Convert the SafeConfigParser object to a dict
2186
3013
server_settings = server_config.defaults()
2187
3014
# Use the appropriate methods on the non-string config options
2188
for option in ("debug", "use_dbus", "use_ipv6"):
3015
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3016
"foreground", "zeroconf"):
2189
3017
server_settings[option] = server_config.getboolean("DEFAULT",
2191
3019
if server_settings["port"]:
2192
3020
server_settings["port"] = server_config.getint("DEFAULT",
3022
if server_settings["socket"]:
3023
server_settings["socket"] = server_config.getint("DEFAULT",
3025
# Later, stdin will, and stdout and stderr might, be dup'ed
3026
# over with an opened os.devnull. But we don't want this to
3027
# happen with a supplied network socket.
3028
if 0 <= server_settings["socket"] <= 2:
3029
server_settings["socket"] = os.dup(server_settings
2194
3031
del server_config
2196
3033
# Override the settings from the config file with command line
2197
3034
# options, if set.
2198
3035
for option in ("interface", "address", "port", "debug",
2199
"priority", "servicename", "configdir",
2200
"use_dbus", "use_ipv6", "debuglevel", "restore",
3036
"priority", "servicename", "configdir", "use_dbus",
3037
"use_ipv6", "debuglevel", "restore", "statedir",
3038
"socket", "foreground", "zeroconf"):
2202
3039
value = getattr(options, option)
2203
3040
if value is not None:
2204
3041
server_settings[option] = value
2206
3043
# Force all strings to be unicode
2207
3044
for option in server_settings.keys():
2208
if type(server_settings[option]) is str:
2209
server_settings[option] = unicode(server_settings[option])
3045
if isinstance(server_settings[option], bytes):
3046
server_settings[option] = (server_settings[option]
3048
# Force all boolean options to be boolean
3049
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3050
"foreground", "zeroconf"):
3051
server_settings[option] = bool(server_settings[option])
3052
# Debug implies foreground
3053
if server_settings["debug"]:
3054
server_settings["foreground"] = True
2210
3055
# Now we have our good server settings in "server_settings"
2212
3057
##################################################################
3059
if (not server_settings["zeroconf"]
3060
and not (server_settings["port"]
3061
or server_settings["socket"] != "")):
3062
parser.error("Needs port or socket to work without Zeroconf")
2214
3064
# For convenience
2215
3065
debug = server_settings["debug"]
2216
3066
debuglevel = server_settings["debuglevel"]
3136
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2277
3138
except OSError as error:
2278
if error[0] != errno.EPERM:
3139
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3140
.format(uid, gid, os.strerror(error.errno)))
3141
if error.errno != errno.EPERM:
2282
3145
# Enable all possible GnuTLS debugging
2284
3147
# "Use a log level over 10 to enable all debugging options."
2285
3148
# - GnuTLS manual
2286
gnutls.library.functions.gnutls_global_set_log_level(11)
2288
@gnutls.library.types.gnutls_log_func
3149
gnutls.global_set_log_level(11)
2289
3152
def debug_gnutls(level, string):
2290
3153
logger.debug("GnuTLS: %s", string[:-1])
2292
(gnutls.library.functions
2293
.gnutls_global_set_log_function(debug_gnutls))
3155
gnutls.global_set_log_function(debug_gnutls)
2295
3157
# Redirect stdin so all checkers get /dev/null
2296
3158
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2297
3159
os.dup2(null, sys.stdin.fileno())
2301
3163
# Need to fork before connecting to D-Bus
2303
3165
# Close all input and output, do double fork, etc.
2306
gobject.threads_init()
3168
# multiprocessing will use threads, so before we use GLib we need
3169
# to inform GLib that threads will be used.
2308
3172
global main_loop
2309
3173
# From the Avahi example code
2310
3174
DBusGMainLoop(set_as_default=True)
2311
main_loop = gobject.MainLoop()
3175
main_loop = GLib.MainLoop()
2312
3176
bus = dbus.SystemBus()
2313
3177
# End of Avahi example code
2316
3180
bus_name = dbus.service.BusName("se.recompile.Mandos",
2317
bus, do_not_queue=True)
2318
old_bus_name = (dbus.service.BusName
2319
("se.bsnet.fukt.Mandos", bus,
2321
except dbus.exceptions.NameExistsException as e:
3183
old_bus_name = dbus.service.BusName(
3184
"se.bsnet.fukt.Mandos", bus,
3186
except dbus.exceptions.DBusException as e:
2322
3187
logger.error("Disabling D-Bus:", exc_info=e)
2323
3188
use_dbus = False
2324
3189
server_settings["use_dbus"] = False
2325
3190
tcp_server.use_dbus = False
2326
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2327
service = AvahiServiceToSyslog(name =
2328
server_settings["servicename"],
2329
servicetype = "_mandos._tcp",
2330
protocol = protocol, bus = bus)
2331
if server_settings["interface"]:
2332
service.interface = (if_nametoindex
2333
(str(server_settings["interface"])))
3192
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3193
service = AvahiServiceToSyslog(
3194
name=server_settings["servicename"],
3195
servicetype="_mandos._tcp",
3198
if server_settings["interface"]:
3199
service.interface = if_nametoindex(
3200
server_settings["interface"].encode("utf-8"))
2335
3202
global multiprocessing_manager
2336
3203
multiprocessing_manager = multiprocessing.Manager()
2338
3205
client_class = Client
2340
client_class = functools.partial(ClientDBusTransitional,
3207
client_class = functools.partial(ClientDBus, bus=bus)
2343
3209
client_settings = Client.config_parser(client_config)
2344
3210
old_client_settings = {}
2345
3211
clients_data = {}
3213
# This is used to redirect stdout and stderr for checker processes
3215
wnull = open(os.devnull, "w") # A writable /dev/null
3216
# Only used if server is running in foreground but not in debug
3218
if debug or not foreground:
2347
3221
# Get client data and settings from last running state.
2348
3222
if server_settings["restore"]:
2350
3224
with open(stored_state_path, "rb") as stored_state:
2351
clients_data, old_client_settings = (pickle.load
3225
if sys.version_info.major == 2:
3226
clients_data, old_client_settings = pickle.load(
3229
bytes_clients_data, bytes_old_client_settings = (
3230
pickle.load(stored_state, encoding="bytes"))
3231
# Fix bytes to strings
3234
clients_data = {(key.decode("utf-8")
3235
if isinstance(key, bytes)
3238
bytes_clients_data.items()}
3239
del bytes_clients_data
3240
for key in clients_data:
3241
value = {(k.decode("utf-8")
3242
if isinstance(k, bytes) else k): v
3244
clients_data[key].items()}
3245
clients_data[key] = value
3247
value["client_structure"] = [
3249
if isinstance(s, bytes)
3251
value["client_structure"]]
3253
for k in ("name", "host"):
3254
if isinstance(value[k], bytes):
3255
value[k] = value[k].decode("utf-8")
3256
if not value.has_key("key_id"):
3257
value["key_id"] = ""
3258
elif not value.has_key("fingerprint"):
3259
value["fingerprint"] = ""
3260
# old_client_settings
3262
old_client_settings = {
3263
(key.decode("utf-8")
3264
if isinstance(key, bytes)
3267
bytes_old_client_settings.items()}
3268
del bytes_old_client_settings
3270
for value in old_client_settings.values():
3271
if isinstance(value["host"], bytes):
3272
value["host"] = (value["host"]
2353
3274
os.remove(stored_state_path)
2354
3275
except IOError as e:
2355
3276
if e.errno == errno.ENOENT:
2356
logger.warning("Could not load persistent state: {0}"
2357
.format(os.strerror(e.errno)))
3277
logger.warning("Could not load persistent state:"
3278
" {}".format(os.strerror(e.errno)))
2359
3280
logger.critical("Could not load persistent state:",
2362
3283
except EOFError as e:
2363
3284
logger.warning("Could not load persistent state: "
2364
"EOFError:", exc_info=e)
2366
3288
with PGPEngine() as pgp:
2367
for client_name, client in clients_data.iteritems():
3289
for client_name, client in clients_data.items():
3290
# Skip removed clients
3291
if client_name not in client_settings:
2368
3294
# Decide which value to use after restoring saved state.
2369
3295
# We have three different values: Old config file,
2370
3296
# new config file, and saved state.
2428
3354
for client_name in (set(client_settings)
2429
3355
- set(old_client_settings)):
2430
3356
clients_data[client_name] = client_settings[client_name]
2432
3358
# Create all client objects
2433
for client_name, client in clients_data.iteritems():
3359
for client_name, client in clients_data.items():
2434
3360
tcp_server.clients[client_name] = client_class(
2435
name = client_name, settings = client)
3363
server_settings=server_settings)
2437
3365
if not tcp_server.clients:
2438
3366
logger.warning("No clients defined")
2444
pidfile.write(str(pid) + "\n".encode("utf-8"))
2447
logger.error("Could not write to file %r with PID %d",
2450
# "pidfile" was never created
3369
if pidfile is not None:
3373
print(pid, file=pidfile)
3375
logger.error("Could not write to file %r with PID %d",
2452
3378
del pidfilename
2453
signal.signal(signal.SIGINT, signal.SIG_IGN)
2455
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2456
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3380
for termsig in (signal.SIGHUP, signal.SIGTERM):
3381
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3382
lambda: main_loop.quit() and False)
2459
class MandosDBusService(DBusObjectWithProperties):
3386
@alternate_dbus_interfaces(
3387
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3388
class MandosDBusService(DBusObjectWithObjectManager):
2460
3389
"""A D-Bus proxy object"""
2461
3391
def __init__(self):
2462
3392
dbus.service.Object.__init__(self, bus, "/")
2463
3394
_interface = "se.recompile.Mandos"
2465
@dbus_interface_annotations(_interface)
2467
return { "org.freedesktop.DBus.Property"
2468
".EmitsChangedSignal":
2471
3396
@dbus.service.signal(_interface, signature="o")
2472
3397
def ClientAdded(self, objpath):
2476
3401
@dbus.service.signal(_interface, signature="ss")
2477
def ClientNotFound(self, fingerprint, address):
3402
def ClientNotFound(self, key_id, address):
3406
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2481
3408
@dbus.service.signal(_interface, signature="os")
2482
3409
def ClientRemoved(self, objpath, name):
3413
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2486
3415
@dbus.service.method(_interface, out_signature="ao")
2487
3416
def GetAllClients(self):
2489
return dbus.Array(c.dbus_object_path
2491
tcp_server.clients.itervalues())
3418
return dbus.Array(c.dbus_object_path for c in
3419
tcp_server.clients.values())
3421
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2493
3423
@dbus.service.method(_interface,
2494
3424
out_signature="a{oa{sv}}")
2495
3425
def GetAllClientsWithProperties(self):
2497
3427
return dbus.Dictionary(
2498
((c.dbus_object_path, c.GetAll(""))
2499
for c in tcp_server.clients.itervalues()),
3428
{c.dbus_object_path: c.GetAll(
3429
"se.recompile.Mandos.Client")
3430
for c in tcp_server.clients.values()},
2500
3431
signature="oa{sv}")
2502
3433
@dbus.service.method(_interface, in_signature="o")
2503
3434
def RemoveClient(self, object_path):
2505
for c in tcp_server.clients.itervalues():
3436
for c in tcp_server.clients.values():
2506
3437
if c.dbus_object_path == object_path:
2507
3438
del tcp_server.clients[c.name]
2508
3439
c.remove_from_connection()
2509
# Don't signal anything except ClientRemoved
3440
# Don't signal the disabling
2510
3441
c.disable(quiet=True)
2512
self.ClientRemoved(object_path, c.name)
3442
# Emit D-Bus signal for removal
3443
self.client_removed_signal(c)
2514
3445
raise KeyError(object_path)
2518
class MandosDBusServiceTransitional(MandosDBusService):
2519
__metaclass__ = AlternateDBusNamesMetaclass
2520
mandos_dbus_service = MandosDBusServiceTransitional()
3449
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3450
out_signature="a{oa{sa{sv}}}")
3451
def GetManagedObjects(self):
3453
return dbus.Dictionary(
3454
{client.dbus_object_path:
3456
{interface: client.GetAll(interface)
3458
client._get_all_interface_names()})
3459
for client in tcp_server.clients.values()})
3461
def client_added_signal(self, client):
3462
"""Send the new standard signal and the old signal"""
3464
# New standard signal
3465
self.InterfacesAdded(
3466
client.dbus_object_path,
3468
{interface: client.GetAll(interface)
3470
client._get_all_interface_names()}))
3472
self.ClientAdded(client.dbus_object_path)
3474
def client_removed_signal(self, client):
3475
"""Send the new standard signal and the old signal"""
3477
# New standard signal
3478
self.InterfacesRemoved(
3479
client.dbus_object_path,
3480
client._get_all_interface_names())
3482
self.ClientRemoved(client.dbus_object_path,
3485
mandos_dbus_service = MandosDBusService()
3487
# Save modules to variables to exempt the modules from being
3488
# unloaded before the function registered with atexit() is run.
3489
mp = multiprocessing
2523
3493
"Cleanup function; run on exit"
2526
multiprocessing.active_children()
3497
mp.active_children()
2527
3499
if not (tcp_server.clients or client_settings):
2530
3502
# Store client before exiting. Secrets are encrypted with key
2531
3503
# based on what config file has. If config file is
2532
3504
# removed/edited, old secret will thus be unrecovable.
2534
3506
with PGPEngine() as pgp:
2535
for client in tcp_server.clients.itervalues():
3507
for client in tcp_server.clients.values():
2536
3508
key = client_settings[client.name]["secret"]
2537
3509
client.encrypted_secret = pgp.encrypt(client.secret,
2539
3511
client_dict = {}
2541
3513
# A list of attributes that can not be pickled
2543
exclude = set(("bus", "changedstate", "secret",
2545
for name, typ in (inspect.getmembers
2546
(dbus.service.Object)):
3515
exclude = {"bus", "changedstate", "secret",
3516
"checker", "server_settings"}
3517
for name, typ in inspect.getmembers(dbus.service
2547
3519
exclude.add(name)
2549
3521
client_dict["encrypted_secret"] = (client
2550
3522
.encrypted_secret)
2551
3523
for attr in client.client_structure:
2552
3524
if attr not in exclude:
2553
3525
client_dict[attr] = getattr(client, attr)
2555
3527
clients[client.name] = client_dict
2556
3528
del client_settings[client.name]["secret"]
2559
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2562
(stored_state_path))
2563
with os.fdopen(tempfd, "wb") as stored_state:
2564
pickle.dump((clients, client_settings), stored_state)
3531
with tempfile.NamedTemporaryFile(
3535
dir=os.path.dirname(stored_state_path),
3536
delete=False) as stored_state:
3537
pickle.dump((clients, client_settings), stored_state,
3539
tempname = stored_state.name
2565
3540
os.rename(tempname, stored_state_path)
2566
3541
except (IOError, OSError) as e: