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
from future_builtins import *
39
import SocketServer as socketserver
48
import SocketServer as socketserver
55
import ConfigParser as configparser
45
import gnutls.connection
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
63
59
import logging.handlers
70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
84
73
import dbus.service
86
from gi.repository import GLib
87
76
from dbus.mainloop.glib import DBusGMainLoop
90
79
import xml.dom.minidom
93
if sys.version_info.major == 2:
98
# Add collections.abc.Callable if it does not exist
100
collections.abc.Callable
101
except AttributeError:
103
Callable = collections.Callable
104
collections.abc = abc
107
# Add shlex.quote if it does not exist
110
except AttributeError:
111
shlex.quote = re.escape
113
# Show warnings by default
114
if not sys.warnoptions:
116
warnings.simplefilter("default")
118
# Try to find the value of SO_BINDTODEVICE:
120
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
121
# newer, and it is also the most natural place for it:
122
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
123
85
except AttributeError:
125
# This is where SO_BINDTODEVICE was up to and including Python
127
87
from IN import SO_BINDTODEVICE
128
88
except ImportError:
129
# In Python 2.7 it seems to have been removed entirely.
130
# Try running the C preprocessor:
132
cc = subprocess.Popen(["cc", "--language=c", "-E",
134
stdin=subprocess.PIPE,
135
stdout=subprocess.PIPE)
136
stdout = cc.communicate(
137
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
138
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
139
except (OSError, ValueError, IndexError):
141
SO_BINDTODEVICE = None
143
if sys.version_info < (3, 2):
144
configparser.Configparser = configparser.SafeConfigParser
89
SO_BINDTODEVICE = None
147
92
stored_state_file = "clients.pickle"
149
log = logging.getLogger(os.path.basename(sys.argv[0]))
150
logging.captureWarnings(True) # Show warnings via the logging system
94
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
154
if_nametoindex = ctypes.cdll.LoadLibrary(
155
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
156
103
except (OSError, AttributeError):
158
104
def if_nametoindex(interface):
159
105
"Get an interface index the hard way, i.e. using fcntl()"
160
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
161
107
with contextlib.closing(socket.socket()) as s:
162
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
163
struct.pack(b"16s16x", interface))
164
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
165
113
return interface_index
168
def copy_function(func):
169
"""Make a copy of a function"""
170
if sys.version_info.major == 2:
171
return types.FunctionType(func.func_code,
177
return types.FunctionType(func.__code__,
184
116
def initlogger(debug, level=logging.WARNING):
185
117
"""init logger and add loglevel"""
188
syslogger = (logging.handlers.SysLogHandler(
189
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
191
119
syslogger.setFormatter(logging.Formatter
192
("Mandos [%(process)d]: %(levelname)s:"
194
log.addHandler(syslogger)
120
('Mandos [%(process)d]: %(levelname)s:'
122
logger.addHandler(syslogger)
197
125
console = logging.StreamHandler()
198
console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
202
log.addHandler(console)
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
130
logger.addHandler(console)
131
logger.setLevel(level)
206
134
class PGPError(Exception):
255
171
os.rmdir(self.tempdir)
256
172
self.tempdir = None
258
174
def password_encode(self, password):
259
175
# Passphrase can not be empty and can not contain newlines or
260
176
# NUL bytes. So we prefix it and hex encode it.
261
encoded = b"mandos" + binascii.hexlify(password)
262
if len(encoded) > 2048:
263
# GnuPG can't handle long passwords, so encode differently
264
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
265
.replace(b"\n", b"\\n")
266
.replace(b"\0", b"\\x00"))
177
return b"mandos" + binascii.hexlify(password)
269
179
def encrypt(self, data, password):
270
passphrase = self.password_encode(password)
271
with tempfile.NamedTemporaryFile(
272
dir=self.tempdir) as passfile:
273
passfile.write(passphrase)
275
proc = subprocess.Popen([self.gpg, "--symmetric",
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
283
if proc.returncode != 0:
180
self.gnupg.passphrase = self.password_encode(password)
181
with open(os.devnull, "w") as devnull:
183
proc = self.gnupg.run(['--symmetric'],
184
create_fhs=['stdin', 'stdout'],
185
attach_fhs={'stderr': devnull})
186
with contextlib.closing(proc.handles['stdin']) as f:
188
with contextlib.closing(proc.handles['stdout']) as f:
189
ciphertext = f.read()
193
self.gnupg.passphrase = None
285
194
return ciphertext
287
196
def decrypt(self, data, password):
288
passphrase = self.password_encode(password)
289
with tempfile.NamedTemporaryFile(
290
dir=self.tempdir) as passfile:
291
passfile.write(passphrase)
293
proc = subprocess.Popen([self.gpg, "--decrypt",
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
301
if proc.returncode != 0:
197
self.gnupg.passphrase = self.password_encode(password)
198
with open(os.devnull, "w") as devnull:
200
proc = self.gnupg.run(['--decrypt'],
201
create_fhs=['stdin', 'stdout'],
202
attach_fhs={'stderr': devnull})
203
with contextlib.closing(proc.handles['stdin']) as f:
205
with contextlib.closing(proc.handles['stdout']) as f:
206
decrypted_plaintext = f.read()
210
self.gnupg.passphrase = None
303
211
return decrypted_plaintext
306
# Pretend that we have an Avahi module
308
"""This isn't so much a class as it is a module-like namespace."""
309
IF_UNSPEC = -1 # avahi-common/address.h
310
PROTO_UNSPEC = -1 # avahi-common/address.h
311
PROTO_INET = 0 # avahi-common/address.h
312
PROTO_INET6 = 1 # avahi-common/address.h
313
DBUS_NAME = "org.freedesktop.Avahi"
314
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
315
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
DBUS_PATH_SERVER = "/"
319
def string_array_to_txt_array(t):
320
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
for s in t), signature="ay")
322
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
323
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
324
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
325
SERVER_INVALID = 0 # avahi-common/defs.h
326
SERVER_REGISTERING = 1 # avahi-common/defs.h
327
SERVER_RUNNING = 2 # avahi-common/defs.h
328
SERVER_COLLISION = 3 # avahi-common/defs.h
329
SERVER_FAILURE = 4 # avahi-common/defs.h
332
214
class AvahiError(Exception):
333
215
def __init__(self, value, *args, **kwargs):
334
216
self.value = value
335
return super(AvahiError, self).__init__(value, *args,
217
super(AvahiError, self).__init__(value, *args, **kwargs)
218
def __unicode__(self):
219
return unicode(repr(self.value))
339
221
class AvahiServiceError(AvahiError):
343
224
class AvahiGroupError(AvahiError):
228
class AvahiService(object):
348
229
"""An Avahi (Zeroconf) service.
351
232
interface: integer; avahi.IF_UNSPEC or an interface index.
352
233
Used to optionally bind to the specified interface.
353
name: string; Example: "Mandos"
354
type: string; Example: "_mandos._tcp".
355
See <https://www.iana.org/assignments/service-names-port-numbers>
234
name: string; Example: 'Mandos'
235
type: string; Example: '_mandos._tcp'.
236
See <http://www.dns-sd.org/ServiceTypes.html>
356
237
port: integer; what port to announce
357
238
TXT: list of strings; TXT record for the service
358
239
domain: string; Domain to publish on, default to .local if empty.
516
376
follow_name_owner_changes=True),
517
377
avahi.DBUS_INTERFACE_SERVER)
518
378
self.server.connect_to_signal("StateChanged",
519
self.server_state_changed)
379
self.server_state_changed)
520
380
self.server_state_changed(self.server.GetState())
523
383
class AvahiServiceToSyslog(AvahiService):
524
def rename(self, *args, **kwargs):
525
385
"""Add the new name to the syslog messages"""
526
ret = super(AvahiServiceToSyslog, self).rename(*args,
528
syslogger.setFormatter(logging.Formatter(
529
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
386
ret = AvahiService.rename(self)
387
syslogger.setFormatter(logging.Formatter
388
('Mandos ({0}) [%(process)d]:'
389
' %(levelname)s: %(message)s'
534
# Pretend that we have a GnuTLS module
536
"""This isn't so much a class as it is a module-like namespace."""
538
library = ctypes.util.find_library("gnutls")
540
library = ctypes.util.find_library("gnutls-deb0")
541
_library = ctypes.cdll.LoadLibrary(library)
544
# Unless otherwise indicated, the constants and types below are
545
# all from the gnutls/gnutls.h C header file.
556
E_NO_CERTIFICATE_FOUND = -49
561
KEYID_USE_SHA256 = 1 # gnutls/x509.h
562
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
565
class _session_int(ctypes.Structure):
567
session_t = ctypes.POINTER(_session_int)
569
class certificate_credentials_st(ctypes.Structure):
571
certificate_credentials_t = ctypes.POINTER(
572
certificate_credentials_st)
573
certificate_type_t = ctypes.c_int
575
class datum_t(ctypes.Structure):
576
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
577
("size", ctypes.c_uint)]
579
class _openpgp_crt_int(ctypes.Structure):
581
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
582
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
583
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
credentials_type_t = ctypes.c_int
585
transport_ptr_t = ctypes.c_void_p
586
close_request_t = ctypes.c_int
589
class Error(Exception):
590
def __init__(self, message=None, code=None, args=()):
591
# Default usage is by a message string, but if a return
592
# code is passed, convert it to a string with
595
if message is None and code is not None:
596
message = gnutls.strerror(code).decode(
597
"utf-8", errors="replace")
598
return super(gnutls.Error, self).__init__(
601
class CertificateSecurityError(Error):
605
def __init__(self, cls):
608
def from_param(self, obj):
609
if not isinstance(obj, self.cls):
610
raise TypeError("Not of type {}: {!r}"
611
.format(self.cls.__name__, obj))
612
return ctypes.byref(obj.from_param(obj))
614
class CastToVoidPointer:
615
def __init__(self, cls):
618
def from_param(self, obj):
619
if not isinstance(obj, self.cls):
620
raise TypeError("Not of type {}: {!r}"
621
.format(self.cls.__name__, obj))
622
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
624
class With_from_param:
626
def from_param(cls, obj):
627
return obj._as_parameter_
630
class Credentials(With_from_param):
632
self._as_parameter_ = gnutls.certificate_credentials_t()
633
gnutls.certificate_allocate_credentials(self)
634
self.type = gnutls.CRD_CERTIFICATE
637
gnutls.certificate_free_credentials(self)
639
class ClientSession(With_from_param):
640
def __init__(self, socket, credentials=None):
641
self._as_parameter_ = gnutls.session_t()
642
gnutls_flags = gnutls.CLIENT
643
if gnutls.check_version(b"3.5.6"):
644
gnutls_flags |= gnutls.NO_TICKETS
646
gnutls_flags |= gnutls.ENABLE_RAWPK
647
gnutls.init(self, gnutls_flags)
649
gnutls.set_default_priority(self)
650
gnutls.transport_set_ptr(self, socket.fileno())
651
gnutls.handshake_set_private_extensions(self, True)
653
if credentials is None:
654
credentials = gnutls.Credentials()
655
gnutls.credentials_set(self, credentials.type,
657
self.credentials = credentials
663
return gnutls.handshake(self)
665
def send(self, data):
669
data_len -= gnutls.record_send(self, data[-data_len:],
673
return gnutls.bye(self, gnutls.SHUT_RDWR)
675
# Error handling functions
676
def _error_code(result):
677
"""A function to raise exceptions on errors, suitable
678
for the "restype" attribute on ctypes functions"""
679
if result >= gnutls.E_SUCCESS:
681
if result == gnutls.E_NO_CERTIFICATE_FOUND:
682
raise gnutls.CertificateSecurityError(code=result)
683
raise gnutls.Error(code=result)
685
def _retry_on_error(result, func, arguments,
686
_error_code=_error_code):
687
"""A function to retry on some errors, suitable
688
for the "errcheck" attribute on ctypes functions"""
689
while result < gnutls.E_SUCCESS:
690
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
691
return _error_code(result)
692
result = func(*arguments)
695
# Unless otherwise indicated, the function declarations below are
696
# all from the gnutls/gnutls.h C header file.
699
priority_set_direct = _library.gnutls_priority_set_direct
700
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
701
ctypes.POINTER(ctypes.c_char_p)]
702
priority_set_direct.restype = _error_code
704
init = _library.gnutls_init
705
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
706
init.restype = _error_code
708
set_default_priority = _library.gnutls_set_default_priority
709
set_default_priority.argtypes = [ClientSession]
710
set_default_priority.restype = _error_code
712
record_send = _library.gnutls_record_send
713
record_send.argtypes = [ClientSession, ctypes.c_void_p,
715
record_send.restype = ctypes.c_ssize_t
716
record_send.errcheck = _retry_on_error
718
certificate_allocate_credentials = (
719
_library.gnutls_certificate_allocate_credentials)
720
certificate_allocate_credentials.argtypes = [
721
PointerTo(Credentials)]
722
certificate_allocate_credentials.restype = _error_code
724
certificate_free_credentials = (
725
_library.gnutls_certificate_free_credentials)
726
certificate_free_credentials.argtypes = [Credentials]
727
certificate_free_credentials.restype = None
729
handshake_set_private_extensions = (
730
_library.gnutls_handshake_set_private_extensions)
731
handshake_set_private_extensions.argtypes = [ClientSession,
733
handshake_set_private_extensions.restype = None
735
credentials_set = _library.gnutls_credentials_set
736
credentials_set.argtypes = [ClientSession, credentials_type_t,
737
CastToVoidPointer(Credentials)]
738
credentials_set.restype = _error_code
740
strerror = _library.gnutls_strerror
741
strerror.argtypes = [ctypes.c_int]
742
strerror.restype = ctypes.c_char_p
744
certificate_type_get = _library.gnutls_certificate_type_get
745
certificate_type_get.argtypes = [ClientSession]
746
certificate_type_get.restype = _error_code
748
certificate_get_peers = _library.gnutls_certificate_get_peers
749
certificate_get_peers.argtypes = [ClientSession,
750
ctypes.POINTER(ctypes.c_uint)]
751
certificate_get_peers.restype = ctypes.POINTER(datum_t)
753
global_set_log_level = _library.gnutls_global_set_log_level
754
global_set_log_level.argtypes = [ctypes.c_int]
755
global_set_log_level.restype = None
757
global_set_log_function = _library.gnutls_global_set_log_function
758
global_set_log_function.argtypes = [log_func]
759
global_set_log_function.restype = None
761
deinit = _library.gnutls_deinit
762
deinit.argtypes = [ClientSession]
763
deinit.restype = None
765
handshake = _library.gnutls_handshake
766
handshake.argtypes = [ClientSession]
767
handshake.restype = ctypes.c_int
768
handshake.errcheck = _retry_on_error
770
transport_set_ptr = _library.gnutls_transport_set_ptr
771
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
772
transport_set_ptr.restype = None
774
bye = _library.gnutls_bye
775
bye.argtypes = [ClientSession, close_request_t]
776
bye.restype = ctypes.c_int
777
bye.errcheck = _retry_on_error
779
check_version = _library.gnutls_check_version
780
check_version.argtypes = [ctypes.c_char_p]
781
check_version.restype = ctypes.c_char_p
783
_need_version = b"3.3.0"
784
if check_version(_need_version) is None:
785
raise self.Error("Needs GnuTLS {} or later"
786
.format(_need_version))
788
_tls_rawpk_version = b"3.6.6"
789
has_rawpk = bool(check_version(_tls_rawpk_version))
793
class pubkey_st(ctypes.Structure):
795
pubkey_t = ctypes.POINTER(pubkey_st)
797
x509_crt_fmt_t = ctypes.c_int
799
# All the function declarations below are from
801
pubkey_init = _library.gnutls_pubkey_init
802
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
803
pubkey_init.restype = _error_code
805
pubkey_import = _library.gnutls_pubkey_import
806
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
808
pubkey_import.restype = _error_code
810
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
811
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
812
ctypes.POINTER(ctypes.c_ubyte),
813
ctypes.POINTER(ctypes.c_size_t)]
814
pubkey_get_key_id.restype = _error_code
816
pubkey_deinit = _library.gnutls_pubkey_deinit
817
pubkey_deinit.argtypes = [pubkey_t]
818
pubkey_deinit.restype = None
820
# All the function declarations below are from
823
openpgp_crt_init = _library.gnutls_openpgp_crt_init
824
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
825
openpgp_crt_init.restype = _error_code
827
openpgp_crt_import = _library.gnutls_openpgp_crt_import
828
openpgp_crt_import.argtypes = [openpgp_crt_t,
829
ctypes.POINTER(datum_t),
831
openpgp_crt_import.restype = _error_code
833
openpgp_crt_verify_self = \
834
_library.gnutls_openpgp_crt_verify_self
835
openpgp_crt_verify_self.argtypes = [
838
ctypes.POINTER(ctypes.c_uint),
840
openpgp_crt_verify_self.restype = _error_code
842
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
843
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
844
openpgp_crt_deinit.restype = None
846
openpgp_crt_get_fingerprint = (
847
_library.gnutls_openpgp_crt_get_fingerprint)
848
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
852
openpgp_crt_get_fingerprint.restype = _error_code
854
if check_version(b"3.6.4"):
855
certificate_type_get2 = _library.gnutls_certificate_type_get2
856
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
857
certificate_type_get2.restype = _error_code
859
# Remove non-public functions
860
del _error_code, _retry_on_error
863
def call_pipe(connection, # : multiprocessing.Connection
864
func, *args, **kwargs):
865
"""This function is meant to be called by multiprocessing.Process
867
This function runs func(*args, **kwargs), and writes the resulting
868
return value on the provided multiprocessing.Connection.
870
connection.send(func(*args, **kwargs))
394
def timedelta_to_milliseconds(td):
395
"Convert a datetime.timedelta() to milliseconds"
396
return ((td.days * 24 * 60 * 60 * 1000)
397
+ (td.seconds * 1000)
398
+ (td.microseconds // 1000))
401
class Client(object):
875
402
"""A representation of a client host served by this server.
878
approved: bool(); None if not yet approved/disapproved
405
approved: bool(); 'None' if not yet approved/disapproved
879
406
approval_delay: datetime.timedelta(); Time to wait for approval
880
407
approval_duration: datetime.timedelta(); Duration of one approval
881
checker: multiprocessing.Process(); a running checker process used
882
to see if the client lives. None if no process is
884
checker_callback_tag: a GLib event source tag, or None
408
checker: subprocess.Popen(); a running checker process used
409
to see if the client lives.
410
'None' if no process is running.
411
checker_callback_tag: a gobject event source tag, or None
885
412
checker_command: string; External command which is run to check
886
413
if client lives. %() expansions are done at
887
414
runtime with vars(self) as dict, so that for
888
415
instance %(name)s can be used in the command.
889
checker_initiator_tag: a GLib event source tag, or None
416
checker_initiator_tag: a gobject event source tag, or None
890
417
created: datetime.datetime(); (UTC) object creation
891
418
client_structure: Object describing what attributes a client has
892
419
and is used for storing the client at exit
893
420
current_checker_command: string; current running checker_command
894
disable_initiator_tag: a GLib event source tag, or None
421
disable_initiator_tag: a gobject event source tag, or None
896
423
fingerprint: string (40 or 32 hexadecimal digits); used to
897
uniquely identify an OpenPGP client
898
key_id: string (64 hexadecimal digits); used to uniquely identify
899
a client using raw public keys
424
uniquely identify the client
900
425
host: string; available for use by the checker command
901
426
interval: datetime.timedelta(); How often to start a new checker
902
427
last_approval_request: datetime.datetime(); (UTC) or None
1023
550
self.current_checker_command = None
1024
551
self.approved = None
1025
552
self.approvals_pending = 0
1026
self.changedstate = multiprocessing_manager.Condition(
1027
multiprocessing_manager.Lock())
1028
self.client_structure = [attr
1029
for attr in self.__dict__.keys()
553
self.changedstate = (multiprocessing_manager
554
.Condition(multiprocessing_manager
556
self.client_structure = [attr for attr in
557
self.__dict__.iterkeys()
1030
558
if not attr.startswith("_")]
1031
559
self.client_structure.append("client_structure")
1033
for name, t in inspect.getmembers(
1034
type(self), lambda obj: isinstance(obj, property)):
561
for name, t in inspect.getmembers(type(self),
1035
565
if not name.startswith("_"):
1036
566
self.client_structure.append(name)
1038
568
# Send notice to process children that client state has changed
1039
569
def send_changedstate(self):
1040
570
with self.changedstate:
1041
571
self.changedstate.notify_all()
1043
573
def enable(self):
1044
574
"""Start this client's checker and timeout hooks"""
1045
575
if getattr(self, "enabled", False):
1046
576
# Already enabled
578
self.expires = datetime.datetime.utcnow() + self.timeout
1048
579
self.enabled = True
1049
580
self.last_enabled = datetime.datetime.utcnow()
1050
581
self.init_checker()
1051
582
self.send_changedstate()
1053
584
def disable(self, quiet=True):
1054
585
"""Disable this client."""
1055
586
if not getattr(self, "enabled", False):
1058
log.info("Disabling client %s", self.name)
589
logger.info("Disabling client %s", self.name)
1059
590
if getattr(self, "disable_initiator_tag", None) is not None:
1060
GLib.source_remove(self.disable_initiator_tag)
591
gobject.source_remove(self.disable_initiator_tag)
1061
592
self.disable_initiator_tag = None
1062
593
self.expires = None
1063
594
if getattr(self, "checker_initiator_tag", None) is not None:
1064
GLib.source_remove(self.checker_initiator_tag)
595
gobject.source_remove(self.checker_initiator_tag)
1065
596
self.checker_initiator_tag = None
1066
597
self.stop_checker()
1067
598
self.enabled = False
1069
600
self.send_changedstate()
1070
# Do not run this again if called by a GLib.timeout_add
601
# Do not run this again if called by a gobject.timeout_add
1073
604
def __del__(self):
1076
def init_checker(self, randomize_start=False):
1077
# Schedule a new checker to be started a randomly selected
1078
# time (a fraction of 'interval') from now. This spreads out
1079
# the startup of checkers over time when the server is
607
def init_checker(self):
608
# Schedule a new checker to be started an 'interval' from now,
609
# and every interval from then on.
1081
610
if self.checker_initiator_tag is not None:
1082
GLib.source_remove(self.checker_initiator_tag)
1083
interval_milliseconds = int(self.interval.total_seconds()
1086
delay_milliseconds = random.randrange(
1087
interval_milliseconds + 1)
1089
delay_milliseconds = interval_milliseconds
1090
self.checker_initiator_tag = GLib.timeout_add(
1091
delay_milliseconds, self.start_checker, randomize_start)
1092
delay = datetime.timedelta(0, 0, 0, delay_milliseconds)
1093
# A checker might take up to an 'interval' of time, so we can
1094
# expire at the soonest one interval after a checker was
1095
# started. Since the initial checker is delayed, the expire
1096
# time might have to be extended.
1097
now = datetime.datetime.utcnow()
1098
self.expires = now + delay + self.interval
1099
# Schedule a disable() at expire time
611
gobject.source_remove(self.checker_initiator_tag)
612
self.checker_initiator_tag = (gobject.timeout_add
613
(self.interval_milliseconds(),
615
# Schedule a disable() when 'timeout' has passed
1100
616
if self.disable_initiator_tag is not None:
1101
GLib.source_remove(self.disable_initiator_tag)
1102
self.disable_initiator_tag = GLib.timeout_add(
1103
int((self.expires - now).total_seconds() * 1000),
1106
def checker_callback(self, source, condition, connection,
617
gobject.source_remove(self.disable_initiator_tag)
618
self.disable_initiator_tag = (gobject.timeout_add
619
(self.timeout_milliseconds(),
621
# Also start a new checker *right now*.
624
def checker_callback(self, pid, condition, command):
1108
625
"""The checker has completed, so take appropriate actions."""
1109
# Read return code from connection (see call_pipe)
1110
returncode = connection.recv()
1112
if self.checker is not None:
1114
626
self.checker_callback_tag = None
1115
627
self.checker = None
1118
self.last_checker_status = returncode
1119
self.last_checker_signal = None
628
if os.WIFEXITED(condition):
629
self.last_checker_status = os.WEXITSTATUS(condition)
1120
630
if self.last_checker_status == 0:
1121
log.info("Checker for %(name)s succeeded", vars(self))
631
logger.info("Checker for %(name)s succeeded",
1122
633
self.checked_ok()
1124
log.info("Checker for %(name)s failed", vars(self))
635
logger.info("Checker for %(name)s failed",
1126
638
self.last_checker_status = -1
1127
self.last_checker_signal = -returncode
1128
log.warning("Checker for %(name)s crashed?", vars(self))
639
logger.warning("Checker for %(name)s crashed?",
1131
642
def checked_ok(self):
1132
643
"""Assert that the client has been seen, alive and well."""
1133
644
self.last_checked_ok = datetime.datetime.utcnow()
1134
645
self.last_checker_status = 0
1135
self.last_checker_signal = None
1136
646
self.bump_timeout()
1138
648
def bump_timeout(self, timeout=None):
1139
649
"""Bump up the timeout for this client."""
1140
650
if timeout is None:
1141
651
timeout = self.timeout
1142
652
if self.disable_initiator_tag is not None:
1143
GLib.source_remove(self.disable_initiator_tag)
653
gobject.source_remove(self.disable_initiator_tag)
1144
654
self.disable_initiator_tag = None
1145
655
if getattr(self, "enabled", False):
1146
self.disable_initiator_tag = GLib.timeout_add(
1147
int(timeout.total_seconds() * 1000), self.disable)
656
self.disable_initiator_tag = (gobject.timeout_add
657
(timedelta_to_milliseconds
658
(timeout), self.disable))
1148
659
self.expires = datetime.datetime.utcnow() + timeout
1150
661
def need_approval(self):
1151
662
self.last_approval_request = datetime.datetime.utcnow()
1153
def start_checker(self, start_was_randomized=False):
664
def start_checker(self):
1154
665
"""Start a new checker subprocess if one is not running.
1156
667
If a checker already exists, leave it running and do
1158
669
# The reason for not killing a running checker is that if we
1163
674
# checkers alone, the checker would have to take more time
1164
675
# than 'timeout' for the client to be disabled, which is as it
1167
if self.checker is not None and not self.checker.is_alive():
1168
log.warning("Checker was not alive; joining")
678
# If a checker exists, make sure it is not a zombie
680
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
681
except (AttributeError, OSError) as error:
682
if (isinstance(error, OSError)
683
and error.errno != errno.ECHILD):
687
logger.warning("Checker was a zombie")
688
gobject.source_remove(self.checker_callback_tag)
689
self.checker_callback(pid, status,
690
self.current_checker_command)
1171
691
# Start a new checker if needed
1172
692
if self.checker is None:
1173
# Escape attributes for the shell
1175
attr: shlex.quote(str(getattr(self, attr)))
1176
for attr in self.runtime_expansions}
1178
command = self.checker_command % escaped_attrs
1179
except TypeError as error:
1180
log.error('Could not format string "%s"',
1181
self.checker_command, exc_info=error)
1182
return True # Try again later
694
# In case checker_command has exactly one % operator
695
command = self.checker_command % self.host
697
# Escape attributes for the shell
698
escaped_attrs = dict(
700
re.escape(unicode(str(getattr(self, attr, "")),
704
self.runtime_expansions)
707
command = self.checker_command % escaped_attrs
708
except TypeError as error:
709
logger.error('Could not format string "%s"',
710
self.checker_command, exc_info=error)
711
return True # Try again later
1183
712
self.current_checker_command = command
1184
log.info("Starting checker %r for %s", command, self.name)
1185
# We don't need to redirect stdout and stderr, since
1186
# in normal mode, that is already done by daemon(),
1187
# and in debug mode we don't want to. (Stdin is
1188
# always replaced by /dev/null.)
1189
# The exception is when not debugging but nevertheless
1190
# running in the foreground; use the previously
1192
popen_args = {"close_fds": True,
1195
if (not self.server_settings["debug"]
1196
and self.server_settings["foreground"]):
1197
popen_args.update({"stdout": wnull,
1199
pipe = multiprocessing.Pipe(duplex=False)
1200
self.checker = multiprocessing.Process(
1202
args=(pipe[1], subprocess.call, command),
1204
self.checker.start()
1205
self.checker_callback_tag = GLib.io_add_watch(
1206
GLib.IOChannel.unix_new(pipe[0].fileno()),
1207
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1208
self.checker_callback, pipe[0], command)
1209
if start_was_randomized:
1210
# We were started after a random delay; Schedule a new
1211
# checker to be started an 'interval' from now, and every
1212
# interval from then on.
1213
now = datetime.datetime.utcnow()
1214
self.checker_initiator_tag = GLib.timeout_add(
1215
int(self.interval.total_seconds() * 1000),
1217
self.expires = max(self.expires, now + self.interval)
1218
# Don't start a new checker again after same random delay
1220
# Re-run this periodically if run by GLib.timeout_add
714
logger.info("Starting checker %r for %s",
716
# We don't need to redirect stdout and stderr, since
717
# in normal mode, that is already done by daemon(),
718
# and in debug mode we don't want to. (Stdin is
719
# always replaced by /dev/null.)
720
self.checker = subprocess.Popen(command,
723
self.checker_callback_tag = (gobject.child_watch_add
725
self.checker_callback,
727
# The checker may have completed before the gobject
728
# watch was added. Check for this.
729
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
731
gobject.source_remove(self.checker_callback_tag)
732
self.checker_callback(pid, status, command)
733
except OSError as error:
734
logger.error("Failed to start subprocess",
736
# Re-run this periodically if run by gobject.timeout_add
1223
739
def stop_checker(self):
1224
740
"""Force the checker process, if any, to stop."""
1225
741
if self.checker_callback_tag:
1226
GLib.source_remove(self.checker_callback_tag)
742
gobject.source_remove(self.checker_callback_tag)
1227
743
self.checker_callback_tag = None
1228
744
if getattr(self, "checker", None) is None:
1230
log.debug("Stopping checker for %(name)s", vars(self))
1231
self.checker.terminate()
746
logger.debug("Stopping checker for %(name)s", vars(self))
748
self.checker.terminate()
750
#if self.checker.poll() is None:
751
# self.checker.kill()
752
except OSError as error:
753
if error.errno != errno.ESRCH: # No such process
1232
755
self.checker = None
1235
def dbus_service_property(dbus_interface,
758
def dbus_service_property(dbus_interface, signature="v",
759
access="readwrite", byte_arrays=False):
1239
760
"""Decorators for marking methods of a DBusObjectWithProperties to
1240
761
become properties on the D-Bus.
1242
763
The decorated method will be called with no arguments by "Get"
1243
764
and with one argument by "Set".
1245
766
The parameters, where they are supported, are the same as
1246
767
dbus.service.method, except there is only "signature", since the
1247
768
type from Get() and the type sent to Set() is the same.
1330
class DBusObjectWithAnnotations(dbus.service.Object):
1331
"""A D-Bus object with annotations.
1333
Classes inheriting from this can use the dbus_annotations
1334
decorator to add annotations to methods or signals.
844
class DBusObjectWithProperties(dbus.service.Object):
845
"""A D-Bus object with properties.
847
Classes inheriting from this can use the dbus_service_property
848
decorator to expose methods as D-Bus properties. It exposes the
849
standard Get(), Set(), and GetAll() methods on the D-Bus.
1338
853
def _is_dbus_thing(thing):
1339
854
"""Returns a function testing if an attribute is a D-Bus thing
1341
856
If called like _is_dbus_thing("method") it returns a function
1342
857
suitable for use as predicate to inspect.getmembers().
1344
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
859
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1347
862
def _get_all_dbus_things(self, thing):
1348
863
"""Returns a generator of (name, attribute) pairs
1350
return ((getattr(athing.__get__(self), "_dbus_name", name),
865
return ((getattr(athing.__get__(self), "_dbus_name",
1351
867
athing.__get__(self))
1352
868
for cls in self.__class__.__mro__
1353
869
for name, athing in
1354
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1356
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1358
path_keyword="object_path",
1359
connection_keyword="connection")
1360
def Introspect(self, object_path, connection):
1361
"""Overloading of standard D-Bus method.
1363
Inserts annotation tags on methods and signals.
1365
xmlstring = dbus.service.Object.Introspect(self, object_path,
1368
document = xml.dom.minidom.parseString(xmlstring)
1370
for if_tag in document.getElementsByTagName("interface"):
1371
# Add annotation tags
1372
for typ in ("method", "signal"):
1373
for tag in if_tag.getElementsByTagName(typ):
1375
for name, prop in (self.
1376
_get_all_dbus_things(typ)):
1377
if (name == tag.getAttribute("name")
1378
and prop._dbus_interface
1379
== if_tag.getAttribute("name")):
1380
annots.update(getattr(
1381
prop, "_dbus_annotations", {}))
1382
for name, value in annots.items():
1383
ann_tag = document.createElement(
1385
ann_tag.setAttribute("name", name)
1386
ann_tag.setAttribute("value", value)
1387
tag.appendChild(ann_tag)
1388
# Add interface annotation tags
1389
for annotation, value in dict(
1390
itertools.chain.from_iterable(
1391
annotations().items()
1392
for name, annotations
1393
in self._get_all_dbus_things("interface")
1394
if name == if_tag.getAttribute("name")
1396
ann_tag = document.createElement("annotation")
1397
ann_tag.setAttribute("name", annotation)
1398
ann_tag.setAttribute("value", value)
1399
if_tag.appendChild(ann_tag)
1400
# Fix argument name for the Introspect method itself
1401
if (if_tag.getAttribute("name")
1402
== dbus.INTROSPECTABLE_IFACE):
1403
for cn in if_tag.getElementsByTagName("method"):
1404
if cn.getAttribute("name") == "Introspect":
1405
for arg in cn.getElementsByTagName("arg"):
1406
if (arg.getAttribute("direction")
1408
arg.setAttribute("name",
1410
xmlstring = document.toxml("utf-8")
1412
except (AttributeError, xml.dom.DOMException,
1413
xml.parsers.expat.ExpatError) as error:
1414
log.error("Failed to override Introspection method",
1419
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1420
"""A D-Bus object with properties.
1422
Classes inheriting from this can use the dbus_service_property
1423
decorator to expose methods as D-Bus properties. It exposes the
1424
standard Get(), Set(), and GetAll() methods on the D-Bus.
870
inspect.getmembers(cls,
871
self._is_dbus_thing(thing)))
1427
873
def _get_dbus_property(self, interface_name, property_name):
1428
874
"""Returns a bound method if one exists which is a D-Bus
1429
875
property with the specified name and interface.
1431
for cls in self.__class__.__mro__:
1432
for name, value in inspect.getmembers(
1433
cls, self._is_dbus_thing("property")):
877
for cls in self.__class__.__mro__:
878
for name, value in (inspect.getmembers
880
self._is_dbus_thing("property"))):
1434
881
if (value._dbus_name == property_name
1435
882
and value._dbus_interface == interface_name):
1436
883
return value.__get__(self)
1438
885
# No such property
1439
raise DBusPropertyNotFound("{}:{}.{}".format(
1440
self.dbus_object_path, interface_name, property_name))
1443
def _get_all_interface_names(cls):
1444
"""Get a sequence of all interfaces supported by an object"""
1445
return (name for name in set(getattr(getattr(x, attr),
1446
"_dbus_interface", None)
1447
for x in (inspect.getmro(cls))
1449
if name is not None)
1451
@dbus.service.method(dbus.PROPERTIES_IFACE,
886
raise DBusPropertyNotFound(self.dbus_object_path + ":"
887
+ interface_name + "."
890
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1453
891
out_signature="v")
1454
892
def Get(self, interface_name, property_name):
1455
893
"""Standard D-Bus property Get() method, see D-Bus standard.
1578
1018
document.unlink()
1579
1019
except (AttributeError, xml.dom.DOMException,
1580
1020
xml.parsers.expat.ExpatError) as error:
1581
log.error("Failed to override Introspection method",
1587
dbus.OBJECT_MANAGER_IFACE
1588
except AttributeError:
1589
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1592
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1593
"""A D-Bus object with an ObjectManager.
1595
Classes inheriting from this exposes the standard
1596
GetManagedObjects call and the InterfacesAdded and
1597
InterfacesRemoved signals on the standard
1598
"org.freedesktop.DBus.ObjectManager" interface.
1600
Note: No signals are sent automatically; they must be sent
1603
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1604
out_signature="a{oa{sa{sv}}}")
1605
def GetManagedObjects(self):
1606
"""This function must be overridden"""
1607
raise NotImplementedError()
1609
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1610
signature="oa{sa{sv}}")
1611
def InterfacesAdded(self, object_path, interfaces_and_properties):
1614
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1615
def InterfacesRemoved(self, object_path, interfaces):
1618
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1620
path_keyword="object_path",
1621
connection_keyword="connection")
1622
def Introspect(self, object_path, connection):
1623
"""Overloading of standard D-Bus method.
1625
Override return argument name of GetManagedObjects to be
1626
"objpath_interfaces_and_properties"
1628
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1632
document = xml.dom.minidom.parseString(xmlstring)
1634
for if_tag in document.getElementsByTagName("interface"):
1635
# Fix argument name for the GetManagedObjects method
1636
if (if_tag.getAttribute("name")
1637
== dbus.OBJECT_MANAGER_IFACE):
1638
for cn in if_tag.getElementsByTagName("method"):
1639
if (cn.getAttribute("name")
1640
== "GetManagedObjects"):
1641
for arg in cn.getElementsByTagName("arg"):
1642
if (arg.getAttribute("direction")
1646
"objpath_interfaces"
1648
xmlstring = document.toxml("utf-8")
1650
except (AttributeError, xml.dom.DOMException,
1651
xml.parsers.expat.ExpatError) as error:
1652
log.error("Failed to override Introspection method",
1657
def datetime_to_dbus(dt, variant_level=0):
1021
logger.error("Failed to override Introspection method",
1026
def datetime_to_dbus (dt, variant_level=0):
1658
1027
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1660
return dbus.String("", variant_level=variant_level)
1661
return dbus.String(dt.isoformat(), variant_level=variant_level)
1029
return dbus.String("", variant_level = variant_level)
1030
return dbus.String(dt.isoformat(),
1031
variant_level=variant_level)
1664
1034
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
2025
1387
server to mandos-client
2029
1391
# Rejected - signal
2030
1392
@dbus.service.signal(_interface, signature="s")
2031
1393
def Rejected(self, reason):
2035
1397
# NeedApproval - signal
2036
1398
@dbus.service.signal(_interface, signature="tb")
2037
1399
def NeedApproval(self, timeout, default):
2039
1401
return self.need_approval()
2043
1405
# Approve - method
2044
1406
@dbus.service.method(_interface, in_signature="b")
2045
1407
def Approve(self, value):
2046
1408
self.approve(value)
2048
1410
# CheckedOK - method
2049
1411
@dbus.service.method(_interface)
2050
1412
def CheckedOK(self):
2051
1413
self.checked_ok()
2053
1415
# Enable - method
2054
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2055
1416
@dbus.service.method(_interface)
2056
1417
def Enable(self):
2060
1421
# StartChecker - method
2061
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2062
1422
@dbus.service.method(_interface)
2063
1423
def StartChecker(self):
2065
1425
self.start_checker()
2067
1427
# Disable - method
2068
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2069
1428
@dbus.service.method(_interface)
2070
1429
def Disable(self):
2074
1433
# StopChecker - method
2075
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2076
1434
@dbus.service.method(_interface)
2077
1435
def StopChecker(self):
2078
1436
self.stop_checker()
2082
1440
# ApprovalPending - property
2083
1441
@dbus_service_property(_interface, signature="b", access="read")
2084
1442
def ApprovalPending_dbus_property(self):
2085
1443
return dbus.Boolean(bool(self.approvals_pending))
2087
1445
# ApprovedByDefault - property
2088
@dbus_service_property(_interface,
1446
@dbus_service_property(_interface, signature="b",
2090
1447
access="readwrite")
2091
1448
def ApprovedByDefault_dbus_property(self, value=None):
2092
1449
if value is None: # get
2093
1450
return dbus.Boolean(self.approved_by_default)
2094
1451
self.approved_by_default = bool(value)
2096
1453
# ApprovalDelay - property
2097
@dbus_service_property(_interface,
1454
@dbus_service_property(_interface, signature="t",
2099
1455
access="readwrite")
2100
1456
def ApprovalDelay_dbus_property(self, value=None):
2101
1457
if value is None: # get
2102
return dbus.UInt64(self.approval_delay.total_seconds()
1458
return dbus.UInt64(self.approval_delay_milliseconds())
2104
1459
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2106
1461
# ApprovalDuration - property
2107
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="t",
2109
1463
access="readwrite")
2110
1464
def ApprovalDuration_dbus_property(self, value=None):
2111
1465
if value is None: # get
2112
return dbus.UInt64(self.approval_duration.total_seconds()
1466
return dbus.UInt64(timedelta_to_milliseconds(
1467
self.approval_duration))
2114
1468
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2116
1470
# Name - property
2118
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2119
1471
@dbus_service_property(_interface, signature="s", access="read")
2120
1472
def Name_dbus_property(self):
2121
1473
return dbus.String(self.name)
2125
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2126
@dbus_service_property(_interface, signature="s", access="read")
2127
def KeyID_dbus_property(self):
2128
return dbus.String(self.key_id)
2130
1475
# Fingerprint - property
2132
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2133
1476
@dbus_service_property(_interface, signature="s", access="read")
2134
1477
def Fingerprint_dbus_property(self):
2135
1478
return dbus.String(self.fingerprint)
2137
1480
# Host - property
2138
@dbus_service_property(_interface,
1481
@dbus_service_property(_interface, signature="s",
2140
1482
access="readwrite")
2141
1483
def Host_dbus_property(self, value=None):
2142
1484
if value is None: # get
2143
1485
return dbus.String(self.host)
2144
self.host = str(value)
1486
self.host = unicode(value)
2146
1488
# Created - property
2148
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2149
1489
@dbus_service_property(_interface, signature="s", access="read")
2150
1490
def Created_dbus_property(self):
2151
1491
return datetime_to_dbus(self.created)
2153
1493
# LastEnabled - property
2154
1494
@dbus_service_property(_interface, signature="s", access="read")
2155
1495
def LastEnabled_dbus_property(self):
2156
1496
return datetime_to_dbus(self.last_enabled)
2158
1498
# Enabled - property
2159
@dbus_service_property(_interface,
1499
@dbus_service_property(_interface, signature="b",
2161
1500
access="readwrite")
2162
1501
def Enabled_dbus_property(self, value=None):
2163
1502
if value is None: # get
2264
1598
self.start_checker()
2266
1600
self.stop_checker()
2268
1602
# ObjectPath - property
2270
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2271
"org.freedesktop.DBus.Deprecated": "true"})
2272
1603
@dbus_service_property(_interface, signature="o", access="read")
2273
1604
def ObjectPath_dbus_property(self):
2274
return self.dbus_object_path # is already a dbus.ObjectPath
1605
return self.dbus_object_path # is already a dbus.ObjectPath
2276
1607
# Secret = property
2278
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2280
@dbus_service_property(_interface,
1608
@dbus_service_property(_interface, signature="ay",
1609
access="write", byte_arrays=True)
2284
1610
def Secret_dbus_property(self, value):
2285
self.secret = bytes(value)
1611
self.secret = str(value)
2291
def __init__(self, child_pipe, key_id, fpr, address):
1616
class ProxyClient(object):
1617
def __init__(self, child_pipe, fpr, address):
2292
1618
self._pipe = child_pipe
2293
self._pipe.send(("init", key_id, fpr, address))
1619
self._pipe.send(('init', fpr, address))
2294
1620
if not self._pipe.recv():
2295
raise KeyError(key_id or fpr)
2297
1623
def __getattribute__(self, name):
2299
1625
return super(ProxyClient, self).__getattribute__(name)
2300
self._pipe.send(("getattr", name))
1626
self._pipe.send(('getattr', name))
2301
1627
data = self._pipe.recv()
2302
if data[0] == "data":
1628
if data[0] == 'data':
2304
if data[0] == "function":
1630
if data[0] == 'function':
2306
1631
def func(*args, **kwargs):
2307
self._pipe.send(("funcall", name, args, kwargs))
1632
self._pipe.send(('funcall', name, args, kwargs))
2308
1633
return self._pipe.recv()[1]
2312
1636
def __setattr__(self, name, value):
2314
1638
return super(ProxyClient, self).__setattr__(name, value)
2315
self._pipe.send(("setattr", name, value))
1639
self._pipe.send(('setattr', name, value))
2318
1642
class ClientHandler(socketserver.BaseRequestHandler, object):
2319
1643
"""A class to handle client connections.
2321
1645
Instantiated once for each connection to handle it.
2322
1646
Note: This will run in its own forked process."""
2324
1648
def handle(self):
2325
1649
with contextlib.closing(self.server.child_pipe) as child_pipe:
2326
log.info("TCP connection from: %s",
2327
str(self.client_address))
2328
log.debug("Pipe FD: %d", self.server.child_pipe.fileno())
2330
session = gnutls.ClientSession(self.request)
2332
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2333
# "+AES-256-CBC", "+SHA1",
2334
# "+COMP-NULL", "+CTYPE-OPENPGP",
1650
logger.info("TCP connection from: %s",
1651
unicode(self.client_address))
1652
logger.debug("Pipe FD: %d",
1653
self.server.child_pipe.fileno())
1655
session = (gnutls.connection
1656
.ClientSession(self.request,
1658
.X509Credentials()))
1660
# Note: gnutls.connection.X509Credentials is really a
1661
# generic GnuTLS certificate credentials object so long as
1662
# no X.509 keys are added to it. Therefore, we can use it
1663
# here despite using OpenPGP certificates.
1665
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1666
# "+AES-256-CBC", "+SHA1",
1667
# "+COMP-NULL", "+CTYPE-OPENPGP",
2336
1669
# Use a fallback default, since this MUST be set.
2337
1670
priority = self.server.gnutls_priority
2338
1671
if priority is None:
2339
1672
priority = "NORMAL"
2340
gnutls.priority_set_direct(session,
2341
priority.encode("utf-8"), None)
1673
(gnutls.library.functions
1674
.gnutls_priority_set_direct(session._c_object,
2343
1677
# Start communication using the Mandos protocol
2344
1678
# Get protocol number
2345
1679
line = self.request.makefile().readline()
2346
log.debug("Protocol version: %r", line)
1680
logger.debug("Protocol version: %r", line)
2348
1682
if int(line.strip().split()[0]) > 1:
2349
raise RuntimeError(line)
2350
1684
except (ValueError, IndexError, RuntimeError) as error:
2351
log.error("Unknown protocol version: %s", error)
1685
logger.error("Unknown protocol version: %s", error)
2354
1688
# Start GnuTLS connection
2356
1690
session.handshake()
2357
except gnutls.Error as error:
2358
log.warning("Handshake failed: %s", error)
1691
except gnutls.errors.GNUTLSError as error:
1692
logger.warning("Handshake failed: %s", error)
2359
1693
# Do not run session.bye() here: the session is not
2360
1694
# established. Just abandon the request.
2362
log.debug("Handshake succeeded")
1696
logger.debug("Handshake succeeded")
2364
1698
approval_required = False
2366
if gnutls.has_rawpk:
2369
key_id = self.key_id(
2370
self.peer_certificate(session))
2371
except (TypeError, gnutls.Error) as error:
2372
log.warning("Bad certificate: %s", error)
2374
log.debug("Key ID: %s",
2375
key_id.decode("utf-8",
2381
fpr = self.fingerprint(
2382
self.peer_certificate(session))
2383
except (TypeError, gnutls.Error) as error:
2384
log.warning("Bad certificate: %s", error)
2386
log.debug("Fingerprint: %s", fpr)
2389
client = ProxyClient(child_pipe, key_id, fpr,
1701
fpr = self.fingerprint(self.peer_certificate
1704
gnutls.errors.GNUTLSError) as error:
1705
logger.warning("Bad certificate: %s", error)
1707
logger.debug("Fingerprint: %s", fpr)
1710
client = ProxyClient(child_pipe, fpr,
2390
1711
self.client_address)
2391
1712
except KeyError:
2394
1715
if client.approval_delay:
2395
1716
delay = client.approval_delay
2396
1717
client.approvals_pending += 1
2397
1718
approval_required = True
2400
1721
if not client.enabled:
2401
log.info("Client %s is disabled", client.name)
1722
logger.info("Client %s is disabled",
2402
1724
if self.server.use_dbus:
2403
1725
# Emit D-Bus signal
2404
1726
client.Rejected("Disabled")
2407
1729
if client.approved or not client.approval_delay:
2408
# We are approved or approval is disabled
1730
#We are approved or approval is disabled
2410
1732
elif client.approved is None:
2411
log.info("Client %s needs approval",
1733
logger.info("Client %s needs approval",
2413
1735
if self.server.use_dbus:
2414
1736
# Emit D-Bus signal
2415
1737
client.NeedApproval(
2416
client.approval_delay.total_seconds()
2417
* 1000, client.approved_by_default)
1738
client.approval_delay_milliseconds(),
1739
client.approved_by_default)
2419
log.warning("Client %s was not approved",
1741
logger.warning("Client %s was not approved",
2421
1743
if self.server.use_dbus:
2422
1744
# Emit D-Bus signal
2423
1745
client.Rejected("Denied")
2426
# wait until timeout or approved
1748
#wait until timeout or approved
2427
1749
time = datetime.datetime.now()
2428
1750
client.changedstate.acquire()
2429
client.changedstate.wait(delay.total_seconds())
1751
client.changedstate.wait(
1752
float(timedelta_to_milliseconds(delay)
2430
1754
client.changedstate.release()
2431
1755
time2 = datetime.datetime.now()
2432
1756
if (time2 - time) >= delay:
2433
1757
if not client.approved_by_default:
2434
log.warning("Client %s timed out while"
2435
" waiting for approval",
1758
logger.warning("Client %s timed out while"
1759
" waiting for approval",
2437
1761
if self.server.use_dbus:
2438
1762
# Emit D-Bus signal
2439
1763
client.Rejected("Approval timed out")
2444
1768
delay -= time2 - time
2447
session.send(client.secret)
2448
except gnutls.Error as error:
2449
log.warning("gnutls send failed", exc_info=error)
2452
log.info("Sending secret to %s", client.name)
1771
while sent_size < len(client.secret):
1773
sent = session.send(client.secret[sent_size:])
1774
except gnutls.errors.GNUTLSError as error:
1775
logger.warning("gnutls send failed",
1778
logger.debug("Sent: %d, remaining: %d",
1779
sent, len(client.secret)
1780
- (sent_size + sent))
1783
logger.info("Sending secret to %s", client.name)
2453
1784
# bump the timeout using extended_timeout
2454
1785
client.bump_timeout(client.extended_timeout)
2455
1786
if self.server.use_dbus:
2456
1787
# Emit D-Bus signal
2457
1788
client.GotSecret()
2460
1791
if approval_required:
2461
1792
client.approvals_pending -= 1
2464
except gnutls.Error as error:
2465
log.warning("GnuTLS bye failed", exc_info=error)
1795
except gnutls.errors.GNUTLSError as error:
1796
logger.warning("GnuTLS bye failed",
2468
1800
def peer_certificate(session):
2469
"Return the peer's certificate as a bytestring"
2471
cert_type = gnutls.certificate_type_get2(
2472
session, gnutls.CTYPE_PEERS)
2473
except AttributeError:
2474
cert_type = gnutls.certificate_type_get(session)
2475
if gnutls.has_rawpk:
2476
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2478
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2479
# If not a valid certificate type...
2480
if cert_type not in valid_cert_types:
2481
log.info("Cert type %r not in %r", cert_type,
2483
# ...return invalid data
1801
"Return the peer's OpenPGP certificate as a bytestring"
1802
# If not an OpenPGP certificate...
1803
if (gnutls.library.functions
1804
.gnutls_certificate_type_get(session._c_object)
1805
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1806
# ...do the normal thing
1807
return session.peer_certificate
2485
1808
list_size = ctypes.c_uint(1)
2486
cert_list = (gnutls.certificate_get_peers
2487
(session, ctypes.byref(list_size)))
1809
cert_list = (gnutls.library.functions
1810
.gnutls_certificate_get_peers
1811
(session._c_object, ctypes.byref(list_size)))
2488
1812
if not bool(cert_list) and list_size.value != 0:
2489
raise gnutls.Error("error getting peer certificate")
1813
raise gnutls.errors.GNUTLSError("error getting peer"
2490
1815
if list_size.value == 0:
2492
1817
cert = cert_list[0]
2493
1818
return ctypes.string_at(cert.data, cert.size)
2496
def key_id(certificate):
2497
"Convert a certificate bytestring to a hexdigit key ID"
2498
# New GnuTLS "datum" with the public key
2499
datum = gnutls.datum_t(
2500
ctypes.cast(ctypes.c_char_p(certificate),
2501
ctypes.POINTER(ctypes.c_ubyte)),
2502
ctypes.c_uint(len(certificate)))
2503
# XXX all these need to be created in the gnutls "module"
2504
# New empty GnuTLS certificate
2505
pubkey = gnutls.pubkey_t()
2506
gnutls.pubkey_init(ctypes.byref(pubkey))
2507
# Import the raw public key into the certificate
2508
gnutls.pubkey_import(pubkey,
2509
ctypes.byref(datum),
2510
gnutls.X509_FMT_DER)
2511
# New buffer for the key ID
2512
buf = ctypes.create_string_buffer(32)
2513
buf_len = ctypes.c_size_t(len(buf))
2514
# Get the key ID from the raw public key into the buffer
2515
gnutls.pubkey_get_key_id(
2517
gnutls.KEYID_USE_SHA256,
2518
ctypes.cast(ctypes.byref(buf),
2519
ctypes.POINTER(ctypes.c_ubyte)),
2520
ctypes.byref(buf_len))
2521
# Deinit the certificate
2522
gnutls.pubkey_deinit(pubkey)
2524
# Convert the buffer to a Python bytestring
2525
key_id = ctypes.string_at(buf, buf_len.value)
2526
# Convert the bytestring to hexadecimal notation
2527
hex_key_id = binascii.hexlify(key_id).upper()
2531
1821
def fingerprint(openpgp):
2532
1822
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2533
1823
# New GnuTLS "datum" with the OpenPGP public key
2534
datum = gnutls.datum_t(
2535
ctypes.cast(ctypes.c_char_p(openpgp),
2536
ctypes.POINTER(ctypes.c_ubyte)),
2537
ctypes.c_uint(len(openpgp)))
1824
datum = (gnutls.library.types
1825
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1828
ctypes.c_uint(len(openpgp))))
2538
1829
# New empty GnuTLS certificate
2539
crt = gnutls.openpgp_crt_t()
2540
gnutls.openpgp_crt_init(ctypes.byref(crt))
1830
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1831
(gnutls.library.functions
1832
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2541
1833
# Import the OpenPGP public key into the certificate
2542
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2543
gnutls.OPENPGP_FMT_RAW)
1834
(gnutls.library.functions
1835
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1836
gnutls.library.constants
1837
.GNUTLS_OPENPGP_FMT_RAW))
2544
1838
# Verify the self signature in the key
2545
1839
crtverify = ctypes.c_uint()
2546
gnutls.openpgp_crt_verify_self(crt, 0,
2547
ctypes.byref(crtverify))
1840
(gnutls.library.functions
1841
.gnutls_openpgp_crt_verify_self(crt, 0,
1842
ctypes.byref(crtverify)))
2548
1843
if crtverify.value != 0:
2549
gnutls.openpgp_crt_deinit(crt)
2550
raise gnutls.CertificateSecurityError(code
1844
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1845
raise (gnutls.errors.CertificateSecurityError
2552
1847
# New buffer for the fingerprint
2553
1848
buf = ctypes.create_string_buffer(20)
2554
1849
buf_len = ctypes.c_size_t()
2555
1850
# Get the fingerprint from the certificate into the buffer
2556
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2557
ctypes.byref(buf_len))
1851
(gnutls.library.functions
1852
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1853
ctypes.byref(buf_len)))
2558
1854
# Deinit the certificate
2559
gnutls.openpgp_crt_deinit(crt)
1855
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2560
1856
# Convert the buffer to a Python bytestring
2561
1857
fpr = ctypes.string_at(buf, buf_len.value)
2562
1858
# Convert the bytestring to hexadecimal notation
2567
class MultiprocessingMixIn:
1863
class MultiprocessingMixIn(object):
2568
1864
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2570
1865
def sub_process_main(self, request, address):
2572
1867
self.finish_request(request, address)
2573
1868
except Exception:
2574
1869
self.handle_error(request, address)
2575
1870
self.close_request(request)
2577
1872
def process_request(self, request, address):
2578
1873
"""Start a new process to process the request."""
2579
proc = multiprocessing.Process(target=self.sub_process_main,
2580
args=(request, address))
1874
proc = multiprocessing.Process(target = self.sub_process_main,
1875
args = (request, address))
2585
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1880
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2586
1881
""" adds a pipe to the MixIn """
2588
1882
def process_request(self, request, client_address):
2589
1883
"""Overrides and wraps the original process_request().
2591
1885
This function creates a new pipe in self.pipe
2593
1887
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2595
1889
proc = MultiprocessingMixIn.process_request(self, request,
2596
1890
client_address)
2597
1891
self.child_pipe.close()
2598
1892
self.add_pipe(parent_pipe, proc)
2600
1894
def add_pipe(self, parent_pipe, proc):
2601
1895
"""Dummy function; override as necessary"""
2602
raise NotImplementedError()
1896
raise NotImplementedError
2605
1899
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2606
socketserver.TCPServer):
2607
"""IPv6-capable TCP server. Accepts None as address and/or port
1900
socketserver.TCPServer, object):
1901
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2610
1904
enabled: Boolean; whether this server is activated yet
2611
1905
interface: None or a network interface name (string)
2612
1906
use_ipv6: Boolean; to use IPv6 or not
2615
1908
def __init__(self, server_address, RequestHandlerClass,
2619
"""If socketfd is set, use that file descriptor instead of
2620
creating a new one with socket.socket().
1909
interface=None, use_ipv6=True):
2622
1910
self.interface = interface
2624
1912
self.address_family = socket.AF_INET6
2625
if socketfd is not None:
2626
# Save the file descriptor
2627
self.socketfd = socketfd
2628
# Save the original socket.socket() function
2629
self.socket_socket = socket.socket
2631
# To implement --socket, we monkey patch socket.socket.
2633
# (When socketserver.TCPServer is a new-style class, we
2634
# could make self.socket into a property instead of monkey
2635
# patching socket.socket.)
2637
# Create a one-time-only replacement for socket.socket()
2638
@functools.wraps(socket.socket)
2639
def socket_wrapper(*args, **kwargs):
2640
# Restore original function so subsequent calls are
2642
socket.socket = self.socket_socket
2643
del self.socket_socket
2644
# This time only, return a new socket object from the
2645
# saved file descriptor.
2646
return socket.fromfd(self.socketfd, *args, **kwargs)
2647
# Replace socket.socket() function with wrapper
2648
socket.socket = socket_wrapper
2649
# The socketserver.TCPServer.__init__ will call
2650
# socket.socket(), which might be our replacement,
2651
# socket_wrapper(), if socketfd was set.
2652
1913
socketserver.TCPServer.__init__(self, server_address,
2653
1914
RequestHandlerClass)
2655
1915
def server_bind(self):
2656
1916
"""This overrides the normal server_bind() function
2657
1917
to bind to an interface if one was specified, and also NOT to
2658
1918
bind to an address or port if they were not specified."""
2659
global SO_BINDTODEVICE
2660
1919
if self.interface is not None:
2661
1920
if SO_BINDTODEVICE is None:
2662
# Fall back to a hard-coded value which seems to be
2664
log.warning("SO_BINDTODEVICE not found, trying 25")
2665
SO_BINDTODEVICE = 25
2667
self.socket.setsockopt(
2668
socket.SOL_SOCKET, SO_BINDTODEVICE,
2669
(self.interface + "\0").encode("utf-8"))
2670
except socket.error as error:
2671
if error.errno == errno.EPERM:
2672
log.error("No permission to bind to interface %s",
2674
elif error.errno == errno.ENOPROTOOPT:
2675
log.error("SO_BINDTODEVICE not available; cannot"
2676
" bind to interface %s", self.interface)
2677
elif error.errno == errno.ENODEV:
2678
log.error("Interface %s does not exist, cannot"
2679
" bind", self.interface)
1921
logger.error("SO_BINDTODEVICE does not exist;"
1922
" cannot bind to interface %s",
1926
self.socket.setsockopt(socket.SOL_SOCKET,
1930
except socket.error as error:
1931
if error.errno == errno.EPERM:
1932
logger.error("No permission to"
1933
" bind to interface %s",
1935
elif error.errno == errno.ENOPROTOOPT:
1936
logger.error("SO_BINDTODEVICE not available;"
1937
" cannot bind to interface %s",
1939
elif error.errno == errno.ENODEV:
1940
logger.error("Interface %s does not"
1941
" exist, cannot bind",
2682
1945
# Only bind(2) the socket if we really need to.
2683
1946
if self.server_address[0] or self.server_address[1]:
2684
if self.server_address[1]:
2685
self.allow_reuse_address = True
2686
1947
if not self.server_address[0]:
2687
1948
if self.address_family == socket.AF_INET6:
2688
any_address = "::" # in6addr_any
1949
any_address = "::" # in6addr_any
2690
any_address = "0.0.0.0" # INADDR_ANY
1951
any_address = socket.INADDR_ANY
2691
1952
self.server_address = (any_address,
2692
1953
self.server_address[1])
2693
1954
elif not self.server_address[1]:
2694
self.server_address = (self.server_address[0], 0)
1955
self.server_address = (self.server_address[0],
2695
1957
# if self.interface:
2696
1958
# self.server_address = (self.server_address[0],
2727
1984
self.gnutls_priority = gnutls_priority
2728
1985
IPv6_TCPServer.__init__(self, server_address,
2729
1986
RequestHandlerClass,
2730
interface=interface,
1987
interface = interface,
1988
use_ipv6 = use_ipv6)
2734
1989
def server_activate(self):
2735
1990
if self.enabled:
2736
1991
return socketserver.TCPServer.server_activate(self)
2738
1993
def enable(self):
2739
1994
self.enabled = True
2741
1996
def add_pipe(self, parent_pipe, proc):
2742
1997
# Call "handle_ipc" for both data and EOF events
2744
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2745
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2746
functools.partial(self.handle_ipc,
2747
parent_pipe=parent_pipe,
2750
def handle_ipc(self, source, condition,
2753
client_object=None):
1998
gobject.io_add_watch(parent_pipe.fileno(),
1999
gobject.IO_IN | gobject.IO_HUP,
2000
functools.partial(self.handle_ipc,
2005
def handle_ipc(self, source, condition, parent_pipe=None,
2006
proc = None, client_object=None):
2754
2007
# error, or the other end of multiprocessing.Pipe has closed
2755
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2008
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2756
2009
# Wait for other process to exit
2760
2013
# Read a request from the child
2761
2014
request = parent_pipe.recv()
2762
2015
command = request[0]
2764
if command == "init":
2765
key_id = request[1].decode("ascii")
2766
fpr = request[2].decode("ascii")
2767
address = request[3]
2769
for c in self.clients.values():
2770
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2771
"27AE41E4649B934CA495991B7852B855"):
2773
if key_id and c.key_id == key_id:
2776
if fpr and c.fingerprint == fpr:
2017
if command == 'init':
2019
address = request[2]
2021
for c in self.clients.itervalues():
2022
if c.fingerprint == fpr:
2780
log.info("Client not found for key ID: %s, address:"
2781
" %s", key_id or fpr, address)
2026
logger.info("Client not found for fingerprint: %s, ad"
2027
"dress: %s", fpr, address)
2782
2028
if self.use_dbus:
2783
2029
# Emit D-Bus signal
2784
mandos_dbus_service.ClientNotFound(key_id or fpr,
2030
mandos_dbus_service.ClientNotFound(fpr,
2786
2032
parent_pipe.send(False)
2790
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2791
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2792
functools.partial(self.handle_ipc,
2793
parent_pipe=parent_pipe,
2795
client_object=client))
2035
gobject.io_add_watch(parent_pipe.fileno(),
2036
gobject.IO_IN | gobject.IO_HUP,
2037
functools.partial(self.handle_ipc,
2796
2043
parent_pipe.send(True)
2797
2044
# remove the old hook in favor of the new above hook on
2800
if command == "funcall":
2047
if command == 'funcall':
2801
2048
funcname = request[1]
2802
2049
args = request[2]
2803
2050
kwargs = request[3]
2805
parent_pipe.send(("data", getattr(client_object,
2052
parent_pipe.send(('data', getattr(client_object,
2806
2053
funcname)(*args,
2809
if command == "getattr":
2056
if command == 'getattr':
2810
2057
attrname = request[1]
2811
if isinstance(client_object.__getattribute__(attrname),
2812
collections.abc.Callable):
2813
parent_pipe.send(("function", ))
2058
if callable(client_object.__getattribute__(attrname)):
2059
parent_pipe.send(('function',))
2816
"data", client_object.__getattribute__(attrname)))
2818
if command == "setattr":
2061
parent_pipe.send(('data', client_object
2062
.__getattribute__(attrname)))
2064
if command == 'setattr':
2819
2065
attrname = request[1]
2820
2066
value = request[2]
2821
2067
setattr(client_object, attrname, value)
2826
def rfc3339_duration_to_delta(duration):
2827
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2829
>>> timedelta = datetime.timedelta
2830
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2832
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2834
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2836
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2838
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2840
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2842
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2847
# Parsing an RFC 3339 duration with regular expressions is not
2848
# possible - there would have to be multiple places for the same
2849
# values, like seconds. The current code, while more esoteric, is
2850
# cleaner without depending on a parsing library. If Python had a
2851
# built-in library for parsing we would use it, but we'd like to
2852
# avoid excessive use of external libraries.
2854
# New type for defining tokens, syntax, and semantics all-in-one
2855
Token = collections.namedtuple("Token", (
2856
"regexp", # To match token; if "value" is not None, must have
2857
# a "group" containing digits
2858
"value", # datetime.timedelta or None
2859
"followers")) # Tokens valid after this token
2860
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2861
# the "duration" ABNF definition in RFC 3339, Appendix A.
2862
token_end = Token(re.compile(r"$"), None, frozenset())
2863
token_second = Token(re.compile(r"(\d+)S"),
2864
datetime.timedelta(seconds=1),
2865
frozenset((token_end, )))
2866
token_minute = Token(re.compile(r"(\d+)M"),
2867
datetime.timedelta(minutes=1),
2868
frozenset((token_second, token_end)))
2869
token_hour = Token(re.compile(r"(\d+)H"),
2870
datetime.timedelta(hours=1),
2871
frozenset((token_minute, token_end)))
2872
token_time = Token(re.compile(r"T"),
2874
frozenset((token_hour, token_minute,
2876
token_day = Token(re.compile(r"(\d+)D"),
2877
datetime.timedelta(days=1),
2878
frozenset((token_time, token_end)))
2879
token_month = Token(re.compile(r"(\d+)M"),
2880
datetime.timedelta(weeks=4),
2881
frozenset((token_day, token_end)))
2882
token_year = Token(re.compile(r"(\d+)Y"),
2883
datetime.timedelta(weeks=52),
2884
frozenset((token_month, token_end)))
2885
token_week = Token(re.compile(r"(\d+)W"),
2886
datetime.timedelta(weeks=1),
2887
frozenset((token_end, )))
2888
token_duration = Token(re.compile(r"P"), None,
2889
frozenset((token_year, token_month,
2890
token_day, token_time,
2892
# Define starting values:
2894
value = datetime.timedelta()
2896
# Following valid tokens
2897
followers = frozenset((token_duration, ))
2898
# String left to parse
2900
# Loop until end token is found
2901
while found_token is not token_end:
2902
# Search for any currently valid tokens
2903
for token in followers:
2904
match = token.regexp.match(s)
2905
if match is not None:
2907
if token.value is not None:
2908
# Value found, parse digits
2909
factor = int(match.group(1), 10)
2910
# Add to value so far
2911
value += factor * token.value
2912
# Strip token from string
2913
s = token.regexp.sub("", s, 1)
2916
# Set valid next tokens
2917
followers = found_token.followers
2920
# No currently valid tokens were found
2921
raise ValueError("Invalid RFC 3339 duration: {!r}"
2927
2072
def string_to_delta(interval):
2928
2073
"""Parse a string and return a datetime.timedelta
2930
>>> string_to_delta("7d") == datetime.timedelta(7)
2932
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2934
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2936
>>> string_to_delta("24h") == datetime.timedelta(1)
2938
>>> string_to_delta("1w") == datetime.timedelta(7)
2940
>>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2075
>>> string_to_delta('7d')
2076
datetime.timedelta(7)
2077
>>> string_to_delta('60s')
2078
datetime.timedelta(0, 60)
2079
>>> string_to_delta('60m')
2080
datetime.timedelta(0, 3600)
2081
>>> string_to_delta('24h')
2082
datetime.timedelta(1)
2083
>>> string_to_delta('1w')
2084
datetime.timedelta(7)
2085
>>> string_to_delta('5m 30s')
2086
datetime.timedelta(0, 330)
2945
return rfc3339_duration_to_delta(interval)
2949
2088
timevalue = datetime.timedelta(0)
2950
2089
for s in interval.split():
2091
suffix = unicode(s[-1])
2953
2092
value = int(s[:-1])
2954
2093
if suffix == "d":
2955
2094
delta = datetime.timedelta(value)
3027
2167
parser.add_argument("--no-dbus", action="store_false",
3028
2168
dest="use_dbus", help="Do not provide D-Bus"
3029
" system bus interface", default=None)
2169
" system bus interface")
3030
2170
parser.add_argument("--no-ipv6", action="store_false",
3031
dest="use_ipv6", help="Do not use IPv6",
2171
dest="use_ipv6", help="Do not use IPv6")
3033
2172
parser.add_argument("--no-restore", action="store_false",
3034
2173
dest="restore", help="Do not restore stored"
3035
" state", default=None)
3036
parser.add_argument("--socket", type=int,
3037
help="Specify a file descriptor to a network"
3038
" socket to use instead of creating one")
3039
2175
parser.add_argument("--statedir", metavar="DIR",
3040
2176
help="Directory to save/restore state in")
3041
parser.add_argument("--foreground", action="store_true",
3042
help="Run in foreground", default=None)
3043
parser.add_argument("--no-zeroconf", action="store_false",
3044
dest="zeroconf", help="Do not use Zeroconf",
3047
2178
options = parser.parse_args()
3049
2185
# Default values for config file for server-global settings
3050
if gnutls.has_rawpk:
3051
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3052
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3054
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3055
":+SIGN-DSA-SHA256")
3056
server_defaults = {"interface": "",
3060
"priority": priority,
3061
"servicename": "Mandos",
3067
"statedir": "/var/lib/mandos",
3068
"foreground": "False",
2186
server_defaults = { "interface": "",
2191
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2192
"servicename": "Mandos",
2197
"statedir": "/var/lib/mandos"
3073
2200
# Parse config file for server-global settings
3074
server_config = configparser.ConfigParser(server_defaults)
2201
server_config = configparser.SafeConfigParser(server_defaults)
3075
2202
del server_defaults
3076
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3077
# Convert the ConfigParser object to a dict
2203
server_config.read(os.path.join(options.configdir,
2205
# Convert the SafeConfigParser object to a dict
3078
2206
server_settings = server_config.defaults()
3079
2207
# Use the appropriate methods on the non-string config options
3080
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3081
"foreground", "zeroconf"):
2208
for option in ("debug", "use_dbus", "use_ipv6"):
3082
2209
server_settings[option] = server_config.getboolean("DEFAULT",
3084
2211
if server_settings["port"]:
3085
2212
server_settings["port"] = server_config.getint("DEFAULT",
3087
if server_settings["socket"]:
3088
server_settings["socket"] = server_config.getint("DEFAULT",
3090
# Later, stdin will, and stdout and stderr might, be dup'ed
3091
# over with an opened os.devnull. But we don't want this to
3092
# happen with a supplied network socket.
3093
if 0 <= server_settings["socket"] <= 2:
3094
server_settings["socket"] = os.dup(server_settings
3096
2214
del server_config
3098
2216
# Override the settings from the config file with command line
3099
2217
# options, if set.
3100
2218
for option in ("interface", "address", "port", "debug",
3101
"priority", "servicename", "configdir", "use_dbus",
3102
"use_ipv6", "debuglevel", "restore", "statedir",
3103
"socket", "foreground", "zeroconf"):
2219
"priority", "servicename", "configdir",
2220
"use_dbus", "use_ipv6", "debuglevel", "restore",
3104
2222
value = getattr(options, option)
3105
2223
if value is not None:
3106
2224
server_settings[option] = value
3108
2226
# Force all strings to be unicode
3109
2227
for option in server_settings.keys():
3110
if isinstance(server_settings[option], bytes):
3111
server_settings[option] = (server_settings[option]
3113
# Force all boolean options to be boolean
3114
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3115
"foreground", "zeroconf"):
3116
server_settings[option] = bool(server_settings[option])
3117
# Debug implies foreground
3118
if server_settings["debug"]:
3119
server_settings["foreground"] = True
2228
if type(server_settings[option]) is str:
2229
server_settings[option] = unicode(server_settings[option])
3120
2230
# Now we have our good server settings in "server_settings"
3122
2232
##################################################################
3124
if (not server_settings["zeroconf"]
3125
and not (server_settings["port"]
3126
or server_settings["socket"] != "")):
3127
parser.error("Needs port or socket to work without Zeroconf")
3129
2234
# For convenience
3130
2235
debug = server_settings["debug"]
3131
2236
debuglevel = server_settings["debuglevel"]
3199
log.debug("Did setuid/setgid to %s:%s", uid, gid)
3200
2297
except OSError as error:
3201
log.warning("Failed to setuid/setgid to %s:%s: %s", uid, gid,
3202
os.strerror(error.errno))
3203
if error.errno != errno.EPERM:
2298
if error[0] != errno.EPERM:
3207
2302
# Enable all possible GnuTLS debugging
3209
2304
# "Use a log level over 10 to enable all debugging options."
3210
2305
# - GnuTLS manual
3211
gnutls.global_set_log_level(11)
2306
gnutls.library.functions.gnutls_global_set_log_level(11)
2308
@gnutls.library.types.gnutls_log_func
3214
2309
def debug_gnutls(level, string):
3215
log.debug("GnuTLS: %s",
3216
string[:-1].decode("utf-8", errors="replace"))
3218
gnutls.global_set_log_function(debug_gnutls)
2310
logger.debug("GnuTLS: %s", string[:-1])
2312
(gnutls.library.functions
2313
.gnutls_global_set_log_function(debug_gnutls))
3220
2315
# Redirect stdin so all checkers get /dev/null
3221
2316
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3222
2317
os.dup2(null, sys.stdin.fileno())
3226
2321
# Need to fork before connecting to D-Bus
3228
2323
# Close all input and output, do double fork, etc.
3231
if gi.version_info < (3, 10, 2):
3232
# multiprocessing will use threads, so before we use GLib we
3233
# need to inform GLib that threads will be used.
2326
gobject.threads_init()
3236
2328
global main_loop
3237
2329
# From the Avahi example code
3238
2330
DBusGMainLoop(set_as_default=True)
3239
main_loop = GLib.MainLoop()
2331
main_loop = gobject.MainLoop()
3240
2332
bus = dbus.SystemBus()
3241
2333
# End of Avahi example code
3244
2336
bus_name = dbus.service.BusName("se.recompile.Mandos",
3247
old_bus_name = dbus.service.BusName(
3248
"se.bsnet.fukt.Mandos", bus,
3250
except dbus.exceptions.DBusException as e:
3251
log.error("Disabling D-Bus:", exc_info=e)
2337
bus, do_not_queue=True)
2338
old_bus_name = (dbus.service.BusName
2339
("se.bsnet.fukt.Mandos", bus,
2341
except dbus.exceptions.NameExistsException as e:
2342
logger.error("Disabling D-Bus:", exc_info=e)
3252
2343
use_dbus = False
3253
2344
server_settings["use_dbus"] = False
3254
2345
tcp_server.use_dbus = False
3256
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3257
service = AvahiServiceToSyslog(
3258
name=server_settings["servicename"],
3259
servicetype="_mandos._tcp",
3262
if server_settings["interface"]:
3263
service.interface = if_nametoindex(
3264
server_settings["interface"].encode("utf-8"))
2346
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2347
service = AvahiServiceToSyslog(name =
2348
server_settings["servicename"],
2349
servicetype = "_mandos._tcp",
2350
protocol = protocol, bus = bus)
2351
if server_settings["interface"]:
2352
service.interface = (if_nametoindex
2353
(str(server_settings["interface"])))
3266
2355
global multiprocessing_manager
3267
2356
multiprocessing_manager = multiprocessing.Manager()
3269
2358
client_class = Client
3271
client_class = functools.partial(ClientDBus, bus=bus)
2360
client_class = functools.partial(ClientDBus, bus = bus)
3273
2362
client_settings = Client.config_parser(client_config)
3274
2363
old_client_settings = {}
3275
2364
clients_data = {}
3277
# This is used to redirect stdout and stderr for checker processes
3279
wnull = open(os.devnull, "w") # A writable /dev/null
3280
# Only used if server is running in foreground but not in debug
3282
if debug or not foreground:
3285
2366
# Get client data and settings from last running state.
3286
2367
if server_settings["restore"]:
3288
2369
with open(stored_state_path, "rb") as stored_state:
3289
if sys.version_info.major == 2:
3290
clients_data, old_client_settings = pickle.load(
3293
bytes_clients_data, bytes_old_client_settings = (
3294
pickle.load(stored_state, encoding="bytes"))
3295
# Fix bytes to strings
3298
clients_data = {(key.decode("utf-8")
3299
if isinstance(key, bytes)
3302
bytes_clients_data.items()}
3303
del bytes_clients_data
3304
for key in clients_data:
3305
value = {(k.decode("utf-8")
3306
if isinstance(k, bytes) else k): v
3308
clients_data[key].items()}
3309
clients_data[key] = value
3311
value["client_structure"] = [
3313
if isinstance(s, bytes)
3315
value["client_structure"]]
3316
# .name, .host, and .checker_command
3317
for k in ("name", "host", "checker_command"):
3318
if isinstance(value[k], bytes):
3319
value[k] = value[k].decode("utf-8")
3320
if "key_id" not in value:
3321
value["key_id"] = ""
3322
elif "fingerprint" not in value:
3323
value["fingerprint"] = ""
3324
# old_client_settings
3326
old_client_settings = {
3327
(key.decode("utf-8")
3328
if isinstance(key, bytes)
3331
bytes_old_client_settings.items()}
3332
del bytes_old_client_settings
3333
# .host and .checker_command
3334
for value in old_client_settings.values():
3335
for attribute in ("host", "checker_command"):
3336
if isinstance(value[attribute], bytes):
3337
value[attribute] = (value[attribute]
2370
clients_data, old_client_settings = (pickle.load
3339
2372
os.remove(stored_state_path)
3340
2373
except IOError as e:
3341
2374
if e.errno == errno.ENOENT:
3342
log.warning("Could not load persistent state:"
3343
" %s", os.strerror(e.errno))
2375
logger.warning("Could not load persistent state: {0}"
2376
.format(os.strerror(e.errno)))
3345
log.critical("Could not load persistent state:",
2378
logger.critical("Could not load persistent state:",
3348
2381
except EOFError as e:
3349
log.warning("Could not load persistent state: EOFError:",
2382
logger.warning("Could not load persistent state: "
2383
"EOFError:", exc_info=e)
3352
2385
with PGPEngine() as pgp:
3353
for client_name, client in clients_data.items():
3354
# Skip removed clients
3355
if client_name not in client_settings:
2386
for client_name, client in clients_data.iteritems():
3358
2387
# Decide which value to use after restoring saved state.
3359
2388
# We have three different values: Old config file,
3360
2389
# new config file, and saved state.
3414
2447
for client_name in (set(client_settings)
3415
2448
- set(old_client_settings)):
3416
2449
clients_data[client_name] = client_settings[client_name]
3418
2451
# Create all client objects
3419
for client_name, client in clients_data.items():
2452
for client_name, client in clients_data.iteritems():
3420
2453
tcp_server.clients[client_name] = client_class(
3423
server_settings=server_settings)
2454
name = client_name, settings = client)
3425
2456
if not tcp_server.clients:
3426
log.warning("No clients defined")
3429
if pidfile is not None:
3433
print(pid, file=pidfile)
3435
log.error("Could not write to file %r with PID %d",
2457
logger.warning("No clients defined")
2463
pidfile.write(str(pid) + "\n".encode("utf-8"))
2466
logger.error("Could not write to file %r with PID %d",
2469
# "pidfile" was never created
3438
2471
del pidfilename
3440
for termsig in (signal.SIGHUP, signal.SIGTERM):
3441
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3442
lambda: main_loop.quit() and False)
2472
signal.signal(signal.SIGINT, signal.SIG_IGN)
2474
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2475
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3446
@alternate_dbus_interfaces(
3447
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3448
class MandosDBusService(DBusObjectWithObjectManager):
2478
@alternate_dbus_interfaces({"se.recompile.Mandos":
2479
"se.bsnet.fukt.Mandos"})
2480
class MandosDBusService(DBusObjectWithProperties):
3449
2481
"""A D-Bus proxy object"""
3451
2482
def __init__(self):
3452
2483
dbus.service.Object.__init__(self, bus, "/")
3454
2484
_interface = "se.recompile.Mandos"
2486
@dbus_interface_annotations(_interface)
2488
return { "org.freedesktop.DBus.Property"
2489
".EmitsChangedSignal":
3456
2492
@dbus.service.signal(_interface, signature="o")
3457
2493
def ClientAdded(self, objpath):
3461
2497
@dbus.service.signal(_interface, signature="ss")
3462
def ClientNotFound(self, key_id, address):
2498
def ClientNotFound(self, fingerprint, address):
3466
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3468
2502
@dbus.service.signal(_interface, signature="os")
3469
2503
def ClientRemoved(self, objpath, name):
3473
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3475
2507
@dbus.service.method(_interface, out_signature="ao")
3476
2508
def GetAllClients(self):
3478
return dbus.Array(c.dbus_object_path for c in
3479
tcp_server.clients.values())
3481
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2510
return dbus.Array(c.dbus_object_path
2512
tcp_server.clients.itervalues())
3483
2514
@dbus.service.method(_interface,
3484
2515
out_signature="a{oa{sv}}")
3485
2516
def GetAllClientsWithProperties(self):
3487
2518
return dbus.Dictionary(
3488
{c.dbus_object_path: c.GetAll(
3489
"se.recompile.Mandos.Client")
3490
for c in tcp_server.clients.values()},
2519
((c.dbus_object_path, c.GetAll(""))
2520
for c in tcp_server.clients.itervalues()),
3491
2521
signature="oa{sv}")
3493
2523
@dbus.service.method(_interface, in_signature="o")
3494
2524
def RemoveClient(self, object_path):
3496
for c in tcp_server.clients.values():
2526
for c in tcp_server.clients.itervalues():
3497
2527
if c.dbus_object_path == object_path:
3498
2528
del tcp_server.clients[c.name]
3499
2529
c.remove_from_connection()
3500
# Don't signal the disabling
2530
# Don't signal anything except ClientRemoved
3501
2531
c.disable(quiet=True)
3502
# Emit D-Bus signal for removal
3503
self.client_removed_signal(c)
2533
self.ClientRemoved(object_path, c.name)
3505
2535
raise KeyError(object_path)
3509
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3510
out_signature="a{oa{sa{sv}}}")
3511
def GetManagedObjects(self):
3513
return dbus.Dictionary(
3514
{client.dbus_object_path:
3516
{interface: client.GetAll(interface)
3518
client._get_all_interface_names()})
3519
for client in tcp_server.clients.values()})
3521
def client_added_signal(self, client):
3522
"""Send the new standard signal and the old signal"""
3524
# New standard signal
3525
self.InterfacesAdded(
3526
client.dbus_object_path,
3528
{interface: client.GetAll(interface)
3530
client._get_all_interface_names()}))
3532
self.ClientAdded(client.dbus_object_path)
3534
def client_removed_signal(self, client):
3535
"""Send the new standard signal and the old signal"""
3537
# New standard signal
3538
self.InterfacesRemoved(
3539
client.dbus_object_path,
3540
client._get_all_interface_names())
3542
self.ClientRemoved(client.dbus_object_path,
3545
2539
mandos_dbus_service = MandosDBusService()
3547
# Save modules to variables to exempt the modules from being
3548
# unloaded before the function registered with atexit() is run.
3549
mp = multiprocessing
3553
2542
"Cleanup function; run on exit"
3557
mp.active_children()
2545
multiprocessing.active_children()
3559
2546
if not (tcp_server.clients or client_settings):
3562
2549
# Store client before exiting. Secrets are encrypted with key
3563
2550
# based on what config file has. If config file is
3564
2551
# removed/edited, old secret will thus be unrecovable.
3566
2553
with PGPEngine() as pgp:
3567
for client in tcp_server.clients.values():
2554
for client in tcp_server.clients.itervalues():
3568
2555
key = client_settings[client.name]["secret"]
3569
2556
client.encrypted_secret = pgp.encrypt(client.secret,
3571
2558
client_dict = {}
3573
2560
# A list of attributes that can not be pickled
3575
exclude = {"bus", "changedstate", "secret",
3576
"checker", "server_settings"}
3577
for name, typ in inspect.getmembers(dbus.service
2562
exclude = set(("bus", "changedstate", "secret",
2564
for name, typ in (inspect.getmembers
2565
(dbus.service.Object)):
3579
2566
exclude.add(name)
3581
2568
client_dict["encrypted_secret"] = (client
3582
2569
.encrypted_secret)
3583
2570
for attr in client.client_structure:
3584
2571
if attr not in exclude:
3585
2572
client_dict[attr] = getattr(client, attr)
3587
2574
clients[client.name] = client_dict
3588
2575
del client_settings[client.name]["secret"]
3591
with tempfile.NamedTemporaryFile(
3595
dir=os.path.dirname(stored_state_path),
3596
delete=False) as stored_state:
3597
pickle.dump((clients, client_settings), stored_state,
3599
tempname = stored_state.name
2578
with (tempfile.NamedTemporaryFile
2579
(mode='wb', suffix=".pickle", prefix='clients-',
2580
dir=os.path.dirname(stored_state_path),
2581
delete=False)) as stored_state:
2582
pickle.dump((clients, client_settings), stored_state)
2583
tempname=stored_state.name
3600
2584
os.rename(tempname, stored_state_path)
3601
2585
except (IOError, OSError) as e:
3605
2589
except NameError:
3607
2591
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3608
log.warning("Could not save persistent state: %s",
3609
os.strerror(e.errno))
2592
logger.warning("Could not save persistent state: {0}"
2593
.format(os.strerror(e.errno)))
3611
log.warning("Could not save persistent state:",
2595
logger.warning("Could not save persistent state:",
3615
2599
# Delete all clients, and settings from config
3616
2600
while tcp_server.clients:
3617
2601
name, client = tcp_server.clients.popitem()
3619
2603
client.remove_from_connection()
3620
# Don't signal the disabling
2604
# Don't signal anything except ClientRemoved
3621
2605
client.disable(quiet=True)
3622
# Emit D-Bus signal for removal
3624
mandos_dbus_service.client_removed_signal(client)
2608
mandos_dbus_service.ClientRemoved(client
3625
2611
client_settings.clear()
3627
2613
atexit.register(cleanup)
3629
for client in tcp_server.clients.values():
2615
for client in tcp_server.clients.itervalues():
3631
# Emit D-Bus signal for adding
3632
mandos_dbus_service.client_added_signal(client)
2618
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3633
2619
# Need to initiate checking of clients
3634
2620
if client.enabled:
3635
client.init_checker(randomize_start=True)
2621
client.init_checker()
3637
2623
tcp_server.enable()
3638
2624
tcp_server.server_activate()
3640
2626
# Find out what port we got
3642
service.port = tcp_server.socket.getsockname()[1]
2627
service.port = tcp_server.socket.getsockname()[1]
3644
log.info("Now listening on address %r, port %d, flowinfo %d,"
3645
" scope_id %d", *tcp_server.socket.getsockname())
2629
logger.info("Now listening on address %r, port %d,"
2630
" flowinfo %d, scope_id %d",
2631
*tcp_server.socket.getsockname())
3647
log.info("Now listening on address %r, port %d",
3648
*tcp_server.socket.getsockname())
3650
# service.interface = tcp_server.socket.getsockname()[3]
2633
logger.info("Now listening on address %r, port %d",
2634
*tcp_server.socket.getsockname())
2636
#service.interface = tcp_server.socket.getsockname()[3]
3654
# From the Avahi example code
3657
except dbus.exceptions.DBusException as error:
3658
log.critical("D-Bus Exception", exc_info=error)
3661
# End of Avahi example code
3664
GLib.IOChannel.unix_new(tcp_server.fileno()),
3665
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3666
lambda *args, **kwargs: (tcp_server.handle_request
3667
(*args[2:], **kwargs) or True))
3669
log.debug("Starting main loop")
2639
# From the Avahi example code
2642
except dbus.exceptions.DBusException as error:
2643
logger.critical("D-Bus Exception", exc_info=error)
2646
# End of Avahi example code
2648
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2649
lambda *args, **kwargs:
2650
(tcp_server.handle_request
2651
(*args[2:], **kwargs) or True))
2653
logger.debug("Starting main loop")
3670
2654
main_loop.run()
3671
2655
except AvahiError as error:
3672
log.critical("Avahi Error", exc_info=error)
2656
logger.critical("Avahi Error", exc_info=error)
3675
2659
except KeyboardInterrupt:
3677
2661
print("", file=sys.stderr)
3678
log.debug("Server received KeyboardInterrupt")
3679
log.debug("Server exiting")
2662
logger.debug("Server received KeyboardInterrupt")
2663
logger.debug("Server exiting")
3680
2664
# Must run before the D-Bus bus name gets deregistered
3684
def parse_test_args():
3685
# type: () -> argparse.Namespace
3686
parser = argparse.ArgumentParser(add_help=False)
3687
parser.add_argument("--check", action="store_true")
3688
parser.add_argument("--prefix", )
3689
args, unknown_args = parser.parse_known_args()
3691
# Remove test options from sys.argv
3692
sys.argv[1:] = unknown_args
3695
# Add all tests from doctest strings
3696
def load_tests(loader, tests, none):
3698
tests.addTests(doctest.DocTestSuite())
3701
if __name__ == "__main__":
3702
options = parse_test_args()
3705
extra_test_prefix = options.prefix
3706
if extra_test_prefix is not None:
3707
if not (unittest.main(argv=[""], exit=False)
3708
.result.wasSuccessful()):
3710
class ExtraTestLoader(unittest.TestLoader):
3711
testMethodPrefix = extra_test_prefix
3712
# Call using ./scriptname --test [--verbose]
3713
unittest.main(argv=[""], testLoader=ExtraTestLoader())
3715
unittest.main(argv=[""])
3723
# (lambda (&optional extra)
3724
# (if (not (funcall run-tests-in-test-buffer default-directory
3726
# (funcall show-test-buffer-in-test-window)
3727
# (funcall remove-test-window)
3728
# (if extra (message "Extra tests run successfully!"))))
3729
# run-tests-in-test-buffer:
3730
# (lambda (dir &optional extra)
3731
# (with-current-buffer (get-buffer-create "*Test*")
3732
# (setq buffer-read-only nil
3733
# default-directory dir)
3735
# (compilation-mode))
3736
# (let ((process-result
3737
# (let ((inhibit-read-only t))
3738
# (process-file-shell-command
3739
# (funcall get-command-line extra) nil "*Test*"))))
3740
# (and (numberp process-result)
3741
# (= process-result 0))))
3743
# (lambda (&optional extra)
3744
# (let ((quoted-script
3745
# (shell-quote-argument (funcall get-script-name))))
3747
# (concat "%s --check" (if extra " --prefix=atest" ""))
3751
# (if (fboundp 'file-local-name)
3752
# (file-local-name (buffer-file-name))
3753
# (or (file-remote-p (buffer-file-name) 'localname)
3754
# (buffer-file-name))))
3755
# remove-test-window:
3757
# (let ((test-window (get-buffer-window "*Test*")))
3758
# (if test-window (delete-window test-window))))
3759
# show-test-buffer-in-test-window:
3761
# (when (not (get-buffer-window-list "*Test*"))
3762
# (setq next-error-last-buffer (get-buffer "*Test*"))
3763
# (let* ((side (if (>= (window-width) 146) 'right 'bottom))
3764
# (display-buffer-overriding-action
3765
# `((display-buffer-in-side-window) (side . ,side)
3766
# (window-height . fit-window-to-buffer)
3767
# (window-width . fit-window-to-buffer))))
3768
# (display-buffer "*Test*"))))
3771
# (let* ((run-extra-tests (lambda () (interactive)
3772
# (funcall run-tests t)))
3773
# (inner-keymap `(keymap (116 . ,run-extra-tests))) ; t
3774
# (outer-keymap `(keymap (3 . ,inner-keymap)))) ; C-c
3775
# (setq minor-mode-overriding-map-alist
3776
# (cons `(run-tests . ,outer-keymap)
3777
# minor-mode-overriding-map-alist)))
3778
# (add-hook 'after-save-hook run-tests 90 t))
2667
if __name__ == '__main__':