2
# -*- coding: utf-8; lexical-binding: t -*-
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-2022 Teddy Hogeborn
15
# Copyright © 2008-2022 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>.
34
34
from __future__ import (division, absolute_import, print_function,
38
from future_builtins import *
37
from future_builtins import *
39
import SocketServer as socketserver
48
import SocketServer as socketserver
55
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
63
59
import logging.handlers
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:
98
# Add collections.abc.Callable if it does not exist
100
collections.abc.Callable
101
except AttributeError:
103
Callable = collections.Callable
104
collections.abc = abc
107
# Add shlex.quote if it does not exist
110
except AttributeError:
111
shlex.quote = re.escape
113
# Show warnings by default
114
if not sys.warnoptions:
116
warnings.simplefilter("default")
118
# Try to find the value of SO_BINDTODEVICE:
120
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
121
# newer, and it is also the most natural place for it:
122
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
123
85
except AttributeError:
125
# This is where SO_BINDTODEVICE was up to and including Python
127
87
from IN import SO_BINDTODEVICE
128
88
except ImportError:
129
# In Python 2.7 it seems to have been removed entirely.
130
# Try running the C preprocessor:
132
cc = subprocess.Popen(["cc", "--language=c", "-E",
134
stdin=subprocess.PIPE,
135
stdout=subprocess.PIPE)
136
stdout = cc.communicate(
137
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
138
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
139
except (OSError, ValueError, IndexError):
141
SO_BINDTODEVICE = None
143
if sys.version_info < (3, 2):
144
configparser.Configparser = configparser.SafeConfigParser
89
SO_BINDTODEVICE = None
91
if sys.version_info.major == 2:
147
95
stored_state_file = "clients.pickle"
149
log = logging.getLogger(os.path.basename(sys.argv[0]))
150
logging.captureWarnings(True) # Show warnings via the logging system
97
logger = logging.getLogger()
154
if_nametoindex = ctypes.cdll.LoadLibrary(
155
ctypes.util.find_library("c")).if_nametoindex
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
156
104
except (OSError, AttributeError):
158
105
def if_nametoindex(interface):
159
106
"Get an interface index the hard way, i.e. using fcntl()"
160
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
265
183
.replace(b"\n", b"\\n")
266
184
.replace(b"\0", b"\\x00"))
269
187
def encrypt(self, data, password):
270
188
passphrase = self.password_encode(password)
271
with tempfile.NamedTemporaryFile(
272
dir=self.tempdir) as passfile:
189
with tempfile.NamedTemporaryFile(dir=self.tempdir
273
191
passfile.write(passphrase)
275
proc = subprocess.Popen([self.gpg, "--symmetric",
193
proc = subprocess.Popen(['gpg', '--symmetric',
278
196
+ self.gnupgargs,
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
197
stdin = subprocess.PIPE,
198
stdout = subprocess.PIPE,
199
stderr = subprocess.PIPE)
200
ciphertext, err = proc.communicate(input = data)
283
201
if proc.returncode != 0:
284
202
raise PGPError(err)
285
203
return ciphertext
287
205
def decrypt(self, data, password):
288
206
passphrase = self.password_encode(password)
289
with tempfile.NamedTemporaryFile(
290
dir=self.tempdir) as passfile:
207
with tempfile.NamedTemporaryFile(dir = self.tempdir
291
209
passfile.write(passphrase)
293
proc = subprocess.Popen([self.gpg, "--decrypt",
211
proc = subprocess.Popen(['gpg', '--decrypt',
296
214
+ self.gnupgargs,
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
215
stdin = subprocess.PIPE,
216
stdout = subprocess.PIPE,
217
stderr = subprocess.PIPE)
218
decrypted_plaintext, err = proc.communicate(input
301
220
if proc.returncode != 0:
302
221
raise PGPError(err)
303
222
return decrypted_plaintext
306
# Pretend that we have an Avahi module
308
"""This isn't so much a class as it is a module-like namespace."""
309
IF_UNSPEC = -1 # avahi-common/address.h
310
PROTO_UNSPEC = -1 # avahi-common/address.h
311
PROTO_INET = 0 # avahi-common/address.h
312
PROTO_INET6 = 1 # avahi-common/address.h
313
DBUS_NAME = "org.freedesktop.Avahi"
314
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
315
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
DBUS_PATH_SERVER = "/"
319
def string_array_to_txt_array(t):
320
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
for s in t), signature="ay")
322
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
323
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
324
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
325
SERVER_INVALID = 0 # avahi-common/defs.h
326
SERVER_REGISTERING = 1 # avahi-common/defs.h
327
SERVER_RUNNING = 2 # avahi-common/defs.h
328
SERVER_COLLISION = 3 # avahi-common/defs.h
329
SERVER_FAILURE = 4 # avahi-common/defs.h
332
225
class AvahiError(Exception):
333
226
def __init__(self, value, *args, **kwargs):
334
227
self.value = value
335
228
return super(AvahiError, self).__init__(value, *args,
339
231
class AvahiServiceError(AvahiError):
343
234
class AvahiGroupError(AvahiError):
238
class AvahiService(object):
348
239
"""An Avahi (Zeroconf) service.
351
242
interface: integer; avahi.IF_UNSPEC or an interface index.
352
243
Used to optionally bind to the specified interface.
353
name: string; Example: "Mandos"
354
type: string; Example: "_mandos._tcp".
244
name: string; Example: 'Mandos'
245
type: string; Example: '_mandos._tcp'.
355
246
See <https://www.iana.org/assignments/service-names-port-numbers>
356
247
port: integer; what port to announce
357
248
TXT: list of strings; TXT record for the service
516
386
follow_name_owner_changes=True),
517
387
avahi.DBUS_INTERFACE_SERVER)
518
388
self.server.connect_to_signal("StateChanged",
519
self.server_state_changed)
389
self.server_state_changed)
520
390
self.server_state_changed(self.server.GetState())
523
393
class AvahiServiceToSyslog(AvahiService):
524
def rename(self, *args, **kwargs):
525
395
"""Add the new name to the syslog messages"""
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
528
syslogger.setFormatter(logging.Formatter(
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
534
# Pretend that we have a GnuTLS module
536
"""This isn't so much a class as it is a module-like namespace."""
538
library = ctypes.util.find_library("gnutls")
540
library = ctypes.util.find_library("gnutls-deb0")
541
_library = ctypes.cdll.LoadLibrary(library)
544
# Unless otherwise indicated, the constants and types below are
545
# all from the gnutls/gnutls.h C header file.
556
E_NO_CERTIFICATE_FOUND = -49
561
KEYID_USE_SHA256 = 1 # gnutls/x509.h
562
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
565
class _session_int(ctypes.Structure):
567
session_t = ctypes.POINTER(_session_int)
569
class certificate_credentials_st(ctypes.Structure):
571
certificate_credentials_t = ctypes.POINTER(
572
certificate_credentials_st)
573
certificate_type_t = ctypes.c_int
575
class datum_t(ctypes.Structure):
576
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
("size", ctypes.c_uint)]
579
class _openpgp_crt_int(ctypes.Structure):
581
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
582
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
583
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
credentials_type_t = ctypes.c_int
585
transport_ptr_t = ctypes.c_void_p
586
close_request_t = ctypes.c_int
589
class Error(Exception):
590
def __init__(self, message=None, code=None, args=()):
591
# Default usage is by a message string, but if a return
592
# code is passed, convert it to a string with
595
if message is None and code is not None:
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
598
return super(gnutls.Error, self).__init__(
601
class CertificateSecurityError(Error):
605
def __init__(self, cls):
608
def from_param(self, obj):
609
if not isinstance(obj, self.cls):
610
raise TypeError("Not of type {}: {!r}"
611
.format(self.cls.__name__, obj))
612
return ctypes.byref(obj.from_param(obj))
614
class CastToVoidPointer:
615
def __init__(self, cls):
618
def from_param(self, obj):
619
if not isinstance(obj, self.cls):
620
raise TypeError("Not of type {}: {!r}"
621
.format(self.cls.__name__, obj))
622
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
624
class With_from_param:
626
def from_param(cls, obj):
627
return obj._as_parameter_
630
class Credentials(With_from_param):
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
634
self.type = gnutls.CRD_CERTIFICATE
637
gnutls.certificate_free_credentials(self)
639
class ClientSession(With_from_param):
640
def __init__(self, socket, credentials=None):
641
self._as_parameter_ = gnutls.session_t()
642
gnutls_flags = gnutls.CLIENT
643
if gnutls.check_version(b"3.5.6"):
644
gnutls_flags |= gnutls.NO_TICKETS
646
gnutls_flags |= gnutls.ENABLE_RAWPK
647
gnutls.init(self, gnutls_flags)
649
gnutls.set_default_priority(self)
650
gnutls.transport_set_ptr(self, socket.fileno())
651
gnutls.handshake_set_private_extensions(self, True)
653
if credentials is None:
654
credentials = gnutls.Credentials()
655
gnutls.credentials_set(self, credentials.type,
657
self.credentials = credentials
663
return gnutls.handshake(self)
665
def send(self, data):
669
data_len -= gnutls.record_send(self, data[-data_len:],
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
675
# Error handling functions
676
def _error_code(result):
677
"""A function to raise exceptions on errors, suitable
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
681
if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
raise gnutls.CertificateSecurityError(code=result)
683
raise gnutls.Error(code=result)
685
def _retry_on_error(result, func, arguments,
686
_error_code=_error_code):
687
"""A function to retry on some errors, suitable
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
690
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
return _error_code(result)
692
result = func(*arguments)
695
# Unless otherwise indicated, the function declarations below are
696
# all from the gnutls/gnutls.h C header file.
699
priority_set_direct = _library.gnutls_priority_set_direct
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
701
ctypes.POINTER(ctypes.c_char_p)]
702
priority_set_direct.restype = _error_code
704
init = _library.gnutls_init
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
706
init.restype = _error_code
708
set_default_priority = _library.gnutls_set_default_priority
709
set_default_priority.argtypes = [ClientSession]
710
set_default_priority.restype = _error_code
712
record_send = _library.gnutls_record_send
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
715
record_send.restype = ctypes.c_ssize_t
716
record_send.errcheck = _retry_on_error
718
certificate_allocate_credentials = (
719
_library.gnutls_certificate_allocate_credentials)
720
certificate_allocate_credentials.argtypes = [
721
PointerTo(Credentials)]
722
certificate_allocate_credentials.restype = _error_code
724
certificate_free_credentials = (
725
_library.gnutls_certificate_free_credentials)
726
certificate_free_credentials.argtypes = [Credentials]
727
certificate_free_credentials.restype = None
729
handshake_set_private_extensions = (
730
_library.gnutls_handshake_set_private_extensions)
731
handshake_set_private_extensions.argtypes = [ClientSession,
733
handshake_set_private_extensions.restype = None
735
credentials_set = _library.gnutls_credentials_set
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
738
credentials_set.restype = _error_code
740
strerror = _library.gnutls_strerror
741
strerror.argtypes = [ctypes.c_int]
742
strerror.restype = ctypes.c_char_p
744
certificate_type_get = _library.gnutls_certificate_type_get
745
certificate_type_get.argtypes = [ClientSession]
746
certificate_type_get.restype = _error_code
748
certificate_get_peers = _library.gnutls_certificate_get_peers
749
certificate_get_peers.argtypes = [ClientSession,
750
ctypes.POINTER(ctypes.c_uint)]
751
certificate_get_peers.restype = ctypes.POINTER(datum_t)
753
global_set_log_level = _library.gnutls_global_set_log_level
754
global_set_log_level.argtypes = [ctypes.c_int]
755
global_set_log_level.restype = None
757
global_set_log_function = _library.gnutls_global_set_log_function
758
global_set_log_function.argtypes = [log_func]
759
global_set_log_function.restype = None
761
deinit = _library.gnutls_deinit
762
deinit.argtypes = [ClientSession]
763
deinit.restype = None
765
handshake = _library.gnutls_handshake
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
768
handshake.errcheck = _retry_on_error
770
transport_set_ptr = _library.gnutls_transport_set_ptr
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
772
transport_set_ptr.restype = None
774
bye = _library.gnutls_bye
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
777
bye.errcheck = _retry_on_error
779
check_version = _library.gnutls_check_version
780
check_version.argtypes = [ctypes.c_char_p]
781
check_version.restype = ctypes.c_char_p
783
_need_version = b"3.3.0"
784
if check_version(_need_version) is None:
785
raise self.Error("Needs GnuTLS {} or later"
786
.format(_need_version))
788
_tls_rawpk_version = b"3.6.6"
789
has_rawpk = bool(check_version(_tls_rawpk_version))
793
class pubkey_st(ctypes.Structure):
795
pubkey_t = ctypes.POINTER(pubkey_st)
797
x509_crt_fmt_t = ctypes.c_int
799
# All the function declarations below are from
801
pubkey_init = _library.gnutls_pubkey_init
802
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
803
pubkey_init.restype = _error_code
805
pubkey_import = _library.gnutls_pubkey_import
806
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
808
pubkey_import.restype = _error_code
810
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
811
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
812
ctypes.POINTER(ctypes.c_ubyte),
813
ctypes.POINTER(ctypes.c_size_t)]
814
pubkey_get_key_id.restype = _error_code
816
pubkey_deinit = _library.gnutls_pubkey_deinit
817
pubkey_deinit.argtypes = [pubkey_t]
818
pubkey_deinit.restype = None
820
# All the function declarations below are from
823
openpgp_crt_init = _library.gnutls_openpgp_crt_init
824
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
825
openpgp_crt_init.restype = _error_code
827
openpgp_crt_import = _library.gnutls_openpgp_crt_import
828
openpgp_crt_import.argtypes = [openpgp_crt_t,
829
ctypes.POINTER(datum_t),
831
openpgp_crt_import.restype = _error_code
833
openpgp_crt_verify_self = \
834
_library.gnutls_openpgp_crt_verify_self
835
openpgp_crt_verify_self.argtypes = [
838
ctypes.POINTER(ctypes.c_uint),
840
openpgp_crt_verify_self.restype = _error_code
842
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
843
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
844
openpgp_crt_deinit.restype = None
846
openpgp_crt_get_fingerprint = (
847
_library.gnutls_openpgp_crt_get_fingerprint)
848
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
852
openpgp_crt_get_fingerprint.restype = _error_code
854
if check_version(b"3.6.4"):
855
certificate_type_get2 = _library.gnutls_certificate_type_get2
856
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
857
certificate_type_get2.restype = _error_code
859
# Remove non-public functions
860
del _error_code, _retry_on_error
863
def call_pipe(connection, # : multiprocessing.Connection
864
func, *args, **kwargs):
865
"""This function is meant to be called by multiprocessing.Process
867
This function runs func(*args, **kwargs), and writes the resulting
868
return value on the provided multiprocessing.Connection.
870
connection.send(func(*args, **kwargs))
404
class Client(object):
875
405
"""A representation of a client host served by this server.
878
approved: bool(); None if not yet approved/disapproved
408
approved: bool(); 'None' if not yet approved/disapproved
879
409
approval_delay: datetime.timedelta(); Time to wait for approval
880
410
approval_duration: datetime.timedelta(); Duration of one approval
881
checker: multiprocessing.Process(); a running checker process used
882
to see if the client lives. None if no process is
884
checker_callback_tag: a GLib event source tag, or None
411
checker: subprocess.Popen(); a running checker process used
412
to see if the client lives.
413
'None' if no process is running.
414
checker_callback_tag: a gobject event source tag, or None
885
415
checker_command: string; External command which is run to check
886
416
if client lives. %() expansions are done at
887
417
runtime with vars(self) as dict, so that for
888
418
instance %(name)s can be used in the command.
889
checker_initiator_tag: a GLib event source tag, or None
419
checker_initiator_tag: a gobject event source tag, or None
890
420
created: datetime.datetime(); (UTC) object creation
891
421
client_structure: Object describing what attributes a client has
892
422
and is used for storing the client at exit
893
423
current_checker_command: string; current running checker_command
894
disable_initiator_tag: a GLib event source tag, or None
424
disable_initiator_tag: a gobject event source tag, or None
896
426
fingerprint: string (40 or 32 hexadecimal digits); used to
897
uniquely identify an OpenPGP client
898
key_id: string (64 hexadecimal digits); used to uniquely identify
899
a client using raw public keys
427
uniquely identify the client
900
428
host: string; available for use by the checker command
901
429
interval: datetime.timedelta(); How often to start a new checker
902
430
last_approval_request: datetime.datetime(); (UTC) or None
1029
543
self.current_checker_command = None
1030
544
self.approved = None
1031
545
self.approvals_pending = 0
1032
self.changedstate = multiprocessing_manager.Condition(
1033
multiprocessing_manager.Lock())
1034
self.client_structure = [attr
1035
for attr in self.__dict__.keys()
546
self.changedstate = (multiprocessing_manager
547
.Condition(multiprocessing_manager
549
self.client_structure = [attr for attr in
550
self.__dict__.iterkeys()
1036
551
if not attr.startswith("_")]
1037
552
self.client_structure.append("client_structure")
1039
for name, t in inspect.getmembers(
1040
type(self), lambda obj: isinstance(obj, property)):
554
for name, t in inspect.getmembers(type(self),
1041
558
if not name.startswith("_"):
1042
559
self.client_structure.append(name)
1044
561
# Send notice to process children that client state has changed
1045
562
def send_changedstate(self):
1046
563
with self.changedstate:
1047
564
self.changedstate.notify_all()
1049
566
def enable(self):
1050
567
"""Start this client's checker and timeout hooks"""
1051
568
if getattr(self, "enabled", False):
1052
569
# Already enabled
571
self.expires = datetime.datetime.utcnow() + self.timeout
1054
572
self.enabled = True
1055
573
self.last_enabled = datetime.datetime.utcnow()
1056
574
self.init_checker()
1057
575
self.send_changedstate()
1059
577
def disable(self, quiet=True):
1060
578
"""Disable this client."""
1061
579
if not getattr(self, "enabled", False):
1064
log.info("Disabling client %s", self.name)
582
logger.info("Disabling client %s", self.name)
1065
583
if getattr(self, "disable_initiator_tag", None) is not None:
1066
GLib.source_remove(self.disable_initiator_tag)
584
gobject.source_remove(self.disable_initiator_tag)
1067
585
self.disable_initiator_tag = None
1068
586
self.expires = None
1069
587
if getattr(self, "checker_initiator_tag", None) is not None:
1070
GLib.source_remove(self.checker_initiator_tag)
588
gobject.source_remove(self.checker_initiator_tag)
1071
589
self.checker_initiator_tag = None
1072
590
self.stop_checker()
1073
591
self.enabled = False
1075
593
self.send_changedstate()
1076
# Do not run this again if called by a GLib.timeout_add
594
# Do not run this again if called by a gobject.timeout_add
1079
597
def __del__(self):
1082
def init_checker(self, randomize_start=False):
1083
# Schedule a new checker to be started a randomly selected
1084
# time (a fraction of 'interval') from now. This spreads out
1085
# the startup of checkers over time when the server is
600
def init_checker(self):
601
# Schedule a new checker to be started an 'interval' from now,
602
# and every interval from then on.
1087
603
if self.checker_initiator_tag is not None:
1088
GLib.source_remove(self.checker_initiator_tag)
1089
interval_milliseconds = int(self.interval.total_seconds()
1092
delay_milliseconds = random.randrange(
1093
interval_milliseconds + 1)
1095
delay_milliseconds = interval_milliseconds
1096
self.checker_initiator_tag = GLib.timeout_add(
1097
delay_milliseconds, self.start_checker, randomize_start)
1098
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1099
# A checker might take up to an 'interval' of time, so we can
1100
# expire at the soonest one interval after a checker was
1101
# started. Since the initial checker is delayed, the expire
1102
# time might have to be extended.
1103
now = datetime.datetime.utcnow()
1104
self.expires = now + delay + self.interval
1105
# Schedule a disable() at expire time
604
gobject.source_remove(self.checker_initiator_tag)
605
self.checker_initiator_tag = (gobject.timeout_add
607
.total_seconds() * 1000),
609
# Schedule a disable() when 'timeout' has passed
1106
610
if self.disable_initiator_tag is not None:
1107
GLib.source_remove(self.disable_initiator_tag)
1108
self.disable_initiator_tag = GLib.timeout_add(
1109
int((self.expires - now).total_seconds() * 1000),
1112
def checker_callback(self, source, condition, connection,
611
gobject.source_remove(self.disable_initiator_tag)
612
self.disable_initiator_tag = (gobject.timeout_add
614
.total_seconds() * 1000),
616
# Also start a new checker *right now*.
619
def checker_callback(self, pid, condition, command):
1114
620
"""The checker has completed, so take appropriate actions."""
1115
# Read return code from connection (see call_pipe)
1116
returncode = connection.recv()
1118
if self.checker is not None:
1120
621
self.checker_callback_tag = None
1121
622
self.checker = None
1124
self.last_checker_status = returncode
1125
self.last_checker_signal = None
623
if os.WIFEXITED(condition):
624
self.last_checker_status = os.WEXITSTATUS(condition)
1126
625
if self.last_checker_status == 0:
1127
log.info("Checker for %(name)s succeeded", vars(self))
626
logger.info("Checker for %(name)s succeeded",
1128
628
self.checked_ok()
1130
log.info("Checker for %(name)s failed", vars(self))
630
logger.info("Checker for %(name)s failed",
1132
633
self.last_checker_status = -1
1133
self.last_checker_signal = -returncode
1134
log.warning("Checker for %(name)s crashed?", vars(self))
634
logger.warning("Checker for %(name)s crashed?",
1137
637
def checked_ok(self):
1138
638
"""Assert that the client has been seen, alive and well."""
1139
639
self.last_checked_ok = datetime.datetime.utcnow()
1140
640
self.last_checker_status = 0
1141
self.last_checker_signal = None
1142
641
self.bump_timeout()
1144
643
def bump_timeout(self, timeout=None):
1145
644
"""Bump up the timeout for this client."""
1146
645
if timeout is None:
1147
646
timeout = self.timeout
1148
647
if self.disable_initiator_tag is not None:
1149
GLib.source_remove(self.disable_initiator_tag)
648
gobject.source_remove(self.disable_initiator_tag)
1150
649
self.disable_initiator_tag = None
1151
650
if getattr(self, "enabled", False):
1152
self.disable_initiator_tag = GLib.timeout_add(
1153
int(timeout.total_seconds() * 1000), self.disable)
651
self.disable_initiator_tag = (gobject.timeout_add
652
(int(timeout.total_seconds()
653
* 1000), self.disable))
1154
654
self.expires = datetime.datetime.utcnow() + timeout
1156
656
def need_approval(self):
1157
657
self.last_approval_request = datetime.datetime.utcnow()
1159
def start_checker(self, start_was_randomized=False):
659
def start_checker(self):
1160
660
"""Start a new checker subprocess if one is not running.
1162
662
If a checker already exists, leave it running and do
1164
664
# The reason for not killing a running checker is that if we
1169
669
# checkers alone, the checker would have to take more time
1170
670
# than 'timeout' for the client to be disabled, which is as it
1173
if self.checker is not None and not self.checker.is_alive():
1174
log.warning("Checker was not alive; joining")
673
# If a checker exists, make sure it is not a zombie
675
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
except AttributeError:
678
except OSError as error:
679
if error.errno != errno.ECHILD:
683
logger.warning("Checker was a zombie")
684
gobject.source_remove(self.checker_callback_tag)
685
self.checker_callback(pid, status,
686
self.current_checker_command)
1177
687
# Start a new checker if needed
1178
688
if self.checker is None:
1179
689
# Escape attributes for the shell
1181
attr: shlex.quote(str(getattr(self, attr)))
1182
for attr in self.runtime_expansions}
690
escaped_attrs = { attr:
691
re.escape(str(getattr(self, attr)))
692
for attr in self.runtime_expansions }
1184
694
command = self.checker_command % escaped_attrs
1185
695
except TypeError as error:
1186
log.error('Could not format string "%s"',
1187
self.checker_command, exc_info=error)
1188
return True # Try again later
696
logger.error('Could not format string "%s"',
697
self.checker_command, exc_info=error)
698
return True # Try again later
1189
699
self.current_checker_command = command
1190
log.info("Starting checker %r for %s", command, self.name)
1191
# We don't need to redirect stdout and stderr, since
1192
# in normal mode, that is already done by daemon(),
1193
# and in debug mode we don't want to. (Stdin is
1194
# always replaced by /dev/null.)
1195
# The exception is when not debugging but nevertheless
1196
# running in the foreground; use the previously
1198
popen_args = {"close_fds": True,
1201
if (not self.server_settings["debug"]
1202
and self.server_settings["foreground"]):
1203
popen_args.update({"stdout": wnull,
1205
pipe = multiprocessing.Pipe(duplex=False)
1206
self.checker = multiprocessing.Process(
1208
args=(pipe[1], subprocess.call, command),
1210
self.checker.start()
1211
self.checker_callback_tag = GLib.io_add_watch(
1212
GLib.IOChannel.unix_new(pipe[0].fileno()),
1213
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1214
self.checker_callback, pipe[0], command)
1215
if start_was_randomized:
1216
# We were started after a random delay; Schedule a new
1217
# checker to be started an 'interval' from now, and every
1218
# interval from then on.
1219
now = datetime.datetime.utcnow()
1220
self.checker_initiator_tag = GLib.timeout_add(
1221
int(self.interval.total_seconds() * 1000),
1223
self.expires = max(self.expires, now + self.interval)
1224
# Don't start a new checker again after same random delay
1226
# Re-run this periodically if run by GLib.timeout_add
701
logger.info("Starting checker %r for %s",
703
# We don't need to redirect stdout and stderr, since
704
# in normal mode, that is already done by daemon(),
705
# and in debug mode we don't want to. (Stdin is
706
# always replaced by /dev/null.)
707
# The exception is when not debugging but nevertheless
708
# running in the foreground; use the previously
711
if (not self.server_settings["debug"]
712
and self.server_settings["foreground"]):
713
popen_args.update({"stdout": wnull,
715
self.checker = subprocess.Popen(command,
719
except OSError as error:
720
logger.error("Failed to start subprocess",
723
self.checker_callback_tag = (gobject.child_watch_add
725
self.checker_callback,
727
# The checker may have completed before the gobject
728
# watch was added. Check for this.
730
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
731
except OSError as error:
732
if error.errno == errno.ECHILD:
733
# This should never happen
734
logger.error("Child process vanished",
739
gobject.source_remove(self.checker_callback_tag)
740
self.checker_callback(pid, status, command)
741
# Re-run this periodically if run by gobject.timeout_add
1229
744
def stop_checker(self):
1230
745
"""Force the checker process, if any, to stop."""
1231
746
if self.checker_callback_tag:
1232
GLib.source_remove(self.checker_callback_tag)
747
gobject.source_remove(self.checker_callback_tag)
1233
748
self.checker_callback_tag = None
1234
749
if getattr(self, "checker", None) is None:
1236
log.debug("Stopping checker for %(name)s", vars(self))
1237
self.checker.terminate()
751
logger.debug("Stopping checker for %(name)s", vars(self))
753
self.checker.terminate()
755
#if self.checker.poll() is None:
756
# self.checker.kill()
757
except OSError as error:
758
if error.errno != errno.ESRCH: # No such process
1238
760
self.checker = None
1241
def dbus_service_property(dbus_interface,
763
def dbus_service_property(dbus_interface, signature="v",
764
access="readwrite", byte_arrays=False):
1245
765
"""Decorators for marking methods of a DBusObjectWithProperties to
1246
766
become properties on the D-Bus.
1248
768
The decorated method will be called with no arguments by "Get"
1249
769
and with one argument by "Set".
1251
771
The parameters, where they are supported, are the same as
1252
772
dbus.service.method, except there is only "signature", since the
1253
773
type from Get() and the type sent to Set() is the same.
1336
class DBusObjectWithAnnotations(dbus.service.Object):
1337
"""A D-Bus object with annotations.
1339
Classes inheriting from this can use the dbus_annotations
1340
decorator to add annotations to methods or signals.
847
class DBusObjectWithProperties(dbus.service.Object):
848
"""A D-Bus object with properties.
850
Classes inheriting from this can use the dbus_service_property
851
decorator to expose methods as D-Bus properties. It exposes the
852
standard Get(), Set(), and GetAll() methods on the D-Bus.
1344
856
def _is_dbus_thing(thing):
1345
857
"""Returns a function testing if an attribute is a D-Bus thing
1347
859
If called like _is_dbus_thing("method") it returns a function
1348
860
suitable for use as predicate to inspect.getmembers().
1350
862
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1353
865
def _get_all_dbus_things(self, thing):
1354
866
"""Returns a generator of (name, attribute) pairs
1356
return ((getattr(athing.__get__(self), "_dbus_name", name),
868
return ((getattr(athing.__get__(self), "_dbus_name",
1357
870
athing.__get__(self))
1358
871
for cls in self.__class__.__mro__
1359
872
for name, athing in
1360
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1362
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1364
path_keyword="object_path",
1365
connection_keyword="connection")
1366
def Introspect(self, object_path, connection):
1367
"""Overloading of standard D-Bus method.
1369
Inserts annotation tags on methods and signals.
1371
xmlstring = dbus.service.Object.Introspect(self, object_path,
1374
document = xml.dom.minidom.parseString(xmlstring)
1376
for if_tag in document.getElementsByTagName("interface"):
1377
# Add annotation tags
1378
for typ in ("method", "signal"):
1379
for tag in if_tag.getElementsByTagName(typ):
1381
for name, prop in (self.
1382
_get_all_dbus_things(typ)):
1383
if (name == tag.getAttribute("name")
1384
and prop._dbus_interface
1385
== if_tag.getAttribute("name")):
1386
annots.update(getattr(
1387
prop, "_dbus_annotations", {}))
1388
for name, value in annots.items():
1389
ann_tag = document.createElement(
1391
ann_tag.setAttribute("name", name)
1392
ann_tag.setAttribute("value", value)
1393
tag.appendChild(ann_tag)
1394
# Add interface annotation tags
1395
for annotation, value in dict(
1396
itertools.chain.from_iterable(
1397
annotations().items()
1398
for name, annotations
1399
in self._get_all_dbus_things("interface")
1400
if name == if_tag.getAttribute("name")
1402
ann_tag = document.createElement("annotation")
1403
ann_tag.setAttribute("name", annotation)
1404
ann_tag.setAttribute("value", value)
1405
if_tag.appendChild(ann_tag)
1406
# Fix argument name for the Introspect method itself
1407
if (if_tag.getAttribute("name")
1408
== dbus.INTROSPECTABLE_IFACE):
1409
for cn in if_tag.getElementsByTagName("method"):
1410
if cn.getAttribute("name") == "Introspect":
1411
for arg in cn.getElementsByTagName("arg"):
1412
if (arg.getAttribute("direction")
1414
arg.setAttribute("name",
1416
xmlstring = document.toxml("utf-8")
1418
except (AttributeError, xml.dom.DOMException,
1419
xml.parsers.expat.ExpatError) as error:
1420
log.error("Failed to override Introspection method",
1425
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1426
"""A D-Bus object with properties.
1428
Classes inheriting from this can use the dbus_service_property
1429
decorator to expose methods as D-Bus properties. It exposes the
1430
standard Get(), Set(), and GetAll() methods on the D-Bus.
873
inspect.getmembers(cls,
874
self._is_dbus_thing(thing)))
1433
876
def _get_dbus_property(self, interface_name, property_name):
1434
877
"""Returns a bound method if one exists which is a D-Bus
1435
878
property with the specified name and interface.
1437
for cls in self.__class__.__mro__:
1438
for name, value in inspect.getmembers(
1439
cls, self._is_dbus_thing("property")):
880
for cls in self.__class__.__mro__:
881
for name, value in (inspect.getmembers
883
self._is_dbus_thing("property"))):
1440
884
if (value._dbus_name == property_name
1441
885
and value._dbus_interface == interface_name):
1442
886
return value.__get__(self)
1444
888
# No such property
1445
raise DBusPropertyNotFound("{}:{}.{}".format(
1446
self.dbus_object_path, interface_name, property_name))
1449
def _get_all_interface_names(cls):
1450
"""Get a sequence of all interfaces supported by an object"""
1451
return (name for name in set(getattr(getattr(x, attr),
1452
"_dbus_interface", None)
1453
for x in (inspect.getmro(cls))
1455
if name is not None)
1457
@dbus.service.method(dbus.PROPERTIES_IFACE,
889
raise DBusPropertyNotFound(self.dbus_object_path + ":"
890
+ interface_name + "."
893
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1459
894
out_signature="v")
1460
895
def Get(self, interface_name, property_name):
1461
896
"""Standard D-Bus property Get() method, see D-Bus standard.
1584
1023
document.unlink()
1585
1024
except (AttributeError, xml.dom.DOMException,
1586
1025
xml.parsers.expat.ExpatError) as error:
1587
log.error("Failed to override Introspection method",
1593
dbus.OBJECT_MANAGER_IFACE
1594
except AttributeError:
1595
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1598
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1599
"""A D-Bus object with an ObjectManager.
1601
Classes inheriting from this exposes the standard
1602
GetManagedObjects call and the InterfacesAdded and
1603
InterfacesRemoved signals on the standard
1604
"org.freedesktop.DBus.ObjectManager" interface.
1606
Note: No signals are sent automatically; they must be sent
1609
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1610
out_signature="a{oa{sa{sv}}}")
1611
def GetManagedObjects(self):
1612
"""This function must be overridden"""
1613
raise NotImplementedError()
1615
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1616
signature="oa{sa{sv}}")
1617
def InterfacesAdded(self, object_path, interfaces_and_properties):
1620
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1621
def InterfacesRemoved(self, object_path, interfaces):
1624
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1626
path_keyword="object_path",
1627
connection_keyword="connection")
1628
def Introspect(self, object_path, connection):
1629
"""Overloading of standard D-Bus method.
1631
Override return argument name of GetManagedObjects to be
1632
"objpath_interfaces_and_properties"
1634
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1638
document = xml.dom.minidom.parseString(xmlstring)
1640
for if_tag in document.getElementsByTagName("interface"):
1641
# Fix argument name for the GetManagedObjects method
1642
if (if_tag.getAttribute("name")
1643
== dbus.OBJECT_MANAGER_IFACE):
1644
for cn in if_tag.getElementsByTagName("method"):
1645
if (cn.getAttribute("name")
1646
== "GetManagedObjects"):
1647
for arg in cn.getElementsByTagName("arg"):
1648
if (arg.getAttribute("direction")
1652
"objpath_interfaces"
1654
xmlstring = document.toxml("utf-8")
1656
except (AttributeError, xml.dom.DOMException,
1657
xml.parsers.expat.ExpatError) as error:
1658
log.error("Failed to override Introspection method",
1026
logger.error("Failed to override Introspection method",
1660
1028
return xmlstring
1663
1031
def datetime_to_dbus(dt, variant_level=0):
1664
1032
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1666
return dbus.String("", variant_level=variant_level)
1667
return dbus.String(dt.isoformat(), variant_level=variant_level)
1034
return dbus.String("", variant_level = variant_level)
1035
return dbus.String(dt.isoformat(),
1036
variant_level=variant_level)
1670
1039
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
2031
1389
server to mandos-client
2035
1393
# Rejected - signal
2036
1394
@dbus.service.signal(_interface, signature="s")
2037
1395
def Rejected(self, reason):
2041
1399
# NeedApproval - signal
2042
1400
@dbus.service.signal(_interface, signature="tb")
2043
1401
def NeedApproval(self, timeout, default):
2045
1403
return self.need_approval()
2049
1407
# Approve - method
2050
1408
@dbus.service.method(_interface, in_signature="b")
2051
1409
def Approve(self, value):
2052
1410
self.approve(value)
2054
1412
# CheckedOK - method
2055
1413
@dbus.service.method(_interface)
2056
1414
def CheckedOK(self):
2057
1415
self.checked_ok()
2059
1417
# Enable - method
2060
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2061
1418
@dbus.service.method(_interface)
2062
1419
def Enable(self):
2066
1423
# StartChecker - method
2067
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2068
1424
@dbus.service.method(_interface)
2069
1425
def StartChecker(self):
2071
1427
self.start_checker()
2073
1429
# Disable - method
2074
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2075
1430
@dbus.service.method(_interface)
2076
1431
def Disable(self):
2080
1435
# StopChecker - method
2081
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2082
1436
@dbus.service.method(_interface)
2083
1437
def StopChecker(self):
2084
1438
self.stop_checker()
2088
1442
# ApprovalPending - property
2089
1443
@dbus_service_property(_interface, signature="b", access="read")
2090
1444
def ApprovalPending_dbus_property(self):
2091
1445
return dbus.Boolean(bool(self.approvals_pending))
2093
1447
# ApprovedByDefault - property
2094
@dbus_service_property(_interface,
1448
@dbus_service_property(_interface, signature="b",
2096
1449
access="readwrite")
2097
1450
def ApprovedByDefault_dbus_property(self, value=None):
2098
1451
if value is None: # get
2099
1452
return dbus.Boolean(self.approved_by_default)
2100
1453
self.approved_by_default = bool(value)
2102
1455
# ApprovalDelay - property
2103
@dbus_service_property(_interface,
1456
@dbus_service_property(_interface, signature="t",
2105
1457
access="readwrite")
2106
1458
def ApprovalDelay_dbus_property(self, value=None):
2107
1459
if value is None: # get
2108
1460
return dbus.UInt64(self.approval_delay.total_seconds()
2110
1462
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2112
1464
# ApprovalDuration - property
2113
@dbus_service_property(_interface,
1465
@dbus_service_property(_interface, signature="t",
2115
1466
access="readwrite")
2116
1467
def ApprovalDuration_dbus_property(self, value=None):
2117
1468
if value is None: # get
2118
1469
return dbus.UInt64(self.approval_duration.total_seconds()
2120
1471
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2122
1473
# Name - property
2124
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2125
1474
@dbus_service_property(_interface, signature="s", access="read")
2126
1475
def Name_dbus_property(self):
2127
1476
return dbus.String(self.name)
2131
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2132
@dbus_service_property(_interface, signature="s", access="read")
2133
def KeyID_dbus_property(self):
2134
return dbus.String(self.key_id)
2136
1478
# Fingerprint - property
2138
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2139
1479
@dbus_service_property(_interface, signature="s", access="read")
2140
1480
def Fingerprint_dbus_property(self):
2141
1481
return dbus.String(self.fingerprint)
2143
1483
# Host - property
2144
@dbus_service_property(_interface,
1484
@dbus_service_property(_interface, signature="s",
2146
1485
access="readwrite")
2147
1486
def Host_dbus_property(self, value=None):
2148
1487
if value is None: # get
2149
1488
return dbus.String(self.host)
2150
1489
self.host = str(value)
2152
1491
# Created - property
2154
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2155
1492
@dbus_service_property(_interface, signature="s", access="read")
2156
1493
def Created_dbus_property(self):
2157
1494
return datetime_to_dbus(self.created)
2159
1496
# LastEnabled - property
2160
1497
@dbus_service_property(_interface, signature="s", access="read")
2161
1498
def LastEnabled_dbus_property(self):
2162
1499
return datetime_to_dbus(self.last_enabled)
2164
1501
# Enabled - property
2165
@dbus_service_property(_interface,
1502
@dbus_service_property(_interface, signature="b",
2167
1503
access="readwrite")
2168
1504
def Enabled_dbus_property(self, value=None):
2169
1505
if value is None: # get
2270
1602
self.start_checker()
2272
1604
self.stop_checker()
2274
1606
# ObjectPath - property
2276
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2277
"org.freedesktop.DBus.Deprecated": "true"})
2278
1607
@dbus_service_property(_interface, signature="o", access="read")
2279
1608
def ObjectPath_dbus_property(self):
2280
return self.dbus_object_path # is already a dbus.ObjectPath
1609
return self.dbus_object_path # is already a dbus.ObjectPath
2282
1611
# Secret = property
2284
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2286
@dbus_service_property(_interface,
1612
@dbus_service_property(_interface, signature="ay",
1613
access="write", byte_arrays=True)
2290
1614
def Secret_dbus_property(self, value):
2291
1615
self.secret = bytes(value)
2297
def __init__(self, child_pipe, key_id, fpr, address):
1620
class ProxyClient(object):
1621
def __init__(self, child_pipe, fpr, address):
2298
1622
self._pipe = child_pipe
2299
self._pipe.send(("init", key_id, fpr, address))
1623
self._pipe.send(('init', fpr, address))
2300
1624
if not self._pipe.recv():
2301
raise KeyError(key_id or fpr)
2303
1627
def __getattribute__(self, name):
2305
1629
return super(ProxyClient, self).__getattribute__(name)
2306
self._pipe.send(("getattr", name))
1630
self._pipe.send(('getattr', name))
2307
1631
data = self._pipe.recv()
2308
if data[0] == "data":
1632
if data[0] == 'data':
2310
if data[0] == "function":
1634
if data[0] == 'function':
2312
1635
def func(*args, **kwargs):
2313
self._pipe.send(("funcall", name, args, kwargs))
1636
self._pipe.send(('funcall', name, args, kwargs))
2314
1637
return self._pipe.recv()[1]
2318
1640
def __setattr__(self, name, value):
2320
1642
return super(ProxyClient, self).__setattr__(name, value)
2321
self._pipe.send(("setattr", name, value))
1643
self._pipe.send(('setattr', name, value))
2324
1646
class ClientHandler(socketserver.BaseRequestHandler, object):
2325
1647
"""A class to handle client connections.
2327
1649
Instantiated once for each connection to handle it.
2328
1650
Note: This will run in its own forked process."""
2330
1652
def handle(self):
2331
1653
with contextlib.closing(self.server.child_pipe) as child_pipe:
2332
log.info("TCP connection from: %s",
2333
str(self.client_address))
2334
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2336
session = gnutls.ClientSession(self.request)
2338
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2339
# "+AES-256-CBC", "+SHA1",
2340
# "+COMP-NULL", "+CTYPE-OPENPGP",
1654
logger.info("TCP connection from: %s",
1655
str(self.client_address))
1656
logger.debug("Pipe FD: %d",
1657
self.server.child_pipe.fileno())
1659
session = (gnutls.connection
1660
.ClientSession(self.request,
1662
.X509Credentials()))
1664
# Note: gnutls.connection.X509Credentials is really a
1665
# generic GnuTLS certificate credentials object so long as
1666
# no X.509 keys are added to it. Therefore, we can use it
1667
# here despite using OpenPGP certificates.
1669
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1670
# "+AES-256-CBC", "+SHA1",
1671
# "+COMP-NULL", "+CTYPE-OPENPGP",
2342
1673
# Use a fallback default, since this MUST be set.
2343
1674
priority = self.server.gnutls_priority
2344
1675
if priority is None:
2345
1676
priority = "NORMAL"
2346
gnutls.priority_set_direct(session,
2347
priority.encode("utf-8"), None)
1677
(gnutls.library.functions
1678
.gnutls_priority_set_direct(session._c_object,
2349
1681
# Start communication using the Mandos protocol
2350
1682
# Get protocol number
2351
1683
line = self.request.makefile().readline()
2352
log.debug("Protocol version: %r", line)
1684
logger.debug("Protocol version: %r", line)
2354
1686
if int(line.strip().split()[0]) > 1:
2355
1687
raise RuntimeError(line)
2356
1688
except (ValueError, IndexError, RuntimeError) as error:
2357
log.error("Unknown protocol version: %s", error)
1689
logger.error("Unknown protocol version: %s", error)
2360
1692
# Start GnuTLS connection
2362
1694
session.handshake()
2363
except gnutls.Error as error:
2364
log.warning("Handshake failed: %s", error)
1695
except gnutls.errors.GNUTLSError as error:
1696
logger.warning("Handshake failed: %s", error)
2365
1697
# Do not run session.bye() here: the session is not
2366
1698
# established. Just abandon the request.
2368
log.debug("Handshake succeeded")
1700
logger.debug("Handshake succeeded")
2370
1702
approval_required = False
2372
if gnutls.has_rawpk:
2375
key_id = self.key_id(
2376
self.peer_certificate(session))
2377
except (TypeError, gnutls.Error) as error:
2378
log.warning("Bad certificate: %s", error)
2380
log.debug("Key ID: %s",
2381
key_id.decode("utf-8",
2387
fpr = self.fingerprint(
2388
self.peer_certificate(session))
2389
except (TypeError, gnutls.Error) as error:
2390
log.warning("Bad certificate: %s", error)
2392
log.debug("Fingerprint: %s", fpr)
2395
client = ProxyClient(child_pipe, key_id, fpr,
1705
fpr = self.fingerprint(self.peer_certificate
1708
gnutls.errors.GNUTLSError) as error:
1709
logger.warning("Bad certificate: %s", error)
1711
logger.debug("Fingerprint: %s", fpr)
1714
client = ProxyClient(child_pipe, fpr,
2396
1715
self.client_address)
2397
1716
except KeyError:
2400
1719
if client.approval_delay:
2401
1720
delay = client.approval_delay
2402
1721
client.approvals_pending += 1
2403
1722
approval_required = True
2406
1725
if not client.enabled:
2407
log.info("Client %s is disabled", client.name)
1726
logger.info("Client %s is disabled",
2408
1728
if self.server.use_dbus:
2409
1729
# Emit D-Bus signal
2410
1730
client.Rejected("Disabled")
2413
1733
if client.approved or not client.approval_delay:
2414
# We are approved or approval is disabled
1734
#We are approved or approval is disabled
2416
1736
elif client.approved is None:
2417
log.info("Client %s needs approval",
1737
logger.info("Client %s needs approval",
2419
1739
if self.server.use_dbus:
2420
1740
# Emit D-Bus signal
2421
1741
client.NeedApproval(
2422
1742
client.approval_delay.total_seconds()
2423
1743
* 1000, client.approved_by_default)
2425
log.warning("Client %s was not approved",
1745
logger.warning("Client %s was not approved",
2427
1747
if self.server.use_dbus:
2428
1748
# Emit D-Bus signal
2429
1749
client.Rejected("Denied")
2432
# wait until timeout or approved
1752
#wait until timeout or approved
2433
1753
time = datetime.datetime.now()
2434
1754
client.changedstate.acquire()
2435
1755
client.changedstate.wait(delay.total_seconds())
2450
1770
delay -= time2 - time
2453
session.send(client.secret)
2454
except gnutls.Error as error:
2455
log.warning("gnutls send failed", exc_info=error)
2458
log.info("Sending secret to %s", client.name)
1773
while sent_size < len(client.secret):
1775
sent = session.send(client.secret[sent_size:])
1776
except gnutls.errors.GNUTLSError as error:
1777
logger.warning("gnutls send failed",
1780
logger.debug("Sent: %d, remaining: %d",
1781
sent, len(client.secret)
1782
- (sent_size + sent))
1785
logger.info("Sending secret to %s", client.name)
2459
1786
# bump the timeout using extended_timeout
2460
1787
client.bump_timeout(client.extended_timeout)
2461
1788
if self.server.use_dbus:
2462
1789
# Emit D-Bus signal
2463
1790
client.GotSecret()
2466
1793
if approval_required:
2467
1794
client.approvals_pending -= 1
2470
except gnutls.Error as error:
2471
log.warning("GnuTLS bye failed", exc_info=error)
1797
except gnutls.errors.GNUTLSError as error:
1798
logger.warning("GnuTLS bye failed",
2474
1802
def peer_certificate(session):
2475
"Return the peer's certificate as a bytestring"
2477
cert_type = gnutls.certificate_type_get2(
2478
session, gnutls.CTYPE_PEERS)
2479
except AttributeError:
2480
cert_type = gnutls.certificate_type_get(session)
2481
if gnutls.has_rawpk:
2482
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2484
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2485
# If not a valid certificate type...
2486
if cert_type not in valid_cert_types:
2487
log.info("Cert type %r not in %r", cert_type,
2489
# ...return invalid data
1803
"Return the peer's OpenPGP certificate as a bytestring"
1804
# If not an OpenPGP certificate...
1805
if (gnutls.library.functions
1806
.gnutls_certificate_type_get(session._c_object)
1807
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1808
# ...do the normal thing
1809
return session.peer_certificate
2491
1810
list_size = ctypes.c_uint(1)
2492
cert_list = (gnutls.certificate_get_peers
2493
(session, ctypes.byref(list_size)))
1811
cert_list = (gnutls.library.functions
1812
.gnutls_certificate_get_peers
1813
(session._c_object, ctypes.byref(list_size)))
2494
1814
if not bool(cert_list) and list_size.value != 0:
2495
raise gnutls.Error("error getting peer certificate")
1815
raise gnutls.errors.GNUTLSError("error getting peer"
2496
1817
if list_size.value == 0:
2498
1819
cert = cert_list[0]
2499
1820
return ctypes.string_at(cert.data, cert.size)
2502
def key_id(certificate):
2503
"Convert a certificate bytestring to a hexdigit key ID"
2504
# New GnuTLS "datum" with the public key
2505
datum = gnutls.datum_t(
2506
ctypes.cast(ctypes.c_char_p(certificate),
2507
ctypes.POINTER(ctypes.c_ubyte)),
2508
ctypes.c_uint(len(certificate)))
2509
# XXX all these need to be created in the gnutls "module"
2510
# New empty GnuTLS certificate
2511
pubkey = gnutls.pubkey_t()
2512
gnutls.pubkey_init(ctypes.byref(pubkey))
2513
# Import the raw public key into the certificate
2514
gnutls.pubkey_import(pubkey,
2515
ctypes.byref(datum),
2516
gnutls.X509_FMT_DER)
2517
# New buffer for the key ID
2518
buf = ctypes.create_string_buffer(32)
2519
buf_len = ctypes.c_size_t(len(buf))
2520
# Get the key ID from the raw public key into the buffer
2521
gnutls.pubkey_get_key_id(
2523
gnutls.KEYID_USE_SHA256,
2524
ctypes.cast(ctypes.byref(buf),
2525
ctypes.POINTER(ctypes.c_ubyte)),
2526
ctypes.byref(buf_len))
2527
# Deinit the certificate
2528
gnutls.pubkey_deinit(pubkey)
2530
# Convert the buffer to a Python bytestring
2531
key_id = ctypes.string_at(buf, buf_len.value)
2532
# Convert the bytestring to hexadecimal notation
2533
hex_key_id = binascii.hexlify(key_id).upper()
2537
1823
def fingerprint(openpgp):
2538
1824
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2539
1825
# New GnuTLS "datum" with the OpenPGP public key
2540
datum = gnutls.datum_t(
2541
ctypes.cast(ctypes.c_char_p(openpgp),
2542
ctypes.POINTER(ctypes.c_ubyte)),
2543
ctypes.c_uint(len(openpgp)))
1826
datum = (gnutls.library.types
1827
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1830
ctypes.c_uint(len(openpgp))))
2544
1831
# New empty GnuTLS certificate
2545
crt = gnutls.openpgp_crt_t()
2546
gnutls.openpgp_crt_init(ctypes.byref(crt))
1832
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1833
(gnutls.library.functions
1834
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2547
1835
# Import the OpenPGP public key into the certificate
2548
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2549
gnutls.OPENPGP_FMT_RAW)
1836
(gnutls.library.functions
1837
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1838
gnutls.library.constants
1839
.GNUTLS_OPENPGP_FMT_RAW))
2550
1840
# Verify the self signature in the key
2551
1841
crtverify = ctypes.c_uint()
2552
gnutls.openpgp_crt_verify_self(crt, 0,
2553
ctypes.byref(crtverify))
1842
(gnutls.library.functions
1843
.gnutls_openpgp_crt_verify_self(crt, 0,
1844
ctypes.byref(crtverify)))
2554
1845
if crtverify.value != 0:
2555
gnutls.openpgp_crt_deinit(crt)
2556
raise gnutls.CertificateSecurityError(code
1846
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1847
raise (gnutls.errors.CertificateSecurityError
2558
1849
# New buffer for the fingerprint
2559
1850
buf = ctypes.create_string_buffer(20)
2560
1851
buf_len = ctypes.c_size_t()
2561
1852
# Get the fingerprint from the certificate into the buffer
2562
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2563
ctypes.byref(buf_len))
1853
(gnutls.library.functions
1854
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1855
ctypes.byref(buf_len)))
2564
1856
# Deinit the certificate
2565
gnutls.openpgp_crt_deinit(crt)
1857
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2566
1858
# Convert the buffer to a Python bytestring
2567
1859
fpr = ctypes.string_at(buf, buf_len.value)
2568
1860
# Convert the bytestring to hexadecimal notation
2657
1943
# socket_wrapper(), if socketfd was set.
2658
1944
socketserver.TCPServer.__init__(self, server_address,
2659
1945
RequestHandlerClass)
2661
1947
def server_bind(self):
2662
1948
"""This overrides the normal server_bind() function
2663
1949
to bind to an interface if one was specified, and also NOT to
2664
1950
bind to an address or port if they were not specified."""
2665
global SO_BINDTODEVICE
2666
1951
if self.interface is not None:
2667
1952
if SO_BINDTODEVICE is None:
2668
# Fall back to a hard-coded value which seems to be
2670
log.warning("SO_BINDTODEVICE not found, trying 25")
2671
SO_BINDTODEVICE = 25
2673
self.socket.setsockopt(
2674
socket.SOL_SOCKET, SO_BINDTODEVICE,
2675
(self.interface + "\0").encode("utf-8"))
2676
except socket.error as error:
2677
if error.errno == errno.EPERM:
2678
log.error("No permission to bind to interface %s",
2680
elif error.errno == errno.ENOPROTOOPT:
2681
log.error("SO_BINDTODEVICE not available; cannot"
2682
" bind to interface %s", self.interface)
2683
elif error.errno == errno.ENODEV:
2684
log.error("Interface %s does not exist, cannot"
2685
" bind", self.interface)
1953
logger.error("SO_BINDTODEVICE does not exist;"
1954
" cannot bind to interface %s",
1958
self.socket.setsockopt(socket.SOL_SOCKET,
1960
(self.interface + "\0")
1962
except socket.error as error:
1963
if error.errno == errno.EPERM:
1964
logger.error("No permission to bind to"
1965
" interface %s", self.interface)
1966
elif error.errno == errno.ENOPROTOOPT:
1967
logger.error("SO_BINDTODEVICE not available;"
1968
" cannot bind to interface %s",
1970
elif error.errno == errno.ENODEV:
1971
logger.error("Interface %s does not exist,"
1972
" cannot bind", self.interface)
2688
1975
# Only bind(2) the socket if we really need to.
2689
1976
if self.server_address[0] or self.server_address[1]:
2690
if self.server_address[1]:
2691
self.allow_reuse_address = True
2692
1977
if not self.server_address[0]:
2693
1978
if self.address_family == socket.AF_INET6:
2694
any_address = "::" # in6addr_any
1979
any_address = "::" # in6addr_any
2696
any_address = "0.0.0.0" # INADDR_ANY
1981
any_address = "0.0.0.0" # INADDR_ANY
2697
1982
self.server_address = (any_address,
2698
1983
self.server_address[1])
2699
1984
elif not self.server_address[1]:
2700
self.server_address = (self.server_address[0], 0)
1985
self.server_address = (self.server_address[0],
2701
1987
# if self.interface:
2702
1988
# self.server_address = (self.server_address[0],
2733
2014
self.gnutls_priority = gnutls_priority
2734
2015
IPv6_TCPServer.__init__(self, server_address,
2735
2016
RequestHandlerClass,
2736
interface=interface,
2017
interface = interface,
2018
use_ipv6 = use_ipv6,
2019
socketfd = socketfd)
2740
2020
def server_activate(self):
2741
2021
if self.enabled:
2742
2022
return socketserver.TCPServer.server_activate(self)
2744
2024
def enable(self):
2745
2025
self.enabled = True
2747
2027
def add_pipe(self, parent_pipe, proc):
2748
2028
# Call "handle_ipc" for both data and EOF events
2750
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2751
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2752
functools.partial(self.handle_ipc,
2753
parent_pipe=parent_pipe,
2756
def handle_ipc(self, source, condition,
2759
client_object=None):
2029
gobject.io_add_watch(parent_pipe.fileno(),
2030
gobject.IO_IN | gobject.IO_HUP,
2031
functools.partial(self.handle_ipc,
2036
def handle_ipc(self, source, condition, parent_pipe=None,
2037
proc = None, client_object=None):
2760
2038
# error, or the other end of multiprocessing.Pipe has closed
2761
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2039
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2762
2040
# Wait for other process to exit
2766
2044
# Read a request from the child
2767
2045
request = parent_pipe.recv()
2768
2046
command = request[0]
2770
if command == "init":
2771
key_id = request[1].decode("ascii")
2772
fpr = request[2].decode("ascii")
2773
address = request[3]
2775
for c in self.clients.values():
2776
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2777
"27AE41E4649B934CA495991B7852B855"):
2779
if key_id and c.key_id == key_id:
2782
if fpr and c.fingerprint == fpr:
2048
if command == 'init':
2050
address = request[2]
2052
for c in self.clients.itervalues():
2053
if c.fingerprint == fpr:
2786
log.info("Client not found for key ID: %s, address:"
2787
" %s", key_id or fpr, address)
2057
logger.info("Client not found for fingerprint: %s, ad"
2058
"dress: %s", fpr, address)
2788
2059
if self.use_dbus:
2789
2060
# Emit D-Bus signal
2790
mandos_dbus_service.ClientNotFound(key_id or fpr,
2061
mandos_dbus_service.ClientNotFound(fpr,
2792
2063
parent_pipe.send(False)
2796
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2797
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2798
functools.partial(self.handle_ipc,
2799
parent_pipe=parent_pipe,
2801
client_object=client))
2066
gobject.io_add_watch(parent_pipe.fileno(),
2067
gobject.IO_IN | gobject.IO_HUP,
2068
functools.partial(self.handle_ipc,
2802
2074
parent_pipe.send(True)
2803
2075
# remove the old hook in favor of the new above hook on
2806
if command == "funcall":
2078
if command == 'funcall':
2807
2079
funcname = request[1]
2808
2080
args = request[2]
2809
2081
kwargs = request[3]
2811
parent_pipe.send(("data", getattr(client_object,
2083
parent_pipe.send(('data', getattr(client_object,
2812
2084
funcname)(*args,
2815
if command == "getattr":
2087
if command == 'getattr':
2816
2088
attrname = request[1]
2817
if isinstance(client_object.__getattribute__(attrname),
2818
collections.abc.Callable):
2819
parent_pipe.send(("function", ))
2089
if callable(client_object.__getattribute__(attrname)):
2090
parent_pipe.send(('function',))
2822
"data", client_object.__getattribute__(attrname)))
2824
if command == "setattr":
2092
parent_pipe.send(('data', client_object
2093
.__getattribute__(attrname)))
2095
if command == 'setattr':
2825
2096
attrname = request[1]
2826
2097
value = request[2]
2827
2098
setattr(client_object, attrname, value)
2832
2103
def rfc3339_duration_to_delta(duration):
2833
2104
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2835
>>> timedelta = datetime.timedelta
2836
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2838
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2840
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2842
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2844
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2846
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2848
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2106
>>> rfc3339_duration_to_delta("P7D")
2107
datetime.timedelta(7)
2108
>>> rfc3339_duration_to_delta("PT60S")
2109
datetime.timedelta(0, 60)
2110
>>> rfc3339_duration_to_delta("PT60M")
2111
datetime.timedelta(0, 3600)
2112
>>> rfc3339_duration_to_delta("PT24H")
2113
datetime.timedelta(1)
2114
>>> rfc3339_duration_to_delta("P1W")
2115
datetime.timedelta(7)
2116
>>> rfc3339_duration_to_delta("PT5M30S")
2117
datetime.timedelta(0, 330)
2118
>>> rfc3339_duration_to_delta("P1DT3M20S")
2119
datetime.timedelta(1, 200)
2853
2122
# Parsing an RFC 3339 duration with regular expressions is not
2854
2123
# possible - there would have to be multiple places for the same
2855
2124
# values, like seconds. The current code, while more esoteric, is
2856
2125
# cleaner without depending on a parsing library. If Python had a
2857
2126
# built-in library for parsing we would use it, but we'd like to
2858
2127
# avoid excessive use of external libraries.
2860
2129
# New type for defining tokens, syntax, and semantics all-in-one
2861
Token = collections.namedtuple("Token", (
2862
"regexp", # To match token; if "value" is not None, must have
2863
# a "group" containing digits
2864
"value", # datetime.timedelta or None
2865
"followers")) # Tokens valid after this token
2130
Token = collections.namedtuple("Token",
2131
("regexp", # To match token; if
2132
# "value" is not None,
2133
# must have a "group"
2135
"value", # datetime.timedelta or
2137
"followers")) # Tokens valid after
2866
2139
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2867
2140
# the "duration" ABNF definition in RFC 3339, Appendix A.
2868
2141
token_end = Token(re.compile(r"$"), None, frozenset())
2869
2142
token_second = Token(re.compile(r"(\d+)S"),
2870
2143
datetime.timedelta(seconds=1),
2871
frozenset((token_end, )))
2144
frozenset((token_end,)))
2872
2145
token_minute = Token(re.compile(r"(\d+)M"),
2873
2146
datetime.timedelta(minutes=1),
2874
2147
frozenset((token_second, token_end)))
3205
log.debug("Did setuid/setgid to %s:%s", uid, gid)
3206
2476
except OSError as error:
3207
log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
3208
os.strerror(error.errno))
3209
2477
if error.errno != errno.EPERM:
3213
2481
# Enable all possible GnuTLS debugging
3215
2483
# "Use a log level over 10 to enable all debugging options."
3216
2484
# - GnuTLS manual
3217
gnutls.global_set_log_level(11)
2485
gnutls.library.functions.gnutls_global_set_log_level(11)
2487
@gnutls.library.types.gnutls_log_func
3220
2488
def debug_gnutls(level, string):
3221
log.debug("GnuTLS: %s",
3222
string[:-1].decode("utf-8", errors="replace"))
3224
gnutls.global_set_log_function(debug_gnutls)
2489
logger.debug("GnuTLS: %s", string[:-1])
2491
(gnutls.library.functions
2492
.gnutls_global_set_log_function(debug_gnutls))
3226
2494
# Redirect stdin so all checkers get /dev/null
3227
2495
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3228
2496
os.dup2(null, sys.stdin.fileno())
3232
2500
# Need to fork before connecting to D-Bus
3233
2501
if not foreground:
3234
2502
# Close all input and output, do double fork, etc.
3237
if gi.version_info < (3, 10, 2):
3238
# multiprocessing will use threads, so before we use GLib we
3239
# need to inform GLib that threads will be used.
2505
# multiprocessing will use threads, so before we use gobject we
2506
# need to inform gobject that threads will be used.
2507
gobject.threads_init()
3242
2509
global main_loop
3243
2510
# From the Avahi example code
3244
2511
DBusGMainLoop(set_as_default=True)
3245
main_loop = GLib.MainLoop()
2512
main_loop = gobject.MainLoop()
3246
2513
bus = dbus.SystemBus()
3247
2514
# End of Avahi example code
3250
2517
bus_name = dbus.service.BusName("se.recompile.Mandos",
3253
old_bus_name = dbus.service.BusName(
3254
"se.bsnet.fukt.Mandos", bus,
3256
except dbus.exceptions.DBusException as e:
3257
log.error("Disabling D-Bus:", exc_info=e)
2518
bus, do_not_queue=True)
2519
old_bus_name = (dbus.service.BusName
2520
("se.bsnet.fukt.Mandos", bus,
2522
except dbus.exceptions.NameExistsException as e:
2523
logger.error("Disabling D-Bus:", exc_info=e)
3258
2524
use_dbus = False
3259
2525
server_settings["use_dbus"] = False
3260
2526
tcp_server.use_dbus = False
3262
2528
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3263
service = AvahiServiceToSyslog(
3264
name=server_settings["servicename"],
3265
servicetype="_mandos._tcp",
2529
service = AvahiServiceToSyslog(name =
2530
server_settings["servicename"],
2531
servicetype = "_mandos._tcp",
2532
protocol = protocol, bus = bus)
3268
2533
if server_settings["interface"]:
3269
service.interface = if_nametoindex(
3270
server_settings["interface"].encode("utf-8"))
2534
service.interface = (if_nametoindex
2535
(server_settings["interface"]
3272
2538
global multiprocessing_manager
3273
2539
multiprocessing_manager = multiprocessing.Manager()
3275
2541
client_class = Client
3277
client_class = functools.partial(ClientDBus, bus=bus)
2543
client_class = functools.partial(ClientDBus, bus = bus)
3279
2545
client_settings = Client.config_parser(client_config)
3280
2546
old_client_settings = {}
3281
2547
clients_data = {}
3283
2549
# This is used to redirect stdout and stderr for checker processes
3285
wnull = open(os.devnull, "w") # A writable /dev/null
2551
wnull = open(os.devnull, "w") # A writable /dev/null
3286
2552
# Only used if server is running in foreground but not in debug
3288
2554
if debug or not foreground:
3291
2557
# Get client data and settings from last running state.
3292
2558
if server_settings["restore"]:
3294
2560
with open(stored_state_path, "rb") as stored_state:
3295
if sys.version_info.major == 2:
3296
clients_data, old_client_settings = pickle.load(
3299
bytes_clients_data, bytes_old_client_settings = (
3300
pickle.load(stored_state, encoding="bytes"))
3301
# Fix bytes to strings
3304
clients_data = {(key.decode("utf-8")
3305
if isinstance(key, bytes)
3308
bytes_clients_data.items()}
3309
del bytes_clients_data
3310
for key in clients_data:
3311
value = {(k.decode("utf-8")
3312
if isinstance(k, bytes) else k): v
3314
clients_data[key].items()}
3315
clients_data[key] = value
3317
value["client_structure"] = [
3319
if isinstance(s, bytes)
3321
value["client_structure"]]
3322
# .name, .host, and .checker_command
3323
for k in ("name", "host", "checker_command"):
3324
if isinstance(value[k], bytes):
3325
value[k] = value[k].decode("utf-8")
3326
if "key_id" not in value:
3327
value["key_id"] = ""
3328
elif "fingerprint" not in value:
3329
value["fingerprint"] = ""
3330
# old_client_settings
3332
old_client_settings = {
3333
(key.decode("utf-8")
3334
if isinstance(key, bytes)
3337
bytes_old_client_settings.items()}
3338
del bytes_old_client_settings
3339
# .host and .checker_command
3340
for value in old_client_settings.values():
3341
for attribute in ("host", "checker_command"):
3342
if isinstance(value[attribute], bytes):
3343
value[attribute] = (value[attribute]
2561
clients_data, old_client_settings = (pickle.load
3345
2563
os.remove(stored_state_path)
3346
2564
except IOError as e:
3347
2565
if e.errno == errno.ENOENT:
3348
log.warning("Could not load persistent state:"
3349
" %s", os.strerror(e.errno))
2566
logger.warning("Could not load persistent state: {}"
2567
.format(os.strerror(e.errno)))
3351
log.critical("Could not load persistent state:",
2569
logger.critical("Could not load persistent state:",
3354
2572
except EOFError as e:
3355
log.warning("Could not load persistent state: EOFError:",
2573
logger.warning("Could not load persistent state: "
2574
"EOFError:", exc_info=e)
3358
2576
with PGPEngine() as pgp:
3359
2577
for client_name, client in clients_data.items():
3360
2578
# Skip removed clients
3361
2579
if client_name not in client_settings:
3364
2582
# Decide which value to use after restoring saved state.
3365
2583
# We have three different values: Old config file,
3366
2584
# new config file, and saved state.
3420
2642
for client_name in (set(client_settings)
3421
2643
- set(old_client_settings)):
3422
2644
clients_data[client_name] = client_settings[client_name]
3424
2646
# Create all client objects
3425
2647
for client_name, client in clients_data.items():
3426
2648
tcp_server.clients[client_name] = client_class(
3429
server_settings=server_settings)
2649
name = client_name, settings = client,
2650
server_settings = server_settings)
3431
2652
if not tcp_server.clients:
3432
log.warning("No clients defined")
2653
logger.warning("No clients defined")
3434
2655
if not foreground:
3435
2656
if pidfile is not None:
3439
print(pid, file=pidfile)
2660
pidfile.write("{}\n".format(pid).encode("utf-8"))
3440
2661
except IOError:
3441
log.error("Could not write to file %r with PID %d",
2662
logger.error("Could not write to file %r with PID %d",
3444
2665
del pidfilename
3446
for termsig in (signal.SIGHUP, signal.SIGTERM):
3447
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3448
lambda: main_loop.quit() and False)
2667
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2668
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3452
@alternate_dbus_interfaces(
3453
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3454
class MandosDBusService(DBusObjectWithObjectManager):
2671
@alternate_dbus_interfaces({"se.recompile.Mandos":
2672
"se.bsnet.fukt.Mandos"})
2673
class MandosDBusService(DBusObjectWithProperties):
3455
2674
"""A D-Bus proxy object"""
3457
2675
def __init__(self):
3458
2676
dbus.service.Object.__init__(self, bus, "/")
3460
2677
_interface = "se.recompile.Mandos"
2679
@dbus_interface_annotations(_interface)
2681
return { "org.freedesktop.DBus.Property"
2682
".EmitsChangedSignal":
3462
2685
@dbus.service.signal(_interface, signature="o")
3463
2686
def ClientAdded(self, objpath):
3467
2690
@dbus.service.signal(_interface, signature="ss")
3468
def ClientNotFound(self, key_id, address):
2691
def ClientNotFound(self, fingerprint, address):
3472
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3474
2695
@dbus.service.signal(_interface, signature="os")
3475
2696
def ClientRemoved(self, objpath, name):
3479
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3481
2700
@dbus.service.method(_interface, out_signature="ao")
3482
2701
def GetAllClients(self):
3484
return dbus.Array(c.dbus_object_path for c in
3485
tcp_server.clients.values())
3487
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2703
return dbus.Array(c.dbus_object_path
2705
tcp_server.clients.itervalues())
3489
2707
@dbus.service.method(_interface,
3490
2708
out_signature="a{oa{sv}}")
3491
2709
def GetAllClientsWithProperties(self):
3493
2711
return dbus.Dictionary(
3494
{c.dbus_object_path: c.GetAll(
3495
"se.recompile.Mandos.Client")
3496
for c in tcp_server.clients.values()},
2712
((c.dbus_object_path, c.GetAll(""))
2713
for c in tcp_server.clients.itervalues()),
3497
2714
signature="oa{sv}")
3499
2716
@dbus.service.method(_interface, in_signature="o")
3500
2717
def RemoveClient(self, object_path):
3502
for c in tcp_server.clients.values():
2719
for c in tcp_server.clients.itervalues():
3503
2720
if c.dbus_object_path == object_path:
3504
2721
del tcp_server.clients[c.name]
3505
2722
c.remove_from_connection()
3506
# Don't signal the disabling
2723
# Don't signal anything except ClientRemoved
3507
2724
c.disable(quiet=True)
3508
# Emit D-Bus signal for removal
3509
self.client_removed_signal(c)
2726
self.ClientRemoved(object_path, c.name)
3511
2728
raise KeyError(object_path)
3515
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3516
out_signature="a{oa{sa{sv}}}")
3517
def GetManagedObjects(self):
3519
return dbus.Dictionary(
3520
{client.dbus_object_path:
3522
{interface: client.GetAll(interface)
3524
client._get_all_interface_names()})
3525
for client in tcp_server.clients.values()})
3527
def client_added_signal(self, client):
3528
"""Send the new standard signal and the old signal"""
3530
# New standard signal
3531
self.InterfacesAdded(
3532
client.dbus_object_path,
3534
{interface: client.GetAll(interface)
3536
client._get_all_interface_names()}))
3538
self.ClientAdded(client.dbus_object_path)
3540
def client_removed_signal(self, client):
3541
"""Send the new standard signal and the old signal"""
3543
# New standard signal
3544
self.InterfacesRemoved(
3545
client.dbus_object_path,
3546
client._get_all_interface_names())
3548
self.ClientRemoved(client.dbus_object_path,
3551
2732
mandos_dbus_service = MandosDBusService()
3553
# Save modules to variables to exempt the modules from being
3554
# unloaded before the function registered with atexit() is run.
3555
mp = multiprocessing
3559
2735
"Cleanup function; run on exit"
3561
2737
service.cleanup()
3563
mp.active_children()
2739
multiprocessing.active_children()
3565
2741
if not (tcp_server.clients or client_settings):
3568
2744
# Store client before exiting. Secrets are encrypted with key
3569
2745
# based on what config file has. If config file is
3570
2746
# removed/edited, old secret will thus be unrecovable.
3572
2748
with PGPEngine() as pgp:
3573
for client in tcp_server.clients.values():
2749
for client in tcp_server.clients.itervalues():
3574
2750
key = client_settings[client.name]["secret"]
3575
2751
client.encrypted_secret = pgp.encrypt(client.secret,
3577
2753
client_dict = {}
3579
2755
# A list of attributes that can not be pickled
3581
exclude = {"bus", "changedstate", "secret",
3582
"checker", "server_settings"}
3583
for name, typ in inspect.getmembers(dbus.service
2757
exclude = { "bus", "changedstate", "secret",
2758
"checker", "server_settings" }
2759
for name, typ in (inspect.getmembers
2760
(dbus.service.Object)):
3585
2761
exclude.add(name)
3587
2763
client_dict["encrypted_secret"] = (client
3588
2764
.encrypted_secret)
3589
2765
for attr in client.client_structure:
3590
2766
if attr not in exclude:
3591
2767
client_dict[attr] = getattr(client, attr)
3593
2769
clients[client.name] = client_dict
3594
2770
del client_settings[client.name]["secret"]
3597
with tempfile.NamedTemporaryFile(
3601
dir=os.path.dirname(stored_state_path),
3602
delete=False) as stored_state:
3603
pickle.dump((clients, client_settings), stored_state,
3605
tempname = stored_state.name
2773
with (tempfile.NamedTemporaryFile
2774
(mode='wb', suffix=".pickle", prefix='clients-',
2775
dir=os.path.dirname(stored_state_path),
2776
delete=False)) as stored_state:
2777
pickle.dump((clients, client_settings), stored_state)
2778
tempname=stored_state.name
3606
2779
os.rename(tempname, stored_state_path)
3607
2780
except (IOError, OSError) as e:
3611
2784
except NameError:
3613
2786
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3614
log.warning("Could not save persistent state: %s",
3615
os.strerror(e.errno))
2787
logger.warning("Could not save persistent state: {}"
2788
.format(os.strerror(e.errno)))
3617
log.warning("Could not save persistent state:",
2790
logger.warning("Could not save persistent state:",
3621
2794
# Delete all clients, and settings from config
3622
2795
while tcp_server.clients:
3623
2796
name, client = tcp_server.clients.popitem()
3625
2798
client.remove_from_connection()
3626
# Don't signal the disabling
2799
# Don't signal anything except ClientRemoved
3627
2800
client.disable(quiet=True)
3628
# Emit D-Bus signal for removal
3630
mandos_dbus_service.client_removed_signal(client)
2803
mandos_dbus_service.ClientRemoved(client
3631
2806
client_settings.clear()
3633
2808
atexit.register(cleanup)
3635
for client in tcp_server.clients.values():
2810
for client in tcp_server.clients.itervalues():
3637
# Emit D-Bus signal for adding
3638
mandos_dbus_service.client_added_signal(client)
2813
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3639
2814
# Need to initiate checking of clients
3640
2815
if client.enabled:
3641
client.init_checker(randomize_start=True)
2816
client.init_checker()
3643
2818
tcp_server.enable()
3644
2819
tcp_server.server_activate()
3646
2821
# Find out what port we got
3648
2823
service.port = tcp_server.socket.getsockname()[1]
3650
log.info("Now listening on address %r, port %d, flowinfo %d,"
3651
" scope_id %d", *tcp_server.socket.getsockname())
2825
logger.info("Now listening on address %r, port %d,"
2826
" flowinfo %d, scope_id %d",
2827
*tcp_server.socket.getsockname())
3653
log.info("Now listening on address %r, port %d",
3654
*tcp_server.socket.getsockname())
3656
# service.interface = tcp_server.socket.getsockname()[3]
2829
logger.info("Now listening on address %r, port %d",
2830
*tcp_server.socket.getsockname())
2832
#service.interface = tcp_server.socket.getsockname()[3]
3660
2836
# From the Avahi example code
3662
2838
service.activate()
3663
2839
except dbus.exceptions.DBusException as error:
3664
log.critical("D-Bus Exception", exc_info=error)
2840
logger.critical("D-Bus Exception", exc_info=error)
3667
2843
# End of Avahi example code
3670
GLib.IOChannel.unix_new(tcp_server.fileno()),
3671
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3672
lambda *args, **kwargs: (tcp_server.handle_request
3673
(*args[2:], **kwargs) or True))
3675
log.debug("Starting main loop")
2845
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2846
lambda *args, **kwargs:
2847
(tcp_server.handle_request
2848
(*args[2:], **kwargs) or True))
2850
logger.debug("Starting main loop")
3676
2851
main_loop.run()
3677
2852
except AvahiError as error:
3678
log.critical("Avahi Error", exc_info=error)
2853
logger.critical("Avahi Error", exc_info=error)
3681
2856
except KeyboardInterrupt:
3683
2858
print("", file=sys.stderr)
3684
log.debug("Server received KeyboardInterrupt")
3685
log.debug("Server exiting")
2859
logger.debug("Server received KeyboardInterrupt")
2860
logger.debug("Server exiting")
3686
2861
# Must run before the D-Bus bus name gets deregistered
3690
def parse_test_args():
3691
# type: () -> argparse.Namespace
3692
parser = argparse.ArgumentParser(add_help=False)
3693
parser.add_argument("--check", action="store_true")
3694
parser.add_argument("--prefix", )
3695
args, unknown_args = parser.parse_known_args()
3697
# Remove test options from sys.argv
3698
sys.argv[1:] = unknown_args
3701
# Add all tests from doctest strings
3702
def load_tests(loader, tests, none):
3704
tests.addTests(doctest.DocTestSuite())
3707
if __name__ == "__main__":
3708
options = parse_test_args()
3711
extra_test_prefix = options.prefix
3712
if extra_test_prefix is not None:
3713
if not (unittest.main(argv=[""], exit=False)
3714
.result.wasSuccessful()):
3716
class ExtraTestLoader(unittest.TestLoader):
3717
testMethodPrefix = extra_test_prefix
3718
# Call using ./scriptname --test [--verbose]
3719
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3721
unittest.main(argv=[""])
3729
# (lambda (&optional extra)
3730
# (if (not (funcall run-tests-in-test-buffer default-directory
3732
# (funcall show-test-buffer-in-test-window)
3733
# (funcall remove-test-window)
3734
# (if extra (message "Extra tests run successfully!"))))
3735
# run-tests-in-test-buffer:
3736
# (lambda (dir &optional extra)
3737
# (with-current-buffer (get-buffer-create "*Test*")
3738
# (setq buffer-read-only nil
3739
# default-directory dir)
3741
# (compilation-mode))
3742
# (let ((process-result
3743
# (let ((inhibit-read-only t))
3744
# (process-file-shell-command
3745
# (funcall get-command-line extra) nil "*Test*"))))
3746
# (and (numberp process-result)
3747
# (= process-result 0))))
3749
# (lambda (&optional extra)
3750
# (let ((quoted-script
3751
# (shell-quote-argument (funcall get-script-name))))
3753
# (concat "%s --check" (if extra " --prefix=atest" ""))
3757
# (if (fboundp 'file-local-name)
3758
# (file-local-name (buffer-file-name))
3759
# (or (file-remote-p (buffer-file-name) 'localname)
3760
# (buffer-file-name))))
3761
# remove-test-window:
3763
# (let ((test-window (get-buffer-window "*Test*")))
3764
# (if test-window (delete-window test-window))))
3765
# show-test-buffer-in-test-window:
3767
# (when (not (get-buffer-window-list "*Test*"))
3768
# (setq next-error-last-buffer (get-buffer "*Test*"))
3769
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3770
# (display-buffer-overriding-action
3771
# `((display-buffer-in-side-window) (side . ,side)
3772
# (window-height . fit-window-to-buffer)
3773
# (window-width . fit-window-to-buffer))))
3774
# (display-buffer "*Test*"))))
3777
# (let* ((run-extra-tests (lambda () (interactive)
3778
# (funcall run-tests t)))
3779
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3780
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3781
# (setq minor-mode-overriding-map-alist
3782
# (cons `(run-tests . ,outer-keymap)
3783
# minor-mode-overriding-map-alist)))
3784
# (add-hook 'after-save-hook run-tests 90 t))
2864
if __name__ == '__main__':