2
# -*- mode: python; coding: utf-8 -*-
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 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2013 Teddy Hogeborn
15
# Copyright © 2008-2013 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
14
# Copyright © 2008-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
from future_builtins import *
39
from future_builtins import *
39
import SocketServer as socketserver
44
import SocketServer as socketserver
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
52
import ConfigParser as configparser
65
import cPickle as pickle
70
import cPickle as pickle
66
73
import multiprocessing
74
84
import dbus.service
86
from gi.repository import GLib
77
87
from dbus.mainloop.glib import DBusGMainLoop
80
90
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:
84
106
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
107
except AttributeError:
109
# This is where SO_BINDTODEVICE was up to and including Python
87
111
from IN import SO_BINDTODEVICE
88
112
except ImportError:
89
SO_BINDTODEVICE = None
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
92
131
stored_state_file = "clients.pickle"
94
133
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
134
logging.captureWarnings(True) # Show warnings via the logging system
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
138
if_nametoindex = ctypes.cdll.LoadLibrary(
139
ctypes.util.find_library("c")).if_nametoindex
103
140
except (OSError, AttributeError):
104
142
def if_nametoindex(interface):
105
143
"Get an interface index the hard way, i.e. using fcntl()"
106
144
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
145
with contextlib.closing(socket.socket()) as s:
108
146
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
147
struct.pack(b"16s16x", interface))
148
interface_index = struct.unpack("I", ifreq[16:20])[0]
113
149
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__,
116
168
def initlogger(debug, level=logging.WARNING):
117
169
"""init logger and add loglevel"""
172
syslogger = (logging.handlers.SysLogHandler(
173
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
119
175
syslogger.setFormatter(logging.Formatter
120
176
('Mandos [%(process)d]: %(levelname)s:'
122
178
logger.addHandler(syslogger)
125
181
console = logging.StreamHandler()
126
182
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
179
249
.replace(b"\n", b"\\n")
180
250
.replace(b"\0", b"\\x00"))
183
253
def encrypt(self, data, password):
184
254
passphrase = self.password_encode(password)
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
255
with tempfile.NamedTemporaryFile(
256
dir=self.tempdir) as passfile:
187
257
passfile.write(passphrase)
189
proc = subprocess.Popen(['gpg', '--symmetric',
259
proc = subprocess.Popen([self.gpg, '--symmetric',
190
260
'--passphrase-file',
192
262
+ self.gnupgargs,
193
stdin = subprocess.PIPE,
194
stdout = subprocess.PIPE,
195
stderr = subprocess.PIPE)
196
ciphertext, err = proc.communicate(input = data)
263
stdin=subprocess.PIPE,
264
stdout=subprocess.PIPE,
265
stderr=subprocess.PIPE)
266
ciphertext, err = proc.communicate(input=data)
197
267
if proc.returncode != 0:
198
268
raise PGPError(err)
199
269
return ciphertext
201
271
def decrypt(self, data, password):
202
272
passphrase = self.password_encode(password)
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
273
with tempfile.NamedTemporaryFile(
274
dir=self.tempdir) as passfile:
205
275
passfile.write(passphrase)
207
proc = subprocess.Popen(['gpg', '--decrypt',
277
proc = subprocess.Popen([self.gpg, '--decrypt',
208
278
'--passphrase-file',
210
280
+ self.gnupgargs,
211
stdin = subprocess.PIPE,
212
stdout = subprocess.PIPE,
213
stderr = subprocess.PIPE)
214
decrypted_plaintext, err = proc.communicate(input
281
stdin=subprocess.PIPE,
282
stdout=subprocess.PIPE,
283
stderr=subprocess.PIPE)
284
decrypted_plaintext, err = proc.communicate(input=data)
216
285
if proc.returncode != 0:
217
286
raise PGPError(err)
218
287
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
221
316
class AvahiError(Exception):
222
317
def __init__(self, value, *args, **kwargs):
223
318
self.value = value
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
319
return super(AvahiError, self).__init__(value, *args,
228
323
class AvahiServiceError(AvahiError):
231
327
class AvahiGroupError(AvahiError):
235
class AvahiService(object):
236
332
"""An Avahi (Zeroconf) service.
239
335
interface: integer; avahi.IF_UNSPEC or an interface index.
240
336
Used to optionally bind to the specified interface.
383
501
follow_name_owner_changes=True),
384
502
avahi.DBUS_INTERFACE_SERVER)
385
503
self.server.connect_to_signal("StateChanged",
386
self.server_state_changed)
504
self.server_state_changed)
387
505
self.server_state_changed(self.server.GetState())
390
508
class AvahiServiceToSyslog(AvahiService):
509
def rename(self, *args, **kwargs):
392
510
"""Add the new name to the syslog messages"""
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
511
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
512
syslogger.setFormatter(logging.Formatter(
513
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
401
def timedelta_to_milliseconds(td):
402
"Convert a datetime.timedelta() to milliseconds"
403
return ((td.days * 24 * 60 * 60 * 1000)
404
+ (td.seconds * 1000)
405
+ (td.microseconds // 1000))
408
class Client(object):
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))
409
831
"""A representation of a client host served by this server.
412
834
approved: bool(); 'None' if not yet approved/disapproved
413
835
approval_delay: datetime.timedelta(); Time to wait for approval
414
836
approval_duration: datetime.timedelta(); Duration of one approval
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
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
419
841
checker_command: string; External command which is run to check
420
842
if client lives. %() expansions are done at
421
843
runtime with vars(self) as dict, so that for
422
844
instance %(name)s can be used in the command.
423
checker_initiator_tag: a gobject event source tag, or None
845
checker_initiator_tag: a GLib event source tag, or None
424
846
created: datetime.datetime(); (UTC) object creation
425
847
client_structure: Object describing what attributes a client has
426
848
and is used for storing the client at exit
427
849
current_checker_command: string; current running checker_command
428
disable_initiator_tag: a gobject event source tag, or None
850
disable_initiator_tag: a GLib event source tag, or None
430
852
fingerprint: string (40 or 32 hexadecimal digits); used to
431
uniquely identify the client
853
uniquely identify an OpenPGP client
854
key_id: string (64 hexadecimal digits); used to uniquely identify
855
a client using raw public keys
432
856
host: string; available for use by the checker command
433
857
interval: datetime.timedelta(); How often to start a new checker
434
858
last_approval_request: datetime.datetime(); (UTC) or None
601
1015
logger.info("Disabling client %s", self.name)
602
1016
if getattr(self, "disable_initiator_tag", None) is not None:
603
gobject.source_remove(self.disable_initiator_tag)
1017
GLib.source_remove(self.disable_initiator_tag)
604
1018
self.disable_initiator_tag = None
605
1019
self.expires = None
606
1020
if getattr(self, "checker_initiator_tag", None) is not None:
607
gobject.source_remove(self.checker_initiator_tag)
1021
GLib.source_remove(self.checker_initiator_tag)
608
1022
self.checker_initiator_tag = None
609
1023
self.stop_checker()
610
1024
self.enabled = False
612
1026
self.send_changedstate()
613
# Do not run this again if called by a gobject.timeout_add
1027
# Do not run this again if called by a GLib.timeout_add
616
1030
def __del__(self):
619
1033
def init_checker(self):
620
1034
# Schedule a new checker to be started an 'interval' from now,
621
1035
# and every interval from then on.
622
1036
if self.checker_initiator_tag is not None:
623
gobject.source_remove(self.checker_initiator_tag)
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
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
627
1042
# Schedule a disable() when 'timeout' has passed
628
1043
if self.disable_initiator_tag is not None:
629
gobject.source_remove(self.disable_initiator_tag)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
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)
633
1047
# Also start a new checker *right now*.
634
1048
self.start_checker()
636
def checker_callback(self, pid, condition, command):
1050
def checker_callback(self, source, condition, connection,
637
1052
"""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:
638
1058
self.checker_callback_tag = None
639
1059
self.checker = None
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
1062
self.last_checker_status = returncode
1063
self.last_checker_signal = None
642
1064
if self.last_checker_status == 0:
643
1065
logger.info("Checker for %(name)s succeeded",
645
1067
self.checked_ok()
647
logger.info("Checker for %(name)s failed",
1069
logger.info("Checker for %(name)s failed", vars(self))
650
1071
self.last_checker_status = -1
1072
self.last_checker_signal = -returncode
651
1073
logger.warning("Checker for %(name)s crashed?",
654
1077
def checked_ok(self):
655
1078
"""Assert that the client has been seen, alive and well."""
656
1079
self.last_checked_ok = datetime.datetime.utcnow()
657
1080
self.last_checker_status = 0
1081
self.last_checker_signal = None
658
1082
self.bump_timeout()
660
1084
def bump_timeout(self, timeout=None):
661
1085
"""Bump up the timeout for this client."""
662
1086
if timeout is None:
663
1087
timeout = self.timeout
664
1088
if self.disable_initiator_tag is not None:
665
gobject.source_remove(self.disable_initiator_tag)
1089
GLib.source_remove(self.disable_initiator_tag)
666
1090
self.disable_initiator_tag = None
667
1091
if getattr(self, "enabled", False):
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
1092
self.disable_initiator_tag = GLib.timeout_add(
1093
int(timeout.total_seconds() * 1000), self.disable)
671
1094
self.expires = datetime.datetime.utcnow() + timeout
673
1096
def need_approval(self):
674
1097
self.last_approval_request = datetime.datetime.utcnow()
676
1099
def start_checker(self):
677
1100
"""Start a new checker subprocess if one is not running.
679
1102
If a checker already exists, leave it running and do
681
1104
# The reason for not killing a running checker is that if we
686
1109
# checkers alone, the checker would have to take more time
687
1110
# than 'timeout' for the client to be disabled, which is as it
690
# If a checker exists, make sure it is not a zombie
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
except (AttributeError, OSError) as error:
694
if (isinstance(error, OSError)
695
and error.errno != errno.ECHILD):
699
logger.warning("Checker was a zombie")
700
gobject.source_remove(self.checker_callback_tag)
701
self.checker_callback(pid, status,
702
self.current_checker_command)
1113
if self.checker is not None and not self.checker.is_alive():
1114
logger.warning("Checker was not alive; joining")
703
1117
# Start a new checker if needed
704
1118
if self.checker is None:
705
1119
# Escape attributes for the shell
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
709
self.runtime_expansions)
1121
attr: re.escape(str(getattr(self, attr)))
1122
for attr in self.runtime_expansions}
711
1124
command = self.checker_command % escaped_attrs
712
1125
except TypeError as error:
713
1126
logger.error('Could not format string "%s"',
714
self.checker_command, exc_info=error)
715
return True # Try again later
1127
self.checker_command,
1129
return True # Try again later
716
1130
self.current_checker_command = command
718
logger.info("Starting checker %r for %s",
720
# We don't need to redirect stdout and stderr, since
721
# in normal mode, that is already done by daemon(),
722
# and in debug mode we don't want to. (Stdin is
723
# always replaced by /dev/null.)
724
# The exception is when not debugging but nevertheless
725
# running in the foreground; use the previously
728
if (not self.server_settings["debug"]
729
and self.server_settings["foreground"]):
730
popen_args.update({"stdout": wnull,
732
self.checker = subprocess.Popen(command,
736
except OSError as error:
737
logger.error("Failed to start subprocess",
740
self.checker_callback_tag = (gobject.child_watch_add
742
self.checker_callback,
744
# The checker may have completed before the gobject
745
# watch was added. Check for this.
747
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
748
except OSError as error:
749
if error.errno == errno.ECHILD:
750
# This should never happen
751
logger.error("Child process vanished",
756
gobject.source_remove(self.checker_callback_tag)
757
self.checker_callback(pid, status, command)
758
# Re-run this periodically if run by gobject.timeout_add
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
761
1160
def stop_checker(self):
762
1161
"""Force the checker process, if any, to stop."""
763
1162
if self.checker_callback_tag:
764
gobject.source_remove(self.checker_callback_tag)
1163
GLib.source_remove(self.checker_callback_tag)
765
1164
self.checker_callback_tag = None
766
1165
if getattr(self, "checker", None) is None:
768
1167
logger.debug("Stopping checker for %(name)s", vars(self))
770
self.checker.terminate()
772
#if self.checker.poll() is None:
773
# self.checker.kill()
774
except OSError as error:
775
if error.errno != errno.ESRCH: # No such process
1168
self.checker.terminate()
777
1169
self.checker = None
780
def dbus_service_property(dbus_interface, signature="v",
781
access="readwrite", byte_arrays=False):
1172
def dbus_service_property(dbus_interface,
782
1176
"""Decorators for marking methods of a DBusObjectWithProperties to
783
1177
become properties on the D-Bus.
785
1179
The decorated method will be called with no arguments by "Get"
786
1180
and with one argument by "Set".
788
1182
The parameters, where they are supported, are the same as
789
1183
dbus.service.method, except there is only "signature", since the
790
1184
type from Get() and the type sent to Set() is the same.
866
class DBusObjectWithProperties(dbus.service.Object):
867
"""A D-Bus object with properties.
869
Classes inheriting from this can use the dbus_service_property
870
decorator to expose methods as D-Bus properties. It exposes the
871
standard Get(), Set(), and GetAll() methods on the D-Bus.
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.
875
1275
def _is_dbus_thing(thing):
876
1276
"""Returns a function testing if an attribute is a D-Bus thing
878
1278
If called like _is_dbus_thing("method") it returns a function
879
1279
suitable for use as predicate to inspect.getmembers().
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1281
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
884
1284
def _get_all_dbus_things(self, thing):
885
1285
"""Returns a generator of (name, attribute) pairs
887
return ((getattr(athing.__get__(self), "_dbus_name",
1287
return ((getattr(athing.__get__(self), "_dbus_name", name),
889
1288
athing.__get__(self))
890
1289
for cls in self.__class__.__mro__
891
1290
for name, athing in
892
inspect.getmembers(cls,
893
self._is_dbus_thing(thing)))
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.
895
1364
def _get_dbus_property(self, interface_name, property_name):
896
1365
"""Returns a bound method if one exists which is a D-Bus
897
1366
property with the specified name and interface.
899
for cls in self.__class__.__mro__:
900
for name, value in (inspect.getmembers
902
self._is_dbus_thing("property"))):
1368
for cls in self.__class__.__mro__:
1369
for name, value in inspect.getmembers(
1370
cls, self._is_dbus_thing("property")):
903
1371
if (value._dbus_name == property_name
904
1372
and value._dbus_interface == interface_name):
905
1373
return value.__get__(self)
907
1375
# No such property
908
raise DBusPropertyNotFound(self.dbus_object_path + ":"
909
+ interface_name + "."
912
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
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,
913
1390
out_signature="v")
914
1391
def Get(self, interface_name, property_name):
915
1392
"""Standard D-Bus property Get() method, see D-Bus standard.
1045
1520
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",
1048
1594
def datetime_to_dbus(dt, variant_level=0):
1049
1595
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1051
return dbus.String("", variant_level = variant_level)
1052
return dbus.String(dt.isoformat(),
1053
variant_level=variant_level)
1597
return dbus.String("", variant_level=variant_level)
1598
return dbus.String(dt.isoformat(), variant_level=variant_level)
1056
1601
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1409
1962
server to mandos-client
1413
1966
# Rejected - signal
1414
1967
@dbus.service.signal(_interface, signature="s")
1415
1968
def Rejected(self, reason):
1419
1972
# NeedApproval - signal
1420
1973
@dbus.service.signal(_interface, signature="tb")
1421
1974
def NeedApproval(self, timeout, default):
1423
1976
return self.need_approval()
1427
1980
# Approve - method
1428
1981
@dbus.service.method(_interface, in_signature="b")
1429
1982
def Approve(self, value):
1430
1983
self.approve(value)
1432
1985
# CheckedOK - method
1433
1986
@dbus.service.method(_interface)
1434
1987
def CheckedOK(self):
1435
1988
self.checked_ok()
1437
1990
# Enable - method
1991
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1438
1992
@dbus.service.method(_interface)
1439
1993
def Enable(self):
1443
1997
# StartChecker - method
1998
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1444
1999
@dbus.service.method(_interface)
1445
2000
def StartChecker(self):
1447
2002
self.start_checker()
1449
2004
# Disable - method
2005
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1450
2006
@dbus.service.method(_interface)
1451
2007
def Disable(self):
1455
2011
# StopChecker - method
2012
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1456
2013
@dbus.service.method(_interface)
1457
2014
def StopChecker(self):
1458
2015
self.stop_checker()
1462
2019
# ApprovalPending - property
1463
2020
@dbus_service_property(_interface, signature="b", access="read")
1464
2021
def ApprovalPending_dbus_property(self):
1465
2022
return dbus.Boolean(bool(self.approvals_pending))
1467
2024
# ApprovedByDefault - property
1468
@dbus_service_property(_interface, signature="b",
2025
@dbus_service_property(_interface,
1469
2027
access="readwrite")
1470
2028
def ApprovedByDefault_dbus_property(self, value=None):
1471
2029
if value is None: # get
1472
2030
return dbus.Boolean(self.approved_by_default)
1473
2031
self.approved_by_default = bool(value)
1475
2033
# ApprovalDelay - property
1476
@dbus_service_property(_interface, signature="t",
2034
@dbus_service_property(_interface,
1477
2036
access="readwrite")
1478
2037
def ApprovalDelay_dbus_property(self, value=None):
1479
2038
if value is None: # get
1480
return dbus.UInt64(self.approval_delay_milliseconds())
2039
return dbus.UInt64(self.approval_delay.total_seconds()
1481
2041
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1483
2043
# ApprovalDuration - property
1484
@dbus_service_property(_interface, signature="t",
2044
@dbus_service_property(_interface,
1485
2046
access="readwrite")
1486
2047
def ApprovalDuration_dbus_property(self, value=None):
1487
2048
if value is None: # get
1488
return dbus.UInt64(timedelta_to_milliseconds(
1489
self.approval_duration))
2049
return dbus.UInt64(self.approval_duration.total_seconds()
1490
2051
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1492
2053
# Name - property
2055
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1493
2056
@dbus_service_property(_interface, signature="s", access="read")
1494
2057
def Name_dbus_property(self):
1495
2058
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)
1497
2067
# Fingerprint - property
2069
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1498
2070
@dbus_service_property(_interface, signature="s", access="read")
1499
2071
def Fingerprint_dbus_property(self):
1500
2072
return dbus.String(self.fingerprint)
1502
2074
# Host - property
1503
@dbus_service_property(_interface, signature="s",
2075
@dbus_service_property(_interface,
1504
2077
access="readwrite")
1505
2078
def Host_dbus_property(self, value=None):
1506
2079
if value is None: # get
1507
2080
return dbus.String(self.host)
1508
self.host = unicode(value)
2081
self.host = str(value)
1510
2083
# Created - property
2085
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1511
2086
@dbus_service_property(_interface, signature="s", access="read")
1512
2087
def Created_dbus_property(self):
1513
2088
return datetime_to_dbus(self.created)
1515
2090
# LastEnabled - property
1516
2091
@dbus_service_property(_interface, signature="s", access="read")
1517
2092
def LastEnabled_dbus_property(self):
1518
2093
return datetime_to_dbus(self.last_enabled)
1520
2095
# Enabled - property
1521
@dbus_service_property(_interface, signature="b",
2096
@dbus_service_property(_interface,
1522
2098
access="readwrite")
1523
2099
def Enabled_dbus_property(self, value=None):
1524
2100
if value is None: # get
1572
2149
if (getattr(self, "disable_initiator_tag", None)
1575
gobject.source_remove(self.disable_initiator_tag)
1576
self.disable_initiator_tag = (
1577
gobject.timeout_add(
1578
timedelta_to_milliseconds(self.expires - now),
2152
GLib.source_remove(self.disable_initiator_tag)
2153
self.disable_initiator_tag = GLib.timeout_add(
2154
int((self.expires - now).total_seconds() * 1000),
1581
2157
# ExtendedTimeout - property
1582
@dbus_service_property(_interface, signature="t",
2158
@dbus_service_property(_interface,
1583
2160
access="readwrite")
1584
2161
def ExtendedTimeout_dbus_property(self, value=None):
1585
2162
if value is None: # get
1586
return dbus.UInt64(self.extended_timeout_milliseconds())
2163
return dbus.UInt64(self.extended_timeout.total_seconds()
1587
2165
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1589
2167
# Interval - property
1590
@dbus_service_property(_interface, signature="t",
2168
@dbus_service_property(_interface,
1591
2170
access="readwrite")
1592
2171
def Interval_dbus_property(self, value=None):
1593
2172
if value is None: # get
1594
return dbus.UInt64(self.interval_milliseconds())
2173
return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
2174
self.interval = datetime.timedelta(0, 0, 0, value)
1596
2175
if getattr(self, "checker_initiator_tag", None) is None:
1598
2177
if self.enabled:
1599
2178
# Reschedule checker run
1600
gobject.source_remove(self.checker_initiator_tag)
1601
self.checker_initiator_tag = (gobject.timeout_add
1602
(value, self.start_checker))
1603
self.start_checker() # Start one now, too
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
1605
2184
# Checker - property
1606
@dbus_service_property(_interface, signature="s",
2185
@dbus_service_property(_interface,
1607
2187
access="readwrite")
1608
2188
def Checker_dbus_property(self, value=None):
1609
2189
if value is None: # get
1610
2190
return dbus.String(self.checker_command)
1611
self.checker_command = unicode(value)
2191
self.checker_command = str(value)
1613
2193
# CheckerRunning - property
1614
@dbus_service_property(_interface, signature="b",
2194
@dbus_service_property(_interface,
1615
2196
access="readwrite")
1616
2197
def CheckerRunning_dbus_property(self, value=None):
1617
2198
if value is None: # get
1664
2255
class ClientHandler(socketserver.BaseRequestHandler, object):
1665
2256
"""A class to handle client connections.
1667
2258
Instantiated once for each connection to handle it.
1668
2259
Note: This will run in its own forked process."""
1670
2261
def handle(self):
1671
2262
with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
2263
logger.info("TCP connection from: %s",
1673
unicode(self.client_address))
2264
str(self.client_address))
1674
2265
logger.debug("Pipe FD: %d",
1675
2266
self.server.child_pipe.fileno())
1677
session = (gnutls.connection
1678
.ClientSession(self.request,
1680
.X509Credentials()))
1682
# Note: gnutls.connection.X509Credentials is really a
1683
# generic GnuTLS certificate credentials object so long as
1684
# no X.509 keys are added to it. Therefore, we can use it
1685
# here despite using OpenPGP certificates.
1687
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1688
# "+AES-256-CBC", "+SHA1",
1689
# "+COMP-NULL", "+CTYPE-OPENPGP",
2268
session = gnutls.ClientSession(self.request)
2270
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2271
# "+AES-256-CBC", "+SHA1",
2272
# "+COMP-NULL", "+CTYPE-OPENPGP",
1691
2274
# Use a fallback default, since this MUST be set.
1692
2275
priority = self.server.gnutls_priority
1693
2276
if priority is None:
1694
2277
priority = "NORMAL"
1695
(gnutls.library.functions
1696
.gnutls_priority_set_direct(session._c_object,
2278
gnutls.priority_set_direct(session._c_object,
2279
priority.encode("utf-8"),
1699
2282
# Start communication using the Mandos protocol
1700
2283
# Get protocol number
1701
2284
line = self.request.makefile().readline()
1702
2285
logger.debug("Protocol version: %r", line)
1704
2287
if int(line.strip().split()[0]) > 1:
2288
raise RuntimeError(line)
1706
2289
except (ValueError, IndexError, RuntimeError) as error:
1707
2290
logger.error("Unknown protocol version: %s", error)
1710
2293
# Start GnuTLS connection
1712
2295
session.handshake()
1713
except gnutls.errors.GNUTLSError as error:
2296
except gnutls.Error as error:
1714
2297
logger.warning("Handshake failed: %s", error)
1715
2298
# Do not run session.bye() here: the session is not
1716
2299
# established. Just abandon the request.
1718
2301
logger.debug("Handshake succeeded")
1720
2303
approval_required = False
1723
fpr = self.fingerprint(self.peer_certificate
1726
gnutls.errors.GNUTLSError) as error:
1727
logger.warning("Bad certificate: %s", error)
1729
logger.debug("Fingerprint: %s", fpr)
1732
client = ProxyClient(child_pipe, fpr,
2305
if gnutls.has_rawpk:
2308
key_id = self.key_id(
2309
self.peer_certificate(session))
2310
except (TypeError, gnutls.Error) as error:
2311
logger.warning("Bad certificate: %s", error)
2313
logger.debug("Key ID: %s", key_id)
2318
fpr = self.fingerprint(
2319
self.peer_certificate(session))
2320
except (TypeError, gnutls.Error) as error:
2321
logger.warning("Bad certificate: %s", error)
2323
logger.debug("Fingerprint: %s", fpr)
2326
client = ProxyClient(child_pipe, key_id, fpr,
1733
2327
self.client_address)
1734
2328
except KeyError:
1737
2331
if client.approval_delay:
1738
2332
delay = client.approval_delay
1739
2333
client.approvals_pending += 1
1740
2334
approval_required = True
1743
2337
if not client.enabled:
1744
2338
logger.info("Client %s is disabled",
1746
2340
if self.server.use_dbus:
1747
2341
# Emit D-Bus signal
1748
2342
client.Rejected("Disabled")
1751
2345
if client.approved or not client.approval_delay:
1752
#We are approved or approval is disabled
2346
# We are approved or approval is disabled
1754
2348
elif client.approved is None:
1755
2349
logger.info("Client %s needs approval",
1790
2382
delay -= time2 - time
1793
while sent_size < len(client.secret):
1795
sent = session.send(client.secret[sent_size:])
1796
except gnutls.errors.GNUTLSError as error:
1797
logger.warning("gnutls send failed",
1800
logger.debug("Sent: %d, remaining: %d",
1801
sent, len(client.secret)
1802
- (sent_size + sent))
2385
session.send(client.secret)
2386
except gnutls.Error as error:
2387
logger.warning("gnutls send failed",
1805
2391
logger.info("Sending secret to %s", client.name)
1806
2392
# bump the timeout using extended_timeout
1807
2393
client.bump_timeout(client.extended_timeout)
1808
2394
if self.server.use_dbus:
1809
2395
# Emit D-Bus signal
1810
2396
client.GotSecret()
1813
2399
if approval_required:
1814
2400
client.approvals_pending -= 1
1817
except gnutls.errors.GNUTLSError as error:
2403
except gnutls.Error as error:
1818
2404
logger.warning("GnuTLS bye failed",
1819
2405
exc_info=error)
1822
2408
def peer_certificate(session):
1823
"Return the peer's OpenPGP certificate as a bytestring"
1824
# If not an OpenPGP certificate...
1825
if (gnutls.library.functions
1826
.gnutls_certificate_type_get(session._c_object)
1827
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1828
# ...do the normal thing
1829
return session.peer_certificate
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
1830
2425
list_size = ctypes.c_uint(1)
1831
cert_list = (gnutls.library.functions
1832
.gnutls_certificate_get_peers
2426
cert_list = (gnutls.certificate_get_peers
1833
2427
(session._c_object, ctypes.byref(list_size)))
1834
2428
if not bool(cert_list) and list_size.value != 0:
1835
raise gnutls.errors.GNUTLSError("error getting peer"
2429
raise gnutls.Error("error getting peer certificate")
1837
2430
if list_size.value == 0:
1839
2432
cert = cert_list[0]
1840
2433
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()
1843
2470
def fingerprint(openpgp):
1844
2471
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1845
2472
# New GnuTLS "datum" with the OpenPGP public key
1846
datum = (gnutls.library.types
1847
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1850
ctypes.c_uint(len(openpgp))))
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)))
1851
2477
# New empty GnuTLS certificate
1852
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1853
(gnutls.library.functions
1854
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2478
crt = gnutls.openpgp_crt_t()
2479
gnutls.openpgp_crt_init(ctypes.byref(crt))
1855
2480
# Import the OpenPGP public key into the certificate
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1858
gnutls.library.constants
1859
.GNUTLS_OPENPGP_FMT_RAW))
2481
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2482
gnutls.OPENPGP_FMT_RAW)
1860
2483
# Verify the self signature in the key
1861
2484
crtverify = ctypes.c_uint()
1862
(gnutls.library.functions
1863
.gnutls_openpgp_crt_verify_self(crt, 0,
1864
ctypes.byref(crtverify)))
2485
gnutls.openpgp_crt_verify_self(crt, 0,
2486
ctypes.byref(crtverify))
1865
2487
if crtverify.value != 0:
1866
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1867
raise (gnutls.errors.CertificateSecurityError
2488
gnutls.openpgp_crt_deinit(crt)
2489
raise gnutls.CertificateSecurityError(code
1869
2491
# New buffer for the fingerprint
1870
2492
buf = ctypes.create_string_buffer(20)
1871
2493
buf_len = ctypes.c_size_t()
1872
2494
# Get the fingerprint from the certificate into the buffer
1873
(gnutls.library.functions
1874
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1875
ctypes.byref(buf_len)))
2495
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2496
ctypes.byref(buf_len))
1876
2497
# Deinit the certificate
1877
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2498
gnutls.openpgp_crt_deinit(crt)
1878
2499
# Convert the buffer to a Python bytestring
1879
2500
fpr = ctypes.string_at(buf, buf_len.value)
1880
2501
# Convert the bytestring to hexadecimal notation
1963
2590
# socket_wrapper(), if socketfd was set.
1964
2591
socketserver.TCPServer.__init__(self, server_address,
1965
2592
RequestHandlerClass)
1967
2594
def server_bind(self):
1968
2595
"""This overrides the normal server_bind() function
1969
2596
to bind to an interface if one was specified, and also NOT to
1970
2597
bind to an address or port if they were not specified."""
2598
global SO_BINDTODEVICE
1971
2599
if self.interface is not None:
1972
2600
if SO_BINDTODEVICE is None:
1973
logger.error("SO_BINDTODEVICE does not exist;"
1974
" cannot bind to interface %s",
1978
self.socket.setsockopt(socket.SOL_SOCKET,
1980
str(self.interface + '\0'))
1981
except socket.error as error:
1982
if error.errno == errno.EPERM:
1983
logger.error("No permission to bind to"
1984
" interface %s", self.interface)
1985
elif error.errno == errno.ENOPROTOOPT:
1986
logger.error("SO_BINDTODEVICE not available;"
1987
" cannot bind to interface %s",
1989
elif error.errno == errno.ENODEV:
1990
logger.error("Interface %s does not exist,"
1991
" cannot bind", self.interface)
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)
1994
2622
# Only bind(2) the socket if we really need to.
1995
2623
if self.server_address[0] or self.server_address[1]:
2624
if self.server_address[1]:
2625
self.allow_reuse_address = True
1996
2626
if not self.server_address[0]:
1997
2627
if self.address_family == socket.AF_INET6:
1998
any_address = "::" # in6addr_any
2628
any_address = "::" # in6addr_any
2000
any_address = "0.0.0.0" # INADDR_ANY
2630
any_address = "0.0.0.0" # INADDR_ANY
2001
2631
self.server_address = (any_address,
2002
2632
self.server_address[1])
2003
2633
elif not self.server_address[1]:
2004
self.server_address = (self.server_address[0],
2634
self.server_address = (self.server_address[0], 0)
2006
2635
# if self.interface:
2007
2636
# self.server_address = (self.server_address[0],
2033
2667
self.gnutls_priority = gnutls_priority
2034
2668
IPv6_TCPServer.__init__(self, server_address,
2035
2669
RequestHandlerClass,
2036
interface = interface,
2037
use_ipv6 = use_ipv6,
2038
socketfd = socketfd)
2670
interface=interface,
2039
2674
def server_activate(self):
2040
2675
if self.enabled:
2041
2676
return socketserver.TCPServer.server_activate(self)
2043
2678
def enable(self):
2044
2679
self.enabled = True
2046
2681
def add_pipe(self, parent_pipe, proc):
2047
2682
# Call "handle_ipc" for both data and EOF events
2048
gobject.io_add_watch(parent_pipe.fileno(),
2049
gobject.IO_IN | gobject.IO_HUP,
2050
functools.partial(self.handle_ipc,
2055
def handle_ipc(self, source, condition, parent_pipe=None,
2056
proc = None, client_object=None):
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):
2057
2694
# error, or the other end of multiprocessing.Pipe has closed
2058
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2695
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2059
2696
# Wait for other process to exit
2063
2700
# Read a request from the child
2064
2701
request = parent_pipe.recv()
2065
2702
command = request[0]
2067
2704
if command == 'init':
2069
address = request[2]
2071
for c in self.clients.itervalues():
2072
if c.fingerprint == fpr:
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:
2076
logger.info("Client not found for fingerprint: %s, ad"
2077
"dress: %s", fpr, address)
2719
logger.info("Client not found for key ID: %s, address"
2720
": %s", key_id or fpr, address)
2078
2721
if self.use_dbus:
2079
2722
# Emit D-Bus signal
2080
mandos_dbus_service.ClientNotFound(fpr,
2723
mandos_dbus_service.ClientNotFound(key_id or fpr,
2082
2725
parent_pipe.send(False)
2085
gobject.io_add_watch(parent_pipe.fileno(),
2086
gobject.IO_IN | gobject.IO_HUP,
2087
functools.partial(self.handle_ipc,
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))
2093
2735
parent_pipe.send(True)
2094
2736
# remove the old hook in favor of the new above hook on
2098
2740
funcname = request[1]
2099
2741
args = request[2]
2100
2742
kwargs = request[3]
2102
2744
parent_pipe.send(('data', getattr(client_object,
2103
2745
funcname)(*args,
2106
2748
if command == 'getattr':
2107
2749
attrname = request[1]
2108
if callable(client_object.__getattribute__(attrname)):
2109
parent_pipe.send(('function',))
2750
if isinstance(client_object.__getattribute__(attrname),
2751
collections.Callable):
2752
parent_pipe.send(('function', ))
2111
parent_pipe.send(('data', client_object
2112
.__getattribute__(attrname)))
2755
'data', client_object.__getattribute__(attrname)))
2114
2757
if command == 'setattr':
2115
2758
attrname = request[1]
2116
2759
value = request[2]
2117
2760
setattr(client_object, attrname, value)
2122
2765
def rfc3339_duration_to_delta(duration):
2123
2766
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2125
>>> rfc3339_duration_to_delta("P7D")
2126
datetime.timedelta(7)
2127
>>> rfc3339_duration_to_delta("PT60S")
2128
datetime.timedelta(0, 60)
2129
>>> rfc3339_duration_to_delta("PT60M")
2130
datetime.timedelta(0, 3600)
2131
>>> rfc3339_duration_to_delta("PT24H")
2132
datetime.timedelta(1)
2133
>>> rfc3339_duration_to_delta("P1W")
2134
datetime.timedelta(7)
2135
>>> rfc3339_duration_to_delta("PT5M30S")
2136
datetime.timedelta(0, 330)
2137
>>> rfc3339_duration_to_delta("P1DT3M20S")
2138
datetime.timedelta(1, 200)
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)
2141
2784
# Parsing an RFC 3339 duration with regular expressions is not
2142
2785
# possible - there would have to be multiple places for the same
2143
2786
# values, like seconds. The current code, while more esoteric, is
2144
2787
# cleaner without depending on a parsing library. If Python had a
2145
2788
# built-in library for parsing we would use it, but we'd like to
2146
2789
# avoid excessive use of external libraries.
2148
2791
# New type for defining tokens, syntax, and semantics all-in-one
2149
Token = collections.namedtuple("Token",
2150
("regexp", # To match token; if
2151
# "value" is not None,
2152
# must have a "group"
2154
"value", # datetime.timedelta or
2156
"followers")) # Tokens valid after
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
2158
2797
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2159
2798
# the "duration" ABNF definition in RFC 3339, Appendix A.
2160
2799
token_end = Token(re.compile(r"$"), None, frozenset())
2161
2800
token_second = Token(re.compile(r"(\d+)S"),
2162
2801
datetime.timedelta(seconds=1),
2163
frozenset((token_end,)))
2802
frozenset((token_end, )))
2164
2803
token_minute = Token(re.compile(r"(\d+)M"),
2165
2804
datetime.timedelta(minutes=1),
2166
2805
frozenset((token_second, token_end)))
3137
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2480
3139
except OSError as error:
3140
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3141
.format(uid, gid, os.strerror(error.errno)))
2481
3142
if error.errno != errno.EPERM:
2485
3146
# Enable all possible GnuTLS debugging
2487
3148
# "Use a log level over 10 to enable all debugging options."
2488
3149
# - GnuTLS manual
2489
gnutls.library.functions.gnutls_global_set_log_level(11)
2491
@gnutls.library.types.gnutls_log_func
3150
gnutls.global_set_log_level(11)
2492
3153
def debug_gnutls(level, string):
2493
3154
logger.debug("GnuTLS: %s", string[:-1])
2495
(gnutls.library.functions
2496
.gnutls_global_set_log_function(debug_gnutls))
3156
gnutls.global_set_log_function(debug_gnutls)
2498
3158
# Redirect stdin so all checkers get /dev/null
2499
3159
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2500
3160
os.dup2(null, sys.stdin.fileno())
2504
3164
# Need to fork before connecting to D-Bus
2505
3165
if not foreground:
2506
3166
# Close all input and output, do double fork, etc.
2509
# multiprocessing will use threads, so before we use gobject we
2510
# need to inform gobject that threads will be used.
2511
gobject.threads_init()
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.
2513
3174
global main_loop
2514
3175
# From the Avahi example code
2515
3176
DBusGMainLoop(set_as_default=True)
2516
main_loop = gobject.MainLoop()
3177
main_loop = GLib.MainLoop()
2517
3178
bus = dbus.SystemBus()
2518
3179
# End of Avahi example code
2521
3182
bus_name = dbus.service.BusName("se.recompile.Mandos",
2522
bus, do_not_queue=True)
2523
old_bus_name = (dbus.service.BusName
2524
("se.bsnet.fukt.Mandos", bus,
2526
except dbus.exceptions.NameExistsException as e:
3185
old_bus_name = dbus.service.BusName(
3186
"se.bsnet.fukt.Mandos", bus,
3188
except dbus.exceptions.DBusException as e:
2527
3189
logger.error("Disabling D-Bus:", exc_info=e)
2528
3190
use_dbus = False
2529
3191
server_settings["use_dbus"] = False
2530
3192
tcp_server.use_dbus = False
2531
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2532
service = AvahiServiceToSyslog(name =
2533
server_settings["servicename"],
2534
servicetype = "_mandos._tcp",
2535
protocol = protocol, bus = bus)
2536
if server_settings["interface"]:
2537
service.interface = (if_nametoindex
2538
(str(server_settings["interface"])))
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"))
2540
3204
global multiprocessing_manager
2541
3205
multiprocessing_manager = multiprocessing.Manager()
2543
3207
client_class = Client
2545
client_class = functools.partial(ClientDBus, bus = bus)
3209
client_class = functools.partial(ClientDBus, bus=bus)
2547
3211
client_settings = Client.config_parser(client_config)
2548
3212
old_client_settings = {}
2549
3213
clients_data = {}
2551
3215
# This is used to redirect stdout and stderr for checker processes
2553
wnull = open(os.devnull, "w") # A writable /dev/null
3217
wnull = open(os.devnull, "w") # A writable /dev/null
2554
3218
# Only used if server is running in foreground but not in debug
2556
3220
if debug or not foreground:
2559
3223
# Get client data and settings from last running state.
2560
3224
if server_settings["restore"]:
2562
3226
with open(stored_state_path, "rb") as stored_state:
2563
clients_data, old_client_settings = (pickle.load
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]
2565
3277
os.remove(stored_state_path)
2566
3278
except IOError as e:
2567
3279
if e.errno == errno.ENOENT:
2568
logger.warning("Could not load persistent state: {0}"
2569
.format(os.strerror(e.errno)))
3280
logger.warning("Could not load persistent state:"
3281
" {}".format(os.strerror(e.errno)))
2571
3283
logger.critical("Could not load persistent state:",
2574
3286
except EOFError as e:
2575
3287
logger.warning("Could not load persistent state: "
2576
"EOFError:", exc_info=e)
2578
3291
with PGPEngine() as pgp:
2579
for client_name, client in clients_data.iteritems():
3292
for client_name, client in clients_data.items():
2580
3293
# Skip removed clients
2581
3294
if client_name not in client_settings:
2584
3297
# Decide which value to use after restoring saved state.
2585
3298
# We have three different values: Old config file,
2586
3299
# new config file, and saved state.
2644
3357
for client_name in (set(client_settings)
2645
3358
- set(old_client_settings)):
2646
3359
clients_data[client_name] = client_settings[client_name]
2648
3361
# Create all client objects
2649
for client_name, client in clients_data.iteritems():
3362
for client_name, client in clients_data.items():
2650
3363
tcp_server.clients[client_name] = client_class(
2651
name = client_name, settings = client,
2652
server_settings = server_settings)
3366
server_settings=server_settings)
2654
3368
if not tcp_server.clients:
2655
3369
logger.warning("No clients defined")
2657
3371
if not foreground:
2658
3372
if pidfile is not None:
2662
pidfile.write(str(pid) + "\n".encode("utf-8"))
3376
print(pid, file=pidfile)
2663
3377
except IOError:
2664
3378
logger.error("Could not write to file %r with PID %d",
2665
3379
pidfilename, pid)
2667
3381
del pidfilename
2669
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2670
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3383
for termsig in (signal.SIGHUP, signal.SIGTERM):
3384
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3385
lambda: main_loop.quit() and False)
2673
@alternate_dbus_interfaces({"se.recompile.Mandos":
2674
"se.bsnet.fukt.Mandos"})
2675
class MandosDBusService(DBusObjectWithProperties):
3389
@alternate_dbus_interfaces(
3390
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3391
class MandosDBusService(DBusObjectWithObjectManager):
2676
3392
"""A D-Bus proxy object"""
2677
3394
def __init__(self):
2678
3395
dbus.service.Object.__init__(self, bus, "/")
2679
3397
_interface = "se.recompile.Mandos"
2681
@dbus_interface_annotations(_interface)
2683
return { "org.freedesktop.DBus.Property"
2684
".EmitsChangedSignal":
2687
3399
@dbus.service.signal(_interface, signature="o")
2688
3400
def ClientAdded(self, objpath):
2692
3404
@dbus.service.signal(_interface, signature="ss")
2693
def ClientNotFound(self, fingerprint, address):
3405
def ClientNotFound(self, key_id, address):
3409
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2697
3411
@dbus.service.signal(_interface, signature="os")
2698
3412
def ClientRemoved(self, objpath, name):
3416
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2702
3418
@dbus.service.method(_interface, out_signature="ao")
2703
3419
def GetAllClients(self):
2705
return dbus.Array(c.dbus_object_path
2707
tcp_server.clients.itervalues())
3421
return dbus.Array(c.dbus_object_path for c in
3422
tcp_server.clients.values())
3424
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2709
3426
@dbus.service.method(_interface,
2710
3427
out_signature="a{oa{sv}}")
2711
3428
def GetAllClientsWithProperties(self):
2713
3430
return dbus.Dictionary(
2714
((c.dbus_object_path, c.GetAll(""))
2715
for c in tcp_server.clients.itervalues()),
3431
{c.dbus_object_path: c.GetAll(
3432
"se.recompile.Mandos.Client")
3433
for c in tcp_server.clients.values()},
2716
3434
signature="oa{sv}")
2718
3436
@dbus.service.method(_interface, in_signature="o")
2719
3437
def RemoveClient(self, object_path):
2721
for c in tcp_server.clients.itervalues():
3439
for c in tcp_server.clients.values():
2722
3440
if c.dbus_object_path == object_path:
2723
3441
del tcp_server.clients[c.name]
2724
3442
c.remove_from_connection()
2725
# Don't signal anything except ClientRemoved
3443
# Don't signal the disabling
2726
3444
c.disable(quiet=True)
2728
self.ClientRemoved(object_path, c.name)
3445
# Emit D-Bus signal for removal
3446
self.client_removed_signal(c)
2730
3448
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,
2734
3488
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
2737
3496
"Cleanup function; run on exit"
2740
multiprocessing.active_children()
3500
mp.active_children()
2742
3502
if not (tcp_server.clients or client_settings):
2745
3505
# Store client before exiting. Secrets are encrypted with key
2746
3506
# based on what config file has. If config file is
2747
3507
# removed/edited, old secret will thus be unrecovable.
2749
3509
with PGPEngine() as pgp:
2750
for client in tcp_server.clients.itervalues():
3510
for client in tcp_server.clients.values():
2751
3511
key = client_settings[client.name]["secret"]
2752
3512
client.encrypted_secret = pgp.encrypt(client.secret,
2754
3514
client_dict = {}
2756
3516
# A list of attributes that can not be pickled
2758
exclude = set(("bus", "changedstate", "secret",
2759
"checker", "server_settings"))
2760
for name, typ in (inspect.getmembers
2761
(dbus.service.Object)):
3518
exclude = {"bus", "changedstate", "secret",
3519
"checker", "server_settings"}
3520
for name, typ in inspect.getmembers(dbus.service
2762
3522
exclude.add(name)
2764
3524
client_dict["encrypted_secret"] = (client
2765
3525
.encrypted_secret)
2766
3526
for attr in client.client_structure:
2767
3527
if attr not in exclude:
2768
3528
client_dict[attr] = getattr(client, attr)
2770
3530
clients[client.name] = client_dict
2771
3531
del client_settings[client.name]["secret"]
2774
with (tempfile.NamedTemporaryFile
2775
(mode='wb', suffix=".pickle", prefix='clients-',
2776
dir=os.path.dirname(stored_state_path),
2777
delete=False)) as stored_state:
2778
pickle.dump((clients, client_settings), stored_state)
2779
tempname=stored_state.name
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
2780
3543
os.rename(tempname, stored_state_path)
2781
3544
except (IOError, OSError) as e: