2
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
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-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
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
35
34
from __future__ import (division, absolute_import, print_function,
39
from future_builtins import *
37
from future_builtins import *
44
import SocketServer as socketserver
39
import SocketServer as socketserver
52
import ConfigParser as configparser
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
84
74
import dbus.service
86
from gi.repository import GLib
87
77
from dbus.mainloop.glib import DBusGMainLoop
90
80
import xml.dom.minidom
93
if sys.version_info.major == 2:
97
# Show warnings by default
98
if not sys.warnoptions:
100
warnings.simplefilter("default")
102
# Try to find the value of SO_BINDTODEVICE:
104
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
105
# newer, and it is also the most natural place for it:
106
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
107
85
except AttributeError:
109
# This is where SO_BINDTODEVICE was up to and including Python
111
87
from IN import SO_BINDTODEVICE
112
88
except ImportError:
113
# In Python 2.7 it seems to have been removed entirely.
114
# Try running the C preprocessor:
116
cc = subprocess.Popen(["cc", "--language=c", "-E",
118
stdin=subprocess.PIPE,
119
stdout=subprocess.PIPE)
120
stdout = cc.communicate(
121
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
122
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
123
except (OSError, ValueError, IndexError):
125
SO_BINDTODEVICE = None
127
if sys.version_info < (3, 2):
128
configparser.Configparser = configparser.SafeConfigParser
89
SO_BINDTODEVICE = None
131
92
stored_state_file = "clients.pickle"
133
94
logger = logging.getLogger()
134
logging.captureWarnings(True) # Show warnings via the logging system
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
138
if_nametoindex = ctypes.cdll.LoadLibrary(
139
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
140
103
except (OSError, AttributeError):
142
104
def if_nametoindex(interface):
143
105
"Get an interface index the hard way, i.e. using fcntl()"
144
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
145
107
with contextlib.closing(socket.socket()) as s:
146
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
147
struct.pack(b"16s16x", interface))
148
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
149
113
return interface_index
152
def copy_function(func):
153
"""Make a copy of a function"""
154
if sys.version_info.major == 2:
155
return types.FunctionType(func.func_code,
161
return types.FunctionType(func.__code__,
168
116
def initlogger(debug, level=logging.WARNING):
169
117
"""init logger and add loglevel"""
172
syslogger = (logging.handlers.SysLogHandler(
173
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
175
119
syslogger.setFormatter(logging.Formatter
176
120
('Mandos [%(process)d]: %(levelname)s:'
178
122
logger.addHandler(syslogger)
181
125
console = logging.StreamHandler()
182
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
249
179
.replace(b"\n", b"\\n")
250
180
.replace(b"\0", b"\\x00"))
253
183
def encrypt(self, data, password):
254
184
passphrase = self.password_encode(password)
255
with tempfile.NamedTemporaryFile(
256
dir=self.tempdir) as passfile:
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
257
187
passfile.write(passphrase)
259
proc = subprocess.Popen([self.gpg, '--symmetric',
189
proc = subprocess.Popen(['gpg', '--symmetric',
260
190
'--passphrase-file',
262
192
+ self.gnupgargs,
263
stdin=subprocess.PIPE,
264
stdout=subprocess.PIPE,
265
stderr=subprocess.PIPE)
266
ciphertext, err = proc.communicate(input=data)
193
stdin = subprocess.PIPE,
194
stdout = subprocess.PIPE,
195
stderr = subprocess.PIPE)
196
ciphertext, err = proc.communicate(input = data)
267
197
if proc.returncode != 0:
268
198
raise PGPError(err)
269
199
return ciphertext
271
201
def decrypt(self, data, password):
272
202
passphrase = self.password_encode(password)
273
with tempfile.NamedTemporaryFile(
274
dir=self.tempdir) as passfile:
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
275
205
passfile.write(passphrase)
277
proc = subprocess.Popen([self.gpg, '--decrypt',
207
proc = subprocess.Popen(['gpg', '--decrypt',
278
208
'--passphrase-file',
280
210
+ self.gnupgargs,
281
stdin=subprocess.PIPE,
282
stdout=subprocess.PIPE,
283
stderr=subprocess.PIPE)
284
decrypted_plaintext, err = proc.communicate(input=data)
211
stdin = subprocess.PIPE,
212
stdout = subprocess.PIPE,
213
stderr = subprocess.PIPE)
214
decrypted_plaintext, err = proc.communicate(input
285
216
if proc.returncode != 0:
286
217
raise PGPError(err)
287
218
return decrypted_plaintext
290
# Pretend that we have an Avahi module
292
"""This isn't so much a class as it is a module-like namespace."""
293
IF_UNSPEC = -1 # avahi-common/address.h
294
PROTO_UNSPEC = -1 # avahi-common/address.h
295
PROTO_INET = 0 # avahi-common/address.h
296
PROTO_INET6 = 1 # avahi-common/address.h
297
DBUS_NAME = "org.freedesktop.Avahi"
298
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
299
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
300
DBUS_PATH_SERVER = "/"
303
def string_array_to_txt_array(t):
304
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
305
for s in t), signature="ay")
306
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
307
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
308
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
309
SERVER_INVALID = 0 # avahi-common/defs.h
310
SERVER_REGISTERING = 1 # avahi-common/defs.h
311
SERVER_RUNNING = 2 # avahi-common/defs.h
312
SERVER_COLLISION = 3 # avahi-common/defs.h
313
SERVER_FAILURE = 4 # avahi-common/defs.h
316
221
class AvahiError(Exception):
317
222
def __init__(self, value, *args, **kwargs):
318
223
self.value = value
319
return super(AvahiError, self).__init__(value, *args,
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
323
228
class AvahiServiceError(AvahiError):
327
231
class AvahiGroupError(AvahiError):
235
class AvahiService(object):
332
236
"""An Avahi (Zeroconf) service.
335
239
interface: integer; avahi.IF_UNSPEC or an interface index.
336
240
Used to optionally bind to the specified interface.
501
383
follow_name_owner_changes=True),
502
384
avahi.DBUS_INTERFACE_SERVER)
503
385
self.server.connect_to_signal("StateChanged",
504
self.server_state_changed)
386
self.server_state_changed)
505
387
self.server_state_changed(self.server.GetState())
508
390
class AvahiServiceToSyslog(AvahiService):
509
def rename(self, *args, **kwargs):
510
392
"""Add the new name to the syslog messages"""
511
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
512
syslogger.setFormatter(logging.Formatter(
513
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
518
# Pretend that we have a GnuTLS module
520
"""This isn't so much a class as it is a module-like namespace."""
522
library = ctypes.util.find_library("gnutls")
524
library = ctypes.util.find_library("gnutls-deb0")
525
_library = ctypes.cdll.LoadLibrary(library)
528
# Unless otherwise indicated, the constants and types below are
529
# all from the gnutls/gnutls.h C header file.
540
E_NO_CERTIFICATE_FOUND = -49
545
KEYID_USE_SHA256 = 1 # gnutls/x509.h
546
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
549
class session_int(ctypes.Structure):
551
session_t = ctypes.POINTER(session_int)
553
class certificate_credentials_st(ctypes.Structure):
555
certificate_credentials_t = ctypes.POINTER(
556
certificate_credentials_st)
557
certificate_type_t = ctypes.c_int
559
class datum_t(ctypes.Structure):
560
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
561
('size', ctypes.c_uint)]
563
class openpgp_crt_int(ctypes.Structure):
565
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
566
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
567
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
568
credentials_type_t = ctypes.c_int
569
transport_ptr_t = ctypes.c_void_p
570
close_request_t = ctypes.c_int
573
class Error(Exception):
574
def __init__(self, message=None, code=None, args=()):
575
# Default usage is by a message string, but if a return
576
# code is passed, convert it to a string with
579
if message is None and code is not None:
580
message = gnutls.strerror(code)
581
return super(gnutls.Error, self).__init__(
584
class CertificateSecurityError(Error):
590
self._c_object = gnutls.certificate_credentials_t()
591
gnutls.certificate_allocate_credentials(
592
ctypes.byref(self._c_object))
593
self.type = gnutls.CRD_CERTIFICATE
596
gnutls.certificate_free_credentials(self._c_object)
599
def __init__(self, socket, credentials=None):
600
self._c_object = gnutls.session_t()
601
gnutls_flags = gnutls.CLIENT
602
if gnutls.check_version(b"3.5.6"):
603
gnutls_flags |= gnutls.NO_TICKETS
605
gnutls_flags |= gnutls.ENABLE_RAWPK
606
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
608
gnutls.set_default_priority(self._c_object)
609
gnutls.transport_set_ptr(self._c_object, socket.fileno())
610
gnutls.handshake_set_private_extensions(self._c_object,
613
if credentials is None:
614
credentials = gnutls.Credentials()
615
gnutls.credentials_set(self._c_object, credentials.type,
616
ctypes.cast(credentials._c_object,
618
self.credentials = credentials
621
gnutls.deinit(self._c_object)
624
return gnutls.handshake(self._c_object)
626
def send(self, data):
630
data_len -= gnutls.record_send(self._c_object,
635
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
637
# Error handling functions
638
def _error_code(result):
639
"""A function to raise exceptions on errors, suitable
640
for the 'restype' attribute on ctypes functions"""
643
if result == gnutls.E_NO_CERTIFICATE_FOUND:
644
raise gnutls.CertificateSecurityError(code=result)
645
raise gnutls.Error(code=result)
647
def _retry_on_error(result, func, arguments):
648
"""A function to retry on some errors, suitable
649
for the 'errcheck' attribute on ctypes functions"""
651
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
652
return _error_code(result)
653
result = func(*arguments)
656
# Unless otherwise indicated, the function declarations below are
657
# all from the gnutls/gnutls.h C header file.
660
priority_set_direct = _library.gnutls_priority_set_direct
661
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
662
ctypes.POINTER(ctypes.c_char_p)]
663
priority_set_direct.restype = _error_code
665
init = _library.gnutls_init
666
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
667
init.restype = _error_code
669
set_default_priority = _library.gnutls_set_default_priority
670
set_default_priority.argtypes = [session_t]
671
set_default_priority.restype = _error_code
673
record_send = _library.gnutls_record_send
674
record_send.argtypes = [session_t, ctypes.c_void_p,
676
record_send.restype = ctypes.c_ssize_t
677
record_send.errcheck = _retry_on_error
679
certificate_allocate_credentials = (
680
_library.gnutls_certificate_allocate_credentials)
681
certificate_allocate_credentials.argtypes = [
682
ctypes.POINTER(certificate_credentials_t)]
683
certificate_allocate_credentials.restype = _error_code
685
certificate_free_credentials = (
686
_library.gnutls_certificate_free_credentials)
687
certificate_free_credentials.argtypes = [
688
certificate_credentials_t]
689
certificate_free_credentials.restype = None
691
handshake_set_private_extensions = (
692
_library.gnutls_handshake_set_private_extensions)
693
handshake_set_private_extensions.argtypes = [session_t,
695
handshake_set_private_extensions.restype = None
697
credentials_set = _library.gnutls_credentials_set
698
credentials_set.argtypes = [session_t, credentials_type_t,
700
credentials_set.restype = _error_code
702
strerror = _library.gnutls_strerror
703
strerror.argtypes = [ctypes.c_int]
704
strerror.restype = ctypes.c_char_p
706
certificate_type_get = _library.gnutls_certificate_type_get
707
certificate_type_get.argtypes = [session_t]
708
certificate_type_get.restype = _error_code
710
certificate_get_peers = _library.gnutls_certificate_get_peers
711
certificate_get_peers.argtypes = [session_t,
712
ctypes.POINTER(ctypes.c_uint)]
713
certificate_get_peers.restype = ctypes.POINTER(datum_t)
715
global_set_log_level = _library.gnutls_global_set_log_level
716
global_set_log_level.argtypes = [ctypes.c_int]
717
global_set_log_level.restype = None
719
global_set_log_function = _library.gnutls_global_set_log_function
720
global_set_log_function.argtypes = [log_func]
721
global_set_log_function.restype = None
723
deinit = _library.gnutls_deinit
724
deinit.argtypes = [session_t]
725
deinit.restype = None
727
handshake = _library.gnutls_handshake
728
handshake.argtypes = [session_t]
729
handshake.restype = _error_code
730
handshake.errcheck = _retry_on_error
732
transport_set_ptr = _library.gnutls_transport_set_ptr
733
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
734
transport_set_ptr.restype = None
736
bye = _library.gnutls_bye
737
bye.argtypes = [session_t, close_request_t]
738
bye.restype = _error_code
739
bye.errcheck = _retry_on_error
741
check_version = _library.gnutls_check_version
742
check_version.argtypes = [ctypes.c_char_p]
743
check_version.restype = ctypes.c_char_p
745
_need_version = b"3.3.0"
746
if check_version(_need_version) is None:
747
raise self.Error("Needs GnuTLS {} or later"
748
.format(_need_version))
750
_tls_rawpk_version = b"3.6.6"
751
has_rawpk = bool(check_version(_tls_rawpk_version))
755
class pubkey_st(ctypes.Structure):
757
pubkey_t = ctypes.POINTER(pubkey_st)
759
x509_crt_fmt_t = ctypes.c_int
761
# All the function declarations below are from gnutls/abstract.h
762
pubkey_init = _library.gnutls_pubkey_init
763
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
764
pubkey_init.restype = _error_code
766
pubkey_import = _library.gnutls_pubkey_import
767
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
769
pubkey_import.restype = _error_code
771
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
772
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
773
ctypes.POINTER(ctypes.c_ubyte),
774
ctypes.POINTER(ctypes.c_size_t)]
775
pubkey_get_key_id.restype = _error_code
777
pubkey_deinit = _library.gnutls_pubkey_deinit
778
pubkey_deinit.argtypes = [pubkey_t]
779
pubkey_deinit.restype = None
781
# All the function declarations below are from gnutls/openpgp.h
783
openpgp_crt_init = _library.gnutls_openpgp_crt_init
784
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
785
openpgp_crt_init.restype = _error_code
787
openpgp_crt_import = _library.gnutls_openpgp_crt_import
788
openpgp_crt_import.argtypes = [openpgp_crt_t,
789
ctypes.POINTER(datum_t),
791
openpgp_crt_import.restype = _error_code
793
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
794
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
795
ctypes.POINTER(ctypes.c_uint)]
796
openpgp_crt_verify_self.restype = _error_code
798
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
799
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
800
openpgp_crt_deinit.restype = None
802
openpgp_crt_get_fingerprint = (
803
_library.gnutls_openpgp_crt_get_fingerprint)
804
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
808
openpgp_crt_get_fingerprint.restype = _error_code
810
if check_version(b"3.6.4"):
811
certificate_type_get2 = _library.gnutls_certificate_type_get2
812
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
813
certificate_type_get2.restype = _error_code
815
# Remove non-public functions
816
del _error_code, _retry_on_error
819
def call_pipe(connection, # : multiprocessing.Connection
820
func, *args, **kwargs):
821
"""This function is meant to be called by multiprocessing.Process
823
This function runs func(*args, **kwargs), and writes the resulting
824
return value on the provided multiprocessing.Connection.
826
connection.send(func(*args, **kwargs))
401
def timedelta_to_milliseconds(td):
402
"Convert a datetime.timedelta() to milliseconds"
403
return ((td.days * 24 * 60 * 60 * 1000)
404
+ (td.seconds * 1000)
405
+ (td.microseconds // 1000))
408
class Client(object):
831
409
"""A representation of a client host served by this server.
834
412
approved: bool(); 'None' if not yet approved/disapproved
835
413
approval_delay: datetime.timedelta(); Time to wait for approval
836
414
approval_duration: datetime.timedelta(); Duration of one approval
837
checker: multiprocessing.Process(); a running checker process used
838
to see if the client lives. 'None' if no process is
840
checker_callback_tag: a GLib event source tag, or None
415
checker: subprocess.Popen(); a running checker process used
416
to see if the client lives.
417
'None' if no process is running.
418
checker_callback_tag: a gobject event source tag, or None
841
419
checker_command: string; External command which is run to check
842
420
if client lives. %() expansions are done at
843
421
runtime with vars(self) as dict, so that for
844
422
instance %(name)s can be used in the command.
845
checker_initiator_tag: a GLib event source tag, or None
423
checker_initiator_tag: a gobject event source tag, or None
846
424
created: datetime.datetime(); (UTC) object creation
847
425
client_structure: Object describing what attributes a client has
848
426
and is used for storing the client at exit
849
427
current_checker_command: string; current running checker_command
850
disable_initiator_tag: a GLib event source tag, or None
428
disable_initiator_tag: a gobject event source tag, or None
852
430
fingerprint: string (40 or 32 hexadecimal digits); used to
853
uniquely identify an OpenPGP client
854
key_id: string (64 hexadecimal digits); used to uniquely identify
855
a client using raw public keys
431
uniquely identify the client
856
432
host: string; available for use by the checker command
857
433
interval: datetime.timedelta(); How often to start a new checker
858
434
last_approval_request: datetime.datetime(); (UTC) or None
1015
601
logger.info("Disabling client %s", self.name)
1016
602
if getattr(self, "disable_initiator_tag", None) is not None:
1017
GLib.source_remove(self.disable_initiator_tag)
603
gobject.source_remove(self.disable_initiator_tag)
1018
604
self.disable_initiator_tag = None
1019
605
self.expires = None
1020
606
if getattr(self, "checker_initiator_tag", None) is not None:
1021
GLib.source_remove(self.checker_initiator_tag)
607
gobject.source_remove(self.checker_initiator_tag)
1022
608
self.checker_initiator_tag = None
1023
609
self.stop_checker()
1024
610
self.enabled = False
1026
612
self.send_changedstate()
1027
# Do not run this again if called by a GLib.timeout_add
613
# Do not run this again if called by a gobject.timeout_add
1030
616
def __del__(self):
1033
619
def init_checker(self):
1034
620
# Schedule a new checker to be started an 'interval' from now,
1035
621
# and every interval from then on.
1036
622
if self.checker_initiator_tag is not None:
1037
GLib.source_remove(self.checker_initiator_tag)
1038
self.checker_initiator_tag = GLib.timeout_add(
1039
random.randrange(int(self.interval.total_seconds() * 1000
623
gobject.source_remove(self.checker_initiator_tag)
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
1042
627
# Schedule a disable() when 'timeout' has passed
1043
628
if self.disable_initiator_tag is not None:
1044
GLib.source_remove(self.disable_initiator_tag)
1045
self.disable_initiator_tag = GLib.timeout_add(
1046
int(self.timeout.total_seconds() * 1000), self.disable)
629
gobject.source_remove(self.disable_initiator_tag)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
1047
633
# Also start a new checker *right now*.
1048
634
self.start_checker()
1050
def checker_callback(self, source, condition, connection,
636
def checker_callback(self, pid, condition, command):
1052
637
"""The checker has completed, so take appropriate actions."""
1053
# Read return code from connection (see call_pipe)
1054
returncode = connection.recv()
1056
if self.checker is not None:
1058
638
self.checker_callback_tag = None
1059
639
self.checker = None
1062
self.last_checker_status = returncode
1063
self.last_checker_signal = None
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
1064
642
if self.last_checker_status == 0:
1065
643
logger.info("Checker for %(name)s succeeded",
1067
645
self.checked_ok()
1069
logger.info("Checker for %(name)s failed", vars(self))
647
logger.info("Checker for %(name)s failed",
1071
650
self.last_checker_status = -1
1072
self.last_checker_signal = -returncode
1073
651
logger.warning("Checker for %(name)s crashed?",
1077
654
def checked_ok(self):
1078
655
"""Assert that the client has been seen, alive and well."""
1079
656
self.last_checked_ok = datetime.datetime.utcnow()
1080
657
self.last_checker_status = 0
1081
self.last_checker_signal = None
1082
658
self.bump_timeout()
1084
660
def bump_timeout(self, timeout=None):
1085
661
"""Bump up the timeout for this client."""
1086
662
if timeout is None:
1087
663
timeout = self.timeout
1088
664
if self.disable_initiator_tag is not None:
1089
GLib.source_remove(self.disable_initiator_tag)
665
gobject.source_remove(self.disable_initiator_tag)
1090
666
self.disable_initiator_tag = None
1091
667
if getattr(self, "enabled", False):
1092
self.disable_initiator_tag = GLib.timeout_add(
1093
int(timeout.total_seconds() * 1000), self.disable)
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
1094
671
self.expires = datetime.datetime.utcnow() + timeout
1096
673
def need_approval(self):
1097
674
self.last_approval_request = datetime.datetime.utcnow()
1099
676
def start_checker(self):
1100
677
"""Start a new checker subprocess if one is not running.
1102
679
If a checker already exists, leave it running and do
1104
681
# The reason for not killing a running checker is that if we
1109
686
# checkers alone, the checker would have to take more time
1110
687
# than 'timeout' for the client to be disabled, which is as it
1113
if self.checker is not None and not self.checker.is_alive():
1114
logger.warning("Checker was not alive; joining")
690
# If a checker exists, make sure it is not a zombie
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
except AttributeError:
695
except OSError as error:
696
if error.errno != errno.ECHILD:
700
logger.warning("Checker was a zombie")
701
gobject.source_remove(self.checker_callback_tag)
702
self.checker_callback(pid, status,
703
self.current_checker_command)
1117
704
# Start a new checker if needed
1118
705
if self.checker is None:
1119
706
# Escape attributes for the shell
1121
attr: re.escape(str(getattr(self, attr)))
1122
for attr in self.runtime_expansions}
707
escaped_attrs = dict(
708
(attr, re.escape(unicode(getattr(self, attr))))
710
self.runtime_expansions)
1124
712
command = self.checker_command % escaped_attrs
1125
713
except TypeError as error:
1126
714
logger.error('Could not format string "%s"',
1127
self.checker_command,
715
self.checker_command, exc_info=error)
716
return True # Try again later
717
self.current_checker_command = command
719
logger.info("Starting checker %r for %s",
721
# We don't need to redirect stdout and stderr, since
722
# in normal mode, that is already done by daemon(),
723
# and in debug mode we don't want to. (Stdin is
724
# always replaced by /dev/null.)
725
# The exception is when not debugging but nevertheless
726
# running in the foreground; use the previously
729
if (not self.server_settings["debug"]
730
and self.server_settings["foreground"]):
731
popen_args.update({"stdout": wnull,
733
self.checker = subprocess.Popen(command,
737
except OSError as error:
738
logger.error("Failed to start subprocess",
1129
return True # Try again later
1130
self.current_checker_command = command
1131
logger.info("Starting checker %r for %s", command,
1133
# We don't need to redirect stdout and stderr, since
1134
# in normal mode, that is already done by daemon(),
1135
# and in debug mode we don't want to. (Stdin is
1136
# always replaced by /dev/null.)
1137
# The exception is when not debugging but nevertheless
1138
# running in the foreground; use the previously
1140
popen_args = {"close_fds": True,
1143
if (not self.server_settings["debug"]
1144
and self.server_settings["foreground"]):
1145
popen_args.update({"stdout": wnull,
1147
pipe = multiprocessing.Pipe(duplex=False)
1148
self.checker = multiprocessing.Process(
1150
args=(pipe[1], subprocess.call, command),
1152
self.checker.start()
1153
self.checker_callback_tag = GLib.io_add_watch(
1154
GLib.IOChannel.unix_new(pipe[0].fileno()),
1155
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1156
self.checker_callback, pipe[0], command)
1157
# Re-run this periodically if run by GLib.timeout_add
741
self.checker_callback_tag = (gobject.child_watch_add
743
self.checker_callback,
745
# The checker may have completed before the gobject
746
# watch was added. Check for this.
748
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
749
except OSError as error:
750
if error.errno == errno.ECHILD:
751
# This should never happen
752
logger.error("Child process vanished",
757
gobject.source_remove(self.checker_callback_tag)
758
self.checker_callback(pid, status, command)
759
# Re-run this periodically if run by gobject.timeout_add
1160
762
def stop_checker(self):
1161
763
"""Force the checker process, if any, to stop."""
1162
764
if self.checker_callback_tag:
1163
GLib.source_remove(self.checker_callback_tag)
765
gobject.source_remove(self.checker_callback_tag)
1164
766
self.checker_callback_tag = None
1165
767
if getattr(self, "checker", None) is None:
1167
769
logger.debug("Stopping checker for %(name)s", vars(self))
1168
self.checker.terminate()
771
self.checker.terminate()
773
#if self.checker.poll() is None:
774
# self.checker.kill()
775
except OSError as error:
776
if error.errno != errno.ESRCH: # No such process
1169
778
self.checker = None
1172
def dbus_service_property(dbus_interface,
781
def dbus_service_property(dbus_interface, signature="v",
782
access="readwrite", byte_arrays=False):
1176
783
"""Decorators for marking methods of a DBusObjectWithProperties to
1177
784
become properties on the D-Bus.
1179
786
The decorated method will be called with no arguments by "Get"
1180
787
and with one argument by "Set".
1182
789
The parameters, where they are supported, are the same as
1183
790
dbus.service.method, except there is only "signature", since the
1184
791
type from Get() and the type sent to Set() is the same.
1267
class DBusObjectWithAnnotations(dbus.service.Object):
1268
"""A D-Bus object with annotations.
1270
Classes inheriting from this can use the dbus_annotations
1271
decorator to add annotations to methods or signals.
867
class DBusObjectWithProperties(dbus.service.Object):
868
"""A D-Bus object with properties.
870
Classes inheriting from this can use the dbus_service_property
871
decorator to expose methods as D-Bus properties. It exposes the
872
standard Get(), Set(), and GetAll() methods on the D-Bus.
1275
876
def _is_dbus_thing(thing):
1276
877
"""Returns a function testing if an attribute is a D-Bus thing
1278
879
If called like _is_dbus_thing("method") it returns a function
1279
880
suitable for use as predicate to inspect.getmembers().
1281
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
882
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1284
885
def _get_all_dbus_things(self, thing):
1285
886
"""Returns a generator of (name, attribute) pairs
1287
return ((getattr(athing.__get__(self), "_dbus_name", name),
888
return ((getattr(athing.__get__(self), "_dbus_name",
1288
890
athing.__get__(self))
1289
891
for cls in self.__class__.__mro__
1290
892
for name, athing in
1291
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1293
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1295
path_keyword='object_path',
1296
connection_keyword='connection')
1297
def Introspect(self, object_path, connection):
1298
"""Overloading of standard D-Bus method.
1300
Inserts annotation tags on methods and signals.
1302
xmlstring = dbus.service.Object.Introspect(self, object_path,
1305
document = xml.dom.minidom.parseString(xmlstring)
1307
for if_tag in document.getElementsByTagName("interface"):
1308
# Add annotation tags
1309
for typ in ("method", "signal"):
1310
for tag in if_tag.getElementsByTagName(typ):
1312
for name, prop in (self.
1313
_get_all_dbus_things(typ)):
1314
if (name == tag.getAttribute("name")
1315
and prop._dbus_interface
1316
== if_tag.getAttribute("name")):
1317
annots.update(getattr(
1318
prop, "_dbus_annotations", {}))
1319
for name, value in annots.items():
1320
ann_tag = document.createElement(
1322
ann_tag.setAttribute("name", name)
1323
ann_tag.setAttribute("value", value)
1324
tag.appendChild(ann_tag)
1325
# Add interface annotation tags
1326
for annotation, value in dict(
1327
itertools.chain.from_iterable(
1328
annotations().items()
1329
for name, annotations
1330
in self._get_all_dbus_things("interface")
1331
if name == if_tag.getAttribute("name")
1333
ann_tag = document.createElement("annotation")
1334
ann_tag.setAttribute("name", annotation)
1335
ann_tag.setAttribute("value", value)
1336
if_tag.appendChild(ann_tag)
1337
# Fix argument name for the Introspect method itself
1338
if (if_tag.getAttribute("name")
1339
== dbus.INTROSPECTABLE_IFACE):
1340
for cn in if_tag.getElementsByTagName("method"):
1341
if cn.getAttribute("name") == "Introspect":
1342
for arg in cn.getElementsByTagName("arg"):
1343
if (arg.getAttribute("direction")
1345
arg.setAttribute("name",
1347
xmlstring = document.toxml("utf-8")
1349
except (AttributeError, xml.dom.DOMException,
1350
xml.parsers.expat.ExpatError) as error:
1351
logger.error("Failed to override Introspection method",
1356
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1357
"""A D-Bus object with properties.
1359
Classes inheriting from this can use the dbus_service_property
1360
decorator to expose methods as D-Bus properties. It exposes the
1361
standard Get(), Set(), and GetAll() methods on the D-Bus.
893
inspect.getmembers(cls,
894
self._is_dbus_thing(thing)))
1364
896
def _get_dbus_property(self, interface_name, property_name):
1365
897
"""Returns a bound method if one exists which is a D-Bus
1366
898
property with the specified name and interface.
1368
for cls in self.__class__.__mro__:
1369
for name, value in inspect.getmembers(
1370
cls, self._is_dbus_thing("property")):
900
for cls in self.__class__.__mro__:
901
for name, value in (inspect.getmembers
903
self._is_dbus_thing("property"))):
1371
904
if (value._dbus_name == property_name
1372
905
and value._dbus_interface == interface_name):
1373
906
return value.__get__(self)
1375
908
# No such property
1376
raise DBusPropertyNotFound("{}:{}.{}".format(
1377
self.dbus_object_path, interface_name, property_name))
1380
def _get_all_interface_names(cls):
1381
"""Get a sequence of all interfaces supported by an object"""
1382
return (name for name in set(getattr(getattr(x, attr),
1383
"_dbus_interface", None)
1384
for x in (inspect.getmro(cls))
1386
if name is not None)
1388
@dbus.service.method(dbus.PROPERTIES_IFACE,
909
raise DBusPropertyNotFound(self.dbus_object_path + ":"
910
+ interface_name + "."
913
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1390
914
out_signature="v")
1391
915
def Get(self, interface_name, property_name):
1392
916
"""Standard D-Bus property Get() method, see D-Bus standard.
1520
1048
return xmlstring
1524
dbus.OBJECT_MANAGER_IFACE
1525
except AttributeError:
1526
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1529
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1530
"""A D-Bus object with an ObjectManager.
1532
Classes inheriting from this exposes the standard
1533
GetManagedObjects call and the InterfacesAdded and
1534
InterfacesRemoved signals on the standard
1535
"org.freedesktop.DBus.ObjectManager" interface.
1537
Note: No signals are sent automatically; they must be sent
1540
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1541
out_signature="a{oa{sa{sv}}}")
1542
def GetManagedObjects(self):
1543
"""This function must be overridden"""
1544
raise NotImplementedError()
1546
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1547
signature="oa{sa{sv}}")
1548
def InterfacesAdded(self, object_path, interfaces_and_properties):
1551
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1552
def InterfacesRemoved(self, object_path, interfaces):
1555
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1557
path_keyword='object_path',
1558
connection_keyword='connection')
1559
def Introspect(self, object_path, connection):
1560
"""Overloading of standard D-Bus method.
1562
Override return argument name of GetManagedObjects to be
1563
"objpath_interfaces_and_properties"
1565
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1569
document = xml.dom.minidom.parseString(xmlstring)
1571
for if_tag in document.getElementsByTagName("interface"):
1572
# Fix argument name for the GetManagedObjects method
1573
if (if_tag.getAttribute("name")
1574
== dbus.OBJECT_MANAGER_IFACE):
1575
for cn in if_tag.getElementsByTagName("method"):
1576
if (cn.getAttribute("name")
1577
== "GetManagedObjects"):
1578
for arg in cn.getElementsByTagName("arg"):
1579
if (arg.getAttribute("direction")
1583
"objpath_interfaces"
1585
xmlstring = document.toxml("utf-8")
1587
except (AttributeError, xml.dom.DOMException,
1588
xml.parsers.expat.ExpatError) as error:
1589
logger.error("Failed to override Introspection method",
1594
1051
def datetime_to_dbus(dt, variant_level=0):
1595
1052
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1597
return dbus.String("", variant_level=variant_level)
1598
return dbus.String(dt.isoformat(), variant_level=variant_level)
1054
return dbus.String("", variant_level = variant_level)
1055
return dbus.String(dt.isoformat(),
1056
variant_level=variant_level)
1601
1059
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1962
1412
server to mandos-client
1966
1416
# Rejected - signal
1967
1417
@dbus.service.signal(_interface, signature="s")
1968
1418
def Rejected(self, reason):
1972
1422
# NeedApproval - signal
1973
1423
@dbus.service.signal(_interface, signature="tb")
1974
1424
def NeedApproval(self, timeout, default):
1976
1426
return self.need_approval()
1980
1430
# Approve - method
1981
1431
@dbus.service.method(_interface, in_signature="b")
1982
1432
def Approve(self, value):
1983
1433
self.approve(value)
1985
1435
# CheckedOK - method
1986
1436
@dbus.service.method(_interface)
1987
1437
def CheckedOK(self):
1988
1438
self.checked_ok()
1990
1440
# Enable - method
1991
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1992
1441
@dbus.service.method(_interface)
1993
1442
def Enable(self):
1997
1446
# StartChecker - method
1998
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1999
1447
@dbus.service.method(_interface)
2000
1448
def StartChecker(self):
2002
1450
self.start_checker()
2004
1452
# Disable - method
2005
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2006
1453
@dbus.service.method(_interface)
2007
1454
def Disable(self):
2011
1458
# StopChecker - method
2012
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2013
1459
@dbus.service.method(_interface)
2014
1460
def StopChecker(self):
2015
1461
self.stop_checker()
2019
1465
# ApprovalPending - property
2020
1466
@dbus_service_property(_interface, signature="b", access="read")
2021
1467
def ApprovalPending_dbus_property(self):
2022
1468
return dbus.Boolean(bool(self.approvals_pending))
2024
1470
# ApprovedByDefault - property
2025
@dbus_service_property(_interface,
1471
@dbus_service_property(_interface, signature="b",
2027
1472
access="readwrite")
2028
1473
def ApprovedByDefault_dbus_property(self, value=None):
2029
1474
if value is None: # get
2030
1475
return dbus.Boolean(self.approved_by_default)
2031
1476
self.approved_by_default = bool(value)
2033
1478
# ApprovalDelay - property
2034
@dbus_service_property(_interface,
1479
@dbus_service_property(_interface, signature="t",
2036
1480
access="readwrite")
2037
1481
def ApprovalDelay_dbus_property(self, value=None):
2038
1482
if value is None: # get
2039
return dbus.UInt64(self.approval_delay.total_seconds()
1483
return dbus.UInt64(self.approval_delay_milliseconds())
2041
1484
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2043
1486
# ApprovalDuration - property
2044
@dbus_service_property(_interface,
1487
@dbus_service_property(_interface, signature="t",
2046
1488
access="readwrite")
2047
1489
def ApprovalDuration_dbus_property(self, value=None):
2048
1490
if value is None: # get
2049
return dbus.UInt64(self.approval_duration.total_seconds()
1491
return dbus.UInt64(timedelta_to_milliseconds(
1492
self.approval_duration))
2051
1493
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2053
1495
# Name - property
2055
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2056
1496
@dbus_service_property(_interface, signature="s", access="read")
2057
1497
def Name_dbus_property(self):
2058
1498
return dbus.String(self.name)
2062
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2063
@dbus_service_property(_interface, signature="s", access="read")
2064
def KeyID_dbus_property(self):
2065
return dbus.String(self.key_id)
2067
1500
# Fingerprint - property
2069
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2070
1501
@dbus_service_property(_interface, signature="s", access="read")
2071
1502
def Fingerprint_dbus_property(self):
2072
1503
return dbus.String(self.fingerprint)
2074
1505
# Host - property
2075
@dbus_service_property(_interface,
1506
@dbus_service_property(_interface, signature="s",
2077
1507
access="readwrite")
2078
1508
def Host_dbus_property(self, value=None):
2079
1509
if value is None: # get
2080
1510
return dbus.String(self.host)
2081
self.host = str(value)
1511
self.host = unicode(value)
2083
1513
# Created - property
2085
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2086
1514
@dbus_service_property(_interface, signature="s", access="read")
2087
1515
def Created_dbus_property(self):
2088
1516
return datetime_to_dbus(self.created)
2090
1518
# LastEnabled - property
2091
1519
@dbus_service_property(_interface, signature="s", access="read")
2092
1520
def LastEnabled_dbus_property(self):
2093
1521
return datetime_to_dbus(self.last_enabled)
2095
1523
# Enabled - property
2096
@dbus_service_property(_interface,
1524
@dbus_service_property(_interface, signature="b",
2098
1525
access="readwrite")
2099
1526
def Enabled_dbus_property(self, value=None):
2100
1527
if value is None: # get
2149
1575
if (getattr(self, "disable_initiator_tag", None)
2152
GLib.source_remove(self.disable_initiator_tag)
2153
self.disable_initiator_tag = GLib.timeout_add(
2154
int((self.expires - now).total_seconds() * 1000),
1578
gobject.source_remove(self.disable_initiator_tag)
1579
self.disable_initiator_tag = (
1580
gobject.timeout_add(
1581
timedelta_to_milliseconds(self.expires - now),
2157
1584
# ExtendedTimeout - property
2158
@dbus_service_property(_interface,
1585
@dbus_service_property(_interface, signature="t",
2160
1586
access="readwrite")
2161
1587
def ExtendedTimeout_dbus_property(self, value=None):
2162
1588
if value is None: # get
2163
return dbus.UInt64(self.extended_timeout.total_seconds()
1589
return dbus.UInt64(self.extended_timeout_milliseconds())
2165
1590
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2167
1592
# Interval - property
2168
@dbus_service_property(_interface,
1593
@dbus_service_property(_interface, signature="t",
2170
1594
access="readwrite")
2171
1595
def Interval_dbus_property(self, value=None):
2172
1596
if value is None: # get
2173
return dbus.UInt64(self.interval.total_seconds() * 1000)
1597
return dbus.UInt64(self.interval_milliseconds())
2174
1598
self.interval = datetime.timedelta(0, 0, 0, value)
2175
1599
if getattr(self, "checker_initiator_tag", None) is None:
2177
1601
if self.enabled:
2178
1602
# Reschedule checker run
2179
GLib.source_remove(self.checker_initiator_tag)
2180
self.checker_initiator_tag = GLib.timeout_add(
2181
value, self.start_checker)
2182
self.start_checker() # Start one now, too
1603
gobject.source_remove(self.checker_initiator_tag)
1604
self.checker_initiator_tag = (gobject.timeout_add
1605
(value, self.start_checker))
1606
self.start_checker() # Start one now, too
2184
1608
# Checker - property
2185
@dbus_service_property(_interface,
1609
@dbus_service_property(_interface, signature="s",
2187
1610
access="readwrite")
2188
1611
def Checker_dbus_property(self, value=None):
2189
1612
if value is None: # get
2190
1613
return dbus.String(self.checker_command)
2191
self.checker_command = str(value)
1614
self.checker_command = unicode(value)
2193
1616
# CheckerRunning - property
2194
@dbus_service_property(_interface,
1617
@dbus_service_property(_interface, signature="b",
2196
1618
access="readwrite")
2197
1619
def CheckerRunning_dbus_property(self, value=None):
2198
1620
if value is None: # get
2382
1793
delay -= time2 - time
2385
session.send(client.secret)
2386
except gnutls.Error as error:
2387
logger.warning("gnutls send failed",
1796
while sent_size < len(client.secret):
1798
sent = session.send(client.secret[sent_size:])
1799
except gnutls.errors.GNUTLSError as error:
1800
logger.warning("gnutls send failed",
1803
logger.debug("Sent: %d, remaining: %d",
1804
sent, len(client.secret)
1805
- (sent_size + sent))
2391
1808
logger.info("Sending secret to %s", client.name)
2392
1809
# bump the timeout using extended_timeout
2393
1810
client.bump_timeout(client.extended_timeout)
2394
1811
if self.server.use_dbus:
2395
1812
# Emit D-Bus signal
2396
1813
client.GotSecret()
2399
1816
if approval_required:
2400
1817
client.approvals_pending -= 1
2403
except gnutls.Error as error:
1820
except gnutls.errors.GNUTLSError as error:
2404
1821
logger.warning("GnuTLS bye failed",
2405
1822
exc_info=error)
2408
1825
def peer_certificate(session):
2409
"Return the peer's certificate as a bytestring"
2411
cert_type = gnutls.certificate_type_get2(session._c_object,
2413
except AttributeError:
2414
cert_type = gnutls.certificate_type_get(session._c_object)
2415
if gnutls.has_rawpk:
2416
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2418
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2419
# If not a valid certificate type...
2420
if cert_type not in valid_cert_types:
2421
logger.info("Cert type %r not in %r", cert_type,
2423
# ...return invalid data
1826
"Return the peer's OpenPGP certificate as a bytestring"
1827
# If not an OpenPGP certificate...
1828
if (gnutls.library.functions
1829
.gnutls_certificate_type_get(session._c_object)
1830
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1831
# ...do the normal thing
1832
return session.peer_certificate
2425
1833
list_size = ctypes.c_uint(1)
2426
cert_list = (gnutls.certificate_get_peers
1834
cert_list = (gnutls.library.functions
1835
.gnutls_certificate_get_peers
2427
1836
(session._c_object, ctypes.byref(list_size)))
2428
1837
if not bool(cert_list) and list_size.value != 0:
2429
raise gnutls.Error("error getting peer certificate")
1838
raise gnutls.errors.GNUTLSError("error getting peer"
2430
1840
if list_size.value == 0:
2432
1842
cert = cert_list[0]
2433
1843
return ctypes.string_at(cert.data, cert.size)
2436
def key_id(certificate):
2437
"Convert a certificate bytestring to a hexdigit key ID"
2438
# New GnuTLS "datum" with the public key
2439
datum = gnutls.datum_t(
2440
ctypes.cast(ctypes.c_char_p(certificate),
2441
ctypes.POINTER(ctypes.c_ubyte)),
2442
ctypes.c_uint(len(certificate)))
2443
# XXX all these need to be created in the gnutls "module"
2444
# New empty GnuTLS certificate
2445
pubkey = gnutls.pubkey_t()
2446
gnutls.pubkey_init(ctypes.byref(pubkey))
2447
# Import the raw public key into the certificate
2448
gnutls.pubkey_import(pubkey,
2449
ctypes.byref(datum),
2450
gnutls.X509_FMT_DER)
2451
# New buffer for the key ID
2452
buf = ctypes.create_string_buffer(32)
2453
buf_len = ctypes.c_size_t(len(buf))
2454
# Get the key ID from the raw public key into the buffer
2455
gnutls.pubkey_get_key_id(pubkey,
2456
gnutls.KEYID_USE_SHA256,
2457
ctypes.cast(ctypes.byref(buf),
2458
ctypes.POINTER(ctypes.c_ubyte)),
2459
ctypes.byref(buf_len))
2460
# Deinit the certificate
2461
gnutls.pubkey_deinit(pubkey)
2463
# Convert the buffer to a Python bytestring
2464
key_id = ctypes.string_at(buf, buf_len.value)
2465
# Convert the bytestring to hexadecimal notation
2466
hex_key_id = binascii.hexlify(key_id).upper()
2470
1846
def fingerprint(openpgp):
2471
1847
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2472
1848
# New GnuTLS "datum" with the OpenPGP public key
2473
datum = gnutls.datum_t(
2474
ctypes.cast(ctypes.c_char_p(openpgp),
2475
ctypes.POINTER(ctypes.c_ubyte)),
2476
ctypes.c_uint(len(openpgp)))
1849
datum = (gnutls.library.types
1850
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1853
ctypes.c_uint(len(openpgp))))
2477
1854
# New empty GnuTLS certificate
2478
crt = gnutls.openpgp_crt_t()
2479
gnutls.openpgp_crt_init(ctypes.byref(crt))
1855
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2480
1858
# Import the OpenPGP public key into the certificate
2481
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2482
gnutls.OPENPGP_FMT_RAW)
1859
(gnutls.library.functions
1860
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1861
gnutls.library.constants
1862
.GNUTLS_OPENPGP_FMT_RAW))
2483
1863
# Verify the self signature in the key
2484
1864
crtverify = ctypes.c_uint()
2485
gnutls.openpgp_crt_verify_self(crt, 0,
2486
ctypes.byref(crtverify))
1865
(gnutls.library.functions
1866
.gnutls_openpgp_crt_verify_self(crt, 0,
1867
ctypes.byref(crtverify)))
2487
1868
if crtverify.value != 0:
2488
gnutls.openpgp_crt_deinit(crt)
2489
raise gnutls.CertificateSecurityError(code
1869
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1870
raise (gnutls.errors.CertificateSecurityError
2491
1872
# New buffer for the fingerprint
2492
1873
buf = ctypes.create_string_buffer(20)
2493
1874
buf_len = ctypes.c_size_t()
2494
1875
# Get the fingerprint from the certificate into the buffer
2495
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2496
ctypes.byref(buf_len))
1876
(gnutls.library.functions
1877
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1878
ctypes.byref(buf_len)))
2497
1879
# Deinit the certificate
2498
gnutls.openpgp_crt_deinit(crt)
1880
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2499
1881
# Convert the buffer to a Python bytestring
2500
1882
fpr = ctypes.string_at(buf, buf_len.value)
2501
1883
# Convert the bytestring to hexadecimal notation
2590
1966
# socket_wrapper(), if socketfd was set.
2591
1967
socketserver.TCPServer.__init__(self, server_address,
2592
1968
RequestHandlerClass)
2594
1970
def server_bind(self):
2595
1971
"""This overrides the normal server_bind() function
2596
1972
to bind to an interface if one was specified, and also NOT to
2597
1973
bind to an address or port if they were not specified."""
2598
global SO_BINDTODEVICE
2599
1974
if self.interface is not None:
2600
1975
if SO_BINDTODEVICE is None:
2601
# Fall back to a hard-coded value which seems to be
2603
logger.warning("SO_BINDTODEVICE not found, trying 25")
2604
SO_BINDTODEVICE = 25
2606
self.socket.setsockopt(
2607
socket.SOL_SOCKET, SO_BINDTODEVICE,
2608
(self.interface + "\0").encode("utf-8"))
2609
except socket.error as error:
2610
if error.errno == errno.EPERM:
2611
logger.error("No permission to bind to"
2612
" interface %s", self.interface)
2613
elif error.errno == errno.ENOPROTOOPT:
2614
logger.error("SO_BINDTODEVICE not available;"
2615
" cannot bind to interface %s",
2617
elif error.errno == errno.ENODEV:
2618
logger.error("Interface %s does not exist,"
2619
" cannot bind", self.interface)
1976
logger.error("SO_BINDTODEVICE does not exist;"
1977
" cannot bind to interface %s",
1981
self.socket.setsockopt(socket.SOL_SOCKET,
1983
str(self.interface + '\0'))
1984
except socket.error as error:
1985
if error.errno == errno.EPERM:
1986
logger.error("No permission to bind to"
1987
" interface %s", self.interface)
1988
elif error.errno == errno.ENOPROTOOPT:
1989
logger.error("SO_BINDTODEVICE not available;"
1990
" cannot bind to interface %s",
1992
elif error.errno == errno.ENODEV:
1993
logger.error("Interface %s does not exist,"
1994
" cannot bind", self.interface)
2622
1997
# Only bind(2) the socket if we really need to.
2623
1998
if self.server_address[0] or self.server_address[1]:
2624
if self.server_address[1]:
2625
self.allow_reuse_address = True
2626
1999
if not self.server_address[0]:
2627
2000
if self.address_family == socket.AF_INET6:
2628
any_address = "::" # in6addr_any
2001
any_address = "::" # in6addr_any
2630
any_address = "0.0.0.0" # INADDR_ANY
2003
any_address = "0.0.0.0" # INADDR_ANY
2631
2004
self.server_address = (any_address,
2632
2005
self.server_address[1])
2633
2006
elif not self.server_address[1]:
2634
self.server_address = (self.server_address[0], 0)
2007
self.server_address = (self.server_address[0],
2635
2009
# if self.interface:
2636
2010
# self.server_address = (self.server_address[0],
2667
2036
self.gnutls_priority = gnutls_priority
2668
2037
IPv6_TCPServer.__init__(self, server_address,
2669
2038
RequestHandlerClass,
2670
interface=interface,
2039
interface = interface,
2040
use_ipv6 = use_ipv6,
2041
socketfd = socketfd)
2674
2042
def server_activate(self):
2675
2043
if self.enabled:
2676
2044
return socketserver.TCPServer.server_activate(self)
2678
2046
def enable(self):
2679
2047
self.enabled = True
2681
2049
def add_pipe(self, parent_pipe, proc):
2682
2050
# Call "handle_ipc" for both data and EOF events
2684
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2685
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2686
functools.partial(self.handle_ipc,
2687
parent_pipe=parent_pipe,
2690
def handle_ipc(self, source, condition,
2693
client_object=None):
2051
gobject.io_add_watch(parent_pipe.fileno(),
2052
gobject.IO_IN | gobject.IO_HUP,
2053
functools.partial(self.handle_ipc,
2058
def handle_ipc(self, source, condition, parent_pipe=None,
2059
proc = None, client_object=None):
2694
2060
# error, or the other end of multiprocessing.Pipe has closed
2695
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2061
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2696
2062
# Wait for other process to exit
2700
2066
# Read a request from the child
2701
2067
request = parent_pipe.recv()
2702
2068
command = request[0]
2704
2070
if command == 'init':
2705
key_id = request[1].decode("ascii")
2706
fpr = request[2].decode("ascii")
2707
address = request[3]
2709
for c in self.clients.values():
2710
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2712
if key_id and c.key_id == key_id:
2715
if fpr and c.fingerprint == fpr:
2072
address = request[2]
2074
for c in self.clients.itervalues():
2075
if c.fingerprint == fpr:
2719
logger.info("Client not found for key ID: %s, address"
2720
": %s", key_id or fpr, address)
2079
logger.info("Client not found for fingerprint: %s, ad"
2080
"dress: %s", fpr, address)
2721
2081
if self.use_dbus:
2722
2082
# Emit D-Bus signal
2723
mandos_dbus_service.ClientNotFound(key_id or fpr,
2083
mandos_dbus_service.ClientNotFound(fpr,
2725
2085
parent_pipe.send(False)
2729
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2730
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2731
functools.partial(self.handle_ipc,
2732
parent_pipe=parent_pipe,
2734
client_object=client))
2088
gobject.io_add_watch(parent_pipe.fileno(),
2089
gobject.IO_IN | gobject.IO_HUP,
2090
functools.partial(self.handle_ipc,
2735
2096
parent_pipe.send(True)
2736
2097
# remove the old hook in favor of the new above hook on
2740
2101
funcname = request[1]
2741
2102
args = request[2]
2742
2103
kwargs = request[3]
2744
2105
parent_pipe.send(('data', getattr(client_object,
2745
2106
funcname)(*args,
2748
2109
if command == 'getattr':
2749
2110
attrname = request[1]
2750
if isinstance(client_object.__getattribute__(attrname),
2751
collections.Callable):
2752
parent_pipe.send(('function', ))
2111
if callable(client_object.__getattribute__(attrname)):
2112
parent_pipe.send(('function',))
2755
'data', client_object.__getattribute__(attrname)))
2114
parent_pipe.send(('data', client_object
2115
.__getattribute__(attrname)))
2757
2117
if command == 'setattr':
2758
2118
attrname = request[1]
2759
2119
value = request[2]
2760
2120
setattr(client_object, attrname, value)
2765
2125
def rfc3339_duration_to_delta(duration):
2766
2126
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2768
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2770
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2772
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2774
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2776
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2778
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2780
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2128
>>> rfc3339_duration_to_delta("P7D")
2129
datetime.timedelta(7)
2130
>>> rfc3339_duration_to_delta("PT60S")
2131
datetime.timedelta(0, 60)
2132
>>> rfc3339_duration_to_delta("PT60M")
2133
datetime.timedelta(0, 3600)
2134
>>> rfc3339_duration_to_delta("PT24H")
2135
datetime.timedelta(1)
2136
>>> rfc3339_duration_to_delta("P1W")
2137
datetime.timedelta(7)
2138
>>> rfc3339_duration_to_delta("PT5M30S")
2139
datetime.timedelta(0, 330)
2140
>>> rfc3339_duration_to_delta("P1DT3M20S")
2141
datetime.timedelta(1, 200)
2784
2144
# Parsing an RFC 3339 duration with regular expressions is not
2785
2145
# possible - there would have to be multiple places for the same
2786
2146
# values, like seconds. The current code, while more esoteric, is
2787
2147
# cleaner without depending on a parsing library. If Python had a
2788
2148
# built-in library for parsing we would use it, but we'd like to
2789
2149
# avoid excessive use of external libraries.
2791
2151
# New type for defining tokens, syntax, and semantics all-in-one
2792
Token = collections.namedtuple("Token", (
2793
"regexp", # To match token; if "value" is not None, must have
2794
# a "group" containing digits
2795
"value", # datetime.timedelta or None
2796
"followers")) # Tokens valid after this token
2152
Token = collections.namedtuple("Token",
2153
("regexp", # To match token; if
2154
# "value" is not None,
2155
# must have a "group"
2157
"value", # datetime.timedelta or
2159
"followers")) # Tokens valid after
2797
2161
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2798
2162
# the "duration" ABNF definition in RFC 3339, Appendix A.
2799
2163
token_end = Token(re.compile(r"$"), None, frozenset())
2800
2164
token_second = Token(re.compile(r"(\d+)S"),
2801
2165
datetime.timedelta(seconds=1),
2802
frozenset((token_end, )))
2166
frozenset((token_end,)))
2803
2167
token_minute = Token(re.compile(r"(\d+)M"),
2804
2168
datetime.timedelta(minutes=1),
2805
2169
frozenset((token_second, token_end)))
3137
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3139
2485
except OSError as error:
3140
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3141
.format(uid, gid, os.strerror(error.errno)))
3142
2486
if error.errno != errno.EPERM:
3146
2490
# Enable all possible GnuTLS debugging
3148
2492
# "Use a log level over 10 to enable all debugging options."
3149
2493
# - GnuTLS manual
3150
gnutls.global_set_log_level(11)
2494
gnutls.library.functions.gnutls_global_set_log_level(11)
2496
@gnutls.library.types.gnutls_log_func
3153
2497
def debug_gnutls(level, string):
3154
2498
logger.debug("GnuTLS: %s", string[:-1])
3156
gnutls.global_set_log_function(debug_gnutls)
2500
(gnutls.library.functions
2501
.gnutls_global_set_log_function(debug_gnutls))
3158
2503
# Redirect stdin so all checkers get /dev/null
3159
2504
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3160
2505
os.dup2(null, sys.stdin.fileno())
3164
2509
# Need to fork before connecting to D-Bus
3165
2510
if not foreground:
3166
2511
# Close all input and output, do double fork, etc.
3169
if gi.version_info < (3, 10, 2):
3170
# multiprocessing will use threads, so before we use GLib we
3171
# need to inform GLib that threads will be used.
2514
# multiprocessing will use threads, so before we use gobject we
2515
# need to inform gobject that threads will be used.
2516
gobject.threads_init()
3174
2518
global main_loop
3175
2519
# From the Avahi example code
3176
2520
DBusGMainLoop(set_as_default=True)
3177
main_loop = GLib.MainLoop()
2521
main_loop = gobject.MainLoop()
3178
2522
bus = dbus.SystemBus()
3179
2523
# End of Avahi example code
3182
2526
bus_name = dbus.service.BusName("se.recompile.Mandos",
3185
old_bus_name = dbus.service.BusName(
3186
"se.bsnet.fukt.Mandos", bus,
3188
except dbus.exceptions.DBusException as e:
2527
bus, do_not_queue=True)
2528
old_bus_name = (dbus.service.BusName
2529
("se.bsnet.fukt.Mandos", bus,
2531
except dbus.exceptions.NameExistsException as e:
3189
2532
logger.error("Disabling D-Bus:", exc_info=e)
3190
2533
use_dbus = False
3191
2534
server_settings["use_dbus"] = False
3192
2535
tcp_server.use_dbus = False
3194
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3195
service = AvahiServiceToSyslog(
3196
name=server_settings["servicename"],
3197
servicetype="_mandos._tcp",
3200
if server_settings["interface"]:
3201
service.interface = if_nametoindex(
3202
server_settings["interface"].encode("utf-8"))
2536
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2537
service = AvahiServiceToSyslog(name =
2538
server_settings["servicename"],
2539
servicetype = "_mandos._tcp",
2540
protocol = protocol, bus = bus)
2541
if server_settings["interface"]:
2542
service.interface = (if_nametoindex
2543
(str(server_settings["interface"])))
3204
2545
global multiprocessing_manager
3205
2546
multiprocessing_manager = multiprocessing.Manager()
3207
2548
client_class = Client
3209
client_class = functools.partial(ClientDBus, bus=bus)
2550
client_class = functools.partial(ClientDBus, bus = bus)
3211
2552
client_settings = Client.config_parser(client_config)
3212
2553
old_client_settings = {}
3213
2554
clients_data = {}
3215
2556
# This is used to redirect stdout and stderr for checker processes
3217
wnull = open(os.devnull, "w") # A writable /dev/null
2558
wnull = open(os.devnull, "w") # A writable /dev/null
3218
2559
# Only used if server is running in foreground but not in debug
3220
2561
if debug or not foreground:
3223
2564
# Get client data and settings from last running state.
3224
2565
if server_settings["restore"]:
3226
2567
with open(stored_state_path, "rb") as stored_state:
3227
if sys.version_info.major == 2:
3228
clients_data, old_client_settings = pickle.load(
3231
bytes_clients_data, bytes_old_client_settings = (
3232
pickle.load(stored_state, encoding="bytes"))
3233
# Fix bytes to strings
3236
clients_data = {(key.decode("utf-8")
3237
if isinstance(key, bytes)
3240
bytes_clients_data.items()}
3241
del bytes_clients_data
3242
for key in clients_data:
3243
value = {(k.decode("utf-8")
3244
if isinstance(k, bytes) else k): v
3246
clients_data[key].items()}
3247
clients_data[key] = value
3249
value["client_structure"] = [
3251
if isinstance(s, bytes)
3253
value["client_structure"]]
3254
# .name, .host, and .checker_command
3255
for k in ("name", "host", "checker_command"):
3256
if isinstance(value[k], bytes):
3257
value[k] = value[k].decode("utf-8")
3258
if "key_id" not in value:
3259
value["key_id"] = ""
3260
elif "fingerprint" not in value:
3261
value["fingerprint"] = ""
3262
# old_client_settings
3264
old_client_settings = {
3265
(key.decode("utf-8")
3266
if isinstance(key, bytes)
3269
bytes_old_client_settings.items()}
3270
del bytes_old_client_settings
3271
# .host and .checker_command
3272
for value in old_client_settings.values():
3273
for attribute in ("host", "checker_command"):
3274
if isinstance(value[attribute], bytes):
3275
value[attribute] = (value[attribute]
2568
clients_data, old_client_settings = (pickle.load
3277
2570
os.remove(stored_state_path)
3278
2571
except IOError as e:
3279
2572
if e.errno == errno.ENOENT:
3280
logger.warning("Could not load persistent state:"
3281
" {}".format(os.strerror(e.errno)))
2573
logger.warning("Could not load persistent state: {0}"
2574
.format(os.strerror(e.errno)))
3283
2576
logger.critical("Could not load persistent state:",
3286
2579
except EOFError as e:
3287
2580
logger.warning("Could not load persistent state: "
2581
"EOFError:", exc_info=e)
3291
2583
with PGPEngine() as pgp:
3292
for client_name, client in clients_data.items():
2584
for client_name, client in clients_data.iteritems():
3293
2585
# Skip removed clients
3294
2586
if client_name not in client_settings:
3297
2589
# Decide which value to use after restoring saved state.
3298
2590
# We have three different values: Old config file,
3299
2591
# new config file, and saved state.
3357
2649
for client_name in (set(client_settings)
3358
2650
- set(old_client_settings)):
3359
2651
clients_data[client_name] = client_settings[client_name]
3361
2653
# Create all client objects
3362
for client_name, client in clients_data.items():
2654
for client_name, client in clients_data.iteritems():
3363
2655
tcp_server.clients[client_name] = client_class(
3366
server_settings=server_settings)
2656
name = client_name, settings = client,
2657
server_settings = server_settings)
3368
2659
if not tcp_server.clients:
3369
2660
logger.warning("No clients defined")
3371
2662
if not foreground:
3372
2663
if pidfile is not None:
3376
print(pid, file=pidfile)
2667
pidfile.write(str(pid) + "\n".encode("utf-8"))
3377
2668
except IOError:
3378
2669
logger.error("Could not write to file %r with PID %d",
3379
2670
pidfilename, pid)
3381
2672
del pidfilename
3383
for termsig in (signal.SIGHUP, signal.SIGTERM):
3384
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3385
lambda: main_loop.quit() and False)
2674
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2675
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3389
@alternate_dbus_interfaces(
3390
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3391
class MandosDBusService(DBusObjectWithObjectManager):
2678
@alternate_dbus_interfaces({"se.recompile.Mandos":
2679
"se.bsnet.fukt.Mandos"})
2680
class MandosDBusService(DBusObjectWithProperties):
3392
2681
"""A D-Bus proxy object"""
3394
2682
def __init__(self):
3395
2683
dbus.service.Object.__init__(self, bus, "/")
3397
2684
_interface = "se.recompile.Mandos"
2686
@dbus_interface_annotations(_interface)
2688
return { "org.freedesktop.DBus.Property"
2689
".EmitsChangedSignal":
3399
2692
@dbus.service.signal(_interface, signature="o")
3400
2693
def ClientAdded(self, objpath):
3404
2697
@dbus.service.signal(_interface, signature="ss")
3405
def ClientNotFound(self, key_id, address):
2698
def ClientNotFound(self, fingerprint, address):
3409
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3411
2702
@dbus.service.signal(_interface, signature="os")
3412
2703
def ClientRemoved(self, objpath, name):
3416
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3418
2707
@dbus.service.method(_interface, out_signature="ao")
3419
2708
def GetAllClients(self):
3421
return dbus.Array(c.dbus_object_path for c in
3422
tcp_server.clients.values())
3424
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2710
return dbus.Array(c.dbus_object_path
2712
tcp_server.clients.itervalues())
3426
2714
@dbus.service.method(_interface,
3427
2715
out_signature="a{oa{sv}}")
3428
2716
def GetAllClientsWithProperties(self):
3430
2718
return dbus.Dictionary(
3431
{c.dbus_object_path: c.GetAll(
3432
"se.recompile.Mandos.Client")
3433
for c in tcp_server.clients.values()},
2719
((c.dbus_object_path, c.GetAll(""))
2720
for c in tcp_server.clients.itervalues()),
3434
2721
signature="oa{sv}")
3436
2723
@dbus.service.method(_interface, in_signature="o")
3437
2724
def RemoveClient(self, object_path):
3439
for c in tcp_server.clients.values():
2726
for c in tcp_server.clients.itervalues():
3440
2727
if c.dbus_object_path == object_path:
3441
2728
del tcp_server.clients[c.name]
3442
2729
c.remove_from_connection()
3443
# Don't signal the disabling
2730
# Don't signal anything except ClientRemoved
3444
2731
c.disable(quiet=True)
3445
# Emit D-Bus signal for removal
3446
self.client_removed_signal(c)
2733
self.ClientRemoved(object_path, c.name)
3448
2735
raise KeyError(object_path)
3452
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3453
out_signature="a{oa{sa{sv}}}")
3454
def GetManagedObjects(self):
3456
return dbus.Dictionary(
3457
{client.dbus_object_path:
3459
{interface: client.GetAll(interface)
3461
client._get_all_interface_names()})
3462
for client in tcp_server.clients.values()})
3464
def client_added_signal(self, client):
3465
"""Send the new standard signal and the old signal"""
3467
# New standard signal
3468
self.InterfacesAdded(
3469
client.dbus_object_path,
3471
{interface: client.GetAll(interface)
3473
client._get_all_interface_names()}))
3475
self.ClientAdded(client.dbus_object_path)
3477
def client_removed_signal(self, client):
3478
"""Send the new standard signal and the old signal"""
3480
# New standard signal
3481
self.InterfacesRemoved(
3482
client.dbus_object_path,
3483
client._get_all_interface_names())
3485
self.ClientRemoved(client.dbus_object_path,
3488
2739
mandos_dbus_service = MandosDBusService()
3490
# Save modules to variables to exempt the modules from being
3491
# unloaded before the function registered with atexit() is run.
3492
mp = multiprocessing
3496
2742
"Cleanup function; run on exit"
3500
mp.active_children()
2745
multiprocessing.active_children()
3502
2747
if not (tcp_server.clients or client_settings):
3505
2750
# Store client before exiting. Secrets are encrypted with key
3506
2751
# based on what config file has. If config file is
3507
2752
# removed/edited, old secret will thus be unrecovable.
3509
2754
with PGPEngine() as pgp:
3510
for client in tcp_server.clients.values():
2755
for client in tcp_server.clients.itervalues():
3511
2756
key = client_settings[client.name]["secret"]
3512
2757
client.encrypted_secret = pgp.encrypt(client.secret,
3514
2759
client_dict = {}
3516
2761
# A list of attributes that can not be pickled
3518
exclude = {"bus", "changedstate", "secret",
3519
"checker", "server_settings"}
3520
for name, typ in inspect.getmembers(dbus.service
2763
exclude = set(("bus", "changedstate", "secret",
2764
"checker", "server_settings"))
2765
for name, typ in (inspect.getmembers
2766
(dbus.service.Object)):
3522
2767
exclude.add(name)
3524
2769
client_dict["encrypted_secret"] = (client
3525
2770
.encrypted_secret)
3526
2771
for attr in client.client_structure:
3527
2772
if attr not in exclude:
3528
2773
client_dict[attr] = getattr(client, attr)
3530
2775
clients[client.name] = client_dict
3531
2776
del client_settings[client.name]["secret"]
3534
with tempfile.NamedTemporaryFile(
3538
dir=os.path.dirname(stored_state_path),
3539
delete=False) as stored_state:
3540
pickle.dump((clients, client_settings), stored_state,
3542
tempname = stored_state.name
2779
with (tempfile.NamedTemporaryFile
2780
(mode='wb', suffix=".pickle", prefix='clients-',
2781
dir=os.path.dirname(stored_state_path),
2782
delete=False)) as stored_state:
2783
pickle.dump((clients, client_settings), stored_state)
2784
tempname=stored_state.name
3543
2785
os.rename(tempname, stored_state_path)
3544
2786
except (IOError, OSError) as e: