2
# -*- mode: python; coding: utf-8 -*-
2
# -*- coding: utf-8; lexical-binding: t -*-
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-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 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-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
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
34
from __future__ import (division, absolute_import, print_function,
37
import SocketServer as socketserver
38
from future_builtins import *
48
import SocketServer as socketserver
43
import gnutls.connection
45
import gnutls.library.functions
46
import gnutls.library.constants
47
import gnutls.library.types
48
import ConfigParser as configparser
55
import ConfigParser as configparser
57
63
import logging.handlers
63
import cPickle as pickle
70
import cPickle as pickle
64
73
import multiprocessing
70
84
import dbus.service
86
from gi.repository import GLib
73
87
from dbus.mainloop.glib import DBusGMainLoop
76
90
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:
81
122
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
123
except AttributeError:
125
# This is where SO_BINDTODEVICE was up to and including Python
84
127
from IN import SO_BINDTODEVICE
85
128
except ImportError:
86
SO_BINDTODEVICE = None
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
147
stored_state_file = "clients.pickle"
91
logger = logging.getLogger()
92
syslogger = (logging.handlers.SysLogHandler
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
149
log = logging.getLogger(os.path.basename(sys.argv[0]))
150
logging.captureWarnings(True) # Show warnings via the logging system
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
154
if_nametoindex = ctypes.cdll.LoadLibrary(
155
ctypes.util.find_library("c")).if_nametoindex
100
156
except (OSError, AttributeError):
101
158
def if_nametoindex(interface):
102
159
"Get an interface index the hard way, i.e. using fcntl()"
103
160
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
104
161
with contextlib.closing(socket.socket()) as s:
105
162
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
163
struct.pack(b"16s16x", interface))
164
interface_index = struct.unpack("I", ifreq[16:20])[0]
110
165
return interface_index
113
def initlogger(level=logging.WARNING):
168
def copy_function(func):
169
"""Make a copy of a function"""
170
if sys.version_info.major == 2:
171
return types.FunctionType(func.func_code,
177
return types.FunctionType(func.__code__,
184
def initlogger(debug, level=logging.WARNING):
114
185
"""init logger and add loglevel"""
188
syslogger = (logging.handlers.SysLogHandler(
189
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
116
191
syslogger.setFormatter(logging.Formatter
117
('Mandos [%(process)d]: %(levelname)s:'
119
logger.addHandler(syslogger)
121
console = logging.StreamHandler()
122
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
126
logger.addHandler(console)
127
logger.setLevel(level)
192
("Mandos [%(process)d]: %(levelname)s:"
194
log.addHandler(syslogger)
197
console = logging.StreamHandler()
198
console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
202
log.addHandler(console)
130
206
class PGPError(Exception):
166
255
os.rmdir(self.tempdir)
167
256
self.tempdir = None
169
258
def password_encode(self, password):
170
259
# Passphrase can not be empty and can not contain newlines or
171
260
# NUL bytes. So we prefix it and hex encode it.
172
return b"mandos" + binascii.hexlify(password)
261
encoded = b"mandos" + binascii.hexlify(password)
262
if len(encoded) > 2048:
263
# GnuPG can't handle long passwords, so encode differently
264
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
265
.replace(b"\n", b"\\n")
266
.replace(b"\0", b"\\x00"))
174
269
def encrypt(self, data, password):
175
self.gnupg.passphrase = self.password_encode(password)
176
with open(os.devnull) as devnull:
178
proc = self.gnupg.run(['--symmetric'],
179
create_fhs=['stdin', 'stdout'],
180
attach_fhs={'stderr': devnull})
181
with contextlib.closing(proc.handles['stdin']) as f:
183
with contextlib.closing(proc.handles['stdout']) as f:
184
ciphertext = f.read()
188
self.gnupg.passphrase = None
270
passphrase = self.password_encode(password)
271
with tempfile.NamedTemporaryFile(
272
dir=self.tempdir) as passfile:
273
passfile.write(passphrase)
275
proc = subprocess.Popen([self.gpg, "--symmetric",
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
283
if proc.returncode != 0:
189
285
return ciphertext
191
287
def decrypt(self, data, password):
192
self.gnupg.passphrase = self.password_encode(password)
193
with open(os.devnull) as devnull:
195
proc = self.gnupg.run(['--decrypt'],
196
create_fhs=['stdin', 'stdout'],
197
attach_fhs={'stderr': devnull})
198
with contextlib.closing(proc.handles['stdin'] ) as f:
200
with contextlib.closing(proc.handles['stdout']) as f:
201
decrypted_plaintext = f.read()
205
self.gnupg.passphrase = None
288
passphrase = self.password_encode(password)
289
with tempfile.NamedTemporaryFile(
290
dir=self.tempdir) as passfile:
291
passfile.write(passphrase)
293
proc = subprocess.Popen([self.gpg, "--decrypt",
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
301
if proc.returncode != 0:
206
303
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
210
332
class AvahiError(Exception):
211
333
def __init__(self, value, *args, **kwargs):
212
334
self.value = value
213
super(AvahiError, self).__init__(value, *args, **kwargs)
214
def __unicode__(self):
215
return unicode(repr(self.value))
335
return super(AvahiError, self).__init__(value, *args,
217
339
class AvahiServiceError(AvahiError):
220
343
class AvahiGroupError(AvahiError):
224
class AvahiService(object):
225
348
"""An Avahi (Zeroconf) service.
228
351
interface: integer; avahi.IF_UNSPEC or an interface index.
229
352
Used to optionally bind to the specified interface.
230
name: string; Example: 'Mandos'
231
type: string; Example: '_mandos._tcp'.
232
See <http://www.dns-sd.org/ServiceTypes.html>
353
name: string; Example: "Mandos"
354
type: string; Example: "_mandos._tcp".
355
See <https://www.iana.org/assignments/service-names-port-numbers>
233
356
port: integer; what port to announce
234
357
TXT: list of strings; TXT record for the service
235
358
domain: string; Domain to publish on, default to .local if empty.
364
516
follow_name_owner_changes=True),
365
517
avahi.DBUS_INTERFACE_SERVER)
366
518
self.server.connect_to_signal("StateChanged",
367
self.server_state_changed)
519
self.server_state_changed)
368
520
self.server_state_changed(self.server.GetState())
370
523
class AvahiServiceToSyslog(AvahiService):
524
def rename(self, *args, **kwargs):
372
525
"""Add the new name to the syslog messages"""
373
ret = AvahiService.rename(self)
374
syslogger.setFormatter(logging.Formatter
375
('Mandos (%s) [%%(process)d]:'
376
' %%(levelname)s: %%(message)s'
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
528
syslogger.setFormatter(logging.Formatter(
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
380
def timedelta_to_milliseconds(td):
381
"Convert a datetime.timedelta() to milliseconds"
382
return ((td.days * 24 * 60 * 60 * 1000)
383
+ (td.seconds * 1000)
384
+ (td.microseconds // 1000))
386
class Client(object):
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))
387
875
"""A representation of a client host served by this server.
390
approved: bool(); 'None' if not yet approved/disapproved
878
approved: bool(); None if not yet approved/disapproved
391
879
approval_delay: datetime.timedelta(); Time to wait for approval
392
880
approval_duration: datetime.timedelta(); Duration of one approval
393
checker: subprocess.Popen(); a running checker process used
394
to see if the client lives.
395
'None' if no process is running.
396
checker_callback_tag: a gobject event source tag, or None
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
397
885
checker_command: string; External command which is run to check
398
886
if client lives. %() expansions are done at
399
887
runtime with vars(self) as dict, so that for
400
888
instance %(name)s can be used in the command.
401
checker_initiator_tag: a gobject event source tag, or None
889
checker_initiator_tag: a GLib event source tag, or None
402
890
created: datetime.datetime(); (UTC) object creation
403
891
client_structure: Object describing what attributes a client has
404
892
and is used for storing the client at exit
405
893
current_checker_command: string; current running checker_command
406
disable_initiator_tag: a gobject event source tag, or None
894
disable_initiator_tag: a GLib event source tag, or None
408
896
fingerprint: string (40 or 32 hexadecimal digits); used to
409
uniquely identify the client
897
uniquely identify an OpenPGP client
898
key_id: string (64 hexadecimal digits); used to uniquely identify
899
a client using raw public keys
410
900
host: string; available for use by the checker command
411
901
interval: datetime.timedelta(); How often to start a new checker
412
902
last_approval_request: datetime.datetime(); (UTC) or None
413
903
last_checked_ok: datetime.datetime(); (UTC) or None
414
904
last_checker_status: integer between 0 and 255 reflecting exit
415
905
status of last checker. -1 reflects crashed
906
checker, -2 means no checker completed yet.
907
last_checker_signal: The signal which killed the last checker, if
908
last_checker_status is -1
417
909
last_enabled: datetime.datetime(); (UTC) or None
418
910
name: string; from the config file, used in log messages and
419
911
D-Bus identifiers
420
912
secret: bytestring; sent verbatim (over TLS) to client
421
913
timeout: datetime.timedelta(); How long from last_checked_ok
422
914
until this client is disabled
423
extended_timeout: extra long timeout when password has been sent
915
extended_timeout: extra long timeout when secret has been sent
424
916
runtime_expansions: Allowed attributes for runtime expansion.
425
917
expires: datetime.datetime(); time (UTC) when a client will be
426
918
disabled, or None
919
server_settings: The server_settings dict from main()
429
922
runtime_expansions = ("approval_delay", "approval_duration",
430
"created", "enabled", "fingerprint",
431
"host", "interval", "last_checked_ok",
923
"created", "enabled", "expires", "key_id",
924
"fingerprint", "host", "interval",
925
"last_approval_request", "last_checked_ok",
432
926
"last_enabled", "name", "timeout")
433
client_defaults = { "timeout": "5m",
434
"extended_timeout": "15m",
436
"checker": "fping -q -- %%(host)s",
438
"approval_delay": "0s",
439
"approval_duration": "1s",
440
"approved_by_default": "True",
444
def timeout_milliseconds(self):
445
"Return the 'timeout' attribute in milliseconds"
446
return timedelta_to_milliseconds(self.timeout)
448
def extended_timeout_milliseconds(self):
449
"Return the 'extended_timeout' attribute in milliseconds"
450
return timedelta_to_milliseconds(self.extended_timeout)
452
def interval_milliseconds(self):
453
"Return the 'interval' attribute in milliseconds"
454
return timedelta_to_milliseconds(self.interval)
456
def approval_delay_milliseconds(self):
457
return timedelta_to_milliseconds(self.approval_delay)
929
"extended_timeout": "PT15M",
931
"checker": "fping -q -- %%(host)s",
933
"approval_delay": "PT0S",
934
"approval_duration": "PT1S",
935
"approved_by_default": "True",
460
940
def config_parser(config):
461
""" Construct a new dict of client settings of this form:
941
"""Construct a new dict of client settings of this form:
462
942
{ client_name: {setting_name: value, ...}, ...}
463
with exceptions for any special settings as defined above"""
943
with exceptions for any special settings as defined above.
944
NOTE: Must be a pure function. Must return the same result
945
value given the same arguments.
465
948
for client_name in config.sections():
466
949
section = dict(config.items(client_name))
467
950
client = settings[client_name] = {}
469
952
client["host"] = section["host"]
470
953
# Reformat values from string types to Python types
471
954
client["approved_by_default"] = config.getboolean(
472
955
client_name, "approved_by_default")
473
client["enabled"] = config.getboolean(client_name, "enabled")
956
client["enabled"] = config.getboolean(client_name,
959
# Uppercase and remove spaces from key_id and fingerprint
960
# for later comparison purposes with return value from the
961
# key_id() and fingerprint() functions
962
client["key_id"] = (section.get("key_id", "").upper()
475
964
client["fingerprint"] = (section["fingerprint"].upper()
476
965
.replace(" ", ""))
477
966
if "secret" in section:
478
client["secret"] = section["secret"].decode("base64")
967
client["secret"] = codecs.decode(section["secret"]
479
970
elif "secfile" in section:
480
971
with open(os.path.expanduser(os.path.expandvars
481
972
(section["secfile"])),
482
973
"rb") as secfile:
483
974
client["secret"] = secfile.read()
485
raise TypeError("No secret or secfile for section %s"
976
raise TypeError("No secret or secfile for section {}"
487
978
client["timeout"] = string_to_delta(section["timeout"])
488
979
client["extended_timeout"] = string_to_delta(
489
980
section["extended_timeout"])
531
1023
self.current_checker_command = None
532
1024
self.approved = None
533
1025
self.approvals_pending = 0
534
self.changedstate = (multiprocessing_manager
535
.Condition(multiprocessing_manager
537
self.client_structure = [attr for attr in
538
self.__dict__.iterkeys()
1026
self.changedstate = multiprocessing_manager.Condition(
1027
multiprocessing_manager.Lock())
1028
self.client_structure = [attr
1029
for attr in self.__dict__.keys()
539
1030
if not attr.startswith("_")]
540
1031
self.client_structure.append("client_structure")
542
for name, t in inspect.getmembers(type(self),
1033
for name, t in inspect.getmembers(
1034
type(self), lambda obj: isinstance(obj, property)):
546
1035
if not name.startswith("_"):
547
1036
self.client_structure.append(name)
549
1038
# Send notice to process children that client state has changed
550
1039
def send_changedstate(self):
551
1040
with self.changedstate:
552
1041
self.changedstate.notify_all()
554
1043
def enable(self):
555
1044
"""Start this client's checker and timeout hooks"""
556
1045
if getattr(self, "enabled", False):
557
1046
# Already enabled
559
self.send_changedstate()
560
1048
self.expires = datetime.datetime.utcnow() + self.timeout
561
1049
self.enabled = True
562
1050
self.last_enabled = datetime.datetime.utcnow()
563
1051
self.init_checker()
1052
self.send_changedstate()
565
1054
def disable(self, quiet=True):
566
1055
"""Disable this client."""
567
1056
if not getattr(self, "enabled", False):
1059
log.info("Disabling client %s", self.name)
1060
if getattr(self, "disable_initiator_tag", None) is not None:
1061
GLib.source_remove(self.disable_initiator_tag)
1062
self.disable_initiator_tag = None
1064
if getattr(self, "checker_initiator_tag", None) is not None:
1065
GLib.source_remove(self.checker_initiator_tag)
1066
self.checker_initiator_tag = None
1068
self.enabled = False
570
1070
self.send_changedstate()
572
logger.info("Disabling client %s", self.name)
573
if getattr(self, "disable_initiator_tag", False):
574
gobject.source_remove(self.disable_initiator_tag)
575
self.disable_initiator_tag = None
577
if getattr(self, "checker_initiator_tag", False):
578
gobject.source_remove(self.checker_initiator_tag)
579
self.checker_initiator_tag = None
582
# Do not run this again if called by a gobject.timeout_add
1071
# Do not run this again if called by a GLib.timeout_add
585
1074
def __del__(self):
588
1077
def init_checker(self):
589
1078
# Schedule a new checker to be started an 'interval' from now,
590
1079
# and every interval from then on.
591
self.checker_initiator_tag = (gobject.timeout_add
592
(self.interval_milliseconds(),
1080
if self.checker_initiator_tag is not None:
1081
GLib.source_remove(self.checker_initiator_tag)
1082
self.checker_initiator_tag = GLib.timeout_add(
1083
random.randrange(int(self.interval.total_seconds() * 1000
594
1086
# Schedule a disable() when 'timeout' has passed
595
self.disable_initiator_tag = (gobject.timeout_add
596
(self.timeout_milliseconds(),
1087
if self.disable_initiator_tag is not None:
1088
GLib.source_remove(self.disable_initiator_tag)
1089
self.disable_initiator_tag = GLib.timeout_add(
1090
int(self.timeout.total_seconds() * 1000), self.disable)
598
1091
# Also start a new checker *right now*.
599
1092
self.start_checker()
601
def checker_callback(self, pid, condition, command):
1094
def checker_callback(self, source, condition, connection,
602
1096
"""The checker has completed, so take appropriate actions."""
1097
# Read return code from connection (see call_pipe)
1098
returncode = connection.recv()
1100
if self.checker is not None:
603
1102
self.checker_callback_tag = None
604
1103
self.checker = None
605
if os.WIFEXITED(condition):
606
self.last_checker_status = os.WEXITSTATUS(condition)
1106
self.last_checker_status = returncode
1107
self.last_checker_signal = None
607
1108
if self.last_checker_status == 0:
608
logger.info("Checker for %(name)s succeeded",
1109
log.info("Checker for %(name)s succeeded", vars(self))
610
1110
self.checked_ok()
612
logger.info("Checker for %(name)s failed",
1112
log.info("Checker for %(name)s failed", vars(self))
615
1114
self.last_checker_status = -1
616
logger.warning("Checker for %(name)s crashed?",
619
def checked_ok(self, timeout=None):
620
"""Bump up the timeout for this client.
622
This should only be called when the client has been seen,
1115
self.last_checker_signal = -returncode
1116
log.warning("Checker for %(name)s crashed?", vars(self))
1119
def checked_ok(self):
1120
"""Assert that the client has been seen, alive and well."""
1121
self.last_checked_ok = datetime.datetime.utcnow()
1122
self.last_checker_status = 0
1123
self.last_checker_signal = None
1126
def bump_timeout(self, timeout=None):
1127
"""Bump up the timeout for this client."""
625
1128
if timeout is None:
626
1129
timeout = self.timeout
627
self.last_checked_ok = datetime.datetime.utcnow()
628
1130
if self.disable_initiator_tag is not None:
629
gobject.source_remove(self.disable_initiator_tag)
1131
GLib.source_remove(self.disable_initiator_tag)
1132
self.disable_initiator_tag = None
630
1133
if getattr(self, "enabled", False):
631
self.disable_initiator_tag = (gobject.timeout_add
632
(timedelta_to_milliseconds
633
(timeout), self.disable))
1134
self.disable_initiator_tag = GLib.timeout_add(
1135
int(timeout.total_seconds() * 1000), self.disable)
634
1136
self.expires = datetime.datetime.utcnow() + timeout
636
1138
def need_approval(self):
637
1139
self.last_approval_request = datetime.datetime.utcnow()
639
1141
def start_checker(self):
640
1142
"""Start a new checker subprocess if one is not running.
642
1144
If a checker already exists, leave it running and do
644
1146
# The reason for not killing a running checker is that if we
645
# did that, then if a checker (for some reason) started
646
# running slowly and taking more than 'interval' time, the
647
# client would inevitably timeout, since no checker would get
648
# a chance to run to completion. If we instead leave running
1147
# did that, and if a checker (for some reason) started running
1148
# slowly and taking more than 'interval' time, then the client
1149
# would inevitably timeout, since no checker would get a
1150
# chance to run to completion. If we instead leave running
649
1151
# checkers alone, the checker would have to take more time
650
1152
# than 'timeout' for the client to be disabled, which is as it
653
# If a checker exists, make sure it is not a zombie
655
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
656
except (AttributeError, OSError) as error:
657
if (isinstance(error, OSError)
658
and error.errno != errno.ECHILD):
662
logger.warning("Checker was a zombie")
663
gobject.source_remove(self.checker_callback_tag)
664
self.checker_callback(pid, status,
665
self.current_checker_command)
1155
if self.checker is not None and not self.checker.is_alive():
1156
log.warning("Checker was not alive; joining")
666
1159
# Start a new checker if needed
667
1160
if self.checker is None:
1161
# Escape attributes for the shell
1163
attr: shlex.quote(str(getattr(self, attr)))
1164
for attr in self.runtime_expansions}
669
# In case checker_command has exactly one % operator
670
command = self.checker_command % self.host
672
# Escape attributes for the shell
673
escaped_attrs = dict(
675
re.escape(unicode(str(getattr(self, attr, "")),
679
self.runtime_expansions)
682
command = self.checker_command % escaped_attrs
683
except TypeError as error:
684
logger.error('Could not format string "%s":'
685
' %s', self.checker_command, error)
686
return True # Try again later
1166
command = self.checker_command % escaped_attrs
1167
except TypeError as error:
1168
log.error('Could not format string "%s"',
1169
self.checker_command, exc_info=error)
1170
return True # Try again later
687
1171
self.current_checker_command = command
689
logger.info("Starting checker %r for %s",
691
# We don't need to redirect stdout and stderr, since
692
# in normal mode, that is already done by daemon(),
693
# and in debug mode we don't want to. (Stdin is
694
# always replaced by /dev/null.)
695
self.checker = subprocess.Popen(command,
698
self.checker_callback_tag = (gobject.child_watch_add
700
self.checker_callback,
702
# The checker may have completed before the gobject
703
# watch was added. Check for this.
704
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
706
gobject.source_remove(self.checker_callback_tag)
707
self.checker_callback(pid, status, command)
708
except OSError as error:
709
logger.error("Failed to start subprocess: %s",
711
# Re-run this periodically if run by gobject.timeout_add
1172
log.info("Starting checker %r for %s", command, self.name)
1173
# We don't need to redirect stdout and stderr, since
1174
# in normal mode, that is already done by daemon(),
1175
# and in debug mode we don't want to. (Stdin is
1176
# always replaced by /dev/null.)
1177
# The exception is when not debugging but nevertheless
1178
# running in the foreground; use the previously
1180
popen_args = {"close_fds": True,
1183
if (not self.server_settings["debug"]
1184
and self.server_settings["foreground"]):
1185
popen_args.update({"stdout": wnull,
1187
pipe = multiprocessing.Pipe(duplex=False)
1188
self.checker = multiprocessing.Process(
1190
args=(pipe[1], subprocess.call, command),
1192
self.checker.start()
1193
self.checker_callback_tag = GLib.io_add_watch(
1194
GLib.IOChannel.unix_new(pipe[0].fileno()),
1195
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1196
self.checker_callback, pipe[0], command)
1197
# Re-run this periodically if run by GLib.timeout_add
714
1200
def stop_checker(self):
715
1201
"""Force the checker process, if any, to stop."""
716
1202
if self.checker_callback_tag:
717
gobject.source_remove(self.checker_callback_tag)
1203
GLib.source_remove(self.checker_callback_tag)
718
1204
self.checker_callback_tag = None
719
1205
if getattr(self, "checker", None) is None:
721
logger.debug("Stopping checker for %(name)s", vars(self))
723
os.kill(self.checker.pid, signal.SIGTERM)
725
#if self.checker.poll() is None:
726
# os.kill(self.checker.pid, signal.SIGKILL)
727
except OSError as error:
728
if error.errno != errno.ESRCH: # No such process
1207
log.debug("Stopping checker for %(name)s", vars(self))
1208
self.checker.terminate()
730
1209
self.checker = None
733
def dbus_service_property(dbus_interface, signature="v",
734
access="readwrite", byte_arrays=False):
1212
def dbus_service_property(dbus_interface,
735
1216
"""Decorators for marking methods of a DBusObjectWithProperties to
736
1217
become properties on the D-Bus.
738
1219
The decorated method will be called with no arguments by "Get"
739
1220
and with one argument by "Set".
741
1222
The parameters, where they are supported, are the same as
742
1223
dbus.service.method, except there is only "signature", since the
743
1224
type from Get() and the type sent to Set() is the same.
782
class DBusObjectWithProperties(dbus.service.Object):
1307
class DBusObjectWithAnnotations(dbus.service.Object):
1308
"""A D-Bus object with annotations.
1310
Classes inheriting from this can use the dbus_annotations
1311
decorator to add annotations to methods or signals.
1315
def _is_dbus_thing(thing):
1316
"""Returns a function testing if an attribute is a D-Bus thing
1318
If called like _is_dbus_thing("method") it returns a function
1319
suitable for use as predicate to inspect.getmembers().
1321
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1324
def _get_all_dbus_things(self, thing):
1325
"""Returns a generator of (name, attribute) pairs
1327
return ((getattr(athing.__get__(self), "_dbus_name", name),
1328
athing.__get__(self))
1329
for cls in self.__class__.__mro__
1331
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1333
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1335
path_keyword="object_path",
1336
connection_keyword="connection")
1337
def Introspect(self, object_path, connection):
1338
"""Overloading of standard D-Bus method.
1340
Inserts annotation tags on methods and signals.
1342
xmlstring = dbus.service.Object.Introspect(self, object_path,
1345
document = xml.dom.minidom.parseString(xmlstring)
1347
for if_tag in document.getElementsByTagName("interface"):
1348
# Add annotation tags
1349
for typ in ("method", "signal"):
1350
for tag in if_tag.getElementsByTagName(typ):
1352
for name, prop in (self.
1353
_get_all_dbus_things(typ)):
1354
if (name == tag.getAttribute("name")
1355
and prop._dbus_interface
1356
== if_tag.getAttribute("name")):
1357
annots.update(getattr(
1358
prop, "_dbus_annotations", {}))
1359
for name, value in annots.items():
1360
ann_tag = document.createElement(
1362
ann_tag.setAttribute("name", name)
1363
ann_tag.setAttribute("value", value)
1364
tag.appendChild(ann_tag)
1365
# Add interface annotation tags
1366
for annotation, value in dict(
1367
itertools.chain.from_iterable(
1368
annotations().items()
1369
for name, annotations
1370
in self._get_all_dbus_things("interface")
1371
if name == if_tag.getAttribute("name")
1373
ann_tag = document.createElement("annotation")
1374
ann_tag.setAttribute("name", annotation)
1375
ann_tag.setAttribute("value", value)
1376
if_tag.appendChild(ann_tag)
1377
# Fix argument name for the Introspect method itself
1378
if (if_tag.getAttribute("name")
1379
== dbus.INTROSPECTABLE_IFACE):
1380
for cn in if_tag.getElementsByTagName("method"):
1381
if cn.getAttribute("name") == "Introspect":
1382
for arg in cn.getElementsByTagName("arg"):
1383
if (arg.getAttribute("direction")
1385
arg.setAttribute("name",
1387
xmlstring = document.toxml("utf-8")
1389
except (AttributeError, xml.dom.DOMException,
1390
xml.parsers.expat.ExpatError) as error:
1391
log.error("Failed to override Introspection method",
1396
class DBusObjectWithProperties(DBusObjectWithAnnotations):
783
1397
"""A D-Bus object with properties.
785
1399
Classes inheriting from this can use the dbus_service_property
786
1400
decorator to expose methods as D-Bus properties. It exposes the
787
1401
standard Get(), Set(), and GetAll() methods on the D-Bus.
791
def _is_dbus_property(obj):
792
return getattr(obj, "_dbus_is_property", False)
794
def _get_all_dbus_properties(self):
795
"""Returns a generator of (name, attribute) pairs
797
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
798
for cls in self.__class__.__mro__
800
inspect.getmembers(cls, self._is_dbus_property))
802
1404
def _get_dbus_property(self, interface_name, property_name):
803
1405
"""Returns a bound method if one exists which is a D-Bus
804
1406
property with the specified name and interface.
806
for cls in self.__class__.__mro__:
807
for name, value in (inspect.getmembers
808
(cls, self._is_dbus_property)):
1408
for cls in self.__class__.__mro__:
1409
for name, value in inspect.getmembers(
1410
cls, self._is_dbus_thing("property")):
809
1411
if (value._dbus_name == property_name
810
1412
and value._dbus_interface == interface_name):
811
1413
return value.__get__(self)
813
1415
# No such property
814
raise DBusPropertyNotFound(self.dbus_object_path + ":"
815
+ interface_name + "."
818
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1416
raise DBusPropertyNotFound("{}:{}.{}".format(
1417
self.dbus_object_path, interface_name, property_name))
1420
def _get_all_interface_names(cls):
1421
"""Get a sequence of all interfaces supported by an object"""
1422
return (name for name in set(getattr(getattr(x, attr),
1423
"_dbus_interface", None)
1424
for x in (inspect.getmro(cls))
1426
if name is not None)
1428
@dbus.service.method(dbus.PROPERTIES_IFACE,
819
1430
out_signature="v")
820
1431
def Get(self, interface_name, property_name):
821
1432
"""Standard D-Bus property Get() method, see D-Bus standard.
912
1555
document.unlink()
913
1556
except (AttributeError, xml.dom.DOMException,
914
1557
xml.parsers.expat.ExpatError) as error:
915
logger.error("Failed to override Introspection method",
920
def datetime_to_dbus (dt, variant_level=0):
1558
log.error("Failed to override Introspection method",
1564
dbus.OBJECT_MANAGER_IFACE
1565
except AttributeError:
1566
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1569
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1570
"""A D-Bus object with an ObjectManager.
1572
Classes inheriting from this exposes the standard
1573
GetManagedObjects call and the InterfacesAdded and
1574
InterfacesRemoved signals on the standard
1575
"org.freedesktop.DBus.ObjectManager" interface.
1577
Note: No signals are sent automatically; they must be sent
1580
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1581
out_signature="a{oa{sa{sv}}}")
1582
def GetManagedObjects(self):
1583
"""This function must be overridden"""
1584
raise NotImplementedError()
1586
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1587
signature="oa{sa{sv}}")
1588
def InterfacesAdded(self, object_path, interfaces_and_properties):
1591
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1592
def InterfacesRemoved(self, object_path, interfaces):
1595
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1597
path_keyword="object_path",
1598
connection_keyword="connection")
1599
def Introspect(self, object_path, connection):
1600
"""Overloading of standard D-Bus method.
1602
Override return argument name of GetManagedObjects to be
1603
"objpath_interfaces_and_properties"
1605
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1609
document = xml.dom.minidom.parseString(xmlstring)
1611
for if_tag in document.getElementsByTagName("interface"):
1612
# Fix argument name for the GetManagedObjects method
1613
if (if_tag.getAttribute("name")
1614
== dbus.OBJECT_MANAGER_IFACE):
1615
for cn in if_tag.getElementsByTagName("method"):
1616
if (cn.getAttribute("name")
1617
== "GetManagedObjects"):
1618
for arg in cn.getElementsByTagName("arg"):
1619
if (arg.getAttribute("direction")
1623
"objpath_interfaces"
1625
xmlstring = document.toxml("utf-8")
1627
except (AttributeError, xml.dom.DOMException,
1628
xml.parsers.expat.ExpatError) as error:
1629
log.error("Failed to override Introspection method",
1634
def datetime_to_dbus(dt, variant_level=0):
921
1635
"""Convert a UTC datetime.datetime() to a D-Bus type."""
923
return dbus.String("", variant_level = variant_level)
924
return dbus.String(dt.isoformat(),
925
variant_level=variant_level)
928
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
930
"""Applied to an empty subclass of a D-Bus object, this metaclass
931
will add additional D-Bus attributes matching a certain pattern.
1637
return dbus.String("", variant_level=variant_level)
1638
return dbus.String(dt.isoformat(), variant_level=variant_level)
1641
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1642
"""A class decorator; applied to a subclass of
1643
dbus.service.Object, it will add alternate D-Bus attributes with
1644
interface names according to the "alt_interface_names" mapping.
1647
@alternate_dbus_interfaces({"org.example.Interface":
1648
"net.example.AlternateInterface"})
1649
class SampleDBusObject(dbus.service.Object):
1650
@dbus.service.method("org.example.Interface")
1651
def SampleDBusMethod():
1654
The above "SampleDBusMethod" on "SampleDBusObject" will be
1655
reachable via two interfaces: "org.example.Interface" and
1656
"net.example.AlternateInterface", the latter of which will have
1657
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1658
"true", unless "deprecate" is passed with a False value.
1660
This works for methods and signals, and also for D-Bus properties
1661
(from DBusObjectWithProperties) and interfaces (from the
1662
dbus_interface_annotations decorator).
933
def __new__(mcs, name, bases, attr):
934
# Go through all the base classes which could have D-Bus
935
# methods, signals, or properties in them
936
for base in (b for b in bases
937
if issubclass(b, dbus.service.Object)):
938
# Go though all attributes of the base class
939
for attrname, attribute in inspect.getmembers(base):
1666
for orig_interface_name, alt_interface_name in (
1667
alt_interface_names.items()):
1669
interface_names = set()
1670
# Go though all attributes of the class
1671
for attrname, attribute in inspect.getmembers(cls):
940
1672
# Ignore non-D-Bus attributes, and D-Bus attributes
941
1673
# with the wrong interface name
942
1674
if (not hasattr(attribute, "_dbus_interface")
943
or not attribute._dbus_interface
944
.startswith("se.recompile.Mandos")):
1675
or not attribute._dbus_interface.startswith(
1676
orig_interface_name)):
946
1678
# Create an alternate D-Bus interface name based on
947
1679
# the current name
948
alt_interface = (attribute._dbus_interface
949
.replace("se.recompile.Mandos",
950
"se.bsnet.fukt.Mandos"))
1680
alt_interface = attribute._dbus_interface.replace(
1681
orig_interface_name, alt_interface_name)
1682
interface_names.add(alt_interface)
951
1683
# Is this a D-Bus signal?
952
1684
if getattr(attribute, "_dbus_is_signal", False):
953
# Extract the original non-method function by
955
nonmethod_func = (dict(
1685
# Extract the original non-method undecorated
1686
# function by black magic
1687
if sys.version_info.major == 2:
1688
nonmethod_func = (dict(
956
1689
zip(attribute.func_code.co_freevars,
957
attribute.__closure__))["func"]
1690
attribute.__closure__))
1691
["func"].cell_contents)
1693
nonmethod_func = (dict(
1694
zip(attribute.__code__.co_freevars,
1695
attribute.__closure__))
1696
["func"].cell_contents)
959
1697
# Create a new, but exactly alike, function
960
1698
# object, and decorate it to be a new D-Bus signal
961
1699
# with the alternate D-Bus interface name
962
new_function = (dbus.service.signal
964
attribute._dbus_signature)
966
nonmethod_func.func_code,
967
nonmethod_func.func_globals,
968
nonmethod_func.func_name,
969
nonmethod_func.func_defaults,
970
nonmethod_func.func_closure)))
1700
new_function = copy_function(nonmethod_func)
1701
new_function = (dbus.service.signal(
1703
attribute._dbus_signature)(new_function))
1704
# Copy annotations, if any
1706
new_function._dbus_annotations = dict(
1707
attribute._dbus_annotations)
1708
except AttributeError:
971
1711
# Define a creator of a function to call both the
972
# old and new functions, so both the old and new
973
# signals gets sent when the function is called
1712
# original and alternate functions, so both the
1713
# original and alternate signals gets sent when
1714
# the function is called
974
1715
def fixscope(func1, func2):
975
1716
"""This function is a scope container to pass
976
1717
func1 and func2 to the "call_both" function
977
1718
outside of its arguments"""
1720
@functools.wraps(func2)
978
1721
def call_both(*args, **kwargs):
979
1722
"""This function will emit two D-Bus
980
1723
signals by calling func1 and func2"""
981
1724
func1(*args, **kwargs)
982
1725
func2(*args, **kwargs)
1726
# Make wrapper function look like a D-Bus
1728
for name, attr in inspect.getmembers(func2):
1729
if name.startswith("_dbus_"):
1730
setattr(call_both, name, attr)
983
1732
return call_both
984
1733
# Create the "call_both" function and add it to
986
attr[attrname] = fixscope(attribute,
1735
attr[attrname] = fixscope(attribute, new_function)
988
1736
# Is this a D-Bus method?
989
1737
elif getattr(attribute, "_dbus_is_method", False):
990
1738
# Create a new, but exactly alike, function
991
1739
# object. Decorate it to be a new D-Bus method
992
1740
# with the alternate D-Bus interface name. Add it
994
attr[attrname] = (dbus.service.method
996
attribute._dbus_in_signature,
997
attribute._dbus_out_signature)
999
(attribute.func_code,
1000
attribute.func_globals,
1001
attribute.func_name,
1002
attribute.func_defaults,
1003
attribute.func_closure)))
1743
dbus.service.method(
1745
attribute._dbus_in_signature,
1746
attribute._dbus_out_signature)
1747
(copy_function(attribute)))
1748
# Copy annotations, if any
1750
attr[attrname]._dbus_annotations = dict(
1751
attribute._dbus_annotations)
1752
except AttributeError:
1004
1754
# Is this a D-Bus property?
1005
1755
elif getattr(attribute, "_dbus_is_property", False):
1006
1756
# Create a new, but exactly alike, function
1007
1757
# object, and decorate it to be a new D-Bus
1008
1758
# property with the alternate D-Bus interface
1009
1759
# name. Add it to the class.
1010
attr[attrname] = (dbus_service_property
1012
attribute._dbus_signature,
1013
attribute._dbus_access,
1015
._dbus_get_args_options
1018
(attribute.func_code,
1019
attribute.func_globals,
1020
attribute.func_name,
1021
attribute.func_defaults,
1022
attribute.func_closure)))
1023
return type.__new__(mcs, name, bases, attr)
1760
attr[attrname] = (dbus_service_property(
1761
alt_interface, attribute._dbus_signature,
1762
attribute._dbus_access,
1763
attribute._dbus_get_args_options
1765
(copy_function(attribute)))
1766
# Copy annotations, if any
1768
attr[attrname]._dbus_annotations = dict(
1769
attribute._dbus_annotations)
1770
except AttributeError:
1772
# Is this a D-Bus interface?
1773
elif getattr(attribute, "_dbus_is_interface", False):
1774
# Create a new, but exactly alike, function
1775
# object. Decorate it to be a new D-Bus interface
1776
# with the alternate D-Bus interface name. Add it
1779
dbus_interface_annotations(alt_interface)
1780
(copy_function(attribute)))
1782
# Deprecate all alternate interfaces
1783
iname = "_AlternateDBusNames_interface_annotation{}"
1784
for interface_name in interface_names:
1786
@dbus_interface_annotations(interface_name)
1788
return {"org.freedesktop.DBus.Deprecated":
1790
# Find an unused name
1791
for aname in (iname.format(i)
1792
for i in itertools.count()):
1793
if aname not in attr:
1797
# Replace the class with a new subclass of it with
1798
# methods, signals, etc. as created above.
1799
if sys.version_info.major == 2:
1800
cls = type(b"{}Alternate".format(cls.__name__),
1803
cls = type("{}Alternate".format(cls.__name__),
1810
@alternate_dbus_interfaces({"se.recompile.Mandos":
1811
"se.bsnet.fukt.Mandos"})
1026
1812
class ClientDBus(Client, DBusObjectWithProperties):
1027
1813
"""A Client class using D-Bus
1030
1816
dbus_object_path: dbus.ObjectPath
1031
1817
bus: dbus.SystemBus()
1034
1820
runtime_expansions = (Client.runtime_expansions
1035
+ ("dbus_object_path",))
1821
+ ("dbus_object_path", ))
1823
_interface = "se.recompile.Mandos.Client"
1037
1825
# dbus.service.Object doesn't use super(), so we can't either.
1039
def __init__(self, bus = None, *args, **kwargs):
1827
def __init__(self, bus=None, *args, **kwargs):
1041
1829
Client.__init__(self, *args, **kwargs)
1042
self._approvals_pending = 0
1044
self._approvals_pending = 0
1045
1830
# Only now, when this client is initialized, can it show up on
1047
client_object_name = unicode(self.name).translate(
1832
client_object_name = str(self.name).translate(
1048
1833
{ord("."): ord("_"),
1049
1834
ord("-"): ord("_")})
1050
self.dbus_object_path = (dbus.ObjectPath
1051
("/clients/" + client_object_name))
1835
self.dbus_object_path = dbus.ObjectPath(
1836
"/clients/" + client_object_name)
1052
1837
DBusObjectWithProperties.__init__(self, self.bus,
1053
1838
self.dbus_object_path)
1055
def notifychangeproperty(transform_func,
1056
dbus_name, type_func=lambda x: x,
1840
def notifychangeproperty(transform_func, dbus_name,
1841
type_func=lambda x: x,
1843
invalidate_only=False,
1844
_interface=_interface):
1058
1845
""" Modify a variable so that it's a property which announces
1059
1846
its changes to DBus.
1061
1848
transform_fun: Function that takes a value and a variant_level
1062
1849
and transforms it to a D-Bus type.
1063
1850
dbus_name: D-Bus name of the variable
1065
1852
to the D-Bus. Default: no transform
1066
1853
variant_level: D-Bus variant level. Default: 1
1068
attrname = "_{0}".format(dbus_name)
1855
attrname = "_{}".format(dbus_name)
1069
1857
def setter(self, value):
1070
1858
if hasattr(self, "dbus_object_path"):
1071
1859
if (not hasattr(self, attrname) or
1072
1860
type_func(getattr(self, attrname, None))
1073
1861
!= type_func(value)):
1074
dbus_value = transform_func(type_func(value),
1077
self.PropertyChanged(dbus.String(dbus_name),
1863
self.PropertiesChanged(
1864
_interface, dbus.Dictionary(),
1865
dbus.Array((dbus_name, )))
1867
dbus_value = transform_func(
1869
variant_level=variant_level)
1870
self.PropertyChanged(dbus.String(dbus_name),
1872
self.PropertiesChanged(
1874
dbus.Dictionary({dbus.String(dbus_name):
1079
1877
setattr(self, attrname, value)
1081
1879
return property(lambda self: getattr(self, attrname), setter)
1084
1881
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1085
1882
approvals_pending = notifychangeproperty(dbus.Boolean,
1086
1883
"ApprovalPending",
1088
1885
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1089
1886
last_enabled = notifychangeproperty(datetime_to_dbus,
1091
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1092
type_func = lambda checker:
1093
checker is not None)
1888
checker = notifychangeproperty(
1889
dbus.Boolean, "CheckerRunning",
1890
type_func=lambda checker: checker is not None)
1094
1891
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1095
1892
"LastCheckedOK")
1893
last_checker_status = notifychangeproperty(dbus.Int16,
1894
"LastCheckerStatus")
1096
1895
last_approval_request = notifychangeproperty(
1097
1896
datetime_to_dbus, "LastApprovalRequest")
1098
1897
approved_by_default = notifychangeproperty(dbus.Boolean,
1099
1898
"ApprovedByDefault")
1100
approval_delay = notifychangeproperty(dbus.UInt64,
1103
timedelta_to_milliseconds)
1899
approval_delay = notifychangeproperty(
1900
dbus.UInt64, "ApprovalDelay",
1901
type_func=lambda td: td.total_seconds() * 1000)
1104
1902
approval_duration = notifychangeproperty(
1105
1903
dbus.UInt64, "ApprovalDuration",
1106
type_func = timedelta_to_milliseconds)
1904
type_func=lambda td: td.total_seconds() * 1000)
1107
1905
host = notifychangeproperty(dbus.String, "Host")
1108
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1110
timedelta_to_milliseconds)
1906
timeout = notifychangeproperty(
1907
dbus.UInt64, "Timeout",
1908
type_func=lambda td: td.total_seconds() * 1000)
1111
1909
extended_timeout = notifychangeproperty(
1112
1910
dbus.UInt64, "ExtendedTimeout",
1113
type_func = timedelta_to_milliseconds)
1114
interval = notifychangeproperty(dbus.UInt64,
1117
timedelta_to_milliseconds)
1911
type_func=lambda td: td.total_seconds() * 1000)
1912
interval = notifychangeproperty(
1913
dbus.UInt64, "Interval",
1914
type_func=lambda td: td.total_seconds() * 1000)
1118
1915
checker_command = notifychangeproperty(dbus.String, "Checker")
1916
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1917
invalidate_only=True)
1120
1919
del notifychangeproperty
1122
1921
def __del__(self, *args, **kwargs):
1124
1923
self.remove_from_connection()
1204
2002
server to mandos-client
1208
2006
# Rejected - signal
1209
2007
@dbus.service.signal(_interface, signature="s")
1210
2008
def Rejected(self, reason):
1214
2012
# NeedApproval - signal
1215
2013
@dbus.service.signal(_interface, signature="tb")
1216
2014
def NeedApproval(self, timeout, default):
1218
2016
return self.need_approval()
1220
# NeRwequest - signal
1221
@dbus.service.signal(_interface, signature="s")
1222
def NewRequest(self, ip):
1224
Is sent after a client request a password.
1230
2020
# Approve - method
1231
2021
@dbus.service.method(_interface, in_signature="b")
1232
2022
def Approve(self, value):
1233
2023
self.approve(value)
1235
2025
# CheckedOK - method
1236
2026
@dbus.service.method(_interface)
1237
2027
def CheckedOK(self):
1238
2028
self.checked_ok()
1240
2030
# Enable - method
2031
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1241
2032
@dbus.service.method(_interface)
1242
2033
def Enable(self):
1246
2037
# StartChecker - method
2038
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1247
2039
@dbus.service.method(_interface)
1248
2040
def StartChecker(self):
1250
2042
self.start_checker()
1252
2044
# Disable - method
2045
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1253
2046
@dbus.service.method(_interface)
1254
2047
def Disable(self):
1258
2051
# StopChecker - method
2052
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1259
2053
@dbus.service.method(_interface)
1260
2054
def StopChecker(self):
1261
2055
self.stop_checker()
1265
2059
# ApprovalPending - property
1266
2060
@dbus_service_property(_interface, signature="b", access="read")
1267
2061
def ApprovalPending_dbus_property(self):
1268
2062
return dbus.Boolean(bool(self.approvals_pending))
1270
2064
# ApprovedByDefault - property
1271
@dbus_service_property(_interface, signature="b",
2065
@dbus_service_property(_interface,
1272
2067
access="readwrite")
1273
2068
def ApprovedByDefault_dbus_property(self, value=None):
1274
2069
if value is None: # get
1275
2070
return dbus.Boolean(self.approved_by_default)
1276
2071
self.approved_by_default = bool(value)
1278
2073
# ApprovalDelay - property
1279
@dbus_service_property(_interface, signature="t",
2074
@dbus_service_property(_interface,
1280
2076
access="readwrite")
1281
2077
def ApprovalDelay_dbus_property(self, value=None):
1282
2078
if value is None: # get
1283
return dbus.UInt64(self.approval_delay_milliseconds())
2079
return dbus.UInt64(self.approval_delay.total_seconds()
1284
2081
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1286
2083
# ApprovalDuration - property
1287
@dbus_service_property(_interface, signature="t",
2084
@dbus_service_property(_interface,
1288
2086
access="readwrite")
1289
2087
def ApprovalDuration_dbus_property(self, value=None):
1290
2088
if value is None: # get
1291
return dbus.UInt64(timedelta_to_milliseconds(
1292
self.approval_duration))
2089
return dbus.UInt64(self.approval_duration.total_seconds()
1293
2091
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1295
2093
# Name - property
2095
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1296
2096
@dbus_service_property(_interface, signature="s", access="read")
1297
2097
def Name_dbus_property(self):
1298
2098
return dbus.String(self.name)
2102
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2103
@dbus_service_property(_interface, signature="s", access="read")
2104
def KeyID_dbus_property(self):
2105
return dbus.String(self.key_id)
1300
2107
# Fingerprint - property
2109
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1301
2110
@dbus_service_property(_interface, signature="s", access="read")
1302
2111
def Fingerprint_dbus_property(self):
1303
2112
return dbus.String(self.fingerprint)
1305
2114
# Host - property
1306
@dbus_service_property(_interface, signature="s",
2115
@dbus_service_property(_interface,
1307
2117
access="readwrite")
1308
2118
def Host_dbus_property(self, value=None):
1309
2119
if value is None: # get
1310
2120
return dbus.String(self.host)
1311
self.host = unicode(value)
2121
self.host = str(value)
1313
2123
# Created - property
2125
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1314
2126
@dbus_service_property(_interface, signature="s", access="read")
1315
2127
def Created_dbus_property(self):
1316
2128
return datetime_to_dbus(self.created)
1318
2130
# LastEnabled - property
1319
2131
@dbus_service_property(_interface, signature="s", access="read")
1320
2132
def LastEnabled_dbus_property(self):
1321
2133
return datetime_to_dbus(self.last_enabled)
1323
2135
# Enabled - property
1324
@dbus_service_property(_interface, signature="b",
2136
@dbus_service_property(_interface,
1325
2138
access="readwrite")
1326
2139
def Enabled_dbus_property(self, value=None):
1327
2140
if value is None: # get
1334
2147
# LastCheckedOK - property
1335
@dbus_service_property(_interface, signature="s",
2148
@dbus_service_property(_interface,
1336
2150
access="readwrite")
1337
2151
def LastCheckedOK_dbus_property(self, value=None):
1338
2152
if value is not None:
1339
2153
self.checked_ok()
1341
2155
return datetime_to_dbus(self.last_checked_ok)
2157
# LastCheckerStatus - property
2158
@dbus_service_property(_interface, signature="n", access="read")
2159
def LastCheckerStatus_dbus_property(self):
2160
return dbus.Int16(self.last_checker_status)
1343
2162
# Expires - property
1344
2163
@dbus_service_property(_interface, signature="s", access="read")
1345
2164
def Expires_dbus_property(self):
1346
2165
return datetime_to_dbus(self.expires)
1348
2167
# LastApprovalRequest - property
1349
2168
@dbus_service_property(_interface, signature="s", access="read")
1350
2169
def LastApprovalRequest_dbus_property(self):
1351
2170
return datetime_to_dbus(self.last_approval_request)
1353
2172
# Timeout - property
1354
@dbus_service_property(_interface, signature="t",
2173
@dbus_service_property(_interface,
1355
2175
access="readwrite")
1356
2176
def Timeout_dbus_property(self, value=None):
1357
2177
if value is None: # get
1358
return dbus.UInt64(self.timeout_milliseconds())
2178
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2179
old_timeout = self.timeout
1359
2180
self.timeout = datetime.timedelta(0, 0, 0, value)
1360
if getattr(self, "disable_initiator_tag", None) is None:
1362
# Reschedule timeout
1363
gobject.source_remove(self.disable_initiator_tag)
1364
self.disable_initiator_tag = None
1366
time_to_die = timedelta_to_milliseconds((self
1371
if time_to_die <= 0:
1372
# The timeout has passed
1375
self.expires = (datetime.datetime.utcnow()
1376
+ datetime.timedelta(milliseconds =
1378
self.disable_initiator_tag = (gobject.timeout_add
1379
(time_to_die, self.disable))
2181
# Reschedule disabling
2183
now = datetime.datetime.utcnow()
2184
self.expires += self.timeout - old_timeout
2185
if self.expires <= now:
2186
# The timeout has passed
2189
if (getattr(self, "disable_initiator_tag", None)
2192
GLib.source_remove(self.disable_initiator_tag)
2193
self.disable_initiator_tag = GLib.timeout_add(
2194
int((self.expires - now).total_seconds() * 1000),
1381
2197
# ExtendedTimeout - property
1382
@dbus_service_property(_interface, signature="t",
2198
@dbus_service_property(_interface,
1383
2200
access="readwrite")
1384
2201
def ExtendedTimeout_dbus_property(self, value=None):
1385
2202
if value is None: # get
1386
return dbus.UInt64(self.extended_timeout_milliseconds())
2203
return dbus.UInt64(self.extended_timeout.total_seconds()
1387
2205
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1389
2207
# Interval - property
1390
@dbus_service_property(_interface, signature="t",
2208
@dbus_service_property(_interface,
1391
2210
access="readwrite")
1392
2211
def Interval_dbus_property(self, value=None):
1393
2212
if value is None: # get
1394
return dbus.UInt64(self.interval_milliseconds())
2213
return dbus.UInt64(self.interval.total_seconds() * 1000)
1395
2214
self.interval = datetime.timedelta(0, 0, 0, value)
1396
2215
if getattr(self, "checker_initiator_tag", None) is None:
1398
2217
if self.enabled:
1399
2218
# Reschedule checker run
1400
gobject.source_remove(self.checker_initiator_tag)
1401
self.checker_initiator_tag = (gobject.timeout_add
1402
(value, self.start_checker))
1403
self.start_checker() # Start one now, too
2219
GLib.source_remove(self.checker_initiator_tag)
2220
self.checker_initiator_tag = GLib.timeout_add(
2221
value, self.start_checker)
2222
self.start_checker() # Start one now, too
1405
2224
# Checker - property
1406
@dbus_service_property(_interface, signature="s",
2225
@dbus_service_property(_interface,
1407
2227
access="readwrite")
1408
2228
def Checker_dbus_property(self, value=None):
1409
2229
if value is None: # get
1410
2230
return dbus.String(self.checker_command)
1411
self.checker_command = unicode(value)
2231
self.checker_command = str(value)
1413
2233
# CheckerRunning - property
1414
@dbus_service_property(_interface, signature="b",
2234
@dbus_service_property(_interface,
1415
2236
access="readwrite")
1416
2237
def CheckerRunning_dbus_property(self, value=None):
1417
2238
if value is None: # get
1420
2241
self.start_checker()
1422
2243
self.stop_checker()
1424
2245
# ObjectPath - property
2247
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2248
"org.freedesktop.DBus.Deprecated": "true"})
1425
2249
@dbus_service_property(_interface, signature="o", access="read")
1426
2250
def ObjectPath_dbus_property(self):
1427
return self.dbus_object_path # is already a dbus.ObjectPath
2251
return self.dbus_object_path # is already a dbus.ObjectPath
1429
2253
# Secret = property
1430
@dbus_service_property(_interface, signature="ay",
1431
access="write", byte_arrays=True)
2255
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2257
@dbus_service_property(_interface,
1432
2261
def Secret_dbus_property(self, value):
1433
self.secret = str(value)
2262
self.secret = bytes(value)
1438
class ProxyClient(object):
1439
def __init__(self, child_pipe, fpr, address):
2268
def __init__(self, child_pipe, key_id, fpr, address):
1440
2269
self._pipe = child_pipe
1441
self._pipe.send(('init', fpr, address))
2270
self._pipe.send(("init", key_id, fpr, address))
1442
2271
if not self._pipe.recv():
2272
raise KeyError(key_id or fpr)
1445
2274
def __getattribute__(self, name):
1447
2276
return super(ProxyClient, self).__getattribute__(name)
1448
self._pipe.send(('getattr', name))
2277
self._pipe.send(("getattr", name))
1449
2278
data = self._pipe.recv()
1450
if data[0] == 'data':
2279
if data[0] == "data":
1452
if data[0] == 'function':
2281
if data[0] == "function":
1453
2283
def func(*args, **kwargs):
1454
self._pipe.send(('funcall', name, args, kwargs))
2284
self._pipe.send(("funcall", name, args, kwargs))
1455
2285
return self._pipe.recv()[1]
1458
2289
def __setattr__(self, name, value):
1460
2291
return super(ProxyClient, self).__setattr__(name, value)
1461
self._pipe.send(('setattr', name, value))
1464
class ClientDBusTransitional(ClientDBus):
1465
__metaclass__ = AlternateDBusNamesMetaclass
2292
self._pipe.send(("setattr", name, value))
1468
2295
class ClientHandler(socketserver.BaseRequestHandler, object):
1469
2296
"""A class to handle client connections.
1471
2298
Instantiated once for each connection to handle it.
1472
2299
Note: This will run in its own forked process."""
1474
2301
def handle(self):
1475
2302
with contextlib.closing(self.server.child_pipe) as child_pipe:
1476
logger.info("TCP connection from: %s",
1477
unicode(self.client_address))
1478
logger.debug("Pipe FD: %d",
1479
self.server.child_pipe.fileno())
1481
session = (gnutls.connection
1482
.ClientSession(self.request,
1484
.X509Credentials()))
1486
# Note: gnutls.connection.X509Credentials is really a
1487
# generic GnuTLS certificate credentials object so long as
1488
# no X.509 keys are added to it. Therefore, we can use it
1489
# here despite using OpenPGP certificates.
1491
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1492
# "+AES-256-CBC", "+SHA1",
1493
# "+COMP-NULL", "+CTYPE-OPENPGP",
2303
log.info("TCP connection from: %s",
2304
str(self.client_address))
2305
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2307
session = gnutls.ClientSession(self.request)
2309
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2310
# "+AES-256-CBC", "+SHA1",
2311
# "+COMP-NULL", "+CTYPE-OPENPGP",
1495
2313
# Use a fallback default, since this MUST be set.
1496
2314
priority = self.server.gnutls_priority
1497
2315
if priority is None:
1498
2316
priority = "NORMAL"
1499
(gnutls.library.functions
1500
.gnutls_priority_set_direct(session._c_object,
2317
gnutls.priority_set_direct(session,
2318
priority.encode("utf-8"), None)
1503
2320
# Start communication using the Mandos protocol
1504
2321
# Get protocol number
1505
2322
line = self.request.makefile().readline()
1506
logger.debug("Protocol version: %r", line)
2323
log.debug("Protocol version: %r", line)
1508
2325
if int(line.strip().split()[0]) > 1:
2326
raise RuntimeError(line)
1510
2327
except (ValueError, IndexError, RuntimeError) as error:
1511
logger.error("Unknown protocol version: %s", error)
2328
log.error("Unknown protocol version: %s", error)
1514
2331
# Start GnuTLS connection
1516
2333
session.handshake()
1517
except gnutls.errors.GNUTLSError as error:
1518
logger.warning("Handshake failed: %s", error)
2334
except gnutls.Error as error:
2335
log.warning("Handshake failed: %s", error)
1519
2336
# Do not run session.bye() here: the session is not
1520
2337
# established. Just abandon the request.
1522
logger.debug("Handshake succeeded")
2339
log.debug("Handshake succeeded")
1524
2341
approval_required = False
1527
fpr = self.fingerprint(self.peer_certificate
1530
gnutls.errors.GNUTLSError) as error:
1531
logger.warning("Bad certificate: %s", error)
1533
logger.debug("Fingerprint: %s", fpr)
1536
client = ProxyClient(child_pipe, fpr,
2343
if gnutls.has_rawpk:
2346
key_id = self.key_id(
2347
self.peer_certificate(session))
2348
except (TypeError, gnutls.Error) as error:
2349
log.warning("Bad certificate: %s", error)
2351
log.debug("Key ID: %s",
2352
key_id.decode("utf-8",
2358
fpr = self.fingerprint(
2359
self.peer_certificate(session))
2360
except (TypeError, gnutls.Error) as error:
2361
log.warning("Bad certificate: %s", error)
2363
log.debug("Fingerprint: %s", fpr)
2366
client = ProxyClient(child_pipe, key_id, fpr,
1537
2367
self.client_address)
1538
2368
except KeyError:
1541
if self.server.use_dbus:
1543
client.NewRequest(str(self.client_address))
1545
2371
if client.approval_delay:
1546
2372
delay = client.approval_delay
1547
2373
client.approvals_pending += 1
1548
2374
approval_required = True
1551
2377
if not client.enabled:
1552
logger.info("Client %s is disabled",
2378
log.info("Client %s is disabled", client.name)
1554
2379
if self.server.use_dbus:
1555
2380
# Emit D-Bus signal
1556
2381
client.Rejected("Disabled")
1559
2384
if client.approved or not client.approval_delay:
1560
#We are approved or approval is disabled
2385
# We are approved or approval is disabled
1562
2387
elif client.approved is None:
1563
logger.info("Client %s needs approval",
2388
log.info("Client %s needs approval",
2390
if self.server.use_dbus:
2392
client.NeedApproval(
2393
client.approval_delay.total_seconds()
2394
* 1000, client.approved_by_default)
2396
log.warning("Client %s was not approved",
1565
2398
if self.server.use_dbus:
1566
2399
# Emit D-Bus signal
1567
client.NeedApproval(
1568
client.approval_delay_milliseconds(),
1569
client.approved_by_default)
1571
logger.warning("Client %s was not approved",
1573
if self.server.use_dbus:
1575
2400
client.Rejected("Denied")
1578
#wait until timeout or approved
2403
# wait until timeout or approved
1579
2404
time = datetime.datetime.now()
1580
2405
client.changedstate.acquire()
1581
(client.changedstate.wait
1582
(float(client.timedelta_to_milliseconds(delay)
2406
client.changedstate.wait(delay.total_seconds())
1584
2407
client.changedstate.release()
1585
2408
time2 = datetime.datetime.now()
1586
2409
if (time2 - time) >= delay:
1587
2410
if not client.approved_by_default:
1588
logger.warning("Client %s timed out while"
1589
" waiting for approval",
2411
log.warning("Client %s timed out while"
2412
" waiting for approval",
1591
2414
if self.server.use_dbus:
1592
2415
# Emit D-Bus signal
1593
2416
client.Rejected("Approval timed out")
1598
2421
delay -= time2 - time
1601
while sent_size < len(client.secret):
1603
sent = session.send(client.secret[sent_size:])
1604
except gnutls.errors.GNUTLSError as error:
1605
logger.warning("gnutls send failed")
1607
logger.debug("Sent: %d, remaining: %d",
1608
sent, len(client.secret)
1609
- (sent_size + sent))
1612
logger.info("Sending secret to %s", client.name)
2424
session.send(client.secret)
2425
except gnutls.Error as error:
2426
log.warning("gnutls send failed", exc_info=error)
2429
log.info("Sending secret to %s", client.name)
1613
2430
# bump the timeout using extended_timeout
1614
client.checked_ok(client.extended_timeout)
2431
client.bump_timeout(client.extended_timeout)
1615
2432
if self.server.use_dbus:
1616
2433
# Emit D-Bus signal
1617
2434
client.GotSecret()
1620
2437
if approval_required:
1621
2438
client.approvals_pending -= 1
1624
except gnutls.errors.GNUTLSError as error:
1625
logger.warning("GnuTLS bye failed")
2441
except gnutls.Error as error:
2442
log.warning("GnuTLS bye failed", exc_info=error)
1628
2445
def peer_certificate(session):
1629
"Return the peer's OpenPGP certificate as a bytestring"
1630
# If not an OpenPGP certificate...
1631
if (gnutls.library.functions
1632
.gnutls_certificate_type_get(session._c_object)
1633
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1634
# ...do the normal thing
1635
return session.peer_certificate
2446
"Return the peer's certificate as a bytestring"
2448
cert_type = gnutls.certificate_type_get2(
2449
session, gnutls.CTYPE_PEERS)
2450
except AttributeError:
2451
cert_type = gnutls.certificate_type_get(session)
2452
if gnutls.has_rawpk:
2453
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2455
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2456
# If not a valid certificate type...
2457
if cert_type not in valid_cert_types:
2458
log.info("Cert type %r not in %r", cert_type,
2460
# ...return invalid data
1636
2462
list_size = ctypes.c_uint(1)
1637
cert_list = (gnutls.library.functions
1638
.gnutls_certificate_get_peers
1639
(session._c_object, ctypes.byref(list_size)))
2463
cert_list = (gnutls.certificate_get_peers
2464
(session, ctypes.byref(list_size)))
1640
2465
if not bool(cert_list) and list_size.value != 0:
1641
raise gnutls.errors.GNUTLSError("error getting peer"
2466
raise gnutls.Error("error getting peer certificate")
1643
2467
if list_size.value == 0:
1645
2469
cert = cert_list[0]
1646
2470
return ctypes.string_at(cert.data, cert.size)
2473
def key_id(certificate):
2474
"Convert a certificate bytestring to a hexdigit key ID"
2475
# New GnuTLS "datum" with the public key
2476
datum = gnutls.datum_t(
2477
ctypes.cast(ctypes.c_char_p(certificate),
2478
ctypes.POINTER(ctypes.c_ubyte)),
2479
ctypes.c_uint(len(certificate)))
2480
# XXX all these need to be created in the gnutls "module"
2481
# New empty GnuTLS certificate
2482
pubkey = gnutls.pubkey_t()
2483
gnutls.pubkey_init(ctypes.byref(pubkey))
2484
# Import the raw public key into the certificate
2485
gnutls.pubkey_import(pubkey,
2486
ctypes.byref(datum),
2487
gnutls.X509_FMT_DER)
2488
# New buffer for the key ID
2489
buf = ctypes.create_string_buffer(32)
2490
buf_len = ctypes.c_size_t(len(buf))
2491
# Get the key ID from the raw public key into the buffer
2492
gnutls.pubkey_get_key_id(
2494
gnutls.KEYID_USE_SHA256,
2495
ctypes.cast(ctypes.byref(buf),
2496
ctypes.POINTER(ctypes.c_ubyte)),
2497
ctypes.byref(buf_len))
2498
# Deinit the certificate
2499
gnutls.pubkey_deinit(pubkey)
2501
# Convert the buffer to a Python bytestring
2502
key_id = ctypes.string_at(buf, buf_len.value)
2503
# Convert the bytestring to hexadecimal notation
2504
hex_key_id = binascii.hexlify(key_id).upper()
1649
2508
def fingerprint(openpgp):
1650
2509
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1651
2510
# New GnuTLS "datum" with the OpenPGP public key
1652
datum = (gnutls.library.types
1653
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1656
ctypes.c_uint(len(openpgp))))
2511
datum = gnutls.datum_t(
2512
ctypes.cast(ctypes.c_char_p(openpgp),
2513
ctypes.POINTER(ctypes.c_ubyte)),
2514
ctypes.c_uint(len(openpgp)))
1657
2515
# New empty GnuTLS certificate
1658
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1659
(gnutls.library.functions
1660
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2516
crt = gnutls.openpgp_crt_t()
2517
gnutls.openpgp_crt_init(ctypes.byref(crt))
1661
2518
# Import the OpenPGP public key into the certificate
1662
(gnutls.library.functions
1663
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1664
gnutls.library.constants
1665
.GNUTLS_OPENPGP_FMT_RAW))
2519
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2520
gnutls.OPENPGP_FMT_RAW)
1666
2521
# Verify the self signature in the key
1667
2522
crtverify = ctypes.c_uint()
1668
(gnutls.library.functions
1669
.gnutls_openpgp_crt_verify_self(crt, 0,
1670
ctypes.byref(crtverify)))
2523
gnutls.openpgp_crt_verify_self(crt, 0,
2524
ctypes.byref(crtverify))
1671
2525
if crtverify.value != 0:
1672
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1673
raise (gnutls.errors.CertificateSecurityError
2526
gnutls.openpgp_crt_deinit(crt)
2527
raise gnutls.CertificateSecurityError(code
1675
2529
# New buffer for the fingerprint
1676
2530
buf = ctypes.create_string_buffer(20)
1677
2531
buf_len = ctypes.c_size_t()
1678
2532
# Get the fingerprint from the certificate into the buffer
1679
(gnutls.library.functions
1680
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1681
ctypes.byref(buf_len)))
2533
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2534
ctypes.byref(buf_len))
1682
2535
# Deinit the certificate
1683
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2536
gnutls.openpgp_crt_deinit(crt)
1684
2537
# Convert the buffer to a Python bytestring
1685
2538
fpr = ctypes.string_at(buf, buf_len.value)
1686
2539
# Convert the bytestring to hexadecimal notation
1691
class MultiprocessingMixIn(object):
2544
class MultiprocessingMixIn:
1692
2545
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1693
2547
def sub_process_main(self, request, address):
1695
2549
self.finish_request(request, address)
1696
2550
except Exception:
1697
2551
self.handle_error(request, address)
1698
2552
self.close_request(request)
1700
2554
def process_request(self, request, address):
1701
2555
"""Start a new process to process the request."""
1702
proc = multiprocessing.Process(target = self.sub_process_main,
2556
proc = multiprocessing.Process(target=self.sub_process_main,
2557
args=(request, address))
1709
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2562
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1710
2563
""" adds a pipe to the MixIn """
1711
2565
def process_request(self, request, client_address):
1712
2566
"""Overrides and wraps the original process_request().
1714
2568
This function creates a new pipe in self.pipe
1716
2570
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1718
2572
proc = MultiprocessingMixIn.process_request(self, request,
1719
2573
client_address)
1720
2574
self.child_pipe.close()
1721
2575
self.add_pipe(parent_pipe, proc)
1723
2577
def add_pipe(self, parent_pipe, proc):
1724
2578
"""Dummy function; override as necessary"""
1725
raise NotImplementedError
2579
raise NotImplementedError()
1728
2582
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1729
socketserver.TCPServer, object):
1730
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2583
socketserver.TCPServer):
2584
"""IPv6-capable TCP server. Accepts None as address and/or port
1733
2587
enabled: Boolean; whether this server is activated yet
1734
2588
interface: None or a network interface name (string)
1735
2589
use_ipv6: Boolean; to use IPv6 or not
1737
2592
def __init__(self, server_address, RequestHandlerClass,
1738
interface=None, use_ipv6=True):
2596
"""If socketfd is set, use that file descriptor instead of
2597
creating a new one with socket.socket().
1739
2599
self.interface = interface
1741
2601
self.address_family = socket.AF_INET6
2602
if socketfd is not None:
2603
# Save the file descriptor
2604
self.socketfd = socketfd
2605
# Save the original socket.socket() function
2606
self.socket_socket = socket.socket
2608
# To implement --socket, we monkey patch socket.socket.
2610
# (When socketserver.TCPServer is a new-style class, we
2611
# could make self.socket into a property instead of monkey
2612
# patching socket.socket.)
2614
# Create a one-time-only replacement for socket.socket()
2615
@functools.wraps(socket.socket)
2616
def socket_wrapper(*args, **kwargs):
2617
# Restore original function so subsequent calls are
2619
socket.socket = self.socket_socket
2620
del self.socket_socket
2621
# This time only, return a new socket object from the
2622
# saved file descriptor.
2623
return socket.fromfd(self.socketfd, *args, **kwargs)
2624
# Replace socket.socket() function with wrapper
2625
socket.socket = socket_wrapper
2626
# The socketserver.TCPServer.__init__ will call
2627
# socket.socket(), which might be our replacement,
2628
# socket_wrapper(), if socketfd was set.
1742
2629
socketserver.TCPServer.__init__(self, server_address,
1743
2630
RequestHandlerClass)
1744
2632
def server_bind(self):
1745
2633
"""This overrides the normal server_bind() function
1746
2634
to bind to an interface if one was specified, and also NOT to
1747
2635
bind to an address or port if they were not specified."""
2636
global SO_BINDTODEVICE
1748
2637
if self.interface is not None:
1749
2638
if SO_BINDTODEVICE is None:
1750
logger.error("SO_BINDTODEVICE does not exist;"
1751
" cannot bind to interface %s",
1755
self.socket.setsockopt(socket.SOL_SOCKET,
1759
except socket.error as error:
1760
if error[0] == errno.EPERM:
1761
logger.error("No permission to"
1762
" bind to interface %s",
1764
elif error[0] == errno.ENOPROTOOPT:
1765
logger.error("SO_BINDTODEVICE not available;"
1766
" cannot bind to interface %s",
2639
# Fall back to a hard-coded value which seems to be
2641
log.warning("SO_BINDTODEVICE not found, trying 25")
2642
SO_BINDTODEVICE = 25
2644
self.socket.setsockopt(
2645
socket.SOL_SOCKET, SO_BINDTODEVICE,
2646
(self.interface + "\0").encode("utf-8"))
2647
except socket.error as error:
2648
if error.errno == errno.EPERM:
2649
log.error("No permission to bind to interface %s",
2651
elif error.errno == errno.ENOPROTOOPT:
2652
log.error("SO_BINDTODEVICE not available; cannot"
2653
" bind to interface %s", self.interface)
2654
elif error.errno == errno.ENODEV:
2655
log.error("Interface %s does not exist, cannot"
2656
" bind", self.interface)
1770
2659
# Only bind(2) the socket if we really need to.
1771
2660
if self.server_address[0] or self.server_address[1]:
2661
if self.server_address[1]:
2662
self.allow_reuse_address = True
1772
2663
if not self.server_address[0]:
1773
2664
if self.address_family == socket.AF_INET6:
1774
any_address = "::" # in6addr_any
2665
any_address = "::" # in6addr_any
1776
any_address = socket.INADDR_ANY
2667
any_address = "0.0.0.0" # INADDR_ANY
1777
2668
self.server_address = (any_address,
1778
2669
self.server_address[1])
1779
2670
elif not self.server_address[1]:
1780
self.server_address = (self.server_address[0],
2671
self.server_address = (self.server_address[0], 0)
1782
2672
# if self.interface:
1783
2673
# self.server_address = (self.server_address[0],
1809
2704
self.gnutls_priority = gnutls_priority
1810
2705
IPv6_TCPServer.__init__(self, server_address,
1811
2706
RequestHandlerClass,
1812
interface = interface,
1813
use_ipv6 = use_ipv6)
2707
interface=interface,
1814
2711
def server_activate(self):
1815
2712
if self.enabled:
1816
2713
return socketserver.TCPServer.server_activate(self)
1818
2715
def enable(self):
1819
2716
self.enabled = True
1821
2718
def add_pipe(self, parent_pipe, proc):
1822
2719
# Call "handle_ipc" for both data and EOF events
1823
gobject.io_add_watch(parent_pipe.fileno(),
1824
gobject.IO_IN | gobject.IO_HUP,
1825
functools.partial(self.handle_ipc,
1830
def handle_ipc(self, source, condition, parent_pipe=None,
1831
proc = None, client_object=None):
1833
gobject.IO_IN: "IN", # There is data to read.
1834
gobject.IO_OUT: "OUT", # Data can be written (without
1836
gobject.IO_PRI: "PRI", # There is urgent data to read.
1837
gobject.IO_ERR: "ERR", # Error condition.
1838
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1839
# broken, usually for pipes and
1842
conditions_string = ' | '.join(name
1844
condition_names.iteritems()
1845
if cond & condition)
2721
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2722
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2723
functools.partial(self.handle_ipc,
2724
parent_pipe=parent_pipe,
2727
def handle_ipc(self, source, condition,
2730
client_object=None):
1846
2731
# error, or the other end of multiprocessing.Pipe has closed
1847
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2732
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1848
2733
# Wait for other process to exit
1852
2737
# Read a request from the child
1853
2738
request = parent_pipe.recv()
1854
2739
command = request[0]
1856
if command == 'init':
1858
address = request[2]
1860
for c in self.clients.itervalues():
1861
if c.fingerprint == fpr:
2741
if command == "init":
2742
key_id = request[1].decode("ascii")
2743
fpr = request[2].decode("ascii")
2744
address = request[3]
2746
for c in self.clients.values():
2747
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2748
"27AE41E4649B934CA495991B7852B855"):
2750
if key_id and c.key_id == key_id:
2753
if fpr and c.fingerprint == fpr:
1865
logger.info("Client not found for fingerprint: %s, ad"
1866
"dress: %s", fpr, address)
2757
log.info("Client not found for key ID: %s, address:"
2758
" %s", key_id or fpr, address)
1867
2759
if self.use_dbus:
1868
2760
# Emit D-Bus signal
1869
mandos_dbus_service.ClientNotFound(fpr,
2761
mandos_dbus_service.ClientNotFound(key_id or fpr,
1871
2763
parent_pipe.send(False)
1874
gobject.io_add_watch(parent_pipe.fileno(),
1875
gobject.IO_IN | gobject.IO_HUP,
1876
functools.partial(self.handle_ipc,
2767
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2768
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2769
functools.partial(self.handle_ipc,
2770
parent_pipe=parent_pipe,
2772
client_object=client))
1882
2773
parent_pipe.send(True)
1883
2774
# remove the old hook in favor of the new above hook on
1886
if command == 'funcall':
2777
if command == "funcall":
1887
2778
funcname = request[1]
1888
2779
args = request[2]
1889
2780
kwargs = request[3]
1891
parent_pipe.send(('data', getattr(client_object,
2782
parent_pipe.send(("data", getattr(client_object,
1892
2783
funcname)(*args,
1895
if command == 'getattr':
2786
if command == "getattr":
1896
2787
attrname = request[1]
1897
if callable(client_object.__getattribute__(attrname)):
1898
parent_pipe.send(('function',))
2788
if isinstance(client_object.__getattribute__(attrname),
2789
collections.abc.Callable):
2790
parent_pipe.send(("function", ))
1900
parent_pipe.send(('data', client_object
1901
.__getattribute__(attrname)))
1903
if command == 'setattr':
2793
"data", client_object.__getattribute__(attrname)))
2795
if command == "setattr":
1904
2796
attrname = request[1]
1905
2797
value = request[2]
1906
2798
setattr(client_object, attrname, value)
2803
def rfc3339_duration_to_delta(duration):
2804
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2806
>>> timedelta = datetime.timedelta
2807
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2809
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2811
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2813
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2815
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2817
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2819
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2824
# Parsing an RFC 3339 duration with regular expressions is not
2825
# possible - there would have to be multiple places for the same
2826
# values, like seconds. The current code, while more esoteric, is
2827
# cleaner without depending on a parsing library. If Python had a
2828
# built-in library for parsing we would use it, but we'd like to
2829
# avoid excessive use of external libraries.
2831
# New type for defining tokens, syntax, and semantics all-in-one
2832
Token = collections.namedtuple("Token", (
2833
"regexp", # To match token; if "value" is not None, must have
2834
# a "group" containing digits
2835
"value", # datetime.timedelta or None
2836
"followers")) # Tokens valid after this token
2837
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2838
# the "duration" ABNF definition in RFC 3339, Appendix A.
2839
token_end = Token(re.compile(r"$"), None, frozenset())
2840
token_second = Token(re.compile(r"(\d+)S"),
2841
datetime.timedelta(seconds=1),
2842
frozenset((token_end, )))
2843
token_minute = Token(re.compile(r"(\d+)M"),
2844
datetime.timedelta(minutes=1),
2845
frozenset((token_second, token_end)))
2846
token_hour = Token(re.compile(r"(\d+)H"),
2847
datetime.timedelta(hours=1),
2848
frozenset((token_minute, token_end)))
2849
token_time = Token(re.compile(r"T"),
2851
frozenset((token_hour, token_minute,
2853
token_day = Token(re.compile(r"(\d+)D"),
2854
datetime.timedelta(days=1),
2855
frozenset((token_time, token_end)))
2856
token_month = Token(re.compile(r"(\d+)M"),
2857
datetime.timedelta(weeks=4),
2858
frozenset((token_day, token_end)))
2859
token_year = Token(re.compile(r"(\d+)Y"),
2860
datetime.timedelta(weeks=52),
2861
frozenset((token_month, token_end)))
2862
token_week = Token(re.compile(r"(\d+)W"),
2863
datetime.timedelta(weeks=1),
2864
frozenset((token_end, )))
2865
token_duration = Token(re.compile(r"P"), None,
2866
frozenset((token_year, token_month,
2867
token_day, token_time,
2869
# Define starting values:
2871
value = datetime.timedelta()
2873
# Following valid tokens
2874
followers = frozenset((token_duration, ))
2875
# String left to parse
2877
# Loop until end token is found
2878
while found_token is not token_end:
2879
# Search for any currently valid tokens
2880
for token in followers:
2881
match = token.regexp.match(s)
2882
if match is not None:
2884
if token.value is not None:
2885
# Value found, parse digits
2886
factor = int(match.group(1), 10)
2887
# Add to value so far
2888
value += factor * token.value
2889
# Strip token from string
2890
s = token.regexp.sub("", s, 1)
2893
# Set valid next tokens
2894
followers = found_token.followers
2897
# No currently valid tokens were found
2898
raise ValueError("Invalid RFC 3339 duration: {!r}"
1911
2904
def string_to_delta(interval):
1912
2905
"""Parse a string and return a datetime.timedelta
1914
>>> string_to_delta('7d')
1915
datetime.timedelta(7)
1916
>>> string_to_delta('60s')
1917
datetime.timedelta(0, 60)
1918
>>> string_to_delta('60m')
1919
datetime.timedelta(0, 3600)
1920
>>> string_to_delta('24h')
1921
datetime.timedelta(1)
1922
>>> string_to_delta('1w')
1923
datetime.timedelta(7)
1924
>>> string_to_delta('5m 30s')
1925
datetime.timedelta(0, 330)
2907
>>> string_to_delta("7d") == datetime.timedelta(7)
2909
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2911
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2913
>>> string_to_delta("24h") == datetime.timedelta(1)
2915
>>> string_to_delta("1w") == datetime.timedelta(7)
2917
>>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2922
return rfc3339_duration_to_delta(interval)
1927
2926
timevalue = datetime.timedelta(0)
1928
2927
for s in interval.split():
1930
suffix = unicode(s[-1])
1931
2930
value = int(s[:-1])
1932
2931
if suffix == "d":
1933
2932
delta = datetime.timedelta(value)
2005
3004
parser.add_argument("--no-dbus", action="store_false",
2006
3005
dest="use_dbus", help="Do not provide D-Bus"
2007
" system bus interface")
3006
" system bus interface", default=None)
2008
3007
parser.add_argument("--no-ipv6", action="store_false",
2009
dest="use_ipv6", help="Do not use IPv6")
3008
dest="use_ipv6", help="Do not use IPv6",
2010
3010
parser.add_argument("--no-restore", action="store_false",
2011
3011
dest="restore", help="Do not restore stored"
3012
" state", default=None)
3013
parser.add_argument("--socket", type=int,
3014
help="Specify a file descriptor to a network"
3015
" socket to use instead of creating one")
2013
3016
parser.add_argument("--statedir", metavar="DIR",
2014
3017
help="Directory to save/restore state in")
3018
parser.add_argument("--foreground", action="store_true",
3019
help="Run in foreground", default=None)
3020
parser.add_argument("--no-zeroconf", action="store_false",
3021
dest="zeroconf", help="Do not use Zeroconf",
2016
3024
options = parser.parse_args()
2023
3026
# Default values for config file for server-global settings
2024
server_defaults = { "interface": "",
2029
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2030
"servicename": "Mandos",
2035
"statedir": "/var/lib/mandos"
3027
if gnutls.has_rawpk:
3028
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3029
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3031
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3032
":+SIGN-DSA-SHA256")
3033
server_defaults = {"interface": "",
3037
"priority": priority,
3038
"servicename": "Mandos",
3044
"statedir": "/var/lib/mandos",
3045
"foreground": "False",
2038
3050
# Parse config file for server-global settings
2039
server_config = configparser.SafeConfigParser(server_defaults)
3051
server_config = configparser.ConfigParser(server_defaults)
2040
3052
del server_defaults
2041
server_config.read(os.path.join(options.configdir,
2043
# Convert the SafeConfigParser object to a dict
3053
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3054
# Convert the ConfigParser object to a dict
2044
3055
server_settings = server_config.defaults()
2045
3056
# Use the appropriate methods on the non-string config options
2046
for option in ("debug", "use_dbus", "use_ipv6"):
3057
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3058
"foreground", "zeroconf"):
2047
3059
server_settings[option] = server_config.getboolean("DEFAULT",
2049
3061
if server_settings["port"]:
2050
3062
server_settings["port"] = server_config.getint("DEFAULT",
3064
if server_settings["socket"]:
3065
server_settings["socket"] = server_config.getint("DEFAULT",
3067
# Later, stdin will, and stdout and stderr might, be dup'ed
3068
# over with an opened os.devnull. But we don't want this to
3069
# happen with a supplied network socket.
3070
if 0 <= server_settings["socket"] <= 2:
3071
server_settings["socket"] = os.dup(server_settings
2052
3073
del server_config
2054
3075
# Override the settings from the config file with command line
2055
3076
# options, if set.
2056
3077
for option in ("interface", "address", "port", "debug",
2057
"priority", "servicename", "configdir",
2058
"use_dbus", "use_ipv6", "debuglevel", "restore",
3078
"priority", "servicename", "configdir", "use_dbus",
3079
"use_ipv6", "debuglevel", "restore", "statedir",
3080
"socket", "foreground", "zeroconf"):
2060
3081
value = getattr(options, option)
2061
3082
if value is not None:
2062
3083
server_settings[option] = value
2064
3085
# Force all strings to be unicode
2065
3086
for option in server_settings.keys():
2066
if type(server_settings[option]) is str:
2067
server_settings[option] = unicode(server_settings[option])
3087
if isinstance(server_settings[option], bytes):
3088
server_settings[option] = (server_settings[option]
3090
# Force all boolean options to be boolean
3091
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3092
"foreground", "zeroconf"):
3093
server_settings[option] = bool(server_settings[option])
3094
# Debug implies foreground
3095
if server_settings["debug"]:
3096
server_settings["foreground"] = True
2068
3097
# Now we have our good server settings in "server_settings"
2070
3099
##################################################################
3101
if (not server_settings["zeroconf"]
3102
and not (server_settings["port"]
3103
or server_settings["socket"] != "")):
3104
parser.error("Needs port or socket to work without Zeroconf")
2072
3106
# For convenience
2073
3107
debug = server_settings["debug"]
2074
3108
debuglevel = server_settings["debuglevel"]
2076
3110
use_ipv6 = server_settings["use_ipv6"]
2077
3111
stored_state_path = os.path.join(server_settings["statedir"],
2078
3112
stored_state_file)
3113
foreground = server_settings["foreground"]
3114
zeroconf = server_settings["zeroconf"]
2081
initlogger(logging.DEBUG)
3117
initlogger(debug, logging.DEBUG)
2083
3119
if not debuglevel:
2086
3122
level = getattr(logging, debuglevel.upper())
3123
initlogger(debug, level)
2089
3125
if server_settings["servicename"] != "Mandos":
2090
syslogger.setFormatter(logging.Formatter
2091
('Mandos (%s) [%%(process)d]:'
2092
' %%(levelname)s: %%(message)s'
2093
% server_settings["servicename"]))
3126
syslogger.setFormatter(
3127
logging.Formatter("Mandos ({}) [%(process)d]:"
3128
" %(levelname)s: %(message)s".format(
3129
server_settings["servicename"])))
2095
3131
# Parse config file with clients
2096
client_config = configparser.SafeConfigParser(Client.client_defaults)
3132
client_config = configparser.ConfigParser(Client.client_defaults)
2097
3133
client_config.read(os.path.join(server_settings["configdir"],
2098
3134
"clients.conf"))
2100
3136
global mandos_dbus_service
2101
3137
mandos_dbus_service = None
2103
tcp_server = MandosServer((server_settings["address"],
2104
server_settings["port"]),
2106
interface=(server_settings["interface"]
2110
server_settings["priority"],
2113
pidfilename = "/var/run/mandos.pid"
2115
pidfile = open(pidfilename, "w")
2117
logger.error("Could not open file %r", pidfilename)
2120
uid = pwd.getpwnam("_mandos").pw_uid
2121
gid = pwd.getpwnam("_mandos").pw_gid
2124
uid = pwd.getpwnam("mandos").pw_uid
2125
gid = pwd.getpwnam("mandos").pw_gid
3140
if server_settings["socket"] != "":
3141
socketfd = server_settings["socket"]
3142
tcp_server = MandosServer(
3143
(server_settings["address"], server_settings["port"]),
3145
interface=(server_settings["interface"] or None),
3147
gnutls_priority=server_settings["priority"],
3151
pidfilename = "/run/mandos.pid"
3152
if not os.path.isdir("/run/."):
3153
pidfilename = "/var/run/mandos.pid"
3156
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3157
except IOError as e:
3158
log.error("Could not open file %r", pidfilename,
3161
for name, group in (("_mandos", "_mandos"),
3162
("mandos", "mandos"),
3163
("nobody", "nogroup")):
3165
uid = pwd.getpwnam(name).pw_uid
3166
gid = pwd.getpwnam(group).pw_gid
2126
3168
except KeyError:
2128
uid = pwd.getpwnam("nobody").pw_uid
2129
gid = pwd.getpwnam("nobody").pw_gid
3176
log.debug("Did setuid/setgid to %s:%s", uid, gid)
2136
3177
except OSError as error:
2137
if error[0] != errno.EPERM:
3178
log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
3179
os.strerror(error.errno))
3180
if error.errno != errno.EPERM:
2141
3184
# Enable all possible GnuTLS debugging
2143
3186
# "Use a log level over 10 to enable all debugging options."
2144
3187
# - GnuTLS manual
2145
gnutls.library.functions.gnutls_global_set_log_level(11)
2147
@gnutls.library.types.gnutls_log_func
3188
gnutls.global_set_log_level(11)
2148
3191
def debug_gnutls(level, string):
2149
logger.debug("GnuTLS: %s", string[:-1])
2151
(gnutls.library.functions
2152
.gnutls_global_set_log_function(debug_gnutls))
3192
log.debug("GnuTLS: %s",
3193
string[:-1].decode("utf-8", errors="replace"))
3195
gnutls.global_set_log_function(debug_gnutls)
2154
3197
# Redirect stdin so all checkers get /dev/null
2155
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3198
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2156
3199
os.dup2(null, sys.stdin.fileno())
2160
# No console logging
2161
logger.removeHandler(console)
2163
3203
# Need to fork before connecting to D-Bus
2165
3205
# Close all input and output, do double fork, etc.
3208
if gi.version_info < (3, 10, 2):
3209
# multiprocessing will use threads, so before we use GLib we
3210
# need to inform GLib that threads will be used.
2168
3213
global main_loop
2169
3214
# From the Avahi example code
2170
DBusGMainLoop(set_as_default=True )
2171
main_loop = gobject.MainLoop()
3215
DBusGMainLoop(set_as_default=True)
3216
main_loop = GLib.MainLoop()
2172
3217
bus = dbus.SystemBus()
2173
3218
# End of Avahi example code
2176
3221
bus_name = dbus.service.BusName("se.recompile.Mandos",
2177
bus, do_not_queue=True)
2178
old_bus_name = (dbus.service.BusName
2179
("se.bsnet.fukt.Mandos", bus,
2181
except dbus.exceptions.NameExistsException as e:
2182
logger.error(unicode(e) + ", disabling D-Bus")
3224
old_bus_name = dbus.service.BusName(
3225
"se.bsnet.fukt.Mandos", bus,
3227
except dbus.exceptions.DBusException as e:
3228
log.error("Disabling D-Bus:", exc_info=e)
2183
3229
use_dbus = False
2184
3230
server_settings["use_dbus"] = False
2185
3231
tcp_server.use_dbus = False
2186
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2187
service = AvahiServiceToSyslog(name =
2188
server_settings["servicename"],
2189
servicetype = "_mandos._tcp",
2190
protocol = protocol, bus = bus)
2191
if server_settings["interface"]:
2192
service.interface = (if_nametoindex
2193
(str(server_settings["interface"])))
3233
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3234
service = AvahiServiceToSyslog(
3235
name=server_settings["servicename"],
3236
servicetype="_mandos._tcp",
3239
if server_settings["interface"]:
3240
service.interface = if_nametoindex(
3241
server_settings["interface"].encode("utf-8"))
2195
3243
global multiprocessing_manager
2196
3244
multiprocessing_manager = multiprocessing.Manager()
2198
3246
client_class = Client
2200
client_class = functools.partial(ClientDBusTransitional,
3248
client_class = functools.partial(ClientDBus, bus=bus)
2203
3250
client_settings = Client.config_parser(client_config)
2204
3251
old_client_settings = {}
2205
3252
clients_data = {}
3254
# This is used to redirect stdout and stderr for checker processes
3256
wnull = open(os.devnull, "w") # A writable /dev/null
3257
# Only used if server is running in foreground but not in debug
3259
if debug or not foreground:
2207
3262
# Get client data and settings from last running state.
2208
3263
if server_settings["restore"]:
2210
3265
with open(stored_state_path, "rb") as stored_state:
2211
clients_data, old_client_settings = (pickle.load
3266
if sys.version_info.major == 2:
3267
clients_data, old_client_settings = pickle.load(
3270
bytes_clients_data, bytes_old_client_settings = (
3271
pickle.load(stored_state, encoding="bytes"))
3272
# Fix bytes to strings
3275
clients_data = {(key.decode("utf-8")
3276
if isinstance(key, bytes)
3279
bytes_clients_data.items()}
3280
del bytes_clients_data
3281
for key in clients_data:
3282
value = {(k.decode("utf-8")
3283
if isinstance(k, bytes) else k): v
3285
clients_data[key].items()}
3286
clients_data[key] = value
3288
value["client_structure"] = [
3290
if isinstance(s, bytes)
3292
value["client_structure"]]
3293
# .name, .host, and .checker_command
3294
for k in ("name", "host", "checker_command"):
3295
if isinstance(value[k], bytes):
3296
value[k] = value[k].decode("utf-8")
3297
if "key_id" not in value:
3298
value["key_id"] = ""
3299
elif "fingerprint" not in value:
3300
value["fingerprint"] = ""
3301
# old_client_settings
3303
old_client_settings = {
3304
(key.decode("utf-8")
3305
if isinstance(key, bytes)
3308
bytes_old_client_settings.items()}
3309
del bytes_old_client_settings
3310
# .host and .checker_command
3311
for value in old_client_settings.values():
3312
for attribute in ("host", "checker_command"):
3313
if isinstance(value[attribute], bytes):
3314
value[attribute] = (value[attribute]
2213
3316
os.remove(stored_state_path)
2214
3317
except IOError as e:
2215
logger.warning("Could not load persistent state: {0}"
2217
if e.errno != errno.ENOENT:
3318
if e.errno == errno.ENOENT:
3319
log.warning("Could not load persistent state:"
3320
" %s", os.strerror(e.errno))
3322
log.critical("Could not load persistent state:",
3325
except EOFError as e:
3326
log.warning("Could not load persistent state: EOFError:",
2220
3329
with PGPEngine() as pgp:
2221
for client_name, client in clients_data.iteritems():
3330
for client_name, client in clients_data.items():
3331
# Skip removed clients
3332
if client_name not in client_settings:
2222
3335
# Decide which value to use after restoring saved state.
2223
3336
# We have three different values: Old config file,
2224
3337
# new config file, and saved state.
2229
3342
# For each value in new config, check if it
2230
3343
# differs from the old config value (Except for
2231
3344
# the "secret" attribute)
2232
if (name != "secret" and
2233
value != old_client_settings[client_name]
3345
if (name != "secret"
3347
old_client_settings[client_name][name])):
2235
3348
client[name] = value
2236
3349
except KeyError:
2239
3352
# Clients who has passed its expire date can still be
2240
# enabled if its last checker was successful. Clients
2241
# whose checker failed before we stored its state is
2242
# assumed to have failed all checkers during downtime.
3353
# enabled if its last checker was successful. A Client
3354
# whose checker succeeded before we stored its state is
3355
# assumed to have successfully run all checkers during
2243
3357
if client["enabled"]:
2244
3358
if datetime.datetime.utcnow() >= client["expires"]:
2245
3359
if not client["last_checked_ok"]:
2247
"disabling client {0} - Client never "
2248
"performed a successfull checker"
2249
.format(client["name"]))
3360
log.warning("disabling client %s - Client"
3361
" never performed a successful"
3362
" checker", client_name)
2250
3363
client["enabled"] = False
2251
3364
elif client["last_checker_status"] != 0:
2253
"disabling client {0} - Client "
2254
"last checker failed with error code {1}"
2255
.format(client["name"],
2256
client["last_checker_status"]))
3365
log.warning("disabling client %s - Client"
3366
" last checker failed with error"
3367
" code %s", client_name,
3368
client["last_checker_status"])
2257
3369
client["enabled"] = False
2259
client["expires"] = (datetime.datetime
2261
+ client["timeout"])
3371
client["expires"] = (
3372
datetime.datetime.utcnow()
3373
+ client["timeout"])
3374
log.debug("Last checker succeeded, keeping %s"
3375
" enabled", client_name)
2264
client["secret"] = (
2265
pgp.decrypt(client["encrypted_secret"],
2266
client_settings[client_name]
3377
client["secret"] = pgp.decrypt(
3378
client["encrypted_secret"],
3379
client_settings[client_name]["secret"])
2268
3380
except PGPError:
2269
3381
# If decryption fails, we use secret from new settings
2270
logger.debug("Failed to decrypt {0} old secret"
2271
.format(client_name))
2272
client["secret"] = (
2273
client_settings[client_name]["secret"])
3382
log.debug("Failed to decrypt %s old secret",
3384
client["secret"] = (client_settings[client_name]
2276
3387
# Add/remove clients based on new changes made to config
2277
for client_name in set(old_client_settings) - set(client_settings):
3388
for client_name in (set(old_client_settings)
3389
- set(client_settings)):
2278
3390
del clients_data[client_name]
2279
for client_name in set(client_settings) - set(old_client_settings):
3391
for client_name in (set(client_settings)
3392
- set(old_client_settings)):
2280
3393
clients_data[client_name] = client_settings[client_name]
2282
# Create clients all clients
2283
for client_name, client in clients_data.iteritems():
3395
# Create all client objects
3396
for client_name, client in clients_data.items():
2284
3397
tcp_server.clients[client_name] = client_class(
2285
name = client_name, settings = client)
3400
server_settings=server_settings)
2287
3402
if not tcp_server.clients:
2288
logger.warning("No clients defined")
2294
pidfile.write(str(pid) + "\n".encode("utf-8"))
2297
logger.error("Could not write to file %r with PID %d",
2300
# "pidfile" was never created
3403
log.warning("No clients defined")
3406
if pidfile is not None:
3410
print(pid, file=pidfile)
3412
log.error("Could not write to file %r with PID %d",
2302
3415
del pidfilename
2303
signal.signal(signal.SIGINT, signal.SIG_IGN)
2305
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2306
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3417
for termsig in (signal.SIGHUP, signal.SIGTERM):
3418
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3419
lambda: main_loop.quit() and False)
2309
class MandosDBusService(dbus.service.Object):
3423
@alternate_dbus_interfaces(
3424
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3425
class MandosDBusService(DBusObjectWithObjectManager):
2310
3426
"""A D-Bus proxy object"""
2311
3428
def __init__(self):
2312
3429
dbus.service.Object.__init__(self, bus, "/")
2313
3431
_interface = "se.recompile.Mandos"
2315
3433
@dbus.service.signal(_interface, signature="o")
2316
3434
def ClientAdded(self, objpath):
2320
3438
@dbus.service.signal(_interface, signature="ss")
2321
def ClientNotFound(self, fingerprint, address):
3439
def ClientNotFound(self, key_id, address):
3443
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2325
3445
@dbus.service.signal(_interface, signature="os")
2326
3446
def ClientRemoved(self, objpath, name):
3450
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2330
3452
@dbus.service.method(_interface, out_signature="ao")
2331
3453
def GetAllClients(self):
2333
return dbus.Array(c.dbus_object_path
2335
tcp_server.clients.itervalues())
3455
return dbus.Array(c.dbus_object_path for c in
3456
tcp_server.clients.values())
3458
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2337
3460
@dbus.service.method(_interface,
2338
3461
out_signature="a{oa{sv}}")
2339
3462
def GetAllClientsWithProperties(self):
2341
3464
return dbus.Dictionary(
2342
((c.dbus_object_path, c.GetAll(""))
2343
for c in tcp_server.clients.itervalues()),
3465
{c.dbus_object_path: c.GetAll(
3466
"se.recompile.Mandos.Client")
3467
for c in tcp_server.clients.values()},
2344
3468
signature="oa{sv}")
2346
3470
@dbus.service.method(_interface, in_signature="o")
2347
3471
def RemoveClient(self, object_path):
2349
for c in tcp_server.clients.itervalues():
3473
for c in tcp_server.clients.values():
2350
3474
if c.dbus_object_path == object_path:
2351
3475
del tcp_server.clients[c.name]
2352
3476
c.remove_from_connection()
2353
# Don't signal anything except ClientRemoved
3477
# Don't signal the disabling
2354
3478
c.disable(quiet=True)
2356
self.ClientRemoved(object_path, c.name)
3479
# Emit D-Bus signal for removal
3480
self.client_removed_signal(c)
2358
3482
raise KeyError(object_path)
2362
class MandosDBusServiceTransitional(MandosDBusService):
2363
__metaclass__ = AlternateDBusNamesMetaclass
2364
mandos_dbus_service = MandosDBusServiceTransitional()
3486
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3487
out_signature="a{oa{sa{sv}}}")
3488
def GetManagedObjects(self):
3490
return dbus.Dictionary(
3491
{client.dbus_object_path:
3493
{interface: client.GetAll(interface)
3495
client._get_all_interface_names()})
3496
for client in tcp_server.clients.values()})
3498
def client_added_signal(self, client):
3499
"""Send the new standard signal and the old signal"""
3501
# New standard signal
3502
self.InterfacesAdded(
3503
client.dbus_object_path,
3505
{interface: client.GetAll(interface)
3507
client._get_all_interface_names()}))
3509
self.ClientAdded(client.dbus_object_path)
3511
def client_removed_signal(self, client):
3512
"""Send the new standard signal and the old signal"""
3514
# New standard signal
3515
self.InterfacesRemoved(
3516
client.dbus_object_path,
3517
client._get_all_interface_names())
3519
self.ClientRemoved(client.dbus_object_path,
3522
mandos_dbus_service = MandosDBusService()
3524
# Save modules to variables to exempt the modules from being
3525
# unloaded before the function registered with atexit() is run.
3526
mp = multiprocessing
2367
3530
"Cleanup function; run on exit"
2370
multiprocessing.active_children()
3534
mp.active_children()
2371
3536
if not (tcp_server.clients or client_settings):
2374
3539
# Store client before exiting. Secrets are encrypted with key
2375
3540
# based on what config file has. If config file is
2376
3541
# removed/edited, old secret will thus be unrecovable.
2378
3543
with PGPEngine() as pgp:
2379
for client in tcp_server.clients.itervalues():
3544
for client in tcp_server.clients.values():
2380
3545
key = client_settings[client.name]["secret"]
2381
3546
client.encrypted_secret = pgp.encrypt(client.secret,
2383
3548
client_dict = {}
2385
3550
# A list of attributes that can not be pickled
2387
exclude = set(("bus", "changedstate", "secret",
2389
for name, typ in (inspect.getmembers
2390
(dbus.service.Object)):
3552
exclude = {"bus", "changedstate", "secret",
3553
"checker", "server_settings"}
3554
for name, typ in inspect.getmembers(dbus.service
2391
3556
exclude.add(name)
2393
3558
client_dict["encrypted_secret"] = (client
2394
3559
.encrypted_secret)
2395
3560
for attr in client.client_structure:
2396
3561
if attr not in exclude:
2397
3562
client_dict[attr] = getattr(client, attr)
2399
3564
clients[client.name] = client_dict
2400
3565
del client_settings[client.name]["secret"]
2403
with os.fdopen(os.open(stored_state_path,
2404
os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2405
0600), "wb") as stored_state:
2406
pickle.dump((clients, client_settings), stored_state)
3568
with tempfile.NamedTemporaryFile(
3572
dir=os.path.dirname(stored_state_path),
3573
delete=False) as stored_state:
3574
pickle.dump((clients, client_settings), stored_state,
3576
tempname = stored_state.name
3577
os.rename(tempname, stored_state_path)
2407
3578
except (IOError, OSError) as e:
2408
logger.warning("Could not save persistent state: {0}"
2410
if e.errno not in (errno.ENOENT, errno.EACCES):
3584
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3585
log.warning("Could not save persistent state: %s",
3586
os.strerror(e.errno))
3588
log.warning("Could not save persistent state:",
2413
3592
# Delete all clients, and settings from config
2414
3593
while tcp_server.clients:
2415
3594
name, client = tcp_server.clients.popitem()
2417
3596
client.remove_from_connection()
2418
# Don't signal anything except ClientRemoved
3597
# Don't signal the disabling
2419
3598
client.disable(quiet=True)
3599
# Emit D-Bus signal for removal
2422
mandos_dbus_service.ClientRemoved(client
3601
mandos_dbus_service.client_removed_signal(client)
2425
3602
client_settings.clear()
2427
3604
atexit.register(cleanup)
2429
for client in tcp_server.clients.itervalues():
3606
for client in tcp_server.clients.values():
2432
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3608
# Emit D-Bus signal for adding
3609
mandos_dbus_service.client_added_signal(client)
2433
3610
# Need to initiate checking of clients
2434
3611
if client.enabled:
2435
3612
client.init_checker()
2437
3614
tcp_server.enable()
2438
3615
tcp_server.server_activate()
2440
3617
# Find out what port we got
2441
service.port = tcp_server.socket.getsockname()[1]
3619
service.port = tcp_server.socket.getsockname()[1]
2443
logger.info("Now listening on address %r, port %d,"
2444
" flowinfo %d, scope_id %d"
2445
% tcp_server.socket.getsockname())
3621
log.info("Now listening on address %r, port %d, flowinfo %d,"
3622
" scope_id %d", *tcp_server.socket.getsockname())
2447
logger.info("Now listening on address %r, port %d"
2448
% tcp_server.socket.getsockname())
2450
#service.interface = tcp_server.socket.getsockname()[3]
3624
log.info("Now listening on address %r, port %d",
3625
*tcp_server.socket.getsockname())
3627
# service.interface = tcp_server.socket.getsockname()[3]
2453
# From the Avahi example code
2456
except dbus.exceptions.DBusException as error:
2457
logger.critical("DBusException: %s", error)
2460
# End of Avahi example code
2462
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2463
lambda *args, **kwargs:
2464
(tcp_server.handle_request
2465
(*args[2:], **kwargs) or True))
2467
logger.debug("Starting main loop")
3631
# From the Avahi example code
3634
except dbus.exceptions.DBusException as error:
3635
log.critical("D-Bus Exception", exc_info=error)
3638
# End of Avahi example code
3641
GLib.IOChannel.unix_new(tcp_server.fileno()),
3642
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3643
lambda *args, **kwargs: (tcp_server.handle_request
3644
(*args[2:], **kwargs) or True))
3646
log.debug("Starting main loop")
2468
3647
main_loop.run()
2469
3648
except AvahiError as error:
2470
logger.critical("AvahiError: %s", error)
3649
log.critical("Avahi Error", exc_info=error)
2473
3652
except KeyboardInterrupt:
2475
3654
print("", file=sys.stderr)
2476
logger.debug("Server received KeyboardInterrupt")
2477
logger.debug("Server exiting")
3655
log.debug("Server received KeyboardInterrupt")
3656
log.debug("Server exiting")
2478
3657
# Must run before the D-Bus bus name gets deregistered
2481
if __name__ == '__main__':
3661
def parse_test_args():
3662
# type: () -> argparse.Namespace
3663
parser = argparse.ArgumentParser(add_help=False)
3664
parser.add_argument("--check", action="store_true")
3665
parser.add_argument("--prefix", )
3666
args, unknown_args = parser.parse_known_args()
3668
# Remove test options from sys.argv
3669
sys.argv[1:] = unknown_args
3672
# Add all tests from doctest strings
3673
def load_tests(loader, tests, none):
3675
tests.addTests(doctest.DocTestSuite())
3678
if __name__ == "__main__":
3679
options = parse_test_args()
3682
extra_test_prefix = options.prefix
3683
if extra_test_prefix is not None:
3684
if not (unittest.main(argv=[""], exit=False)
3685
.result.wasSuccessful()):
3687
class ExtraTestLoader(unittest.TestLoader):
3688
testMethodPrefix = extra_test_prefix
3689
# Call using ./scriptname --test [--verbose]
3690
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3692
unittest.main(argv=[""])
3700
# (lambda (&optional extra)
3701
# (if (not (funcall run-tests-in-test-buffer default-directory
3703
# (funcall show-test-buffer-in-test-window)
3704
# (funcall remove-test-window)
3705
# (if extra (message "Extra tests run successfully!"))))
3706
# run-tests-in-test-buffer:
3707
# (lambda (dir &optional extra)
3708
# (with-current-buffer (get-buffer-create "*Test*")
3709
# (setq buffer-read-only nil
3710
# default-directory dir)
3712
# (compilation-mode))
3713
# (let ((process-result
3714
# (let ((inhibit-read-only t))
3715
# (process-file-shell-command
3716
# (funcall get-command-line extra) nil "*Test*"))))
3717
# (and (numberp process-result)
3718
# (= process-result 0))))
3720
# (lambda (&optional extra)
3721
# (let ((quoted-script
3722
# (shell-quote-argument (funcall get-script-name))))
3724
# (concat "%s --check" (if extra " --prefix=atest" ""))
3728
# (if (fboundp 'file-local-name)
3729
# (file-local-name (buffer-file-name))
3730
# (or (file-remote-p (buffer-file-name) 'localname)
3731
# (buffer-file-name))))
3732
# remove-test-window:
3734
# (let ((test-window (get-buffer-window "*Test*")))
3735
# (if test-window (delete-window test-window))))
3736
# show-test-buffer-in-test-window:
3738
# (when (not (get-buffer-window-list "*Test*"))
3739
# (setq next-error-last-buffer (get-buffer "*Test*"))
3740
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3741
# (display-buffer-overriding-action
3742
# `((display-buffer-in-side-window) (side . ,side)
3743
# (window-height . fit-window-to-buffer)
3744
# (window-width . fit-window-to-buffer))))
3745
# (display-buffer "*Test*"))))
3748
# (let* ((run-extra-tests (lambda () (interactive)
3749
# (funcall run-tests t)))
3750
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3751
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3752
# (setq minor-mode-overriding-map-alist
3753
# (cons `(run-tests . ,outer-keymap)
3754
# minor-mode-overriding-map-alist)))
3755
# (add-hook 'after-save-hook run-tests 90 t))