2
# -*- coding: utf-8; lexical-binding: t -*-
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2022 Teddy Hogeborn
15
# Copyright © 2008-2022 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
34
34
from __future__ import (division, absolute_import, print_function,
38
from future_builtins import *
37
import SocketServer as socketserver
48
import SocketServer as socketserver
55
import ConfigParser as configparser
43
import gnutls.connection
45
import gnutls.library.functions
46
import gnutls.library.constants
47
import gnutls.library.types
48
import ConfigParser as configparser
63
57
import logging.handlers
70
import cPickle as pickle
63
import cPickle as pickle
73
64
import multiprocessing
84
70
import dbus.service
86
from gi.repository import GLib
87
73
from dbus.mainloop.glib import DBusGMainLoop
90
76
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
# Add os.set_inheritable if it does not exist
116
except AttributeError:
117
def set_inheritable(fd, inheritable):
118
flags = fcntl.fcntl(fd, fcntl.F_GETFD)
119
if inheritable and ((flags & fcntl.FD_CLOEXEC) != 0):
120
fcntl.fcntl(fd, fcntl.F_SETFL, flags & ~fcntl.FD_CLOEXEC)
121
elif (not inheritable) and ((flags & fcntl.FD_CLOEXEC) == 0):
122
fcntl.fcntl(fd, fcntl.F_SETFL, flags | fcntl.FD_CLOEXEC)
123
os.set_inheritable = set_inheritable
126
# Show warnings by default
127
if not sys.warnoptions:
129
warnings.simplefilter("default")
131
# Try to find the value of SO_BINDTODEVICE:
133
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
134
# newer, and it is also the most natural place for it:
135
81
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
136
82
except AttributeError:
138
# This is where SO_BINDTODEVICE was up to and including Python
140
84
from IN import SO_BINDTODEVICE
141
85
except ImportError:
142
# In Python 2.7 it seems to have been removed entirely.
143
# Try running the C preprocessor:
145
cc = subprocess.Popen(["cc", "--language=c", "-E",
147
stdin=subprocess.PIPE,
148
stdout=subprocess.PIPE)
149
stdout = cc.communicate(
150
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
151
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
152
except (OSError, ValueError, IndexError):
154
SO_BINDTODEVICE = None
156
if sys.version_info < (3, 2):
157
configparser.Configparser = configparser.SafeConfigParser
86
SO_BINDTODEVICE = None
160
89
stored_state_file = "clients.pickle"
162
log = logging.getLogger(os.path.basename(sys.argv[0]))
163
logging.captureWarnings(True) # Show warnings via the logging system
91
logger = logging.getLogger()
92
syslogger = (logging.handlers.SysLogHandler
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
167
if_nametoindex = ctypes.cdll.LoadLibrary(
168
ctypes.util.find_library("c")).if_nametoindex
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
169
100
except (OSError, AttributeError):
171
101
def if_nametoindex(interface):
172
102
"Get an interface index the hard way, i.e. using fcntl()"
173
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
174
104
with contextlib.closing(socket.socket()) as s:
175
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
176
struct.pack(b"16s16x", interface))
177
interface_index = struct.unpack("I", ifreq[16:20])[0]
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
178
110
return interface_index
181
def copy_function(func):
182
"""Make a copy of a function"""
183
if sys.version_info.major == 2:
184
return types.FunctionType(func.func_code,
190
return types.FunctionType(func.__code__,
197
113
def initlogger(debug, level=logging.WARNING):
198
114
"""init logger and add loglevel"""
201
syslogger = (logging.handlers.SysLogHandler(
202
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
204
116
syslogger.setFormatter(logging.Formatter
205
("Mandos [%(process)d]: %(levelname)s:"
207
log.addHandler(syslogger)
117
('Mandos [%(process)d]: %(levelname)s:'
119
logger.addHandler(syslogger)
210
122
console = logging.StreamHandler()
211
console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
215
log.addHandler(console)
123
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
logger.addHandler(console)
128
logger.setLevel(level)
219
131
class PGPError(Exception):
268
168
os.rmdir(self.tempdir)
269
169
self.tempdir = None
271
171
def password_encode(self, password):
272
172
# Passphrase can not be empty and can not contain newlines or
273
173
# NUL bytes. So we prefix it and hex encode it.
274
encoded = b"mandos" + binascii.hexlify(password)
275
if len(encoded) > 2048:
276
# GnuPG can't handle long passwords, so encode differently
277
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
278
.replace(b"\n", b"\\n")
279
.replace(b"\0", b"\\x00"))
174
return b"mandos" + binascii.hexlify(password)
282
176
def encrypt(self, data, password):
283
passphrase = self.password_encode(password)
284
with tempfile.NamedTemporaryFile(
285
dir=self.tempdir) as passfile:
286
passfile.write(passphrase)
288
proc = subprocess.Popen([self.gpg, "--symmetric",
292
stdin=subprocess.PIPE,
293
stdout=subprocess.PIPE,
294
stderr=subprocess.PIPE)
295
ciphertext, err = proc.communicate(input=data)
296
if proc.returncode != 0:
177
self.gnupg.passphrase = self.password_encode(password)
178
with open(os.devnull) as devnull:
180
proc = self.gnupg.run(['--symmetric'],
181
create_fhs=['stdin', 'stdout'],
182
attach_fhs={'stderr': devnull})
183
with contextlib.closing(proc.handles['stdin']) as f:
185
with contextlib.closing(proc.handles['stdout']) as f:
186
ciphertext = f.read()
190
self.gnupg.passphrase = None
298
191
return ciphertext
300
193
def decrypt(self, data, password):
301
passphrase = self.password_encode(password)
302
with tempfile.NamedTemporaryFile(
303
dir=self.tempdir) as passfile:
304
passfile.write(passphrase)
306
proc = subprocess.Popen([self.gpg, "--decrypt",
310
stdin=subprocess.PIPE,
311
stdout=subprocess.PIPE,
312
stderr=subprocess.PIPE)
313
decrypted_plaintext, err = proc.communicate(input=data)
314
if proc.returncode != 0:
194
self.gnupg.passphrase = self.password_encode(password)
195
with open(os.devnull) as devnull:
197
proc = self.gnupg.run(['--decrypt'],
198
create_fhs=['stdin', 'stdout'],
199
attach_fhs={'stderr': devnull})
200
with contextlib.closing(proc.handles['stdin'] ) as f:
202
with contextlib.closing(proc.handles['stdout']) as f:
203
decrypted_plaintext = f.read()
207
self.gnupg.passphrase = None
316
208
return decrypted_plaintext
319
# Pretend that we have an Avahi module
321
"""This isn't so much a class as it is a module-like namespace."""
322
IF_UNSPEC = -1 # avahi-common/address.h
323
PROTO_UNSPEC = -1 # avahi-common/address.h
324
PROTO_INET = 0 # avahi-common/address.h
325
PROTO_INET6 = 1 # avahi-common/address.h
326
DBUS_NAME = "org.freedesktop.Avahi"
327
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
328
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
329
DBUS_PATH_SERVER = "/"
332
def string_array_to_txt_array(t):
333
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
334
for s in t), signature="ay")
335
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
336
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
337
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
338
SERVER_INVALID = 0 # avahi-common/defs.h
339
SERVER_REGISTERING = 1 # avahi-common/defs.h
340
SERVER_RUNNING = 2 # avahi-common/defs.h
341
SERVER_COLLISION = 3 # avahi-common/defs.h
342
SERVER_FAILURE = 4 # avahi-common/defs.h
345
212
class AvahiError(Exception):
346
213
def __init__(self, value, *args, **kwargs):
347
214
self.value = value
348
return super(AvahiError, self).__init__(value, *args,
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
352
219
class AvahiServiceError(AvahiError):
356
222
class AvahiGroupError(AvahiError):
226
class AvahiService(object):
361
227
"""An Avahi (Zeroconf) service.
364
230
interface: integer; avahi.IF_UNSPEC or an interface index.
365
231
Used to optionally bind to the specified interface.
366
name: string; Example: "Mandos"
367
type: string; Example: "_mandos._tcp".
368
See <https://www.iana.org/assignments/service-names-port-numbers>
232
name: string; Example: 'Mandos'
233
type: string; Example: '_mandos._tcp'.
234
See <http://www.dns-sd.org/ServiceTypes.html>
369
235
port: integer; what port to announce
370
236
TXT: list of strings; TXT record for the service
371
237
domain: string; Domain to publish on, default to .local if empty.
529
366
follow_name_owner_changes=True),
530
367
avahi.DBUS_INTERFACE_SERVER)
531
368
self.server.connect_to_signal("StateChanged",
532
self.server_state_changed)
369
self.server_state_changed)
533
370
self.server_state_changed(self.server.GetState())
536
372
class AvahiServiceToSyslog(AvahiService):
537
def rename(self, *args, **kwargs):
538
374
"""Add the new name to the syslog messages"""
539
ret = super(AvahiServiceToSyslog, self).rename(*args,
541
syslogger.setFormatter(logging.Formatter(
542
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
375
ret = AvahiService.rename(self)
376
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
547
# Pretend that we have a GnuTLS module
549
"""This isn't so much a class as it is a module-like namespace."""
551
library = ctypes.util.find_library("gnutls")
553
library = ctypes.util.find_library("gnutls-deb0")
554
_library = ctypes.cdll.LoadLibrary(library)
557
# Unless otherwise indicated, the constants and types below are
558
# all from the gnutls/gnutls.h C header file.
569
E_NO_CERTIFICATE_FOUND = -49
574
KEYID_USE_SHA256 = 1 # gnutls/x509.h
575
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
578
class _session_int(ctypes.Structure):
580
session_t = ctypes.POINTER(_session_int)
582
class certificate_credentials_st(ctypes.Structure):
584
certificate_credentials_t = ctypes.POINTER(
585
certificate_credentials_st)
586
certificate_type_t = ctypes.c_int
588
class datum_t(ctypes.Structure):
589
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
590
("size", ctypes.c_uint)]
592
class _openpgp_crt_int(ctypes.Structure):
594
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
595
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
596
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
597
credentials_type_t = ctypes.c_int
598
transport_ptr_t = ctypes.c_void_p
599
close_request_t = ctypes.c_int
602
class Error(Exception):
603
def __init__(self, message=None, code=None, args=()):
604
# Default usage is by a message string, but if a return
605
# code is passed, convert it to a string with
608
if message is None and code is not None:
609
message = gnutls.strerror(code).decode(
610
"utf-8", errors="replace")
611
return super(gnutls.Error, self).__init__(
614
class CertificateSecurityError(Error):
618
def __init__(self, cls):
621
def from_param(self, obj):
622
if not isinstance(obj, self.cls):
623
raise TypeError("Not of type {}: {!r}"
624
.format(self.cls.__name__, obj))
625
return ctypes.byref(obj.from_param(obj))
627
class CastToVoidPointer:
628
def __init__(self, cls):
631
def from_param(self, obj):
632
if not isinstance(obj, self.cls):
633
raise TypeError("Not of type {}: {!r}"
634
.format(self.cls.__name__, obj))
635
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
637
class With_from_param:
639
def from_param(cls, obj):
640
return obj._as_parameter_
643
class Credentials(With_from_param):
645
self._as_parameter_ = gnutls.certificate_credentials_t()
646
gnutls.certificate_allocate_credentials(self)
647
self.type = gnutls.CRD_CERTIFICATE
650
gnutls.certificate_free_credentials(self)
652
class ClientSession(With_from_param):
653
def __init__(self, socket, credentials=None):
654
self._as_parameter_ = gnutls.session_t()
655
gnutls_flags = gnutls.CLIENT
656
if gnutls.check_version(b"3.5.6"):
657
gnutls_flags |= gnutls.NO_TICKETS
659
gnutls_flags |= gnutls.ENABLE_RAWPK
660
gnutls.init(self, gnutls_flags)
662
gnutls.set_default_priority(self)
663
gnutls.transport_set_ptr(self, socket.fileno())
664
gnutls.handshake_set_private_extensions(self, True)
666
if credentials is None:
667
credentials = gnutls.Credentials()
668
gnutls.credentials_set(self, credentials.type,
670
self.credentials = credentials
676
return gnutls.handshake(self)
678
def send(self, data):
682
data_len -= gnutls.record_send(self, data[-data_len:],
686
return gnutls.bye(self, gnutls.SHUT_RDWR)
688
# Error handling functions
689
def _error_code(result):
690
"""A function to raise exceptions on errors, suitable
691
for the "restype" attribute on ctypes functions"""
692
if result >= gnutls.E_SUCCESS:
694
if result == gnutls.E_NO_CERTIFICATE_FOUND:
695
raise gnutls.CertificateSecurityError(code=result)
696
raise gnutls.Error(code=result)
698
def _retry_on_error(result, func, arguments,
699
_error_code=_error_code):
700
"""A function to retry on some errors, suitable
701
for the "errcheck" attribute on ctypes functions"""
702
while result < gnutls.E_SUCCESS:
703
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
704
return _error_code(result)
705
result = func(*arguments)
708
# Unless otherwise indicated, the function declarations below are
709
# all from the gnutls/gnutls.h C header file.
712
priority_set_direct = _library.gnutls_priority_set_direct
713
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
714
ctypes.POINTER(ctypes.c_char_p)]
715
priority_set_direct.restype = _error_code
717
init = _library.gnutls_init
718
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
719
init.restype = _error_code
721
set_default_priority = _library.gnutls_set_default_priority
722
set_default_priority.argtypes = [ClientSession]
723
set_default_priority.restype = _error_code
725
record_send = _library.gnutls_record_send
726
record_send.argtypes = [ClientSession, ctypes.c_void_p,
728
record_send.restype = ctypes.c_ssize_t
729
record_send.errcheck = _retry_on_error
731
certificate_allocate_credentials = (
732
_library.gnutls_certificate_allocate_credentials)
733
certificate_allocate_credentials.argtypes = [
734
PointerTo(Credentials)]
735
certificate_allocate_credentials.restype = _error_code
737
certificate_free_credentials = (
738
_library.gnutls_certificate_free_credentials)
739
certificate_free_credentials.argtypes = [Credentials]
740
certificate_free_credentials.restype = None
742
handshake_set_private_extensions = (
743
_library.gnutls_handshake_set_private_extensions)
744
handshake_set_private_extensions.argtypes = [ClientSession,
746
handshake_set_private_extensions.restype = None
748
credentials_set = _library.gnutls_credentials_set
749
credentials_set.argtypes = [ClientSession, credentials_type_t,
750
CastToVoidPointer(Credentials)]
751
credentials_set.restype = _error_code
753
strerror = _library.gnutls_strerror
754
strerror.argtypes = [ctypes.c_int]
755
strerror.restype = ctypes.c_char_p
757
certificate_type_get = _library.gnutls_certificate_type_get
758
certificate_type_get.argtypes = [ClientSession]
759
certificate_type_get.restype = _error_code
761
certificate_get_peers = _library.gnutls_certificate_get_peers
762
certificate_get_peers.argtypes = [ClientSession,
763
ctypes.POINTER(ctypes.c_uint)]
764
certificate_get_peers.restype = ctypes.POINTER(datum_t)
766
global_set_log_level = _library.gnutls_global_set_log_level
767
global_set_log_level.argtypes = [ctypes.c_int]
768
global_set_log_level.restype = None
770
global_set_log_function = _library.gnutls_global_set_log_function
771
global_set_log_function.argtypes = [log_func]
772
global_set_log_function.restype = None
774
deinit = _library.gnutls_deinit
775
deinit.argtypes = [ClientSession]
776
deinit.restype = None
778
handshake = _library.gnutls_handshake
779
handshake.argtypes = [ClientSession]
780
handshake.restype = ctypes.c_int
781
handshake.errcheck = _retry_on_error
783
transport_set_ptr = _library.gnutls_transport_set_ptr
784
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
785
transport_set_ptr.restype = None
787
bye = _library.gnutls_bye
788
bye.argtypes = [ClientSession, close_request_t]
789
bye.restype = ctypes.c_int
790
bye.errcheck = _retry_on_error
792
check_version = _library.gnutls_check_version
793
check_version.argtypes = [ctypes.c_char_p]
794
check_version.restype = ctypes.c_char_p
796
_need_version = b"3.3.0"
797
if check_version(_need_version) is None:
798
raise self.Error("Needs GnuTLS {} or later"
799
.format(_need_version))
801
_tls_rawpk_version = b"3.6.6"
802
has_rawpk = bool(check_version(_tls_rawpk_version))
806
class pubkey_st(ctypes.Structure):
808
pubkey_t = ctypes.POINTER(pubkey_st)
810
x509_crt_fmt_t = ctypes.c_int
812
# All the function declarations below are from
814
pubkey_init = _library.gnutls_pubkey_init
815
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
816
pubkey_init.restype = _error_code
818
pubkey_import = _library.gnutls_pubkey_import
819
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
821
pubkey_import.restype = _error_code
823
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
824
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
825
ctypes.POINTER(ctypes.c_ubyte),
826
ctypes.POINTER(ctypes.c_size_t)]
827
pubkey_get_key_id.restype = _error_code
829
pubkey_deinit = _library.gnutls_pubkey_deinit
830
pubkey_deinit.argtypes = [pubkey_t]
831
pubkey_deinit.restype = None
833
# All the function declarations below are from
836
openpgp_crt_init = _library.gnutls_openpgp_crt_init
837
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
838
openpgp_crt_init.restype = _error_code
840
openpgp_crt_import = _library.gnutls_openpgp_crt_import
841
openpgp_crt_import.argtypes = [openpgp_crt_t,
842
ctypes.POINTER(datum_t),
844
openpgp_crt_import.restype = _error_code
846
openpgp_crt_verify_self = \
847
_library.gnutls_openpgp_crt_verify_self
848
openpgp_crt_verify_self.argtypes = [
851
ctypes.POINTER(ctypes.c_uint),
853
openpgp_crt_verify_self.restype = _error_code
855
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
856
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
857
openpgp_crt_deinit.restype = None
859
openpgp_crt_get_fingerprint = (
860
_library.gnutls_openpgp_crt_get_fingerprint)
861
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
865
openpgp_crt_get_fingerprint.restype = _error_code
867
if check_version(b"3.6.4"):
868
certificate_type_get2 = _library.gnutls_certificate_type_get2
869
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
870
certificate_type_get2.restype = _error_code
872
# Remove non-public functions
873
del _error_code, _retry_on_error
876
def call_pipe(connection, # : multiprocessing.Connection
877
func, *args, **kwargs):
878
"""This function is meant to be called by multiprocessing.Process
880
This function runs func(*args, **kwargs), and writes the resulting
881
return value on the provided multiprocessing.Connection.
883
connection.send(func(*args, **kwargs))
382
def timedelta_to_milliseconds(td):
383
"Convert a datetime.timedelta() to milliseconds"
384
return ((td.days * 24 * 60 * 60 * 1000)
385
+ (td.seconds * 1000)
386
+ (td.microseconds // 1000))
388
class Client(object):
888
389
"""A representation of a client host served by this server.
891
approved: bool(); None if not yet approved/disapproved
392
approved: bool(); 'None' if not yet approved/disapproved
892
393
approval_delay: datetime.timedelta(); Time to wait for approval
893
394
approval_duration: datetime.timedelta(); Duration of one approval
894
checker: multiprocessing.Process(); a running checker process used
895
to see if the client lives. None if no process is
897
checker_callback_tag: a GLib event source tag, or None
395
checker: subprocess.Popen(); a running checker process used
396
to see if the client lives.
397
'None' if no process is running.
398
checker_callback_tag: a gobject event source tag, or None
898
399
checker_command: string; External command which is run to check
899
400
if client lives. %() expansions are done at
900
401
runtime with vars(self) as dict, so that for
901
402
instance %(name)s can be used in the command.
902
checker_initiator_tag: a GLib event source tag, or None
403
checker_initiator_tag: a gobject event source tag, or None
903
404
created: datetime.datetime(); (UTC) object creation
904
405
client_structure: Object describing what attributes a client has
905
406
and is used for storing the client at exit
906
407
current_checker_command: string; current running checker_command
907
disable_initiator_tag: a GLib event source tag, or None
408
disable_initiator_tag: a gobject event source tag, or None
909
410
fingerprint: string (40 or 32 hexadecimal digits); used to
910
uniquely identify an OpenPGP client
911
key_id: string (64 hexadecimal digits); used to uniquely identify
912
a client using raw public keys
411
uniquely identify the client
913
412
host: string; available for use by the checker command
914
413
interval: datetime.timedelta(); How often to start a new checker
915
414
last_approval_request: datetime.datetime(); (UTC) or None
916
415
last_checked_ok: datetime.datetime(); (UTC) or None
917
416
last_checker_status: integer between 0 and 255 reflecting exit
918
417
status of last checker. -1 reflects crashed
919
checker, -2 means no checker completed yet.
920
last_checker_signal: The signal which killed the last checker, if
921
last_checker_status is -1
922
419
last_enabled: datetime.datetime(); (UTC) or None
923
420
name: string; from the config file, used in log messages and
924
421
D-Bus identifiers
925
422
secret: bytestring; sent verbatim (over TLS) to client
926
423
timeout: datetime.timedelta(); How long from last_checked_ok
927
424
until this client is disabled
928
extended_timeout: extra long timeout when secret has been sent
425
extended_timeout: extra long timeout when password has been sent
929
426
runtime_expansions: Allowed attributes for runtime expansion.
930
427
expires: datetime.datetime(); time (UTC) when a client will be
931
428
disabled, or None
932
server_settings: The server_settings dict from main()
935
431
runtime_expansions = ("approval_delay", "approval_duration",
936
"created", "enabled", "expires", "key_id",
937
"fingerprint", "host", "interval",
938
"last_approval_request", "last_checked_ok",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
939
434
"last_enabled", "name", "timeout")
942
"extended_timeout": "PT15M",
944
"checker": "fping -q -- %%(host)s",
946
"approval_delay": "PT0S",
947
"approval_duration": "PT1S",
948
"approved_by_default": "True",
435
client_defaults = { "timeout": "5m",
436
"extended_timeout": "15m",
438
"checker": "fping -q -- %%(host)s",
440
"approval_delay": "0s",
441
"approval_duration": "1s",
442
"approved_by_default": "True",
446
def timeout_milliseconds(self):
447
"Return the 'timeout' attribute in milliseconds"
448
return timedelta_to_milliseconds(self.timeout)
450
def extended_timeout_milliseconds(self):
451
"Return the 'extended_timeout' attribute in milliseconds"
452
return timedelta_to_milliseconds(self.extended_timeout)
454
def interval_milliseconds(self):
455
"Return the 'interval' attribute in milliseconds"
456
return timedelta_to_milliseconds(self.interval)
458
def approval_delay_milliseconds(self):
459
return timedelta_to_milliseconds(self.approval_delay)
953
462
def config_parser(config):
1042
541
self.current_checker_command = None
1043
542
self.approved = None
1044
543
self.approvals_pending = 0
1045
self.changedstate = multiprocessing_manager.Condition(
1046
multiprocessing_manager.Lock())
1047
self.client_structure = [attr
1048
for attr in self.__dict__.keys()
544
self.changedstate = (multiprocessing_manager
545
.Condition(multiprocessing_manager
547
self.client_structure = [attr for attr in
548
self.__dict__.iterkeys()
1049
549
if not attr.startswith("_")]
1050
550
self.client_structure.append("client_structure")
1052
for name, t in inspect.getmembers(
1053
type(self), lambda obj: isinstance(obj, property)):
552
for name, t in inspect.getmembers(type(self),
1054
556
if not name.startswith("_"):
1055
557
self.client_structure.append(name)
1057
559
# Send notice to process children that client state has changed
1058
560
def send_changedstate(self):
1059
561
with self.changedstate:
1060
562
self.changedstate.notify_all()
1062
564
def enable(self):
1063
565
"""Start this client's checker and timeout hooks"""
1064
566
if getattr(self, "enabled", False):
1065
567
# Already enabled
569
self.send_changedstate()
570
self.expires = datetime.datetime.utcnow() + self.timeout
1067
571
self.enabled = True
1068
572
self.last_enabled = datetime.datetime.utcnow()
1069
573
self.init_checker()
1070
self.send_changedstate()
1072
575
def disable(self, quiet=True):
1073
576
"""Disable this client."""
1074
577
if not getattr(self, "enabled", False):
1077
log.info("Disabling client %s", self.name)
1078
if getattr(self, "disable_initiator_tag", None) is not None:
1079
GLib.source_remove(self.disable_initiator_tag)
580
self.send_changedstate()
582
logger.info("Disabling client %s", self.name)
583
if getattr(self, "disable_initiator_tag", False):
584
gobject.source_remove(self.disable_initiator_tag)
1080
585
self.disable_initiator_tag = None
1081
586
self.expires = None
1082
if getattr(self, "checker_initiator_tag", None) is not None:
1083
GLib.source_remove(self.checker_initiator_tag)
587
if getattr(self, "checker_initiator_tag", False):
588
gobject.source_remove(self.checker_initiator_tag)
1084
589
self.checker_initiator_tag = None
1085
590
self.stop_checker()
1086
591
self.enabled = False
1088
self.send_changedstate()
1089
# Do not run this again if called by a GLib.timeout_add
592
# Do not run this again if called by a gobject.timeout_add
1092
595
def __del__(self):
1095
def init_checker(self, randomize_start=False):
1096
# Schedule a new checker to be started a randomly selected
1097
# time (a fraction of 'interval') from now. This spreads out
1098
# the startup of checkers over time when the server is
1100
if self.checker_initiator_tag is not None:
1101
GLib.source_remove(self.checker_initiator_tag)
1102
interval_milliseconds = int(self.interval.total_seconds()
1105
delay_milliseconds = random.randrange(
1106
interval_milliseconds + 1)
1108
delay_milliseconds = interval_milliseconds
1109
self.checker_initiator_tag = GLib.timeout_add(
1110
delay_milliseconds, self.start_checker, randomize_start)
1111
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1112
# A checker might take up to an 'interval' of time, so we can
1113
# expire at the soonest one interval after a checker was
1114
# started. Since the initial checker is delayed, the expire
1115
# time might have to be extended.
1116
now = datetime.datetime.utcnow()
1117
self.expires = now + delay + self.interval
1118
# Schedule a disable() at expire time
1119
if self.disable_initiator_tag is not None:
1120
GLib.source_remove(self.disable_initiator_tag)
1121
self.disable_initiator_tag = GLib.timeout_add(
1122
int((self.expires - now).total_seconds() * 1000),
1125
def checker_callback(self, source, condition, connection,
598
def init_checker(self):
599
# Schedule a new checker to be started an 'interval' from now,
600
# and every interval from then on.
601
self.checker_initiator_tag = (gobject.timeout_add
602
(self.interval_milliseconds(),
604
# Schedule a disable() when 'timeout' has passed
605
self.disable_initiator_tag = (gobject.timeout_add
606
(self.timeout_milliseconds(),
608
# Also start a new checker *right now*.
611
def checker_callback(self, pid, condition, command):
1127
612
"""The checker has completed, so take appropriate actions."""
1128
# Read return code from connection (see call_pipe)
1129
returncode = connection.recv()
1131
if self.checker is not None:
1133
613
self.checker_callback_tag = None
1134
614
self.checker = None
1137
self.last_checker_status = returncode
1138
self.last_checker_signal = None
615
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
1139
617
if self.last_checker_status == 0:
1140
log.info("Checker for %(name)s succeeded", vars(self))
618
logger.info("Checker for %(name)s succeeded",
1141
620
self.checked_ok()
1143
log.info("Checker for %(name)s failed", vars(self))
622
logger.info("Checker for %(name)s failed",
1145
625
self.last_checker_status = -1
1146
self.last_checker_signal = -returncode
1147
log.warning("Checker for %(name)s crashed?", vars(self))
1150
def checked_ok(self):
1151
"""Assert that the client has been seen, alive and well."""
1152
self.last_checked_ok = datetime.datetime.utcnow()
1153
self.last_checker_status = 0
1154
self.last_checker_signal = None
1157
def bump_timeout(self, timeout=None):
1158
"""Bump up the timeout for this client."""
626
logger.warning("Checker for %(name)s crashed?",
629
def checked_ok(self, timeout=None):
630
"""Bump up the timeout for this client.
632
This should only be called when the client has been seen,
1159
635
if timeout is None:
1160
636
timeout = self.timeout
637
self.last_checked_ok = datetime.datetime.utcnow()
1161
638
if self.disable_initiator_tag is not None:
1162
GLib.source_remove(self.disable_initiator_tag)
1163
self.disable_initiator_tag = None
639
gobject.source_remove(self.disable_initiator_tag)
1164
640
if getattr(self, "enabled", False):
1165
self.disable_initiator_tag = GLib.timeout_add(
1166
int(timeout.total_seconds() * 1000), self.disable)
641
self.disable_initiator_tag = (gobject.timeout_add
642
(timedelta_to_milliseconds
643
(timeout), self.disable))
1167
644
self.expires = datetime.datetime.utcnow() + timeout
1169
646
def need_approval(self):
1170
647
self.last_approval_request = datetime.datetime.utcnow()
1172
def start_checker(self, start_was_randomized=False):
649
def start_checker(self):
1173
650
"""Start a new checker subprocess if one is not running.
1175
652
If a checker already exists, leave it running and do
1177
654
# The reason for not killing a running checker is that if we
1178
# did that, and if a checker (for some reason) started running
1179
# slowly and taking more than 'interval' time, then the client
1180
# would inevitably timeout, since no checker would get a
1181
# chance to run to completion. If we instead leave running
655
# did that, then if a checker (for some reason) started
656
# running slowly and taking more than 'interval' time, the
657
# client would inevitably timeout, since no checker would get
658
# a chance to run to completion. If we instead leave running
1182
659
# checkers alone, the checker would have to take more time
1183
660
# than 'timeout' for the client to be disabled, which is as it
1186
if self.checker is not None and not self.checker.is_alive():
1187
log.warning("Checker was not alive; joining")
663
# If a checker exists, make sure it is not a zombie
665
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
666
except (AttributeError, OSError) as error:
667
if (isinstance(error, OSError)
668
and error.errno != errno.ECHILD):
672
logger.warning("Checker was a zombie")
673
gobject.source_remove(self.checker_callback_tag)
674
self.checker_callback(pid, status,
675
self.current_checker_command)
1190
676
# Start a new checker if needed
1191
677
if self.checker is None:
1192
# Escape attributes for the shell
1194
attr: shlex.quote(str(getattr(self, attr)))
1195
for attr in self.runtime_expansions}
1197
command = self.checker_command % escaped_attrs
1198
except TypeError as error:
1199
log.error('Could not format string "%s"',
1200
self.checker_command, exc_info=error)
1201
return True # Try again later
679
# In case checker_command has exactly one % operator
680
command = self.checker_command % self.host
682
# Escape attributes for the shell
683
escaped_attrs = dict(
685
re.escape(unicode(str(getattr(self, attr, "")),
689
self.runtime_expansions)
692
command = self.checker_command % escaped_attrs
693
except TypeError as error:
694
logger.error('Could not format string "%s":'
695
' %s', self.checker_command, error)
696
return True # Try again later
1202
697
self.current_checker_command = command
1203
log.info("Starting checker %r for %s", command, self.name)
1204
# We don't need to redirect stdout and stderr, since
1205
# in normal mode, that is already done by daemon(),
1206
# and in debug mode we don't want to. (Stdin is
1207
# always replaced by /dev/null.)
1208
# The exception is when not debugging but nevertheless
1209
# running in the foreground; use the previously
1211
popen_args = {"close_fds": True,
1214
if (not self.server_settings["debug"]
1215
and self.server_settings["foreground"]):
1216
popen_args.update({"stdout": wnull,
1218
pipe = multiprocessing.Pipe(duplex=False)
1219
self.checker = multiprocessing.Process(
1221
args=(pipe[1], subprocess.call, command),
1223
self.checker.start()
1224
self.checker_callback_tag = GLib.io_add_watch(
1225
GLib.IOChannel.unix_new(pipe[0].fileno()),
1226
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1227
self.checker_callback, pipe[0], command)
1228
if start_was_randomized:
1229
# We were started after a random delay; Schedule a new
1230
# checker to be started an 'interval' from now, and every
1231
# interval from then on.
1232
now = datetime.datetime.utcnow()
1233
self.checker_initiator_tag = GLib.timeout_add(
1234
int(self.interval.total_seconds() * 1000),
1236
self.expires = max(self.expires, now + self.interval)
1237
# Don't start a new checker again after same random delay
1239
# Re-run this periodically if run by GLib.timeout_add
699
logger.info("Starting checker %r for %s",
701
# We don't need to redirect stdout and stderr, since
702
# in normal mode, that is already done by daemon(),
703
# and in debug mode we don't want to. (Stdin is
704
# always replaced by /dev/null.)
705
self.checker = subprocess.Popen(command,
708
self.checker_callback_tag = (gobject.child_watch_add
710
self.checker_callback,
712
# The checker may have completed before the gobject
713
# watch was added. Check for this.
714
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
716
gobject.source_remove(self.checker_callback_tag)
717
self.checker_callback(pid, status, command)
718
except OSError as error:
719
logger.error("Failed to start subprocess: %s",
721
# Re-run this periodically if run by gobject.timeout_add
1242
724
def stop_checker(self):
1243
725
"""Force the checker process, if any, to stop."""
1244
726
if self.checker_callback_tag:
1245
GLib.source_remove(self.checker_callback_tag)
727
gobject.source_remove(self.checker_callback_tag)
1246
728
self.checker_callback_tag = None
1247
729
if getattr(self, "checker", None) is None:
1249
log.debug("Stopping checker for %(name)s", vars(self))
1250
self.checker.terminate()
731
logger.debug("Stopping checker for %(name)s", vars(self))
733
os.kill(self.checker.pid, signal.SIGTERM)
735
#if self.checker.poll() is None:
736
# os.kill(self.checker.pid, signal.SIGKILL)
737
except OSError as error:
738
if error.errno != errno.ESRCH: # No such process
1251
740
self.checker = None
1254
def dbus_service_property(dbus_interface,
743
def dbus_service_property(dbus_interface, signature="v",
744
access="readwrite", byte_arrays=False):
1258
745
"""Decorators for marking methods of a DBusObjectWithProperties to
1259
746
become properties on the D-Bus.
1261
748
The decorated method will be called with no arguments by "Get"
1262
749
and with one argument by "Set".
1264
751
The parameters, where they are supported, are the same as
1265
752
dbus.service.method, except there is only "signature", since the
1266
753
type from Get() and the type sent to Set() is the same.
1349
class DBusObjectWithAnnotations(dbus.service.Object):
1350
"""A D-Bus object with annotations.
1352
Classes inheriting from this can use the dbus_annotations
1353
decorator to add annotations to methods or signals.
1357
def _is_dbus_thing(thing):
1358
"""Returns a function testing if an attribute is a D-Bus thing
1360
If called like _is_dbus_thing("method") it returns a function
1361
suitable for use as predicate to inspect.getmembers().
1363
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1366
def _get_all_dbus_things(self, thing):
1367
"""Returns a generator of (name, attribute) pairs
1369
return ((getattr(athing.__get__(self), "_dbus_name", name),
1370
athing.__get__(self))
1371
for cls in self.__class__.__mro__
1373
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1375
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1377
path_keyword="object_path",
1378
connection_keyword="connection")
1379
def Introspect(self, object_path, connection):
1380
"""Overloading of standard D-Bus method.
1382
Inserts annotation tags on methods and signals.
1384
xmlstring = dbus.service.Object.Introspect(self, object_path,
1387
document = xml.dom.minidom.parseString(xmlstring)
1389
for if_tag in document.getElementsByTagName("interface"):
1390
# Add annotation tags
1391
for typ in ("method", "signal"):
1392
for tag in if_tag.getElementsByTagName(typ):
1394
for name, prop in (self.
1395
_get_all_dbus_things(typ)):
1396
if (name == tag.getAttribute("name")
1397
and prop._dbus_interface
1398
== if_tag.getAttribute("name")):
1399
annots.update(getattr(
1400
prop, "_dbus_annotations", {}))
1401
for name, value in annots.items():
1402
ann_tag = document.createElement(
1404
ann_tag.setAttribute("name", name)
1405
ann_tag.setAttribute("value", value)
1406
tag.appendChild(ann_tag)
1407
# Add interface annotation tags
1408
for annotation, value in dict(
1409
itertools.chain.from_iterable(
1410
annotations().items()
1411
for name, annotations
1412
in self._get_all_dbus_things("interface")
1413
if name == if_tag.getAttribute("name")
1415
ann_tag = document.createElement("annotation")
1416
ann_tag.setAttribute("name", annotation)
1417
ann_tag.setAttribute("value", value)
1418
if_tag.appendChild(ann_tag)
1419
# Fix argument name for the Introspect method itself
1420
if (if_tag.getAttribute("name")
1421
== dbus.INTROSPECTABLE_IFACE):
1422
for cn in if_tag.getElementsByTagName("method"):
1423
if cn.getAttribute("name") == "Introspect":
1424
for arg in cn.getElementsByTagName("arg"):
1425
if (arg.getAttribute("direction")
1427
arg.setAttribute("name",
1429
xmlstring = document.toxml("utf-8")
1431
except (AttributeError, xml.dom.DOMException,
1432
xml.parsers.expat.ExpatError) as error:
1433
log.error("Failed to override Introspection method",
1438
class DBusObjectWithProperties(DBusObjectWithAnnotations):
792
class DBusObjectWithProperties(dbus.service.Object):
1439
793
"""A D-Bus object with properties.
1441
795
Classes inheriting from this can use the dbus_service_property
1442
796
decorator to expose methods as D-Bus properties. It exposes the
1443
797
standard Get(), Set(), and GetAll() methods on the D-Bus.
801
def _is_dbus_property(obj):
802
return getattr(obj, "_dbus_is_property", False)
804
def _get_all_dbus_properties(self):
805
"""Returns a generator of (name, attribute) pairs
807
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
808
for cls in self.__class__.__mro__
810
inspect.getmembers(cls, self._is_dbus_property))
1446
812
def _get_dbus_property(self, interface_name, property_name):
1447
813
"""Returns a bound method if one exists which is a D-Bus
1448
814
property with the specified name and interface.
1450
for cls in self.__class__.__mro__:
1451
for name, value in inspect.getmembers(
1452
cls, self._is_dbus_thing("property")):
816
for cls in self.__class__.__mro__:
817
for name, value in (inspect.getmembers
818
(cls, self._is_dbus_property)):
1453
819
if (value._dbus_name == property_name
1454
820
and value._dbus_interface == interface_name):
1455
821
return value.__get__(self)
1457
823
# No such property
1458
raise DBusPropertyNotFound("{}:{}.{}".format(
1459
self.dbus_object_path, interface_name, property_name))
1462
def _get_all_interface_names(cls):
1463
"""Get a sequence of all interfaces supported by an object"""
1464
return (name for name in set(getattr(getattr(x, attr),
1465
"_dbus_interface", None)
1466
for x in (inspect.getmro(cls))
1468
if name is not None)
1470
@dbus.service.method(dbus.PROPERTIES_IFACE,
824
raise DBusPropertyNotFound(self.dbus_object_path + ":"
825
+ interface_name + "."
828
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1472
829
out_signature="v")
1473
830
def Get(self, interface_name, property_name):
1474
831
"""Standard D-Bus property Get() method, see D-Bus standard.
1597
922
document.unlink()
1598
923
except (AttributeError, xml.dom.DOMException,
1599
924
xml.parsers.expat.ExpatError) as error:
1600
log.error("Failed to override Introspection method",
1606
dbus.OBJECT_MANAGER_IFACE
1607
except AttributeError:
1608
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1611
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1612
"""A D-Bus object with an ObjectManager.
1614
Classes inheriting from this exposes the standard
1615
GetManagedObjects call and the InterfacesAdded and
1616
InterfacesRemoved signals on the standard
1617
"org.freedesktop.DBus.ObjectManager" interface.
1619
Note: No signals are sent automatically; they must be sent
1622
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1623
out_signature="a{oa{sa{sv}}}")
1624
def GetManagedObjects(self):
1625
"""This function must be overridden"""
1626
raise NotImplementedError()
1628
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1629
signature="oa{sa{sv}}")
1630
def InterfacesAdded(self, object_path, interfaces_and_properties):
1633
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1634
def InterfacesRemoved(self, object_path, interfaces):
1637
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1639
path_keyword="object_path",
1640
connection_keyword="connection")
1641
def Introspect(self, object_path, connection):
1642
"""Overloading of standard D-Bus method.
1644
Override return argument name of GetManagedObjects to be
1645
"objpath_interfaces_and_properties"
1647
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1651
document = xml.dom.minidom.parseString(xmlstring)
1653
for if_tag in document.getElementsByTagName("interface"):
1654
# Fix argument name for the GetManagedObjects method
1655
if (if_tag.getAttribute("name")
1656
== dbus.OBJECT_MANAGER_IFACE):
1657
for cn in if_tag.getElementsByTagName("method"):
1658
if (cn.getAttribute("name")
1659
== "GetManagedObjects"):
1660
for arg in cn.getElementsByTagName("arg"):
1661
if (arg.getAttribute("direction")
1665
"objpath_interfaces"
1667
xmlstring = document.toxml("utf-8")
1669
except (AttributeError, xml.dom.DOMException,
1670
xml.parsers.expat.ExpatError) as error:
1671
log.error("Failed to override Introspection method",
1676
def datetime_to_dbus(dt, variant_level=0):
925
logger.error("Failed to override Introspection method",
930
def datetime_to_dbus (dt, variant_level=0):
1677
931
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1679
return dbus.String("", variant_level=variant_level)
1680
return dbus.String(dt.isoformat(), variant_level=variant_level)
1683
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1684
"""A class decorator; applied to a subclass of
1685
dbus.service.Object, it will add alternate D-Bus attributes with
1686
interface names according to the "alt_interface_names" mapping.
1689
@alternate_dbus_interfaces({"org.example.Interface":
1690
"net.example.AlternateInterface"})
1691
class SampleDBusObject(dbus.service.Object):
1692
@dbus.service.method("org.example.Interface")
1693
def SampleDBusMethod():
1696
The above "SampleDBusMethod" on "SampleDBusObject" will be
1697
reachable via two interfaces: "org.example.Interface" and
1698
"net.example.AlternateInterface", the latter of which will have
1699
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1700
"true", unless "deprecate" is passed with a False value.
1702
This works for methods and signals, and also for D-Bus properties
1703
(from DBusObjectWithProperties) and interfaces (from the
1704
dbus_interface_annotations decorator).
933
return dbus.String("", variant_level = variant_level)
934
return dbus.String(dt.isoformat(),
935
variant_level=variant_level)
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
"""Applied to an empty subclass of a D-Bus object, this metaclass
941
will add additional D-Bus attributes matching a certain pattern.
1708
for orig_interface_name, alt_interface_name in (
1709
alt_interface_names.items()):
1711
interface_names = set()
1712
# Go though all attributes of the class
1713
for attrname, attribute in inspect.getmembers(cls):
943
def __new__(mcs, name, bases, attr):
944
# Go through all the base classes which could have D-Bus
945
# methods, signals, or properties in them
946
for base in (b for b in bases
947
if issubclass(b, dbus.service.Object)):
948
# Go though all attributes of the base class
949
for attrname, attribute in inspect.getmembers(base):
1714
950
# Ignore non-D-Bus attributes, and D-Bus attributes
1715
951
# with the wrong interface name
1716
952
if (not hasattr(attribute, "_dbus_interface")
1717
or not attribute._dbus_interface.startswith(
1718
orig_interface_name)):
953
or not attribute._dbus_interface
954
.startswith("se.recompile.Mandos")):
1720
956
# Create an alternate D-Bus interface name based on
1721
957
# the current name
1722
alt_interface = attribute._dbus_interface.replace(
1723
orig_interface_name, alt_interface_name)
1724
interface_names.add(alt_interface)
958
alt_interface = (attribute._dbus_interface
959
.replace("se.recompile.Mandos",
960
"se.bsnet.fukt.Mandos"))
1725
961
# Is this a D-Bus signal?
1726
962
if getattr(attribute, "_dbus_is_signal", False):
1727
# Extract the original non-method undecorated
1728
# function by black magic
1729
if sys.version_info.major == 2:
1730
nonmethod_func = (dict(
963
# Extract the original non-method function by
965
nonmethod_func = (dict(
1731
966
zip(attribute.func_code.co_freevars,
1732
attribute.__closure__))
1733
["func"].cell_contents)
1735
nonmethod_func = (dict(
1736
zip(attribute.__code__.co_freevars,
1737
attribute.__closure__))
1738
["func"].cell_contents)
967
attribute.__closure__))["func"]
1739
969
# Create a new, but exactly alike, function
1740
970
# object, and decorate it to be a new D-Bus signal
1741
971
# with the alternate D-Bus interface name
1742
new_function = copy_function(nonmethod_func)
1743
new_function = (dbus.service.signal(
1745
attribute._dbus_signature)(new_function))
1746
# Copy annotations, if any
1748
new_function._dbus_annotations = dict(
1749
attribute._dbus_annotations)
1750
except AttributeError:
972
new_function = (dbus.service.signal
974
attribute._dbus_signature)
976
nonmethod_func.func_code,
977
nonmethod_func.func_globals,
978
nonmethod_func.func_name,
979
nonmethod_func.func_defaults,
980
nonmethod_func.func_closure)))
1753
981
# Define a creator of a function to call both the
1754
# original and alternate functions, so both the
1755
# original and alternate signals gets sent when
1756
# the function is called
982
# old and new functions, so both the old and new
983
# signals gets sent when the function is called
1757
984
def fixscope(func1, func2):
1758
985
"""This function is a scope container to pass
1759
986
func1 and func2 to the "call_both" function
1760
987
outside of its arguments"""
1762
@functools.wraps(func2)
1763
988
def call_both(*args, **kwargs):
1764
989
"""This function will emit two D-Bus
1765
990
signals by calling func1 and func2"""
1766
991
func1(*args, **kwargs)
1767
992
func2(*args, **kwargs)
1768
# Make wrapper function look like a D-Bus
1770
for name, attr in inspect.getmembers(func2):
1771
if name.startswith("_dbus_"):
1772
setattr(call_both, name, attr)
1774
993
return call_both
1775
994
# Create the "call_both" function and add it to
1777
attr[attrname] = fixscope(attribute, new_function)
996
attr[attrname] = fixscope(attribute,
1778
998
# Is this a D-Bus method?
1779
999
elif getattr(attribute, "_dbus_is_method", False):
1780
1000
# Create a new, but exactly alike, function
1781
1001
# object. Decorate it to be a new D-Bus method
1782
1002
# with the alternate D-Bus interface name. Add it
1783
1003
# to the class.
1785
dbus.service.method(
1787
attribute._dbus_in_signature,
1788
attribute._dbus_out_signature)
1789
(copy_function(attribute)))
1790
# Copy annotations, if any
1792
attr[attrname]._dbus_annotations = dict(
1793
attribute._dbus_annotations)
1794
except AttributeError:
1004
attr[attrname] = (dbus.service.method
1006
attribute._dbus_in_signature,
1007
attribute._dbus_out_signature)
1009
(attribute.func_code,
1010
attribute.func_globals,
1011
attribute.func_name,
1012
attribute.func_defaults,
1013
attribute.func_closure)))
1796
1014
# Is this a D-Bus property?
1797
1015
elif getattr(attribute, "_dbus_is_property", False):
1798
1016
# Create a new, but exactly alike, function
1799
1017
# object, and decorate it to be a new D-Bus
1800
1018
# property with the alternate D-Bus interface
1801
1019
# name. Add it to the class.
1802
attr[attrname] = (dbus_service_property(
1803
alt_interface, attribute._dbus_signature,
1804
attribute._dbus_access,
1805
attribute._dbus_get_args_options
1807
(copy_function(attribute)))
1808
# Copy annotations, if any
1810
attr[attrname]._dbus_annotations = dict(
1811
attribute._dbus_annotations)
1812
except AttributeError:
1814
# Is this a D-Bus interface?
1815
elif getattr(attribute, "_dbus_is_interface", False):
1816
# Create a new, but exactly alike, function
1817
# object. Decorate it to be a new D-Bus interface
1818
# with the alternate D-Bus interface name. Add it
1821
dbus_interface_annotations(alt_interface)
1822
(copy_function(attribute)))
1824
# Deprecate all alternate interfaces
1825
iname = "_AlternateDBusNames_interface_annotation{}"
1826
for interface_name in interface_names:
1828
@dbus_interface_annotations(interface_name)
1830
return {"org.freedesktop.DBus.Deprecated":
1832
# Find an unused name
1833
for aname in (iname.format(i)
1834
for i in itertools.count()):
1835
if aname not in attr:
1839
# Replace the class with a new subclass of it with
1840
# methods, signals, etc. as created above.
1841
if sys.version_info.major == 2:
1842
cls = type(b"{}Alternate".format(cls.__name__),
1845
cls = type("{}Alternate".format(cls.__name__),
1852
@alternate_dbus_interfaces({"se.recompile.Mandos":
1853
"se.bsnet.fukt.Mandos"})
1020
attr[attrname] = (dbus_service_property
1022
attribute._dbus_signature,
1023
attribute._dbus_access,
1025
._dbus_get_args_options
1028
(attribute.func_code,
1029
attribute.func_globals,
1030
attribute.func_name,
1031
attribute.func_defaults,
1032
attribute.func_closure)))
1033
return type.__new__(mcs, name, bases, attr)
1854
1036
class ClientDBus(Client, DBusObjectWithProperties):
1855
1037
"""A Client class using D-Bus
1858
1040
dbus_object_path: dbus.ObjectPath
1859
1041
bus: dbus.SystemBus()
1862
1044
runtime_expansions = (Client.runtime_expansions
1863
+ ("dbus_object_path", ))
1865
_interface = "se.recompile.Mandos.Client"
1045
+ ("dbus_object_path",))
1867
1047
# dbus.service.Object doesn't use super(), so we can't either.
1869
def __init__(self, bus=None, *args, **kwargs):
1049
def __init__(self, bus = None, *args, **kwargs):
1871
1051
Client.__init__(self, *args, **kwargs)
1052
self._approvals_pending = 0
1054
self._approvals_pending = 0
1872
1055
# Only now, when this client is initialized, can it show up on
1874
client_object_name = str(self.name).translate(
1057
client_object_name = unicode(self.name).translate(
1875
1058
{ord("."): ord("_"),
1876
1059
ord("-"): ord("_")})
1877
self.dbus_object_path = dbus.ObjectPath(
1878
"/clients/" + client_object_name)
1060
self.dbus_object_path = (dbus.ObjectPath
1061
("/clients/" + client_object_name))
1879
1062
DBusObjectWithProperties.__init__(self, self.bus,
1880
1063
self.dbus_object_path)
1882
def notifychangeproperty(transform_func, dbus_name,
1883
type_func=lambda x: x,
1885
invalidate_only=False,
1886
_interface=_interface):
1065
def notifychangeproperty(transform_func,
1066
dbus_name, type_func=lambda x: x,
1887
1068
""" Modify a variable so that it's a property which announces
1888
1069
its changes to DBus.
1890
1071
transform_fun: Function that takes a value and a variant_level
1891
1072
and transforms it to a D-Bus type.
1892
1073
dbus_name: D-Bus name of the variable
1894
1075
to the D-Bus. Default: no transform
1895
1076
variant_level: D-Bus variant level. Default: 1
1897
attrname = "_{}".format(dbus_name)
1078
attrname = "_{0}".format(dbus_name)
1899
1079
def setter(self, value):
1900
1080
if hasattr(self, "dbus_object_path"):
1901
1081
if (not hasattr(self, attrname) or
1902
1082
type_func(getattr(self, attrname, None))
1903
1083
!= type_func(value)):
1905
self.PropertiesChanged(
1906
_interface, dbus.Dictionary(),
1907
dbus.Array((dbus_name, )))
1909
dbus_value = transform_func(
1911
variant_level=variant_level)
1912
self.PropertyChanged(dbus.String(dbus_name),
1914
self.PropertiesChanged(
1916
dbus.Dictionary({dbus.String(dbus_name):
1084
dbus_value = transform_func(type_func(value),
1087
self.PropertyChanged(dbus.String(dbus_name),
1919
1089
setattr(self, attrname, value)
1921
1091
return property(lambda self: getattr(self, attrname), setter)
1923
1094
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1924
1095
approvals_pending = notifychangeproperty(dbus.Boolean,
1925
1096
"ApprovalPending",
1927
1098
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1928
1099
last_enabled = notifychangeproperty(datetime_to_dbus,
1930
checker = notifychangeproperty(
1931
dbus.Boolean, "CheckerRunning",
1932
type_func=lambda checker: checker is not None)
1101
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1102
type_func = lambda checker:
1103
checker is not None)
1933
1104
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1934
1105
"LastCheckedOK")
1935
last_checker_status = notifychangeproperty(dbus.Int16,
1936
"LastCheckerStatus")
1937
1106
last_approval_request = notifychangeproperty(
1938
1107
datetime_to_dbus, "LastApprovalRequest")
1939
1108
approved_by_default = notifychangeproperty(dbus.Boolean,
1940
1109
"ApprovedByDefault")
1941
approval_delay = notifychangeproperty(
1942
dbus.UInt64, "ApprovalDelay",
1943
type_func=lambda td: td.total_seconds() * 1000)
1110
approval_delay = notifychangeproperty(dbus.UInt64,
1113
timedelta_to_milliseconds)
1944
1114
approval_duration = notifychangeproperty(
1945
1115
dbus.UInt64, "ApprovalDuration",
1946
type_func=lambda td: td.total_seconds() * 1000)
1116
type_func = timedelta_to_milliseconds)
1947
1117
host = notifychangeproperty(dbus.String, "Host")
1948
timeout = notifychangeproperty(
1949
dbus.UInt64, "Timeout",
1950
type_func=lambda td: td.total_seconds() * 1000)
1118
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1120
timedelta_to_milliseconds)
1951
1121
extended_timeout = notifychangeproperty(
1952
1122
dbus.UInt64, "ExtendedTimeout",
1953
type_func=lambda td: td.total_seconds() * 1000)
1954
interval = notifychangeproperty(
1955
dbus.UInt64, "Interval",
1956
type_func=lambda td: td.total_seconds() * 1000)
1123
type_func = timedelta_to_milliseconds)
1124
interval = notifychangeproperty(dbus.UInt64,
1127
timedelta_to_milliseconds)
1957
1128
checker_command = notifychangeproperty(dbus.String, "Checker")
1958
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1959
invalidate_only=True)
1961
1130
del notifychangeproperty
1963
1132
def __del__(self, *args, **kwargs):
1965
1134
self.remove_from_connection()
2044
1214
server to mandos-client
2048
1218
# Rejected - signal
2049
1219
@dbus.service.signal(_interface, signature="s")
2050
1220
def Rejected(self, reason):
2054
1224
# NeedApproval - signal
2055
1225
@dbus.service.signal(_interface, signature="tb")
2056
1226
def NeedApproval(self, timeout, default):
2058
1228
return self.need_approval()
1230
# NeRwequest - signal
1231
@dbus.service.signal(_interface, signature="s")
1232
def NewRequest(self, ip):
1234
Is sent after a client request a password.
2062
1240
# Approve - method
2063
1241
@dbus.service.method(_interface, in_signature="b")
2064
1242
def Approve(self, value):
2065
1243
self.approve(value)
2067
1245
# CheckedOK - method
2068
1246
@dbus.service.method(_interface)
2069
1247
def CheckedOK(self):
2070
1248
self.checked_ok()
2072
1250
# Enable - method
2073
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2074
1251
@dbus.service.method(_interface)
2075
1252
def Enable(self):
2079
1256
# StartChecker - method
2080
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2081
1257
@dbus.service.method(_interface)
2082
1258
def StartChecker(self):
2084
1260
self.start_checker()
2086
1262
# Disable - method
2087
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2088
1263
@dbus.service.method(_interface)
2089
1264
def Disable(self):
2093
1268
# StopChecker - method
2094
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2095
1269
@dbus.service.method(_interface)
2096
1270
def StopChecker(self):
2097
1271
self.stop_checker()
2101
1275
# ApprovalPending - property
2102
1276
@dbus_service_property(_interface, signature="b", access="read")
2103
1277
def ApprovalPending_dbus_property(self):
2104
1278
return dbus.Boolean(bool(self.approvals_pending))
2106
1280
# ApprovedByDefault - property
2107
@dbus_service_property(_interface,
1281
@dbus_service_property(_interface, signature="b",
2109
1282
access="readwrite")
2110
1283
def ApprovedByDefault_dbus_property(self, value=None):
2111
1284
if value is None: # get
2112
1285
return dbus.Boolean(self.approved_by_default)
2113
1286
self.approved_by_default = bool(value)
2115
1288
# ApprovalDelay - property
2116
@dbus_service_property(_interface,
1289
@dbus_service_property(_interface, signature="t",
2118
1290
access="readwrite")
2119
1291
def ApprovalDelay_dbus_property(self, value=None):
2120
1292
if value is None: # get
2121
return dbus.UInt64(self.approval_delay.total_seconds()
1293
return dbus.UInt64(self.approval_delay_milliseconds())
2123
1294
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2125
1296
# ApprovalDuration - property
2126
@dbus_service_property(_interface,
1297
@dbus_service_property(_interface, signature="t",
2128
1298
access="readwrite")
2129
1299
def ApprovalDuration_dbus_property(self, value=None):
2130
1300
if value is None: # get
2131
return dbus.UInt64(self.approval_duration.total_seconds()
1301
return dbus.UInt64(timedelta_to_milliseconds(
1302
self.approval_duration))
2133
1303
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2135
1305
# Name - property
2137
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2138
1306
@dbus_service_property(_interface, signature="s", access="read")
2139
1307
def Name_dbus_property(self):
2140
1308
return dbus.String(self.name)
2144
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2145
@dbus_service_property(_interface, signature="s", access="read")
2146
def KeyID_dbus_property(self):
2147
return dbus.String(self.key_id)
2149
1310
# Fingerprint - property
2151
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2152
1311
@dbus_service_property(_interface, signature="s", access="read")
2153
1312
def Fingerprint_dbus_property(self):
2154
1313
return dbus.String(self.fingerprint)
2156
1315
# Host - property
2157
@dbus_service_property(_interface,
1316
@dbus_service_property(_interface, signature="s",
2159
1317
access="readwrite")
2160
1318
def Host_dbus_property(self, value=None):
2161
1319
if value is None: # get
2162
1320
return dbus.String(self.host)
2163
self.host = str(value)
1321
self.host = unicode(value)
2165
1323
# Created - property
2167
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2168
1324
@dbus_service_property(_interface, signature="s", access="read")
2169
1325
def Created_dbus_property(self):
2170
1326
return datetime_to_dbus(self.created)
2172
1328
# LastEnabled - property
2173
1329
@dbus_service_property(_interface, signature="s", access="read")
2174
1330
def LastEnabled_dbus_property(self):
2175
1331
return datetime_to_dbus(self.last_enabled)
2177
1333
# Enabled - property
2178
@dbus_service_property(_interface,
1334
@dbus_service_property(_interface, signature="b",
2180
1335
access="readwrite")
2181
1336
def Enabled_dbus_property(self, value=None):
2182
1337
if value is None: # get
2189
1344
# LastCheckedOK - property
2190
@dbus_service_property(_interface,
1345
@dbus_service_property(_interface, signature="s",
2192
1346
access="readwrite")
2193
1347
def LastCheckedOK_dbus_property(self, value=None):
2194
1348
if value is not None:
2195
1349
self.checked_ok()
2197
1351
return datetime_to_dbus(self.last_checked_ok)
2199
# LastCheckerStatus - property
2200
@dbus_service_property(_interface, signature="n", access="read")
2201
def LastCheckerStatus_dbus_property(self):
2202
return dbus.Int16(self.last_checker_status)
2204
1353
# Expires - property
2205
1354
@dbus_service_property(_interface, signature="s", access="read")
2206
1355
def Expires_dbus_property(self):
2207
1356
return datetime_to_dbus(self.expires)
2209
1358
# LastApprovalRequest - property
2210
1359
@dbus_service_property(_interface, signature="s", access="read")
2211
1360
def LastApprovalRequest_dbus_property(self):
2212
1361
return datetime_to_dbus(self.last_approval_request)
2214
1363
# Timeout - property
2215
@dbus_service_property(_interface,
1364
@dbus_service_property(_interface, signature="t",
2217
1365
access="readwrite")
2218
1366
def Timeout_dbus_property(self, value=None):
2219
1367
if value is None: # get
2220
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2221
old_timeout = self.timeout
1368
return dbus.UInt64(self.timeout_milliseconds())
2222
1369
self.timeout = datetime.timedelta(0, 0, 0, value)
2223
# Reschedule disabling
1370
# Reschedule timeout
2224
1371
if self.enabled:
2225
1372
now = datetime.datetime.utcnow()
2226
self.expires += self.timeout - old_timeout
2227
if self.expires <= now:
1373
time_to_die = timedelta_to_milliseconds(
1374
(self.last_checked_ok + self.timeout) - now)
1375
if time_to_die <= 0:
2228
1376
# The timeout has passed
1379
self.expires = (now +
1380
datetime.timedelta(milliseconds =
2231
1382
if (getattr(self, "disable_initiator_tag", None)
2234
GLib.source_remove(self.disable_initiator_tag)
2235
self.disable_initiator_tag = GLib.timeout_add(
2236
int((self.expires - now).total_seconds() * 1000),
1385
gobject.source_remove(self.disable_initiator_tag)
1386
self.disable_initiator_tag = (gobject.timeout_add
2239
1390
# ExtendedTimeout - property
2240
@dbus_service_property(_interface,
1391
@dbus_service_property(_interface, signature="t",
2242
1392
access="readwrite")
2243
1393
def ExtendedTimeout_dbus_property(self, value=None):
2244
1394
if value is None: # get
2245
return dbus.UInt64(self.extended_timeout.total_seconds()
1395
return dbus.UInt64(self.extended_timeout_milliseconds())
2247
1396
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2249
1398
# Interval - property
2250
@dbus_service_property(_interface,
1399
@dbus_service_property(_interface, signature="t",
2252
1400
access="readwrite")
2253
1401
def Interval_dbus_property(self, value=None):
2254
1402
if value is None: # get
2255
return dbus.UInt64(self.interval.total_seconds() * 1000)
1403
return dbus.UInt64(self.interval_milliseconds())
2256
1404
self.interval = datetime.timedelta(0, 0, 0, value)
2257
1405
if getattr(self, "checker_initiator_tag", None) is None:
2259
1407
if self.enabled:
2260
1408
# Reschedule checker run
2261
GLib.source_remove(self.checker_initiator_tag)
2262
self.checker_initiator_tag = GLib.timeout_add(
2263
value, self.start_checker)
2264
self.start_checker() # Start one now, too
1409
gobject.source_remove(self.checker_initiator_tag)
1410
self.checker_initiator_tag = (gobject.timeout_add
1411
(value, self.start_checker))
1412
self.start_checker() # Start one now, too
2266
1414
# Checker - property
2267
@dbus_service_property(_interface,
1415
@dbus_service_property(_interface, signature="s",
2269
1416
access="readwrite")
2270
1417
def Checker_dbus_property(self, value=None):
2271
1418
if value is None: # get
2272
1419
return dbus.String(self.checker_command)
2273
self.checker_command = str(value)
1420
self.checker_command = unicode(value)
2275
1422
# CheckerRunning - property
2276
@dbus_service_property(_interface,
1423
@dbus_service_property(_interface, signature="b",
2278
1424
access="readwrite")
2279
1425
def CheckerRunning_dbus_property(self, value=None):
2280
1426
if value is None: # get
2283
1429
self.start_checker()
2285
1431
self.stop_checker()
2287
1433
# ObjectPath - property
2289
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2290
"org.freedesktop.DBus.Deprecated": "true"})
2291
1434
@dbus_service_property(_interface, signature="o", access="read")
2292
1435
def ObjectPath_dbus_property(self):
2293
return self.dbus_object_path # is already a dbus.ObjectPath
1436
return self.dbus_object_path # is already a dbus.ObjectPath
2295
1438
# Secret = property
2297
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2299
@dbus_service_property(_interface,
1439
@dbus_service_property(_interface, signature="ay",
1440
access="write", byte_arrays=True)
2303
1441
def Secret_dbus_property(self, value):
2304
self.secret = bytes(value)
1442
self.secret = str(value)
2310
def __init__(self, child_pipe, key_id, fpr, address):
1447
class ProxyClient(object):
1448
def __init__(self, child_pipe, fpr, address):
2311
1449
self._pipe = child_pipe
2312
self._pipe.send(("init", key_id, fpr, address))
1450
self._pipe.send(('init', fpr, address))
2313
1451
if not self._pipe.recv():
2314
raise KeyError(key_id or fpr)
2316
1454
def __getattribute__(self, name):
2318
1456
return super(ProxyClient, self).__getattribute__(name)
2319
self._pipe.send(("getattr", name))
1457
self._pipe.send(('getattr', name))
2320
1458
data = self._pipe.recv()
2321
if data[0] == "data":
1459
if data[0] == 'data':
2323
if data[0] == "function":
1461
if data[0] == 'function':
2325
1462
def func(*args, **kwargs):
2326
self._pipe.send(("funcall", name, args, kwargs))
1463
self._pipe.send(('funcall', name, args, kwargs))
2327
1464
return self._pipe.recv()[1]
2331
1467
def __setattr__(self, name, value):
2333
1469
return super(ProxyClient, self).__setattr__(name, value)
2334
self._pipe.send(("setattr", name, value))
1470
self._pipe.send(('setattr', name, value))
1473
class ClientDBusTransitional(ClientDBus):
1474
__metaclass__ = AlternateDBusNamesMetaclass
2337
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
2338
1478
"""A class to handle client connections.
2340
1480
Instantiated once for each connection to handle it.
2341
1481
Note: This will run in its own forked process."""
2343
1483
def handle(self):
2344
1484
with contextlib.closing(self.server.child_pipe) as child_pipe:
2345
log.info("TCP connection from: %s",
2346
str(self.client_address))
2347
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2349
session = gnutls.ClientSession(self.request)
2351
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2352
# "+AES-256-CBC", "+SHA1",
2353
# "+COMP-NULL", "+CTYPE-OPENPGP",
1485
logger.info("TCP connection from: %s",
1486
unicode(self.client_address))
1487
logger.debug("Pipe FD: %d",
1488
self.server.child_pipe.fileno())
1490
session = (gnutls.connection
1491
.ClientSession(self.request,
1493
.X509Credentials()))
1495
# Note: gnutls.connection.X509Credentials is really a
1496
# generic GnuTLS certificate credentials object so long as
1497
# no X.509 keys are added to it. Therefore, we can use it
1498
# here despite using OpenPGP certificates.
1500
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1501
# "+AES-256-CBC", "+SHA1",
1502
# "+COMP-NULL", "+CTYPE-OPENPGP",
2355
1504
# Use a fallback default, since this MUST be set.
2356
1505
priority = self.server.gnutls_priority
2357
1506
if priority is None:
2358
1507
priority = "NORMAL"
2359
gnutls.priority_set_direct(session,
2360
priority.encode("utf-8"), None)
1508
(gnutls.library.functions
1509
.gnutls_priority_set_direct(session._c_object,
2362
1512
# Start communication using the Mandos protocol
2363
1513
# Get protocol number
2364
1514
line = self.request.makefile().readline()
2365
log.debug("Protocol version: %r", line)
1515
logger.debug("Protocol version: %r", line)
2367
1517
if int(line.strip().split()[0]) > 1:
2368
raise RuntimeError(line)
2369
1519
except (ValueError, IndexError, RuntimeError) as error:
2370
log.error("Unknown protocol version: %s", error)
1520
logger.error("Unknown protocol version: %s", error)
2373
1523
# Start GnuTLS connection
2375
1525
session.handshake()
2376
except gnutls.Error as error:
2377
log.warning("Handshake failed: %s", error)
1526
except gnutls.errors.GNUTLSError as error:
1527
logger.warning("Handshake failed: %s", error)
2378
1528
# Do not run session.bye() here: the session is not
2379
1529
# established. Just abandon the request.
2381
log.debug("Handshake succeeded")
1531
logger.debug("Handshake succeeded")
2383
1533
approval_required = False
2385
if gnutls.has_rawpk:
2388
key_id = self.key_id(
2389
self.peer_certificate(session))
2390
except (TypeError, gnutls.Error) as error:
2391
log.warning("Bad certificate: %s", error)
2393
log.debug("Key ID: %s",
2394
key_id.decode("utf-8",
2400
fpr = self.fingerprint(
2401
self.peer_certificate(session))
2402
except (TypeError, gnutls.Error) as error:
2403
log.warning("Bad certificate: %s", error)
2405
log.debug("Fingerprint: %s", fpr)
2408
client = ProxyClient(child_pipe, key_id, fpr,
1536
fpr = self.fingerprint(self.peer_certificate
1539
gnutls.errors.GNUTLSError) as error:
1540
logger.warning("Bad certificate: %s", error)
1542
logger.debug("Fingerprint: %s", fpr)
1545
client = ProxyClient(child_pipe, fpr,
2409
1546
self.client_address)
2410
1547
except KeyError:
1550
if self.server.use_dbus:
1552
client.NewRequest(str(self.client_address))
2413
1554
if client.approval_delay:
2414
1555
delay = client.approval_delay
2415
1556
client.approvals_pending += 1
2416
1557
approval_required = True
2419
1560
if not client.enabled:
2420
log.info("Client %s is disabled", client.name)
1561
logger.info("Client %s is disabled",
2421
1563
if self.server.use_dbus:
2422
1564
# Emit D-Bus signal
2423
1565
client.Rejected("Disabled")
2426
1568
if client.approved or not client.approval_delay:
2427
# We are approved or approval is disabled
1569
#We are approved or approval is disabled
2429
1571
elif client.approved is None:
2430
log.info("Client %s needs approval",
1572
logger.info("Client %s needs approval",
2432
1574
if self.server.use_dbus:
2433
1575
# Emit D-Bus signal
2434
1576
client.NeedApproval(
2435
client.approval_delay.total_seconds()
2436
* 1000, client.approved_by_default)
1577
client.approval_delay_milliseconds(),
1578
client.approved_by_default)
2438
log.warning("Client %s was not approved",
1580
logger.warning("Client %s was not approved",
2440
1582
if self.server.use_dbus:
2441
1583
# Emit D-Bus signal
2442
1584
client.Rejected("Denied")
2445
# wait until timeout or approved
1587
#wait until timeout or approved
2446
1588
time = datetime.datetime.now()
2447
1589
client.changedstate.acquire()
2448
client.changedstate.wait(delay.total_seconds())
1590
(client.changedstate.wait
1591
(float(client.timedelta_to_milliseconds(delay)
2449
1593
client.changedstate.release()
2450
1594
time2 = datetime.datetime.now()
2451
1595
if (time2 - time) >= delay:
2452
1596
if not client.approved_by_default:
2453
log.warning("Client %s timed out while"
2454
" waiting for approval",
1597
logger.warning("Client %s timed out while"
1598
" waiting for approval",
2456
1600
if self.server.use_dbus:
2457
1601
# Emit D-Bus signal
2458
1602
client.Rejected("Approval timed out")
2463
1607
delay -= time2 - time
2466
session.send(client.secret)
2467
except gnutls.Error as error:
2468
log.warning("gnutls send failed", exc_info=error)
2471
log.info("Sending secret to %s", client.name)
1610
while sent_size < len(client.secret):
1612
sent = session.send(client.secret[sent_size:])
1613
except gnutls.errors.GNUTLSError as error:
1614
logger.warning("gnutls send failed")
1616
logger.debug("Sent: %d, remaining: %d",
1617
sent, len(client.secret)
1618
- (sent_size + sent))
1621
logger.info("Sending secret to %s", client.name)
2472
1622
# bump the timeout using extended_timeout
2473
client.bump_timeout(client.extended_timeout)
1623
client.checked_ok(client.extended_timeout)
2474
1624
if self.server.use_dbus:
2475
1625
# Emit D-Bus signal
2476
1626
client.GotSecret()
2479
1629
if approval_required:
2480
1630
client.approvals_pending -= 1
2483
except gnutls.Error as error:
2484
log.warning("GnuTLS bye failed", exc_info=error)
1633
except gnutls.errors.GNUTLSError as error:
1634
logger.warning("GnuTLS bye failed")
2487
1637
def peer_certificate(session):
2488
"Return the peer's certificate as a bytestring"
2490
cert_type = gnutls.certificate_type_get2(
2491
session, gnutls.CTYPE_PEERS)
2492
except AttributeError:
2493
cert_type = gnutls.certificate_type_get(session)
2494
if gnutls.has_rawpk:
2495
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2497
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2498
# If not a valid certificate type...
2499
if cert_type not in valid_cert_types:
2500
log.info("Cert type %r not in %r", cert_type,
2502
# ...return invalid data
1638
"Return the peer's OpenPGP certificate as a bytestring"
1639
# If not an OpenPGP certificate...
1640
if (gnutls.library.functions
1641
.gnutls_certificate_type_get(session._c_object)
1642
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1643
# ...do the normal thing
1644
return session.peer_certificate
2504
1645
list_size = ctypes.c_uint(1)
2505
cert_list = (gnutls.certificate_get_peers
2506
(session, ctypes.byref(list_size)))
1646
cert_list = (gnutls.library.functions
1647
.gnutls_certificate_get_peers
1648
(session._c_object, ctypes.byref(list_size)))
2507
1649
if not bool(cert_list) and list_size.value != 0:
2508
raise gnutls.Error("error getting peer certificate")
1650
raise gnutls.errors.GNUTLSError("error getting peer"
2509
1652
if list_size.value == 0:
2511
1654
cert = cert_list[0]
2512
1655
return ctypes.string_at(cert.data, cert.size)
2515
def key_id(certificate):
2516
"Convert a certificate bytestring to a hexdigit key ID"
2517
# New GnuTLS "datum" with the public key
2518
datum = gnutls.datum_t(
2519
ctypes.cast(ctypes.c_char_p(certificate),
2520
ctypes.POINTER(ctypes.c_ubyte)),
2521
ctypes.c_uint(len(certificate)))
2522
# XXX all these need to be created in the gnutls "module"
2523
# New empty GnuTLS certificate
2524
pubkey = gnutls.pubkey_t()
2525
gnutls.pubkey_init(ctypes.byref(pubkey))
2526
# Import the raw public key into the certificate
2527
gnutls.pubkey_import(pubkey,
2528
ctypes.byref(datum),
2529
gnutls.X509_FMT_DER)
2530
# New buffer for the key ID
2531
buf = ctypes.create_string_buffer(32)
2532
buf_len = ctypes.c_size_t(len(buf))
2533
# Get the key ID from the raw public key into the buffer
2534
gnutls.pubkey_get_key_id(
2536
gnutls.KEYID_USE_SHA256,
2537
ctypes.cast(ctypes.byref(buf),
2538
ctypes.POINTER(ctypes.c_ubyte)),
2539
ctypes.byref(buf_len))
2540
# Deinit the certificate
2541
gnutls.pubkey_deinit(pubkey)
2543
# Convert the buffer to a Python bytestring
2544
key_id = ctypes.string_at(buf, buf_len.value)
2545
# Convert the bytestring to hexadecimal notation
2546
hex_key_id = binascii.hexlify(key_id).upper()
2550
1658
def fingerprint(openpgp):
2551
1659
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2552
1660
# New GnuTLS "datum" with the OpenPGP public key
2553
datum = gnutls.datum_t(
2554
ctypes.cast(ctypes.c_char_p(openpgp),
2555
ctypes.POINTER(ctypes.c_ubyte)),
2556
ctypes.c_uint(len(openpgp)))
1661
datum = (gnutls.library.types
1662
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1665
ctypes.c_uint(len(openpgp))))
2557
1666
# New empty GnuTLS certificate
2558
crt = gnutls.openpgp_crt_t()
2559
gnutls.openpgp_crt_init(ctypes.byref(crt))
1667
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1668
(gnutls.library.functions
1669
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2560
1670
# Import the OpenPGP public key into the certificate
2561
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2562
gnutls.OPENPGP_FMT_RAW)
1671
(gnutls.library.functions
1672
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1673
gnutls.library.constants
1674
.GNUTLS_OPENPGP_FMT_RAW))
2563
1675
# Verify the self signature in the key
2564
1676
crtverify = ctypes.c_uint()
2565
gnutls.openpgp_crt_verify_self(crt, 0,
2566
ctypes.byref(crtverify))
1677
(gnutls.library.functions
1678
.gnutls_openpgp_crt_verify_self(crt, 0,
1679
ctypes.byref(crtverify)))
2567
1680
if crtverify.value != 0:
2568
gnutls.openpgp_crt_deinit(crt)
2569
raise gnutls.CertificateSecurityError(code
1681
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1682
raise (gnutls.errors.CertificateSecurityError
2571
1684
# New buffer for the fingerprint
2572
1685
buf = ctypes.create_string_buffer(20)
2573
1686
buf_len = ctypes.c_size_t()
2574
1687
# Get the fingerprint from the certificate into the buffer
2575
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2576
ctypes.byref(buf_len))
1688
(gnutls.library.functions
1689
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1690
ctypes.byref(buf_len)))
2577
1691
# Deinit the certificate
2578
gnutls.openpgp_crt_deinit(crt)
1692
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2579
1693
# Convert the buffer to a Python bytestring
2580
1694
fpr = ctypes.string_at(buf, buf_len.value)
2581
1695
# Convert the bytestring to hexadecimal notation
2586
class MultiprocessingMixIn:
1700
class MultiprocessingMixIn(object):
2587
1701
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2589
1702
def sub_process_main(self, request, address):
2591
1704
self.finish_request(request, address)
2592
1705
except Exception:
2593
1706
self.handle_error(request, address)
2594
1707
self.close_request(request)
2596
1709
def process_request(self, request, address):
2597
1710
"""Start a new process to process the request."""
2598
proc = multiprocessing.Process(target=self.sub_process_main,
2599
args=(request, address))
1711
proc = multiprocessing.Process(target = self.sub_process_main,
2604
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1718
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2605
1719
""" adds a pipe to the MixIn """
2607
1720
def process_request(self, request, client_address):
2608
1721
"""Overrides and wraps the original process_request().
2610
1723
This function creates a new pipe in self.pipe
2612
1725
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2614
1727
proc = MultiprocessingMixIn.process_request(self, request,
2615
1728
client_address)
2616
1729
self.child_pipe.close()
2617
1730
self.add_pipe(parent_pipe, proc)
2619
1732
def add_pipe(self, parent_pipe, proc):
2620
1733
"""Dummy function; override as necessary"""
2621
raise NotImplementedError()
1734
raise NotImplementedError
2624
1737
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2625
socketserver.TCPServer):
2626
"""IPv6-capable TCP server. Accepts None as address and/or port
1738
socketserver.TCPServer, object):
1739
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2629
1742
enabled: Boolean; whether this server is activated yet
2630
1743
interface: None or a network interface name (string)
2631
1744
use_ipv6: Boolean; to use IPv6 or not
2634
1746
def __init__(self, server_address, RequestHandlerClass,
2638
"""If socketfd is set, use that file descriptor instead of
2639
creating a new one with socket.socket().
1747
interface=None, use_ipv6=True):
2641
1748
self.interface = interface
2643
1750
self.address_family = socket.AF_INET6
2644
if socketfd is not None:
2645
# Save the file descriptor
2646
self.socketfd = socketfd
2647
# Save the original socket.socket() function
2648
self.socket_socket = socket.socket
2650
# To implement --socket, we monkey patch socket.socket.
2652
# (When socketserver.TCPServer is a new-style class, we
2653
# could make self.socket into a property instead of monkey
2654
# patching socket.socket.)
2656
# Create a one-time-only replacement for socket.socket()
2657
@functools.wraps(socket.socket)
2658
def socket_wrapper(*args, **kwargs):
2659
# Restore original function so subsequent calls are
2661
socket.socket = self.socket_socket
2662
del self.socket_socket
2663
# This time only, return a new socket object from the
2664
# saved file descriptor.
2665
return socket.fromfd(self.socketfd, *args, **kwargs)
2666
# Replace socket.socket() function with wrapper
2667
socket.socket = socket_wrapper
2668
# The socketserver.TCPServer.__init__ will call
2669
# socket.socket(), which might be our replacement,
2670
# socket_wrapper(), if socketfd was set.
2671
1751
socketserver.TCPServer.__init__(self, server_address,
2672
1752
RequestHandlerClass)
2674
1753
def server_bind(self):
2675
1754
"""This overrides the normal server_bind() function
2676
1755
to bind to an interface if one was specified, and also NOT to
2677
1756
bind to an address or port if they were not specified."""
2678
global SO_BINDTODEVICE
2679
1757
if self.interface is not None:
2680
1758
if SO_BINDTODEVICE is None:
2681
# Fall back to a hard-coded value which seems to be
2683
log.warning("SO_BINDTODEVICE not found, trying 25")
2684
SO_BINDTODEVICE = 25
2686
self.socket.setsockopt(
2687
socket.SOL_SOCKET, SO_BINDTODEVICE,
2688
(self.interface + "\0").encode("utf-8"))
2689
except socket.error as error:
2690
if error.errno == errno.EPERM:
2691
log.error("No permission to bind to interface %s",
2693
elif error.errno == errno.ENOPROTOOPT:
2694
log.error("SO_BINDTODEVICE not available; cannot"
2695
" bind to interface %s", self.interface)
2696
elif error.errno == errno.ENODEV:
2697
log.error("Interface %s does not exist, cannot"
2698
" bind", self.interface)
1759
logger.error("SO_BINDTODEVICE does not exist;"
1760
" cannot bind to interface %s",
1764
self.socket.setsockopt(socket.SOL_SOCKET,
1768
except socket.error as error:
1769
if error[0] == errno.EPERM:
1770
logger.error("No permission to"
1771
" bind to interface %s",
1773
elif error[0] == errno.ENOPROTOOPT:
1774
logger.error("SO_BINDTODEVICE not available;"
1775
" cannot bind to interface %s",
2701
1779
# Only bind(2) the socket if we really need to.
2702
1780
if self.server_address[0] or self.server_address[1]:
2703
if self.server_address[1]:
2704
self.allow_reuse_address = True
2705
1781
if not self.server_address[0]:
2706
1782
if self.address_family == socket.AF_INET6:
2707
any_address = "::" # in6addr_any
1783
any_address = "::" # in6addr_any
2709
any_address = "0.0.0.0" # INADDR_ANY
1785
any_address = socket.INADDR_ANY
2710
1786
self.server_address = (any_address,
2711
1787
self.server_address[1])
2712
1788
elif not self.server_address[1]:
2713
self.server_address = (self.server_address[0], 0)
1789
self.server_address = (self.server_address[0],
2714
1791
# if self.interface:
2715
1792
# self.server_address = (self.server_address[0],
2746
1818
self.gnutls_priority = gnutls_priority
2747
1819
IPv6_TCPServer.__init__(self, server_address,
2748
1820
RequestHandlerClass,
2749
interface=interface,
1821
interface = interface,
1822
use_ipv6 = use_ipv6)
2753
1823
def server_activate(self):
2754
1824
if self.enabled:
2755
1825
return socketserver.TCPServer.server_activate(self)
2757
1827
def enable(self):
2758
1828
self.enabled = True
2760
1830
def add_pipe(self, parent_pipe, proc):
2761
1831
# Call "handle_ipc" for both data and EOF events
2763
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2764
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2765
functools.partial(self.handle_ipc,
2766
parent_pipe=parent_pipe,
2769
def handle_ipc(self, source, condition,
2772
client_object=None):
1832
gobject.io_add_watch(parent_pipe.fileno(),
1833
gobject.IO_IN | gobject.IO_HUP,
1834
functools.partial(self.handle_ipc,
1839
def handle_ipc(self, source, condition, parent_pipe=None,
1840
proc = None, client_object=None):
1842
gobject.IO_IN: "IN", # There is data to read.
1843
gobject.IO_OUT: "OUT", # Data can be written (without
1845
gobject.IO_PRI: "PRI", # There is urgent data to read.
1846
gobject.IO_ERR: "ERR", # Error condition.
1847
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1848
# broken, usually for pipes and
1851
conditions_string = ' | '.join(name
1853
condition_names.iteritems()
1854
if cond & condition)
2773
1855
# error, or the other end of multiprocessing.Pipe has closed
2774
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1856
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2775
1857
# Wait for other process to exit
2779
1861
# Read a request from the child
2780
1862
request = parent_pipe.recv()
2781
1863
command = request[0]
2783
if command == "init":
2784
key_id = request[1].decode("ascii")
2785
fpr = request[2].decode("ascii")
2786
address = request[3]
2788
for c in self.clients.values():
2789
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2790
"27AE41E4649B934CA495991B7852B855"):
2792
if key_id and c.key_id == key_id:
2795
if fpr and c.fingerprint == fpr:
1865
if command == 'init':
1867
address = request[2]
1869
for c in self.clients.itervalues():
1870
if c.fingerprint == fpr:
2799
log.info("Client not found for key ID: %s, address:"
2800
" %s", key_id or fpr, address)
1874
logger.info("Client not found for fingerprint: %s, ad"
1875
"dress: %s", fpr, address)
2801
1876
if self.use_dbus:
2802
1877
# Emit D-Bus signal
2803
mandos_dbus_service.ClientNotFound(key_id or fpr,
1878
mandos_dbus_service.ClientNotFound(fpr,
2805
1880
parent_pipe.send(False)
2809
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2810
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2811
functools.partial(self.handle_ipc,
2812
parent_pipe=parent_pipe,
2814
client_object=client))
1883
gobject.io_add_watch(parent_pipe.fileno(),
1884
gobject.IO_IN | gobject.IO_HUP,
1885
functools.partial(self.handle_ipc,
2815
1891
parent_pipe.send(True)
2816
1892
# remove the old hook in favor of the new above hook on
2819
if command == "funcall":
1895
if command == 'funcall':
2820
1896
funcname = request[1]
2821
1897
args = request[2]
2822
1898
kwargs = request[3]
2824
parent_pipe.send(("data", getattr(client_object,
1900
parent_pipe.send(('data', getattr(client_object,
2825
1901
funcname)(*args,
2828
if command == "getattr":
1904
if command == 'getattr':
2829
1905
attrname = request[1]
2830
if isinstance(client_object.__getattribute__(attrname),
2831
collections.abc.Callable):
2832
parent_pipe.send(("function", ))
1906
if callable(client_object.__getattribute__(attrname)):
1907
parent_pipe.send(('function',))
2835
"data", client_object.__getattribute__(attrname)))
2837
if command == "setattr":
1909
parent_pipe.send(('data', client_object
1910
.__getattribute__(attrname)))
1912
if command == 'setattr':
2838
1913
attrname = request[1]
2839
1914
value = request[2]
2840
1915
setattr(client_object, attrname, value)
2845
def rfc3339_duration_to_delta(duration):
2846
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2848
>>> timedelta = datetime.timedelta
2849
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2851
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2853
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2855
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2857
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2859
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2861
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2866
# Parsing an RFC 3339 duration with regular expressions is not
2867
# possible - there would have to be multiple places for the same
2868
# values, like seconds. The current code, while more esoteric, is
2869
# cleaner without depending on a parsing library. If Python had a
2870
# built-in library for parsing we would use it, but we'd like to
2871
# avoid excessive use of external libraries.
2873
# New type for defining tokens, syntax, and semantics all-in-one
2874
Token = collections.namedtuple("Token", (
2875
"regexp", # To match token; if "value" is not None, must have
2876
# a "group" containing digits
2877
"value", # datetime.timedelta or None
2878
"followers")) # Tokens valid after this token
2879
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2880
# the "duration" ABNF definition in RFC 3339, Appendix A.
2881
token_end = Token(re.compile(r"$"), None, frozenset())
2882
token_second = Token(re.compile(r"(\d+)S"),
2883
datetime.timedelta(seconds=1),
2884
frozenset((token_end, )))
2885
token_minute = Token(re.compile(r"(\d+)M"),
2886
datetime.timedelta(minutes=1),
2887
frozenset((token_second, token_end)))
2888
token_hour = Token(re.compile(r"(\d+)H"),
2889
datetime.timedelta(hours=1),
2890
frozenset((token_minute, token_end)))
2891
token_time = Token(re.compile(r"T"),
2893
frozenset((token_hour, token_minute,
2895
token_day = Token(re.compile(r"(\d+)D"),
2896
datetime.timedelta(days=1),
2897
frozenset((token_time, token_end)))
2898
token_month = Token(re.compile(r"(\d+)M"),
2899
datetime.timedelta(weeks=4),
2900
frozenset((token_day, token_end)))
2901
token_year = Token(re.compile(r"(\d+)Y"),
2902
datetime.timedelta(weeks=52),
2903
frozenset((token_month, token_end)))
2904
token_week = Token(re.compile(r"(\d+)W"),
2905
datetime.timedelta(weeks=1),
2906
frozenset((token_end, )))
2907
token_duration = Token(re.compile(r"P"), None,
2908
frozenset((token_year, token_month,
2909
token_day, token_time,
2911
# Define starting values:
2913
value = datetime.timedelta()
2915
# Following valid tokens
2916
followers = frozenset((token_duration, ))
2917
# String left to parse
2919
# Loop until end token is found
2920
while found_token is not token_end:
2921
# Search for any currently valid tokens
2922
for token in followers:
2923
match = token.regexp.match(s)
2924
if match is not None:
2926
if token.value is not None:
2927
# Value found, parse digits
2928
factor = int(match.group(1), 10)
2929
# Add to value so far
2930
value += factor * token.value
2931
# Strip token from string
2932
s = token.regexp.sub("", s, 1)
2935
# Set valid next tokens
2936
followers = found_token.followers
2939
# No currently valid tokens were found
2940
raise ValueError("Invalid RFC 3339 duration: {!r}"
2946
1920
def string_to_delta(interval):
2947
1921
"""Parse a string and return a datetime.timedelta
2949
>>> string_to_delta("7d") == datetime.timedelta(7)
2951
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2953
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2955
>>> string_to_delta("24h") == datetime.timedelta(1)
2957
>>> string_to_delta("1w") == datetime.timedelta(7)
2959
>>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
1923
>>> string_to_delta('7d')
1924
datetime.timedelta(7)
1925
>>> string_to_delta('60s')
1926
datetime.timedelta(0, 60)
1927
>>> string_to_delta('60m')
1928
datetime.timedelta(0, 3600)
1929
>>> string_to_delta('24h')
1930
datetime.timedelta(1)
1931
>>> string_to_delta('1w')
1932
datetime.timedelta(7)
1933
>>> string_to_delta('5m 30s')
1934
datetime.timedelta(0, 330)
2964
return rfc3339_duration_to_delta(interval)
2968
1936
timevalue = datetime.timedelta(0)
2969
1937
for s in interval.split():
1939
suffix = unicode(s[-1])
2972
1940
value = int(s[:-1])
2973
1941
if suffix == "d":
2974
1942
delta = datetime.timedelta(value)
3046
2014
parser.add_argument("--no-dbus", action="store_false",
3047
2015
dest="use_dbus", help="Do not provide D-Bus"
3048
" system bus interface", default=None)
2016
" system bus interface")
3049
2017
parser.add_argument("--no-ipv6", action="store_false",
3050
dest="use_ipv6", help="Do not use IPv6",
2018
dest="use_ipv6", help="Do not use IPv6")
3052
2019
parser.add_argument("--no-restore", action="store_false",
3053
2020
dest="restore", help="Do not restore stored"
3054
" state", default=None)
3055
parser.add_argument("--socket", type=int,
3056
help="Specify a file descriptor to a network"
3057
" socket to use instead of creating one")
3058
2022
parser.add_argument("--statedir", metavar="DIR",
3059
2023
help="Directory to save/restore state in")
3060
parser.add_argument("--foreground", action="store_true",
3061
help="Run in foreground", default=None)
3062
parser.add_argument("--no-zeroconf", action="store_false",
3063
dest="zeroconf", help="Do not use Zeroconf",
3066
2025
options = parser.parse_args()
3068
2032
# Default values for config file for server-global settings
3069
if gnutls.has_rawpk:
3070
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3071
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3073
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3074
":+SIGN-DSA-SHA256")
3075
server_defaults = {"interface": "",
3079
"priority": priority,
3080
"servicename": "Mandos",
3086
"statedir": "/var/lib/mandos",
3087
"foreground": "False",
2033
server_defaults = { "interface": "",
2038
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2039
"servicename": "Mandos",
2044
"statedir": "/var/lib/mandos"
3092
2047
# Parse config file for server-global settings
3093
server_config = configparser.ConfigParser(server_defaults)
2048
server_config = configparser.SafeConfigParser(server_defaults)
3094
2049
del server_defaults
3095
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3096
# Convert the ConfigParser object to a dict
2050
server_config.read(os.path.join(options.configdir,
2052
# Convert the SafeConfigParser object to a dict
3097
2053
server_settings = server_config.defaults()
3098
2054
# Use the appropriate methods on the non-string config options
3099
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3100
"foreground", "zeroconf"):
2055
for option in ("debug", "use_dbus", "use_ipv6"):
3101
2056
server_settings[option] = server_config.getboolean("DEFAULT",
3103
2058
if server_settings["port"]:
3104
2059
server_settings["port"] = server_config.getint("DEFAULT",
3106
if server_settings["socket"]:
3107
server_settings["socket"] = server_config.getint("DEFAULT",
3109
# Later, stdin will, and stdout and stderr might, be dup'ed
3110
# over with an opened os.devnull. But we don't want this to
3111
# happen with a supplied network socket.
3112
while 0 <= server_settings["socket"] <= 2:
3113
server_settings["socket"] = os.dup(server_settings
3115
os.set_inheritable(server_settings["socket"], False)
3116
2061
del server_config
3118
2063
# Override the settings from the config file with command line
3119
2064
# options, if set.
3120
2065
for option in ("interface", "address", "port", "debug",
3121
"priority", "servicename", "configdir", "use_dbus",
3122
"use_ipv6", "debuglevel", "restore", "statedir",
3123
"socket", "foreground", "zeroconf"):
2066
"priority", "servicename", "configdir",
2067
"use_dbus", "use_ipv6", "debuglevel", "restore",
3124
2069
value = getattr(options, option)
3125
2070
if value is not None:
3126
2071
server_settings[option] = value
3128
2073
# Force all strings to be unicode
3129
2074
for option in server_settings.keys():
3130
if isinstance(server_settings[option], bytes):
3131
server_settings[option] = (server_settings[option]
3133
# Force all boolean options to be boolean
3134
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3135
"foreground", "zeroconf"):
3136
server_settings[option] = bool(server_settings[option])
3137
# Debug implies foreground
3138
if server_settings["debug"]:
3139
server_settings["foreground"] = True
2075
if type(server_settings[option]) is str:
2076
server_settings[option] = unicode(server_settings[option])
3140
2077
# Now we have our good server settings in "server_settings"
3142
2079
##################################################################
3144
if (not server_settings["zeroconf"]
3145
and not (server_settings["port"]
3146
or server_settings["socket"] != "")):
3147
parser.error("Needs port or socket to work without Zeroconf")
3149
2081
# For convenience
3150
2082
debug = server_settings["debug"]
3151
2083
debuglevel = server_settings["debuglevel"]
3165
2095
level = getattr(logging, debuglevel.upper())
3166
2096
initlogger(debug, level)
3168
2098
if server_settings["servicename"] != "Mandos":
3169
syslogger.setFormatter(
3170
logging.Formatter("Mandos ({}) [%(process)d]:"
3171
" %(levelname)s: %(message)s".format(
3172
server_settings["servicename"])))
2099
syslogger.setFormatter(logging.Formatter
2100
('Mandos (%s) [%%(process)d]:'
2101
' %%(levelname)s: %%(message)s'
2102
% server_settings["servicename"]))
3174
2104
# Parse config file with clients
3175
client_config = configparser.ConfigParser(Client.client_defaults)
2105
client_config = configparser.SafeConfigParser(Client
3176
2107
client_config.read(os.path.join(server_settings["configdir"],
3177
2108
"clients.conf"))
3179
2110
global mandos_dbus_service
3180
2111
mandos_dbus_service = None
3183
if server_settings["socket"] != "":
3184
socketfd = server_settings["socket"]
3185
tcp_server = MandosServer(
3186
(server_settings["address"], server_settings["port"]),
3188
interface=(server_settings["interface"] or None),
3190
gnutls_priority=server_settings["priority"],
3194
pidfilename = "/run/mandos.pid"
3195
if not os.path.isdir("/run/."):
3196
pidfilename = "/var/run/mandos.pid"
3199
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3200
except IOError as e:
3201
log.error("Could not open file %r", pidfilename,
3204
for name, group in (("_mandos", "_mandos"),
3205
("mandos", "mandos"),
3206
("nobody", "nogroup")):
3208
uid = pwd.getpwnam(name).pw_uid
3209
gid = pwd.getpwnam(group).pw_gid
2113
tcp_server = MandosServer((server_settings["address"],
2114
server_settings["port"]),
2116
interface=(server_settings["interface"]
2120
server_settings["priority"],
2123
pidfilename = "/var/run/mandos.pid"
2125
pidfile = open(pidfilename, "w")
2127
logger.error("Could not open file %r", pidfilename)
2130
uid = pwd.getpwnam("_mandos").pw_uid
2131
gid = pwd.getpwnam("_mandos").pw_gid
2134
uid = pwd.getpwnam("mandos").pw_uid
2135
gid = pwd.getpwnam("mandos").pw_gid
3211
2136
except KeyError:
2138
uid = pwd.getpwnam("nobody").pw_uid
2139
gid = pwd.getpwnam("nobody").pw_gid
3219
log.debug("Did setuid/setgid to %s:%s", uid, gid)
3220
2146
except OSError as error:
3221
log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
3222
os.strerror(error.errno))
3223
if error.errno != errno.EPERM:
2147
if error[0] != errno.EPERM:
3227
2151
# Enable all possible GnuTLS debugging
3229
2153
# "Use a log level over 10 to enable all debugging options."
3230
2154
# - GnuTLS manual
3231
gnutls.global_set_log_level(11)
2155
gnutls.library.functions.gnutls_global_set_log_level(11)
2157
@gnutls.library.types.gnutls_log_func
3234
2158
def debug_gnutls(level, string):
3235
log.debug("GnuTLS: %s",
3236
string[:-1].decode("utf-8", errors="replace"))
3238
gnutls.global_set_log_function(debug_gnutls)
2159
logger.debug("GnuTLS: %s", string[:-1])
2161
(gnutls.library.functions
2162
.gnutls_global_set_log_function(debug_gnutls))
3240
2164
# Redirect stdin so all checkers get /dev/null
3241
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2165
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3242
2166
os.dup2(null, sys.stdin.fileno())
3246
2170
# Need to fork before connecting to D-Bus
3248
2172
# Close all input and output, do double fork, etc.
3251
if gi.version_info < (3, 10, 2):
3252
# multiprocessing will use threads, so before we use GLib we
3253
# need to inform GLib that threads will be used.
2175
gobject.threads_init()
3256
2177
global main_loop
3257
2178
# From the Avahi example code
3258
DBusGMainLoop(set_as_default=True)
3259
main_loop = GLib.MainLoop()
3260
if use_dbus or zeroconf:
3261
bus = dbus.SystemBus()
2179
DBusGMainLoop(set_as_default=True )
2180
main_loop = gobject.MainLoop()
2181
bus = dbus.SystemBus()
3262
2182
# End of Avahi example code
3265
2185
bus_name = dbus.service.BusName("se.recompile.Mandos",
3268
old_bus_name = dbus.service.BusName(
3269
"se.bsnet.fukt.Mandos", bus,
3271
except dbus.exceptions.DBusException as e:
3272
log.error("Disabling D-Bus:", exc_info=e)
2186
bus, do_not_queue=True)
2187
old_bus_name = (dbus.service.BusName
2188
("se.bsnet.fukt.Mandos", bus,
2190
except dbus.exceptions.NameExistsException as e:
2191
logger.error(unicode(e) + ", disabling D-Bus")
3273
2192
use_dbus = False
3274
2193
server_settings["use_dbus"] = False
3275
2194
tcp_server.use_dbus = False
3277
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3278
service = AvahiServiceToSyslog(
3279
name=server_settings["servicename"],
3280
servicetype="_mandos._tcp",
3283
if server_settings["interface"]:
3284
service.interface = if_nametoindex(
3285
server_settings["interface"].encode("utf-8"))
2195
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2196
service = AvahiServiceToSyslog(name =
2197
server_settings["servicename"],
2198
servicetype = "_mandos._tcp",
2199
protocol = protocol, bus = bus)
2200
if server_settings["interface"]:
2201
service.interface = (if_nametoindex
2202
(str(server_settings["interface"])))
3287
2204
global multiprocessing_manager
3288
2205
multiprocessing_manager = multiprocessing.Manager()
3290
2207
client_class = Client
3292
client_class = functools.partial(ClientDBus, bus=bus)
2209
client_class = functools.partial(ClientDBusTransitional,
3294
2212
client_settings = Client.config_parser(client_config)
3295
2213
old_client_settings = {}
3296
2214
clients_data = {}
3298
# This is used to redirect stdout and stderr for checker processes
3300
wnull = open(os.devnull, "w") # A writable /dev/null
3301
# Only used if server is running in foreground but not in debug
3303
if debug or not foreground:
3306
2216
# Get client data and settings from last running state.
3307
2217
if server_settings["restore"]:
3309
2219
with open(stored_state_path, "rb") as stored_state:
3310
if sys.version_info.major == 2:
3311
clients_data, old_client_settings = pickle.load(
3314
bytes_clients_data, bytes_old_client_settings = (
3315
pickle.load(stored_state, encoding="bytes"))
3316
# Fix bytes to strings
3319
clients_data = {(key.decode("utf-8")
3320
if isinstance(key, bytes)
3323
bytes_clients_data.items()}
3324
del bytes_clients_data
3325
for key in clients_data:
3326
value = {(k.decode("utf-8")
3327
if isinstance(k, bytes) else k): v
3329
clients_data[key].items()}
3330
clients_data[key] = value
3332
value["client_structure"] = [
3334
if isinstance(s, bytes)
3336
value["client_structure"]]
3337
# .name, .host, and .checker_command
3338
for k in ("name", "host", "checker_command"):
3339
if isinstance(value[k], bytes):
3340
value[k] = value[k].decode("utf-8")
3341
if "key_id" not in value:
3342
value["key_id"] = ""
3343
elif "fingerprint" not in value:
3344
value["fingerprint"] = ""
3345
# old_client_settings
3347
old_client_settings = {
3348
(key.decode("utf-8")
3349
if isinstance(key, bytes)
3352
bytes_old_client_settings.items()}
3353
del bytes_old_client_settings
3354
# .host and .checker_command
3355
for value in old_client_settings.values():
3356
for attribute in ("host", "checker_command"):
3357
if isinstance(value[attribute], bytes):
3358
value[attribute] = (value[attribute]
2220
clients_data, old_client_settings = (pickle.load
3360
2222
os.remove(stored_state_path)
3361
2223
except IOError as e:
3362
if e.errno == errno.ENOENT:
3363
log.warning("Could not load persistent state:"
3364
" %s", os.strerror(e.errno))
3366
log.critical("Could not load persistent state:",
2224
logger.warning("Could not load persistent state: {0}"
2226
if e.errno != errno.ENOENT:
3369
2228
except EOFError as e:
3370
log.warning("Could not load persistent state: EOFError:",
2229
logger.warning("Could not load persistent state: "
2230
"EOFError: {0}".format(e))
3373
2232
with PGPEngine() as pgp:
3374
for client_name, client in clients_data.items():
3375
# Skip removed clients
3376
if client_name not in client_settings:
2233
for client_name, client in clients_data.iteritems():
3379
2234
# Decide which value to use after restoring saved state.
3380
2235
# We have three different values: Old config file,
3381
2236
# new config file, and saved state.
3436
2295
- set(old_client_settings)):
3437
2296
clients_data[client_name] = client_settings[client_name]
3439
# Create all client objects
3440
for client_name, client in clients_data.items():
2298
# Create clients all clients
2299
for client_name, client in clients_data.iteritems():
3441
2300
tcp_server.clients[client_name] = client_class(
3444
server_settings=server_settings)
2301
name = client_name, settings = client)
3446
2303
if not tcp_server.clients:
3447
log.warning("No clients defined")
3450
if pidfile is not None:
3454
print(pid, file=pidfile)
3456
log.error("Could not write to file %r with PID %d",
2304
logger.warning("No clients defined")
2310
pidfile.write(str(pid) + "\n".encode("utf-8"))
2313
logger.error("Could not write to file %r with PID %d",
2316
# "pidfile" was never created
3459
2318
del pidfilename
3461
for termsig in (signal.SIGHUP, signal.SIGTERM):
3462
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3463
lambda: main_loop.quit() and False)
2319
signal.signal(signal.SIGINT, signal.SIG_IGN)
2321
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2322
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3467
@alternate_dbus_interfaces(
3468
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3469
class MandosDBusService(DBusObjectWithObjectManager):
2325
class MandosDBusService(dbus.service.Object):
3470
2326
"""A D-Bus proxy object"""
3472
2327
def __init__(self):
3473
2328
dbus.service.Object.__init__(self, bus, "/")
3475
2329
_interface = "se.recompile.Mandos"
3477
2331
@dbus.service.signal(_interface, signature="o")
3478
2332
def ClientAdded(self, objpath):
3482
2336
@dbus.service.signal(_interface, signature="ss")
3483
def ClientNotFound(self, key_id, address):
2337
def ClientNotFound(self, fingerprint, address):
3487
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3489
2341
@dbus.service.signal(_interface, signature="os")
3490
2342
def ClientRemoved(self, objpath, name):
3494
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3496
2346
@dbus.service.method(_interface, out_signature="ao")
3497
2347
def GetAllClients(self):
3499
return dbus.Array(c.dbus_object_path for c in
3500
tcp_server.clients.values())
3502
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2349
return dbus.Array(c.dbus_object_path
2351
tcp_server.clients.itervalues())
3504
2353
@dbus.service.method(_interface,
3505
2354
out_signature="a{oa{sv}}")
3506
2355
def GetAllClientsWithProperties(self):
3508
2357
return dbus.Dictionary(
3509
{c.dbus_object_path: c.GetAll(
3510
"se.recompile.Mandos.Client")
3511
for c in tcp_server.clients.values()},
2358
((c.dbus_object_path, c.GetAll(""))
2359
for c in tcp_server.clients.itervalues()),
3512
2360
signature="oa{sv}")
3514
2362
@dbus.service.method(_interface, in_signature="o")
3515
2363
def RemoveClient(self, object_path):
3517
for c in tcp_server.clients.values():
2365
for c in tcp_server.clients.itervalues():
3518
2366
if c.dbus_object_path == object_path:
3519
2367
del tcp_server.clients[c.name]
3520
2368
c.remove_from_connection()
3521
# Don't signal the disabling
2369
# Don't signal anything except ClientRemoved
3522
2370
c.disable(quiet=True)
3523
# Emit D-Bus signal for removal
3524
self.client_removed_signal(c)
2372
self.ClientRemoved(object_path, c.name)
3526
2374
raise KeyError(object_path)
3530
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3531
out_signature="a{oa{sa{sv}}}")
3532
def GetManagedObjects(self):
3534
return dbus.Dictionary(
3535
{client.dbus_object_path:
3537
{interface: client.GetAll(interface)
3539
client._get_all_interface_names()})
3540
for client in tcp_server.clients.values()})
3542
def client_added_signal(self, client):
3543
"""Send the new standard signal and the old signal"""
3545
# New standard signal
3546
self.InterfacesAdded(
3547
client.dbus_object_path,
3549
{interface: client.GetAll(interface)
3551
client._get_all_interface_names()}))
3553
self.ClientAdded(client.dbus_object_path)
3555
def client_removed_signal(self, client):
3556
"""Send the new standard signal and the old signal"""
3558
# New standard signal
3559
self.InterfacesRemoved(
3560
client.dbus_object_path,
3561
client._get_all_interface_names())
3563
self.ClientRemoved(client.dbus_object_path,
3566
mandos_dbus_service = MandosDBusService()
3568
# Save modules to variables to exempt the modules from being
3569
# unloaded before the function registered with atexit() is run.
3570
mp = multiprocessing
2378
class MandosDBusServiceTransitional(MandosDBusService):
2379
__metaclass__ = AlternateDBusNamesMetaclass
2380
mandos_dbus_service = MandosDBusServiceTransitional()
3574
2383
"Cleanup function; run on exit"
3578
mp.active_children()
2386
multiprocessing.active_children()
3580
2387
if not (tcp_server.clients or client_settings):
3583
2390
# Store client before exiting. Secrets are encrypted with key
3584
2391
# based on what config file has. If config file is
3585
2392
# removed/edited, old secret will thus be unrecovable.
3587
2394
with PGPEngine() as pgp:
3588
for client in tcp_server.clients.values():
2395
for client in tcp_server.clients.itervalues():
3589
2396
key = client_settings[client.name]["secret"]
3590
2397
client.encrypted_secret = pgp.encrypt(client.secret,
3592
2399
client_dict = {}
3594
2401
# A list of attributes that can not be pickled
3596
exclude = {"bus", "changedstate", "secret",
3597
"checker", "server_settings"}
3598
for name, typ in inspect.getmembers(dbus.service
2403
exclude = set(("bus", "changedstate", "secret",
2405
for name, typ in (inspect.getmembers
2406
(dbus.service.Object)):
3600
2407
exclude.add(name)
3602
2409
client_dict["encrypted_secret"] = (client
3603
2410
.encrypted_secret)
3604
2411
for attr in client.client_structure:
3605
2412
if attr not in exclude:
3606
2413
client_dict[attr] = getattr(client, attr)
3608
2415
clients[client.name] = client_dict
3609
2416
del client_settings[client.name]["secret"]
3612
with tempfile.NamedTemporaryFile(
3616
dir=os.path.dirname(stored_state_path),
3617
delete=False) as stored_state:
3618
pickle.dump((clients, client_settings), stored_state,
3620
tempname = stored_state.name
2419
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2422
(stored_state_path))
2423
with os.fdopen(tempfd, "wb") as stored_state:
2424
pickle.dump((clients, client_settings), stored_state)
3621
2425
os.rename(tempname, stored_state_path)
3622
2426
except (IOError, OSError) as e:
2427
logger.warning("Could not save persistent state: {0}"
3625
2431
os.remove(tempname)
3626
2432
except NameError:
3628
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3629
log.warning("Could not save persistent state: %s",
3630
os.strerror(e.errno))
3632
log.warning("Could not save persistent state:",
2434
if e.errno not in set((errno.ENOENT, errno.EACCES,
3636
2438
# Delete all clients, and settings from config
3637
2439
while tcp_server.clients:
3638
2440
name, client = tcp_server.clients.popitem()
3640
2442
client.remove_from_connection()
3641
# Don't signal the disabling
2443
# Don't signal anything except ClientRemoved
3642
2444
client.disable(quiet=True)
3643
# Emit D-Bus signal for removal
3645
mandos_dbus_service.client_removed_signal(client)
2447
mandos_dbus_service.ClientRemoved(client
3646
2450
client_settings.clear()
3648
2452
atexit.register(cleanup)
3650
for client in tcp_server.clients.values():
2454
for client in tcp_server.clients.itervalues():
3652
# Emit D-Bus signal for adding
3653
mandos_dbus_service.client_added_signal(client)
2457
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3654
2458
# Need to initiate checking of clients
3655
2459
if client.enabled:
3656
client.init_checker(randomize_start=True)
2460
client.init_checker()
3658
2462
tcp_server.enable()
3659
2463
tcp_server.server_activate()
3661
2465
# Find out what port we got
3663
service.port = tcp_server.socket.getsockname()[1]
2466
service.port = tcp_server.socket.getsockname()[1]
3665
log.info("Now listening on address %r, port %d, flowinfo %d,"
3666
" scope_id %d", *tcp_server.socket.getsockname())
2468
logger.info("Now listening on address %r, port %d,"
2469
" flowinfo %d, scope_id %d"
2470
% tcp_server.socket.getsockname())
3668
log.info("Now listening on address %r, port %d",
3669
*tcp_server.socket.getsockname())
3671
# service.interface = tcp_server.socket.getsockname()[3]
2472
logger.info("Now listening on address %r, port %d"
2473
% tcp_server.socket.getsockname())
2475
#service.interface = tcp_server.socket.getsockname()[3]
3675
# From the Avahi example code
3678
except dbus.exceptions.DBusException as error:
3679
log.critical("D-Bus Exception", exc_info=error)
3682
# End of Avahi example code
3685
GLib.IOChannel.unix_new(tcp_server.fileno()),
3686
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3687
lambda *args, **kwargs: (tcp_server.handle_request
3688
(*args[2:], **kwargs) or True))
3690
log.debug("Starting main loop")
2478
# From the Avahi example code
2481
except dbus.exceptions.DBusException as error:
2482
logger.critical("DBusException: %s", error)
2485
# End of Avahi example code
2487
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2488
lambda *args, **kwargs:
2489
(tcp_server.handle_request
2490
(*args[2:], **kwargs) or True))
2492
logger.debug("Starting main loop")
3691
2493
main_loop.run()
3692
2494
except AvahiError as error:
3693
log.critical("Avahi Error", exc_info=error)
2495
logger.critical("AvahiError: %s", error)
3696
2498
except KeyboardInterrupt:
3698
2500
print("", file=sys.stderr)
3699
log.debug("Server received KeyboardInterrupt")
3700
log.debug("Server exiting")
2501
logger.debug("Server received KeyboardInterrupt")
2502
logger.debug("Server exiting")
3701
2503
# Must run before the D-Bus bus name gets deregistered
3705
def parse_test_args():
3706
# type: () -> argparse.Namespace
3707
parser = argparse.ArgumentParser(add_help=False)
3708
parser.add_argument("--check", action="store_true")
3709
parser.add_argument("--prefix", )
3710
args, unknown_args = parser.parse_known_args()
3712
# Remove test options from sys.argv
3713
sys.argv[1:] = unknown_args
3716
# Add all tests from doctest strings
3717
def load_tests(loader, tests, none):
3719
tests.addTests(doctest.DocTestSuite())
3722
if __name__ == "__main__":
3723
options = parse_test_args()
3726
extra_test_prefix = options.prefix
3727
if extra_test_prefix is not None:
3728
if not (unittest.main(argv=[""], exit=False)
3729
.result.wasSuccessful()):
3731
class ExtraTestLoader(unittest.TestLoader):
3732
testMethodPrefix = extra_test_prefix
3733
# Call using ./scriptname --test [--verbose]
3734
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3736
unittest.main(argv=[""])
3744
# (lambda (&optional extra)
3745
# (if (not (funcall run-tests-in-test-buffer default-directory
3747
# (funcall show-test-buffer-in-test-window)
3748
# (funcall remove-test-window)
3749
# (if extra (message "Extra tests run successfully!"))))
3750
# run-tests-in-test-buffer:
3751
# (lambda (dir &optional extra)
3752
# (with-current-buffer (get-buffer-create "*Test*")
3753
# (setq buffer-read-only nil
3754
# default-directory dir)
3756
# (compilation-mode))
3757
# (let ((process-result
3758
# (let ((inhibit-read-only t))
3759
# (process-file-shell-command
3760
# (funcall get-command-line extra) nil "*Test*"))))
3761
# (and (numberp process-result)
3762
# (= process-result 0))))
3764
# (lambda (&optional extra)
3765
# (let ((quoted-script
3766
# (shell-quote-argument (funcall get-script-name))))
3768
# (concat "%s --check" (if extra " --prefix=atest" ""))
3772
# (if (fboundp 'file-local-name)
3773
# (file-local-name (buffer-file-name))
3774
# (or (file-remote-p (buffer-file-name) 'localname)
3775
# (buffer-file-name))))
3776
# remove-test-window:
3778
# (let ((test-window (get-buffer-window "*Test*")))
3779
# (if test-window (delete-window test-window))))
3780
# show-test-buffer-in-test-window:
3782
# (when (not (get-buffer-window-list "*Test*"))
3783
# (setq next-error-last-buffer (get-buffer "*Test*"))
3784
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3785
# (display-buffer-overriding-action
3786
# `((display-buffer-in-side-window) (side . ,side)
3787
# (window-height . fit-window-to-buffer)
3788
# (window-width . fit-window-to-buffer))))
3789
# (display-buffer "*Test*"))))
3792
# (let* ((run-extra-tests (lambda () (interactive)
3793
# (funcall run-tests t)))
3794
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3795
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3796
# (setq minor-mode-overriding-map-alist
3797
# (cons `(run-tests . ,outer-keymap)
3798
# minor-mode-overriding-map-alist)))
3799
# (add-hook 'after-save-hook run-tests 90 t))
2506
if __name__ == '__main__':