2
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-2018 Teddy Hogeborn
15
# Copyright © 2008-2018 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>.
35
34
from __future__ import (division, absolute_import, print_function,
39
from future_builtins import *
44
import SocketServer as socketserver
37
import SocketServer as socketserver
52
import ConfigParser as configparser
43
import gnutls.connection
45
import gnutls.library.functions
46
import gnutls.library.constants
47
import gnutls.library.types
48
import ConfigParser as configparser
70
import cPickle as pickle
63
import cPickle as pickle
73
64
import multiprocessing
82
71
import dbus.service
83
from gi.repository import GLib
84
74
from dbus.mainloop.glib import DBusGMainLoop
87
77
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
94
82
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
83
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
99
85
from IN import SO_BINDTODEVICE
100
86
except ImportError:
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
115
if sys.version_info.major == 2:
87
SO_BINDTODEVICE = None
119
90
stored_state_file = "clients.pickle"
121
92
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
127
101
except (OSError, AttributeError):
129
102
def if_nametoindex(interface):
130
103
"Get an interface index the hard way, i.e. using fcntl()"
131
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
132
105
with contextlib.closing(socket.socket()) as s:
133
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
136
111
return interface_index
139
def copy_function(func):
140
"""Make a copy of a function"""
141
if sys.version_info.major == 2:
142
return types.FunctionType(func.func_code,
148
return types.FunctionType(func.__code__,
155
114
def initlogger(debug, level=logging.WARNING):
156
115
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
162
117
syslogger.setFormatter(logging.Formatter
163
118
('Mandos [%(process)d]: %(levelname)s:'
165
120
logger.addHandler(syslogger)
168
123
console = logging.StreamHandler()
169
124
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
226
169
os.rmdir(self.tempdir)
227
170
self.tempdir = None
229
172
def password_encode(self, password):
230
173
# Passphrase can not be empty and can not contain newlines or
231
174
# NUL bytes. So we prefix it and hex encode it.
232
encoded = b"mandos" + binascii.hexlify(password)
233
if len(encoded) > 2048:
234
# GnuPG can't handle long passwords, so encode differently
235
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
236
.replace(b"\n", b"\\n")
237
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
240
177
def encrypt(self, data, password):
241
passphrase = self.password_encode(password)
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
244
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
254
if proc.returncode != 0:
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
191
self.gnupg.passphrase = None
256
192
return ciphertext
258
194
def decrypt(self, data, password):
259
passphrase = self.password_encode(password)
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
262
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
272
if proc.returncode != 0:
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
208
self.gnupg.passphrase = None
274
209
return decrypted_plaintext
277
# Pretend that we have an Avahi module
279
"""This isn't so much a class as it is a module-like namespace.
280
It is instantiated once, and simulates having an Avahi module."""
281
IF_UNSPEC = -1 # avahi-common/address.h
282
PROTO_UNSPEC = -1 # avahi-common/address.h
283
PROTO_INET = 0 # avahi-common/address.h
284
PROTO_INET6 = 1 # avahi-common/address.h
285
DBUS_NAME = "org.freedesktop.Avahi"
286
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
287
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
288
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(self, t):
291
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
for s in t), signature="ay")
293
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
294
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
295
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
296
SERVER_INVALID = 0 # avahi-common/defs.h
297
SERVER_REGISTERING = 1 # avahi-common/defs.h
298
SERVER_RUNNING = 2 # avahi-common/defs.h
299
SERVER_COLLISION = 3 # avahi-common/defs.h
300
SERVER_FAILURE = 4 # avahi-common/defs.h
304
213
class AvahiError(Exception):
305
214
def __init__(self, value, *args, **kwargs):
306
215
self.value = value
307
return super(AvahiError, self).__init__(value, *args,
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
311
220
class AvahiServiceError(AvahiError):
315
223
class AvahiGroupError(AvahiError):
319
227
class AvahiService(object):
320
228
"""An Avahi (Zeroconf) service.
323
231
interface: integer; avahi.IF_UNSPEC or an interface index.
324
232
Used to optionally bind to the specified interface.
325
233
name: string; Example: 'Mandos'
326
234
type: string; Example: '_mandos._tcp'.
327
See <https://www.iana.org/assignments/service-names-port-numbers>
235
See <http://www.dns-sd.org/ServiceTypes.html>
328
236
port: integer; what port to announce
329
237
TXT: list of strings; TXT record for the service
330
238
domain: string; Domain to publish on, default to .local if empty.
489
367
follow_name_owner_changes=True),
490
368
avahi.DBUS_INTERFACE_SERVER)
491
369
self.server.connect_to_signal("StateChanged",
492
self.server_state_changed)
370
self.server_state_changed)
493
371
self.server_state_changed(self.server.GetState())
496
373
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
498
375
"""Add the new name to the syslog messages"""
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
500
syslogger.setFormatter(logging.Formatter(
501
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos (%s) [%%(process)d]:'
379
' %%(levelname)s: %%(message)s'
506
# Pretend that we have a GnuTLS module
507
class GnuTLS(object):
508
"""This isn't so much a class as it is a module-like namespace.
509
It is instantiated once, and simulates having a GnuTLS module."""
511
library = ctypes.util.find_library("gnutls")
513
library = ctypes.util.find_library("gnutls-deb0")
514
_library = ctypes.cdll.LoadLibrary(library)
516
_need_version = b"3.3.0"
519
# Need to use "self" here, since this method is called before
520
# the assignment to the "gnutls" global variable happens.
521
if self.check_version(self._need_version) is None:
522
raise self.Error("Needs GnuTLS {} or later"
523
.format(self._need_version))
525
# Unless otherwise indicated, the constants and types below are
526
# all from the gnutls/gnutls.h C header file.
536
E_NO_CERTIFICATE_FOUND = -49
537
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
540
class session_int(ctypes.Structure):
542
session_t = ctypes.POINTER(session_int)
544
class certificate_credentials_st(ctypes.Structure):
546
certificate_credentials_t = ctypes.POINTER(
547
certificate_credentials_st)
548
certificate_type_t = ctypes.c_int
550
class datum_t(ctypes.Structure):
551
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
('size', ctypes.c_uint)]
554
class openpgp_crt_int(ctypes.Structure):
556
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
credentials_type_t = ctypes.c_int
560
transport_ptr_t = ctypes.c_void_p
561
close_request_t = ctypes.c_int
564
class Error(Exception):
565
# We need to use the class name "GnuTLS" here, since this
566
# exception might be raised from within GnuTLS.__init__,
567
# which is called before the assignment to the "gnutls"
568
# global variable has happened.
569
def __init__(self, message=None, code=None, args=()):
570
# Default usage is by a message string, but if a return
571
# code is passed, convert it to a string with
574
if message is None and code is not None:
575
message = GnuTLS.strerror(code)
576
return super(GnuTLS.Error, self).__init__(
579
class CertificateSecurityError(Error):
583
class Credentials(object):
585
self._c_object = gnutls.certificate_credentials_t()
586
gnutls.certificate_allocate_credentials(
587
ctypes.byref(self._c_object))
588
self.type = gnutls.CRD_CERTIFICATE
591
gnutls.certificate_free_credentials(self._c_object)
593
class ClientSession(object):
594
def __init__(self, socket, credentials=None):
595
self._c_object = gnutls.session_t()
596
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
597
gnutls.set_default_priority(self._c_object)
598
gnutls.transport_set_ptr(self._c_object, socket.fileno())
599
gnutls.handshake_set_private_extensions(self._c_object,
602
if credentials is None:
603
credentials = gnutls.Credentials()
604
gnutls.credentials_set(self._c_object, credentials.type,
605
ctypes.cast(credentials._c_object,
607
self.credentials = credentials
610
gnutls.deinit(self._c_object)
613
return gnutls.handshake(self._c_object)
615
def send(self, data):
619
data_len -= gnutls.record_send(self._c_object,
624
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
626
# Error handling functions
627
def _error_code(result):
628
"""A function to raise exceptions on errors, suitable
629
for the 'restype' attribute on ctypes functions"""
632
if result == gnutls.E_NO_CERTIFICATE_FOUND:
633
raise gnutls.CertificateSecurityError(code=result)
634
raise gnutls.Error(code=result)
636
def _retry_on_error(result, func, arguments):
637
"""A function to retry on some errors, suitable
638
for the 'errcheck' attribute on ctypes functions"""
640
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
641
return _error_code(result)
642
result = func(*arguments)
645
# Unless otherwise indicated, the function declarations below are
646
# all from the gnutls/gnutls.h C header file.
649
priority_set_direct = _library.gnutls_priority_set_direct
650
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
651
ctypes.POINTER(ctypes.c_char_p)]
652
priority_set_direct.restype = _error_code
654
init = _library.gnutls_init
655
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
656
init.restype = _error_code
658
set_default_priority = _library.gnutls_set_default_priority
659
set_default_priority.argtypes = [session_t]
660
set_default_priority.restype = _error_code
662
record_send = _library.gnutls_record_send
663
record_send.argtypes = [session_t, ctypes.c_void_p,
665
record_send.restype = ctypes.c_ssize_t
666
record_send.errcheck = _retry_on_error
668
certificate_allocate_credentials = (
669
_library.gnutls_certificate_allocate_credentials)
670
certificate_allocate_credentials.argtypes = [
671
ctypes.POINTER(certificate_credentials_t)]
672
certificate_allocate_credentials.restype = _error_code
674
certificate_free_credentials = (
675
_library.gnutls_certificate_free_credentials)
676
certificate_free_credentials.argtypes = [
677
certificate_credentials_t]
678
certificate_free_credentials.restype = None
680
handshake_set_private_extensions = (
681
_library.gnutls_handshake_set_private_extensions)
682
handshake_set_private_extensions.argtypes = [session_t,
684
handshake_set_private_extensions.restype = None
686
credentials_set = _library.gnutls_credentials_set
687
credentials_set.argtypes = [session_t, credentials_type_t,
689
credentials_set.restype = _error_code
691
strerror = _library.gnutls_strerror
692
strerror.argtypes = [ctypes.c_int]
693
strerror.restype = ctypes.c_char_p
695
certificate_type_get = _library.gnutls_certificate_type_get
696
certificate_type_get.argtypes = [session_t]
697
certificate_type_get.restype = _error_code
699
certificate_get_peers = _library.gnutls_certificate_get_peers
700
certificate_get_peers.argtypes = [session_t,
701
ctypes.POINTER(ctypes.c_uint)]
702
certificate_get_peers.restype = ctypes.POINTER(datum_t)
704
global_set_log_level = _library.gnutls_global_set_log_level
705
global_set_log_level.argtypes = [ctypes.c_int]
706
global_set_log_level.restype = None
708
global_set_log_function = _library.gnutls_global_set_log_function
709
global_set_log_function.argtypes = [log_func]
710
global_set_log_function.restype = None
712
deinit = _library.gnutls_deinit
713
deinit.argtypes = [session_t]
714
deinit.restype = None
716
handshake = _library.gnutls_handshake
717
handshake.argtypes = [session_t]
718
handshake.restype = _error_code
719
handshake.errcheck = _retry_on_error
721
transport_set_ptr = _library.gnutls_transport_set_ptr
722
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
723
transport_set_ptr.restype = None
725
bye = _library.gnutls_bye
726
bye.argtypes = [session_t, close_request_t]
727
bye.restype = _error_code
728
bye.errcheck = _retry_on_error
730
check_version = _library.gnutls_check_version
731
check_version.argtypes = [ctypes.c_char_p]
732
check_version.restype = ctypes.c_char_p
734
# All the function declarations below are from gnutls/openpgp.h
736
openpgp_crt_init = _library.gnutls_openpgp_crt_init
737
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
738
openpgp_crt_init.restype = _error_code
740
openpgp_crt_import = _library.gnutls_openpgp_crt_import
741
openpgp_crt_import.argtypes = [openpgp_crt_t,
742
ctypes.POINTER(datum_t),
744
openpgp_crt_import.restype = _error_code
746
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
747
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
748
ctypes.POINTER(ctypes.c_uint)]
749
openpgp_crt_verify_self.restype = _error_code
751
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
752
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
753
openpgp_crt_deinit.restype = None
755
openpgp_crt_get_fingerprint = (
756
_library.gnutls_openpgp_crt_get_fingerprint)
757
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
761
openpgp_crt_get_fingerprint.restype = _error_code
763
# Remove non-public functions
764
del _error_code, _retry_on_error
765
# Create the global "gnutls" object, simulating a module
769
def call_pipe(connection, # : multiprocessing.Connection
770
func, *args, **kwargs):
771
"""This function is meant to be called by multiprocessing.Process
773
This function runs func(*args, **kwargs), and writes the resulting
774
return value on the provided multiprocessing.Connection.
776
connection.send(func(*args, **kwargs))
383
def timedelta_to_milliseconds(td):
384
"Convert a datetime.timedelta() to milliseconds"
385
return ((td.days * 24 * 60 * 60 * 1000)
386
+ (td.seconds * 1000)
387
+ (td.microseconds // 1000))
780
389
class Client(object):
781
390
"""A representation of a client host served by this server.
784
393
approved: bool(); 'None' if not yet approved/disapproved
785
394
approval_delay: datetime.timedelta(); Time to wait for approval
820
427
runtime_expansions: Allowed attributes for runtime expansion.
821
428
expires: datetime.datetime(); time (UTC) when a client will be
822
429
disabled, or None
823
server_settings: The server_settings dict from main()
826
432
runtime_expansions = ("approval_delay", "approval_duration",
827
"created", "enabled", "expires",
828
"fingerprint", "host", "interval",
829
"last_approval_request", "last_checked_ok",
433
"created", "enabled", "fingerprint",
434
"host", "interval", "last_checked_ok",
830
435
"last_enabled", "name", "timeout")
833
"extended_timeout": "PT15M",
835
"checker": "fping -q -- %%(host)s",
837
"approval_delay": "PT0S",
838
"approval_duration": "PT1S",
839
"approved_by_default": "True",
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
439
"checker": "fping -q -- %%(host)s",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
443
"approved_by_default": "True",
447
def timeout_milliseconds(self):
448
"Return the 'timeout' attribute in milliseconds"
449
return timedelta_to_milliseconds(self.timeout)
451
def extended_timeout_milliseconds(self):
452
"Return the 'extended_timeout' attribute in milliseconds"
453
return timedelta_to_milliseconds(self.extended_timeout)
455
def interval_milliseconds(self):
456
"Return the 'interval' attribute in milliseconds"
457
return timedelta_to_milliseconds(self.interval)
459
def approval_delay_milliseconds(self):
460
return timedelta_to_milliseconds(self.approval_delay)
844
463
def config_parser(config):
924
542
self.current_checker_command = None
925
543
self.approved = None
926
544
self.approvals_pending = 0
927
self.changedstate = multiprocessing_manager.Condition(
928
multiprocessing_manager.Lock())
929
self.client_structure = [attr
930
for attr in self.__dict__.keys()
545
self.changedstate = (multiprocessing_manager
546
.Condition(multiprocessing_manager
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
931
550
if not attr.startswith("_")]
932
551
self.client_structure.append("client_structure")
934
for name, t in inspect.getmembers(
935
type(self), lambda obj: isinstance(obj, property)):
553
for name, t in inspect.getmembers(type(self),
936
557
if not name.startswith("_"):
937
558
self.client_structure.append(name)
939
560
# Send notice to process children that client state has changed
940
561
def send_changedstate(self):
941
562
with self.changedstate:
942
563
self.changedstate.notify_all()
944
565
def enable(self):
945
566
"""Start this client's checker and timeout hooks"""
946
567
if getattr(self, "enabled", False):
947
568
# Already enabled
570
self.send_changedstate()
949
571
self.expires = datetime.datetime.utcnow() + self.timeout
950
572
self.enabled = True
951
573
self.last_enabled = datetime.datetime.utcnow()
952
574
self.init_checker()
953
self.send_changedstate()
955
576
def disable(self, quiet=True):
956
577
"""Disable this client."""
957
578
if not getattr(self, "enabled", False):
581
self.send_changedstate()
960
583
logger.info("Disabling client %s", self.name)
961
if getattr(self, "disable_initiator_tag", None) is not None:
962
GLib.source_remove(self.disable_initiator_tag)
584
if getattr(self, "disable_initiator_tag", False):
585
gobject.source_remove(self.disable_initiator_tag)
963
586
self.disable_initiator_tag = None
964
587
self.expires = None
965
if getattr(self, "checker_initiator_tag", None) is not None:
966
GLib.source_remove(self.checker_initiator_tag)
588
if getattr(self, "checker_initiator_tag", False):
589
gobject.source_remove(self.checker_initiator_tag)
967
590
self.checker_initiator_tag = None
968
591
self.stop_checker()
969
592
self.enabled = False
971
self.send_changedstate()
972
# Do not run this again if called by a GLib.timeout_add
593
# Do not run this again if called by a gobject.timeout_add
975
596
def __del__(self):
978
599
def init_checker(self):
979
600
# Schedule a new checker to be started an 'interval' from now,
980
601
# and every interval from then on.
981
if self.checker_initiator_tag is not None:
982
GLib.source_remove(self.checker_initiator_tag)
983
self.checker_initiator_tag = GLib.timeout_add(
984
int(self.interval.total_seconds() * 1000),
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
986
605
# Schedule a disable() when 'timeout' has passed
987
if self.disable_initiator_tag is not None:
988
GLib.source_remove(self.disable_initiator_tag)
989
self.disable_initiator_tag = GLib.timeout_add(
990
int(self.timeout.total_seconds() * 1000), self.disable)
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
991
609
# Also start a new checker *right now*.
992
610
self.start_checker()
994
def checker_callback(self, source, condition, connection,
612
def checker_callback(self, pid, condition, command):
996
613
"""The checker has completed, so take appropriate actions."""
997
614
self.checker_callback_tag = None
998
615
self.checker = None
999
# Read return code from connection (see call_pipe)
1000
returncode = connection.recv()
1004
self.last_checker_status = returncode
1005
self.last_checker_signal = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
1006
618
if self.last_checker_status == 0:
1007
619
logger.info("Checker for %(name)s succeeded",
1009
621
self.checked_ok()
1011
logger.info("Checker for %(name)s failed", vars(self))
623
logger.info("Checker for %(name)s failed",
1013
626
self.last_checker_status = -1
1014
self.last_checker_signal = -returncode
1015
627
logger.warning("Checker for %(name)s crashed?",
1019
630
def checked_ok(self):
1020
631
"""Assert that the client has been seen, alive and well."""
1021
632
self.last_checked_ok = datetime.datetime.utcnow()
1022
633
self.last_checker_status = 0
1023
self.last_checker_signal = None
1024
634
self.bump_timeout()
1026
636
def bump_timeout(self, timeout=None):
1027
637
"""Bump up the timeout for this client."""
1028
638
if timeout is None:
1029
639
timeout = self.timeout
1030
640
if self.disable_initiator_tag is not None:
1031
GLib.source_remove(self.disable_initiator_tag)
1032
self.disable_initiator_tag = None
641
gobject.source_remove(self.disable_initiator_tag)
1033
642
if getattr(self, "enabled", False):
1034
self.disable_initiator_tag = GLib.timeout_add(
1035
int(timeout.total_seconds() * 1000), self.disable)
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
1036
646
self.expires = datetime.datetime.utcnow() + timeout
1038
648
def need_approval(self):
1039
649
self.last_approval_request = datetime.datetime.utcnow()
1041
651
def start_checker(self):
1042
652
"""Start a new checker subprocess if one is not running.
1044
654
If a checker already exists, leave it running and do
1046
656
# The reason for not killing a running checker is that if we
1047
# did that, and if a checker (for some reason) started running
1048
# slowly and taking more than 'interval' time, then the client
1049
# would inevitably timeout, since no checker would get a
1050
# chance to run to completion. If we instead leave running
657
# did that, then if a checker (for some reason) started
658
# running slowly and taking more than 'interval' time, the
659
# client would inevitably timeout, since no checker would get
660
# a chance to run to completion. If we instead leave running
1051
661
# checkers alone, the checker would have to take more time
1052
662
# than 'timeout' for the client to be disabled, which is as it
1055
if self.checker is not None and not self.checker.is_alive():
1056
logger.warning("Checker was not alive; joining")
665
# If a checker exists, make sure it is not a zombie
667
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
668
except (AttributeError, OSError) as error:
669
if (isinstance(error, OSError)
670
and error.errno != errno.ECHILD):
674
logger.warning("Checker was a zombie")
675
gobject.source_remove(self.checker_callback_tag)
676
self.checker_callback(pid, status,
677
self.current_checker_command)
1059
678
# Start a new checker if needed
1060
679
if self.checker is None:
1061
# Escape attributes for the shell
1063
attr: re.escape(str(getattr(self, attr)))
1064
for attr in self.runtime_expansions}
1066
command = self.checker_command % escaped_attrs
1067
except TypeError as error:
1068
logger.error('Could not format string "%s"',
1069
self.checker_command,
1071
return True # Try again later
681
# In case checker_command has exactly one % operator
682
command = self.checker_command % self.host
684
# Escape attributes for the shell
685
escaped_attrs = dict(
687
re.escape(unicode(str(getattr(self, attr, "")),
691
self.runtime_expansions)
694
command = self.checker_command % escaped_attrs
695
except TypeError as error:
696
logger.error('Could not format string "%s":'
697
' %s', self.checker_command, error)
698
return True # Try again later
1072
699
self.current_checker_command = command
1073
logger.info("Starting checker %r for %s", command,
1075
# We don't need to redirect stdout and stderr, since
1076
# in normal mode, that is already done by daemon(),
1077
# and in debug mode we don't want to. (Stdin is
1078
# always replaced by /dev/null.)
1079
# The exception is when not debugging but nevertheless
1080
# running in the foreground; use the previously
1082
popen_args = {"close_fds": True,
1085
if (not self.server_settings["debug"]
1086
and self.server_settings["foreground"]):
1087
popen_args.update({"stdout": wnull,
1089
pipe = multiprocessing.Pipe(duplex=False)
1090
self.checker = multiprocessing.Process(
1092
args=(pipe[1], subprocess.call, command),
1094
self.checker.start()
1095
self.checker_callback_tag = GLib.io_add_watch(
1096
pipe[0].fileno(), GLib.IO_IN,
1097
self.checker_callback, pipe[0], command)
1098
# Re-run this periodically if run by GLib.timeout_add
701
logger.info("Starting checker %r for %s",
703
# We don't need to redirect stdout and stderr, since
704
# in normal mode, that is already done by daemon(),
705
# and in debug mode we don't want to. (Stdin is
706
# always replaced by /dev/null.)
707
self.checker = subprocess.Popen(command,
710
self.checker_callback_tag = (gobject.child_watch_add
712
self.checker_callback,
714
# The checker may have completed before the gobject
715
# watch was added. Check for this.
716
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
718
gobject.source_remove(self.checker_callback_tag)
719
self.checker_callback(pid, status, command)
720
except OSError as error:
721
logger.error("Failed to start subprocess: %s",
723
# Re-run this periodically if run by gobject.timeout_add
1101
726
def stop_checker(self):
1102
727
"""Force the checker process, if any, to stop."""
1103
728
if self.checker_callback_tag:
1104
GLib.source_remove(self.checker_callback_tag)
729
gobject.source_remove(self.checker_callback_tag)
1105
730
self.checker_callback_tag = None
1106
731
if getattr(self, "checker", None) is None:
1108
733
logger.debug("Stopping checker for %(name)s", vars(self))
1109
self.checker.terminate()
735
os.kill(self.checker.pid, signal.SIGTERM)
737
#if self.checker.poll() is None:
738
# os.kill(self.checker.pid, signal.SIGKILL)
739
except OSError as error:
740
if error.errno != errno.ESRCH: # No such process
1110
742
self.checker = None
1113
def dbus_service_property(dbus_interface,
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
1117
747
"""Decorators for marking methods of a DBusObjectWithProperties to
1118
748
become properties on the D-Bus.
1120
750
The decorated method will be called with no arguments by "Get"
1121
751
and with one argument by "Set".
1123
753
The parameters, where they are supported, are the same as
1124
754
dbus.service.method, except there is only "signature", since the
1125
755
type from Get() and the type sent to Set() is the same.
1208
class DBusObjectWithAnnotations(dbus.service.Object):
1209
"""A D-Bus object with annotations.
1211
Classes inheriting from this can use the dbus_annotations
1212
decorator to add annotations to methods or signals.
831
class DBusObjectWithProperties(dbus.service.Object):
832
"""A D-Bus object with properties.
834
Classes inheriting from this can use the dbus_service_property
835
decorator to expose methods as D-Bus properties. It exposes the
836
standard Get(), Set(), and GetAll() methods on the D-Bus.
1216
840
def _is_dbus_thing(thing):
1217
841
"""Returns a function testing if an attribute is a D-Bus thing
1219
843
If called like _is_dbus_thing("method") it returns a function
1220
844
suitable for use as predicate to inspect.getmembers().
1222
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1225
849
def _get_all_dbus_things(self, thing):
1226
850
"""Returns a generator of (name, attribute) pairs
1228
return ((getattr(athing.__get__(self), "_dbus_name", name),
852
return ((getattr(athing.__get__(self), "_dbus_name",
1229
854
athing.__get__(self))
1230
855
for cls in self.__class__.__mro__
1231
856
for name, athing in
1232
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1234
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1236
path_keyword='object_path',
1237
connection_keyword='connection')
1238
def Introspect(self, object_path, connection):
1239
"""Overloading of standard D-Bus method.
1241
Inserts annotation tags on methods and signals.
1243
xmlstring = dbus.service.Object.Introspect(self, object_path,
1246
document = xml.dom.minidom.parseString(xmlstring)
1248
for if_tag in document.getElementsByTagName("interface"):
1249
# Add annotation tags
1250
for typ in ("method", "signal"):
1251
for tag in if_tag.getElementsByTagName(typ):
1253
for name, prop in (self.
1254
_get_all_dbus_things(typ)):
1255
if (name == tag.getAttribute("name")
1256
and prop._dbus_interface
1257
== if_tag.getAttribute("name")):
1258
annots.update(getattr(
1259
prop, "_dbus_annotations", {}))
1260
for name, value in annots.items():
1261
ann_tag = document.createElement(
1263
ann_tag.setAttribute("name", name)
1264
ann_tag.setAttribute("value", value)
1265
tag.appendChild(ann_tag)
1266
# Add interface annotation tags
1267
for annotation, value in dict(
1268
itertools.chain.from_iterable(
1269
annotations().items()
1270
for name, annotations
1271
in self._get_all_dbus_things("interface")
1272
if name == if_tag.getAttribute("name")
1274
ann_tag = document.createElement("annotation")
1275
ann_tag.setAttribute("name", annotation)
1276
ann_tag.setAttribute("value", value)
1277
if_tag.appendChild(ann_tag)
1278
# Fix argument name for the Introspect method itself
1279
if (if_tag.getAttribute("name")
1280
== dbus.INTROSPECTABLE_IFACE):
1281
for cn in if_tag.getElementsByTagName("method"):
1282
if cn.getAttribute("name") == "Introspect":
1283
for arg in cn.getElementsByTagName("arg"):
1284
if (arg.getAttribute("direction")
1286
arg.setAttribute("name",
1288
xmlstring = document.toxml("utf-8")
1290
except (AttributeError, xml.dom.DOMException,
1291
xml.parsers.expat.ExpatError) as error:
1292
logger.error("Failed to override Introspection method",
1297
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1298
"""A D-Bus object with properties.
1300
Classes inheriting from this can use the dbus_service_property
1301
decorator to expose methods as D-Bus properties. It exposes the
1302
standard Get(), Set(), and GetAll() methods on the D-Bus.
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
1305
860
def _get_dbus_property(self, interface_name, property_name):
1306
861
"""Returns a bound method if one exists which is a D-Bus
1307
862
property with the specified name and interface.
1309
for cls in self.__class__.__mro__:
1310
for name, value in inspect.getmembers(
1311
cls, self._is_dbus_thing("property")):
864
for cls in self.__class__.__mro__:
865
for name, value in (inspect.getmembers
867
self._is_dbus_thing("property"))):
1312
868
if (value._dbus_name == property_name
1313
869
and value._dbus_interface == interface_name):
1314
870
return value.__get__(self)
1316
872
# No such property
1317
raise DBusPropertyNotFound("{}:{}.{}".format(
1318
self.dbus_object_path, interface_name, property_name))
1321
def _get_all_interface_names(cls):
1322
"""Get a sequence of all interfaces supported by an object"""
1323
return (name for name in set(getattr(getattr(x, attr),
1324
"_dbus_interface", None)
1325
for x in (inspect.getmro(cls))
1327
if name is not None)
1329
@dbus.service.method(dbus.PROPERTIES_IFACE,
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1331
878
out_signature="v")
1332
879
def Get(self, interface_name, property_name):
1333
880
"""Standard D-Bus property Get() method, see D-Bus standard.
1458
1006
except (AttributeError, xml.dom.DOMException,
1459
1007
xml.parsers.expat.ExpatError) as error:
1460
1008
logger.error("Failed to override Introspection method",
1466
dbus.OBJECT_MANAGER_IFACE
1467
except AttributeError:
1468
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1471
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1472
"""A D-Bus object with an ObjectManager.
1474
Classes inheriting from this exposes the standard
1475
GetManagedObjects call and the InterfacesAdded and
1476
InterfacesRemoved signals on the standard
1477
"org.freedesktop.DBus.ObjectManager" interface.
1479
Note: No signals are sent automatically; they must be sent
1482
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1483
out_signature="a{oa{sa{sv}}}")
1484
def GetManagedObjects(self):
1485
"""This function must be overridden"""
1486
raise NotImplementedError()
1488
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1489
signature="oa{sa{sv}}")
1490
def InterfacesAdded(self, object_path, interfaces_and_properties):
1493
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1494
def InterfacesRemoved(self, object_path, interfaces):
1497
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1499
path_keyword='object_path',
1500
connection_keyword='connection')
1501
def Introspect(self, object_path, connection):
1502
"""Overloading of standard D-Bus method.
1504
Override return argument name of GetManagedObjects to be
1505
"objpath_interfaces_and_properties"
1507
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1511
document = xml.dom.minidom.parseString(xmlstring)
1513
for if_tag in document.getElementsByTagName("interface"):
1514
# Fix argument name for the GetManagedObjects method
1515
if (if_tag.getAttribute("name")
1516
== dbus.OBJECT_MANAGER_IFACE):
1517
for cn in if_tag.getElementsByTagName("method"):
1518
if (cn.getAttribute("name")
1519
== "GetManagedObjects"):
1520
for arg in cn.getElementsByTagName("arg"):
1521
if (arg.getAttribute("direction")
1525
"objpath_interfaces"
1527
xmlstring = document.toxml("utf-8")
1529
except (AttributeError, xml.dom.DOMException,
1530
xml.parsers.expat.ExpatError) as error:
1531
logger.error("Failed to override Introspection method",
1536
def datetime_to_dbus(dt, variant_level=0):
1013
def datetime_to_dbus (dt, variant_level=0):
1537
1014
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1539
return dbus.String("", variant_level=variant_level)
1540
return dbus.String(dt.isoformat(), variant_level=variant_level)
1543
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1544
"""A class decorator; applied to a subclass of
1545
dbus.service.Object, it will add alternate D-Bus attributes with
1546
interface names according to the "alt_interface_names" mapping.
1549
@alternate_dbus_interfaces({"org.example.Interface":
1550
"net.example.AlternateInterface"})
1551
class SampleDBusObject(dbus.service.Object):
1552
@dbus.service.method("org.example.Interface")
1553
def SampleDBusMethod():
1556
The above "SampleDBusMethod" on "SampleDBusObject" will be
1557
reachable via two interfaces: "org.example.Interface" and
1558
"net.example.AlternateInterface", the latter of which will have
1559
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1560
"true", unless "deprecate" is passed with a False value.
1562
This works for methods and signals, and also for D-Bus properties
1563
(from DBusObjectWithProperties) and interfaces (from the
1564
dbus_interface_annotations decorator).
1016
return dbus.String("", variant_level = variant_level)
1017
return dbus.String(dt.isoformat(),
1018
variant_level=variant_level)
1021
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1023
"""Applied to an empty subclass of a D-Bus object, this metaclass
1024
will add additional D-Bus attributes matching a certain pattern.
1568
for orig_interface_name, alt_interface_name in (
1569
alt_interface_names.items()):
1571
interface_names = set()
1572
# Go though all attributes of the class
1573
for attrname, attribute in inspect.getmembers(cls):
1026
def __new__(mcs, name, bases, attr):
1027
# Go through all the base classes which could have D-Bus
1028
# methods, signals, or properties in them
1029
old_interface_names = []
1030
for base in (b for b in bases
1031
if issubclass(b, dbus.service.Object)):
1032
# Go though all attributes of the base class
1033
for attrname, attribute in inspect.getmembers(base):
1574
1034
# Ignore non-D-Bus attributes, and D-Bus attributes
1575
1035
# with the wrong interface name
1576
1036
if (not hasattr(attribute, "_dbus_interface")
1577
or not attribute._dbus_interface.startswith(
1578
orig_interface_name)):
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1580
1040
# Create an alternate D-Bus interface name based on
1581
1041
# the current name
1582
alt_interface = attribute._dbus_interface.replace(
1583
orig_interface_name, alt_interface_name)
1584
interface_names.add(alt_interface)
1042
alt_interface = (attribute._dbus_interface
1043
.replace("se.recompile.Mandos",
1044
"se.bsnet.fukt.Mandos"))
1045
if alt_interface != attribute._dbus_interface:
1046
old_interface_names.append(alt_interface)
1585
1047
# Is this a D-Bus signal?
1586
1048
if getattr(attribute, "_dbus_is_signal", False):
1587
# Extract the original non-method undecorated
1588
# function by black magic
1589
if sys.version_info.major == 2:
1590
nonmethod_func = (dict(
1049
# Extract the original non-method function by
1051
nonmethod_func = (dict(
1591
1052
zip(attribute.func_code.co_freevars,
1592
attribute.__closure__))
1593
["func"].cell_contents)
1595
nonmethod_func = (dict(
1596
zip(attribute.__code__.co_freevars,
1597
attribute.__closure__))
1598
["func"].cell_contents)
1053
attribute.__closure__))["func"]
1599
1055
# Create a new, but exactly alike, function
1600
1056
# object, and decorate it to be a new D-Bus signal
1601
1057
# with the alternate D-Bus interface name
1602
new_function = copy_function(nonmethod_func)
1603
new_function = (dbus.service.signal(
1605
attribute._dbus_signature)(new_function))
1058
new_function = (dbus.service.signal
1060
attribute._dbus_signature)
1061
(types.FunctionType(
1062
nonmethod_func.func_code,
1063
nonmethod_func.func_globals,
1064
nonmethod_func.func_name,
1065
nonmethod_func.func_defaults,
1066
nonmethod_func.func_closure)))
1606
1067
# Copy annotations, if any
1608
new_function._dbus_annotations = dict(
1609
attribute._dbus_annotations)
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1610
1071
except AttributeError:
1613
1073
# Define a creator of a function to call both the
1614
# original and alternate functions, so both the
1615
# original and alternate signals gets sent when
1616
# the function is called
1074
# old and new functions, so both the old and new
1075
# signals gets sent when the function is called
1617
1076
def fixscope(func1, func2):
1618
1077
"""This function is a scope container to pass
1619
1078
func1 and func2 to the "call_both" function
1620
1079
outside of its arguments"""
1622
@functools.wraps(func2)
1623
1080
def call_both(*args, **kwargs):
1624
1081
"""This function will emit two D-Bus
1625
1082
signals by calling func1 and func2"""
1626
1083
func1(*args, **kwargs)
1627
1084
func2(*args, **kwargs)
1628
# Make wrapper function look like a D-Bus
1630
for name, attr in inspect.getmembers(func2):
1631
if name.startswith("_dbus_"):
1632
setattr(call_both, name, attr)
1634
1085
return call_both
1635
1086
# Create the "call_both" function and add it to
1637
attr[attrname] = fixscope(attribute, new_function)
1088
attr[attrname] = fixscope(attribute,
1638
1090
# Is this a D-Bus method?
1639
1091
elif getattr(attribute, "_dbus_is_method", False):
1640
1092
# Create a new, but exactly alike, function
1641
1093
# object. Decorate it to be a new D-Bus method
1642
1094
# with the alternate D-Bus interface name. Add it
1643
1095
# to the class.
1645
dbus.service.method(
1647
attribute._dbus_in_signature,
1648
attribute._dbus_out_signature)
1649
(copy_function(attribute)))
1096
attr[attrname] = (dbus.service.method
1098
attribute._dbus_in_signature,
1099
attribute._dbus_out_signature)
1101
(attribute.func_code,
1102
attribute.func_globals,
1103
attribute.func_name,
1104
attribute.func_defaults,
1105
attribute.func_closure)))
1650
1106
# Copy annotations, if any
1652
attr[attrname]._dbus_annotations = dict(
1653
attribute._dbus_annotations)
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1654
1110
except AttributeError:
1656
1112
# Is this a D-Bus property?
1677
1140
# object. Decorate it to be a new D-Bus interface
1678
1141
# with the alternate D-Bus interface name. Add it
1679
1142
# to the class.
1681
dbus_interface_annotations(alt_interface)
1682
(copy_function(attribute)))
1684
# Deprecate all alternate interfaces
1685
iname = "_AlternateDBusNames_interface_annotation{}"
1686
for interface_name in interface_names:
1688
@dbus_interface_annotations(interface_name)
1690
return {"org.freedesktop.DBus.Deprecated":
1692
# Find an unused name
1693
for aname in (iname.format(i)
1694
for i in itertools.count()):
1695
if aname not in attr:
1699
# Replace the class with a new subclass of it with
1700
# methods, signals, etc. as created above.
1701
if sys.version_info.major == 2:
1702
cls = type(b"{}Alternate".format(cls.__name__),
1705
cls = type("{}Alternate".format(cls.__name__),
1712
@alternate_dbus_interfaces({"se.recompile.Mandos":
1713
"se.bsnet.fukt.Mandos"})
1143
attr[attrname] = (dbus_interface_annotations
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1160
if aname not in attr:
1163
return type.__new__(mcs, name, bases, attr)
1714
1166
class ClientDBus(Client, DBusObjectWithProperties):
1715
1167
"""A Client class using D-Bus
1718
1170
dbus_object_path: dbus.ObjectPath
1719
1171
bus: dbus.SystemBus()
1722
1174
runtime_expansions = (Client.runtime_expansions
1723
+ ("dbus_object_path", ))
1725
_interface = "se.recompile.Mandos.Client"
1175
+ ("dbus_object_path",))
1727
1177
# dbus.service.Object doesn't use super(), so we can't either.
1729
def __init__(self, bus=None, *args, **kwargs):
1179
def __init__(self, bus = None, *args, **kwargs):
1731
1181
Client.__init__(self, *args, **kwargs)
1732
1182
# Only now, when this client is initialized, can it show up on
1734
client_object_name = str(self.name).translate(
1184
client_object_name = unicode(self.name).translate(
1735
1185
{ord("."): ord("_"),
1736
1186
ord("-"): ord("_")})
1737
self.dbus_object_path = dbus.ObjectPath(
1738
"/clients/" + client_object_name)
1187
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
1739
1189
DBusObjectWithProperties.__init__(self, self.bus,
1740
1190
self.dbus_object_path)
1742
def notifychangeproperty(transform_func, dbus_name,
1743
type_func=lambda x: x,
1745
invalidate_only=False,
1746
_interface=_interface):
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1747
1195
""" Modify a variable so that it's a property which announces
1748
1196
its changes to DBus.
1750
1198
transform_fun: Function that takes a value and a variant_level
1751
1199
and transforms it to a D-Bus type.
1752
1200
dbus_name: D-Bus name of the variable
1904
1350
server to mandos-client
1908
1354
# Rejected - signal
1909
1355
@dbus.service.signal(_interface, signature="s")
1910
1356
def Rejected(self, reason):
1914
1360
# NeedApproval - signal
1915
1361
@dbus.service.signal(_interface, signature="tb")
1916
1362
def NeedApproval(self, timeout, default):
1918
1364
return self.need_approval()
1922
1368
# Approve - method
1923
1369
@dbus.service.method(_interface, in_signature="b")
1924
1370
def Approve(self, value):
1925
1371
self.approve(value)
1927
1373
# CheckedOK - method
1928
1374
@dbus.service.method(_interface)
1929
1375
def CheckedOK(self):
1930
1376
self.checked_ok()
1932
1378
# Enable - method
1933
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1934
1379
@dbus.service.method(_interface)
1935
1380
def Enable(self):
1939
1384
# StartChecker - method
1940
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1941
1385
@dbus.service.method(_interface)
1942
1386
def StartChecker(self):
1944
1388
self.start_checker()
1946
1390
# Disable - method
1947
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1948
1391
@dbus.service.method(_interface)
1949
1392
def Disable(self):
1953
1396
# StopChecker - method
1954
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1955
1397
@dbus.service.method(_interface)
1956
1398
def StopChecker(self):
1957
1399
self.stop_checker()
1961
1403
# ApprovalPending - property
1962
1404
@dbus_service_property(_interface, signature="b", access="read")
1963
1405
def ApprovalPending_dbus_property(self):
1964
1406
return dbus.Boolean(bool(self.approvals_pending))
1966
1408
# ApprovedByDefault - property
1967
@dbus_service_property(_interface,
1409
@dbus_service_property(_interface, signature="b",
1969
1410
access="readwrite")
1970
1411
def ApprovedByDefault_dbus_property(self, value=None):
1971
1412
if value is None: # get
1972
1413
return dbus.Boolean(self.approved_by_default)
1973
1414
self.approved_by_default = bool(value)
1975
1416
# ApprovalDelay - property
1976
@dbus_service_property(_interface,
1417
@dbus_service_property(_interface, signature="t",
1978
1418
access="readwrite")
1979
1419
def ApprovalDelay_dbus_property(self, value=None):
1980
1420
if value is None: # get
1981
return dbus.UInt64(self.approval_delay.total_seconds()
1421
return dbus.UInt64(self.approval_delay_milliseconds())
1983
1422
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1985
1424
# ApprovalDuration - property
1986
@dbus_service_property(_interface,
1425
@dbus_service_property(_interface, signature="t",
1988
1426
access="readwrite")
1989
1427
def ApprovalDuration_dbus_property(self, value=None):
1990
1428
if value is None: # get
1991
return dbus.UInt64(self.approval_duration.total_seconds()
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
1993
1431
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1995
1433
# Name - property
1997
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1998
1434
@dbus_service_property(_interface, signature="s", access="read")
1999
1435
def Name_dbus_property(self):
2000
1436
return dbus.String(self.name)
2002
1438
# Fingerprint - property
2004
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2005
1439
@dbus_service_property(_interface, signature="s", access="read")
2006
1440
def Fingerprint_dbus_property(self):
2007
1441
return dbus.String(self.fingerprint)
2009
1443
# Host - property
2010
@dbus_service_property(_interface,
1444
@dbus_service_property(_interface, signature="s",
2012
1445
access="readwrite")
2013
1446
def Host_dbus_property(self, value=None):
2014
1447
if value is None: # get
2015
1448
return dbus.String(self.host)
2016
self.host = str(value)
1449
self.host = unicode(value)
2018
1451
# Created - property
2020
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2021
1452
@dbus_service_property(_interface, signature="s", access="read")
2022
1453
def Created_dbus_property(self):
2023
1454
return datetime_to_dbus(self.created)
2025
1456
# LastEnabled - property
2026
1457
@dbus_service_property(_interface, signature="s", access="read")
2027
1458
def LastEnabled_dbus_property(self):
2028
1459
return datetime_to_dbus(self.last_enabled)
2030
1461
# Enabled - property
2031
@dbus_service_property(_interface,
1462
@dbus_service_property(_interface, signature="b",
2033
1463
access="readwrite")
2034
1464
def Enabled_dbus_property(self, value=None):
2035
1465
if value is None: # get
2042
1472
# LastCheckedOK - property
2043
@dbus_service_property(_interface,
1473
@dbus_service_property(_interface, signature="s",
2045
1474
access="readwrite")
2046
1475
def LastCheckedOK_dbus_property(self, value=None):
2047
1476
if value is not None:
2048
1477
self.checked_ok()
2050
1479
return datetime_to_dbus(self.last_checked_ok)
2052
1481
# LastCheckerStatus - property
2053
@dbus_service_property(_interface, signature="n", access="read")
1482
@dbus_service_property(_interface, signature="n",
2054
1484
def LastCheckerStatus_dbus_property(self):
2055
1485
return dbus.Int16(self.last_checker_status)
2057
1487
# Expires - property
2058
1488
@dbus_service_property(_interface, signature="s", access="read")
2059
1489
def Expires_dbus_property(self):
2060
1490
return datetime_to_dbus(self.expires)
2062
1492
# LastApprovalRequest - property
2063
1493
@dbus_service_property(_interface, signature="s", access="read")
2064
1494
def LastApprovalRequest_dbus_property(self):
2065
1495
return datetime_to_dbus(self.last_approval_request)
2067
1497
# Timeout - property
2068
@dbus_service_property(_interface,
1498
@dbus_service_property(_interface, signature="t",
2070
1499
access="readwrite")
2071
1500
def Timeout_dbus_property(self, value=None):
2072
1501
if value is None: # get
2073
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2074
old_timeout = self.timeout
1502
return dbus.UInt64(self.timeout_milliseconds())
2075
1503
self.timeout = datetime.timedelta(0, 0, 0, value)
2076
# Reschedule disabling
1504
# Reschedule timeout
2077
1505
if self.enabled:
2078
1506
now = datetime.datetime.utcnow()
2079
self.expires += self.timeout - old_timeout
2080
if self.expires <= now:
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
2081
1510
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
2084
1516
if (getattr(self, "disable_initiator_tag", None)
2087
GLib.source_remove(self.disable_initiator_tag)
2088
self.disable_initiator_tag = GLib.timeout_add(
2089
int((self.expires - now).total_seconds() * 1000),
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2092
1524
# ExtendedTimeout - property
2093
@dbus_service_property(_interface,
1525
@dbus_service_property(_interface, signature="t",
2095
1526
access="readwrite")
2096
1527
def ExtendedTimeout_dbus_property(self, value=None):
2097
1528
if value is None: # get
2098
return dbus.UInt64(self.extended_timeout.total_seconds()
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2100
1530
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2102
1532
# Interval - property
2103
@dbus_service_property(_interface,
1533
@dbus_service_property(_interface, signature="t",
2105
1534
access="readwrite")
2106
1535
def Interval_dbus_property(self, value=None):
2107
1536
if value is None: # get
2108
return dbus.UInt64(self.interval.total_seconds() * 1000)
1537
return dbus.UInt64(self.interval_milliseconds())
2109
1538
self.interval = datetime.timedelta(0, 0, 0, value)
2110
1539
if getattr(self, "checker_initiator_tag", None) is None:
2112
1541
if self.enabled:
2113
1542
# Reschedule checker run
2114
GLib.source_remove(self.checker_initiator_tag)
2115
self.checker_initiator_tag = GLib.timeout_add(
2116
value, self.start_checker)
2117
self.start_checker() # Start one now, too
1543
gobject.source_remove(self.checker_initiator_tag)
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
2119
1548
# Checker - property
2120
@dbus_service_property(_interface,
1549
@dbus_service_property(_interface, signature="s",
2122
1550
access="readwrite")
2123
1551
def Checker_dbus_property(self, value=None):
2124
1552
if value is None: # get
2125
1553
return dbus.String(self.checker_command)
2126
self.checker_command = str(value)
1554
self.checker_command = unicode(value)
2128
1556
# CheckerRunning - property
2129
@dbus_service_property(_interface,
1557
@dbus_service_property(_interface, signature="b",
2131
1558
access="readwrite")
2132
1559
def CheckerRunning_dbus_property(self, value=None):
2133
1560
if value is None: # get
2174
1593
if data[0] == 'data':
2176
1595
if data[0] == 'function':
2178
1596
def func(*args, **kwargs):
2179
1597
self._pipe.send(('funcall', name, args, kwargs))
2180
1598
return self._pipe.recv()[1]
2184
1601
def __setattr__(self, name, value):
2185
1602
if name == '_pipe':
2186
1603
return super(ProxyClient, self).__setattr__(name, value)
2187
1604
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
2190
1611
class ClientHandler(socketserver.BaseRequestHandler, object):
2191
1612
"""A class to handle client connections.
2193
1614
Instantiated once for each connection to handle it.
2194
1615
Note: This will run in its own forked process."""
2196
1617
def handle(self):
2197
1618
with contextlib.closing(self.server.child_pipe) as child_pipe:
2198
1619
logger.info("TCP connection from: %s",
2199
str(self.client_address))
1620
unicode(self.client_address))
2200
1621
logger.debug("Pipe FD: %d",
2201
1622
self.server.child_pipe.fileno())
2203
session = gnutls.ClientSession(self.request)
2205
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2206
# "+AES-256-CBC", "+SHA1",
2207
# "+COMP-NULL", "+CTYPE-OPENPGP",
1624
session = (gnutls.connection
1625
.ClientSession(self.request,
1627
.X509Credentials()))
1629
# Note: gnutls.connection.X509Credentials is really a
1630
# generic GnuTLS certificate credentials object so long as
1631
# no X.509 keys are added to it. Therefore, we can use it
1632
# here despite using OpenPGP certificates.
1634
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
# "+AES-256-CBC", "+SHA1",
1636
# "+COMP-NULL", "+CTYPE-OPENPGP",
2209
1638
# Use a fallback default, since this MUST be set.
2210
1639
priority = self.server.gnutls_priority
2211
1640
if priority is None:
2212
1641
priority = "NORMAL"
2213
gnutls.priority_set_direct(session._c_object,
2214
priority.encode("utf-8"),
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2217
1646
# Start communication using the Mandos protocol
2218
1647
# Get protocol number
2219
1648
line = self.request.makefile().readline()
2220
1649
logger.debug("Protocol version: %r", line)
2222
1651
if int(line.strip().split()[0]) > 1:
2223
raise RuntimeError(line)
2224
1653
except (ValueError, IndexError, RuntimeError) as error:
2225
1654
logger.error("Unknown protocol version: %s", error)
2228
1657
# Start GnuTLS connection
2230
1659
session.handshake()
2231
except gnutls.Error as error:
1660
except gnutls.errors.GNUTLSError as error:
2232
1661
logger.warning("Handshake failed: %s", error)
2233
1662
# Do not run session.bye() here: the session is not
2234
1663
# established. Just abandon the request.
2236
1665
logger.debug("Handshake succeeded")
2238
1667
approval_required = False
2241
fpr = self.fingerprint(
2242
self.peer_certificate(session))
2243
except (TypeError, gnutls.Error) as error:
1670
fpr = self.fingerprint(self.peer_certificate
1673
gnutls.errors.GNUTLSError) as error:
2244
1674
logger.warning("Bad certificate: %s", error)
2246
1676
logger.debug("Fingerprint: %s", fpr)
2249
1679
client = ProxyClient(child_pipe, fpr,
2250
1680
self.client_address)
2251
1681
except KeyError:
2254
1684
if client.approval_delay:
2255
1685
delay = client.approval_delay
2256
1686
client.approvals_pending += 1
2257
1687
approval_required = True
2260
1690
if not client.enabled:
2261
1691
logger.info("Client %s is disabled",
2263
1693
if self.server.use_dbus:
2264
1694
# Emit D-Bus signal
2265
1695
client.Rejected("Disabled")
2268
1698
if client.approved or not client.approval_delay:
2269
# We are approved or approval is disabled
1699
#We are approved or approval is disabled
2271
1701
elif client.approved is None:
2272
1702
logger.info("Client %s needs approval",
2305
1737
delay -= time2 - time
2308
session.send(client.secret)
2309
except gnutls.Error as error:
2310
logger.warning("gnutls send failed",
1740
while sent_size < len(client.secret):
1742
sent = session.send(client.secret[sent_size:])
1743
except gnutls.errors.GNUTLSError as error:
1744
logger.warning("gnutls send failed")
1746
logger.debug("Sent: %d, remaining: %d",
1747
sent, len(client.secret)
1748
- (sent_size + sent))
2314
1751
logger.info("Sending secret to %s", client.name)
2315
1752
# bump the timeout using extended_timeout
2316
1753
client.bump_timeout(client.extended_timeout)
2317
1754
if self.server.use_dbus:
2318
1755
# Emit D-Bus signal
2319
1756
client.GotSecret()
2322
1759
if approval_required:
2323
1760
client.approvals_pending -= 1
2326
except gnutls.Error as error:
2327
logger.warning("GnuTLS bye failed",
1763
except gnutls.errors.GNUTLSError as error:
1764
logger.warning("GnuTLS bye failed")
2331
1767
def peer_certificate(session):
2332
1768
"Return the peer's OpenPGP certificate as a bytestring"
2333
1769
# If not an OpenPGP certificate...
2334
if (gnutls.certificate_type_get(session._c_object)
2335
!= gnutls.CRT_OPENPGP):
2336
# ...return invalid data
1770
if (gnutls.library.functions
1771
.gnutls_certificate_type_get(session._c_object)
1772
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1773
# ...do the normal thing
1774
return session.peer_certificate
2338
1775
list_size = ctypes.c_uint(1)
2339
cert_list = (gnutls.certificate_get_peers
1776
cert_list = (gnutls.library.functions
1777
.gnutls_certificate_get_peers
2340
1778
(session._c_object, ctypes.byref(list_size)))
2341
1779
if not bool(cert_list) and list_size.value != 0:
2342
raise gnutls.Error("error getting peer certificate")
1780
raise gnutls.errors.GNUTLSError("error getting peer"
2343
1782
if list_size.value == 0:
2345
1784
cert = cert_list[0]
2346
1785
return ctypes.string_at(cert.data, cert.size)
2349
1788
def fingerprint(openpgp):
2350
1789
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2351
1790
# New GnuTLS "datum" with the OpenPGP public key
2352
datum = gnutls.datum_t(
2353
ctypes.cast(ctypes.c_char_p(openpgp),
2354
ctypes.POINTER(ctypes.c_ubyte)),
2355
ctypes.c_uint(len(openpgp)))
1791
datum = (gnutls.library.types
1792
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1795
ctypes.c_uint(len(openpgp))))
2356
1796
# New empty GnuTLS certificate
2357
crt = gnutls.openpgp_crt_t()
2358
gnutls.openpgp_crt_init(ctypes.byref(crt))
1797
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1798
(gnutls.library.functions
1799
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2359
1800
# Import the OpenPGP public key into the certificate
2360
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2361
gnutls.OPENPGP_FMT_RAW)
1801
(gnutls.library.functions
1802
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1803
gnutls.library.constants
1804
.GNUTLS_OPENPGP_FMT_RAW))
2362
1805
# Verify the self signature in the key
2363
1806
crtverify = ctypes.c_uint()
2364
gnutls.openpgp_crt_verify_self(crt, 0,
2365
ctypes.byref(crtverify))
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
2366
1810
if crtverify.value != 0:
2367
gnutls.openpgp_crt_deinit(crt)
2368
raise gnutls.CertificateSecurityError("Verify failed")
1811
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
raise (gnutls.errors.CertificateSecurityError
2369
1814
# New buffer for the fingerprint
2370
1815
buf = ctypes.create_string_buffer(20)
2371
1816
buf_len = ctypes.c_size_t()
2372
1817
# Get the fingerprint from the certificate into the buffer
2373
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2374
ctypes.byref(buf_len))
1818
(gnutls.library.functions
1819
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1820
ctypes.byref(buf_len)))
2375
1821
# Deinit the certificate
2376
gnutls.openpgp_crt_deinit(crt)
1822
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2377
1823
# Convert the buffer to a Python bytestring
2378
1824
fpr = ctypes.string_at(buf, buf_len.value)
2379
1825
# Convert the bytestring to hexadecimal notation
2384
1830
class MultiprocessingMixIn(object):
2385
1831
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2387
1832
def sub_process_main(self, request, address):
2389
1834
self.finish_request(request, address)
2390
1835
except Exception:
2391
1836
self.handle_error(request, address)
2392
1837
self.close_request(request)
2394
1839
def process_request(self, request, address):
2395
1840
"""Start a new process to process the request."""
2396
proc = multiprocessing.Process(target=self.sub_process_main,
2397
args=(request, address))
1841
proc = multiprocessing.Process(target = self.sub_process_main,
2402
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2403
1849
""" adds a pipe to the MixIn """
2405
1850
def process_request(self, request, client_address):
2406
1851
"""Overrides and wraps the original process_request().
2408
1853
This function creates a new pipe in self.pipe
2410
1855
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2412
1857
proc = MultiprocessingMixIn.process_request(self, request,
2413
1858
client_address)
2414
1859
self.child_pipe.close()
2415
1860
self.add_pipe(parent_pipe, proc)
2417
1862
def add_pipe(self, parent_pipe, proc):
2418
1863
"""Dummy function; override as necessary"""
2419
raise NotImplementedError()
1864
raise NotImplementedError
2422
1867
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2423
1868
socketserver.TCPServer, object):
2424
1869
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2427
1872
enabled: Boolean; whether this server is activated yet
2428
1873
interface: None or a network interface name (string)
2429
1874
use_ipv6: Boolean; to use IPv6 or not
2432
1876
def __init__(self, server_address, RequestHandlerClass,
2436
"""If socketfd is set, use that file descriptor instead of
2437
creating a new one with socket.socket().
1877
interface=None, use_ipv6=True):
2439
1878
self.interface = interface
2441
1880
self.address_family = socket.AF_INET6
2442
if socketfd is not None:
2443
# Save the file descriptor
2444
self.socketfd = socketfd
2445
# Save the original socket.socket() function
2446
self.socket_socket = socket.socket
2448
# To implement --socket, we monkey patch socket.socket.
2450
# (When socketserver.TCPServer is a new-style class, we
2451
# could make self.socket into a property instead of monkey
2452
# patching socket.socket.)
2454
# Create a one-time-only replacement for socket.socket()
2455
@functools.wraps(socket.socket)
2456
def socket_wrapper(*args, **kwargs):
2457
# Restore original function so subsequent calls are
2459
socket.socket = self.socket_socket
2460
del self.socket_socket
2461
# This time only, return a new socket object from the
2462
# saved file descriptor.
2463
return socket.fromfd(self.socketfd, *args, **kwargs)
2464
# Replace socket.socket() function with wrapper
2465
socket.socket = socket_wrapper
2466
# The socketserver.TCPServer.__init__ will call
2467
# socket.socket(), which might be our replacement,
2468
# socket_wrapper(), if socketfd was set.
2469
1881
socketserver.TCPServer.__init__(self, server_address,
2470
1882
RequestHandlerClass)
2472
1883
def server_bind(self):
2473
1884
"""This overrides the normal server_bind() function
2474
1885
to bind to an interface if one was specified, and also NOT to
2475
1886
bind to an address or port if they were not specified."""
2476
global SO_BINDTODEVICE
2477
1887
if self.interface is not None:
2478
1888
if SO_BINDTODEVICE is None:
2479
# Fall back to a hard-coded value which seems to be
2481
logger.warning("SO_BINDTODEVICE not found, trying 25")
2482
SO_BINDTODEVICE = 25
2484
self.socket.setsockopt(
2485
socket.SOL_SOCKET, SO_BINDTODEVICE,
2486
(self.interface + "\0").encode("utf-8"))
2487
except socket.error as error:
2488
if error.errno == errno.EPERM:
2489
logger.error("No permission to bind to"
2490
" interface %s", self.interface)
2491
elif error.errno == errno.ENOPROTOOPT:
2492
logger.error("SO_BINDTODEVICE not available;"
2493
" cannot bind to interface %s",
2495
elif error.errno == errno.ENODEV:
2496
logger.error("Interface %s does not exist,"
2497
" cannot bind", self.interface)
1889
logger.error("SO_BINDTODEVICE does not exist;"
1890
" cannot bind to interface %s",
1894
self.socket.setsockopt(socket.SOL_SOCKET,
1898
except socket.error as error:
1899
if error[0] == errno.EPERM:
1900
logger.error("No permission to"
1901
" bind to interface %s",
1903
elif error[0] == errno.ENOPROTOOPT:
1904
logger.error("SO_BINDTODEVICE not available;"
1905
" cannot bind to interface %s",
2500
1909
# Only bind(2) the socket if we really need to.
2501
1910
if self.server_address[0] or self.server_address[1]:
2502
1911
if not self.server_address[0]:
2503
1912
if self.address_family == socket.AF_INET6:
2504
any_address = "::" # in6addr_any
1913
any_address = "::" # in6addr_any
2506
any_address = "0.0.0.0" # INADDR_ANY
1915
any_address = socket.INADDR_ANY
2507
1916
self.server_address = (any_address,
2508
1917
self.server_address[1])
2509
1918
elif not self.server_address[1]:
2510
self.server_address = (self.server_address[0], 0)
1919
self.server_address = (self.server_address[0],
2511
1921
# if self.interface:
2512
1922
# self.server_address = (self.server_address[0],
2610
2026
funcname = request[1]
2611
2027
args = request[2]
2612
2028
kwargs = request[3]
2614
2030
parent_pipe.send(('data', getattr(client_object,
2615
2031
funcname)(*args,
2618
2034
if command == 'getattr':
2619
2035
attrname = request[1]
2620
if isinstance(client_object.__getattribute__(attrname),
2621
collections.Callable):
2622
parent_pipe.send(('function', ))
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2625
'data', client_object.__getattribute__(attrname)))
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2627
2042
if command == 'setattr':
2628
2043
attrname = request[1]
2629
2044
value = request[2]
2630
2045
setattr(client_object, attrname, value)
2635
def rfc3339_duration_to_delta(duration):
2636
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2638
>>> rfc3339_duration_to_delta("P7D")
2639
datetime.timedelta(7)
2640
>>> rfc3339_duration_to_delta("PT60S")
2641
datetime.timedelta(0, 60)
2642
>>> rfc3339_duration_to_delta("PT60M")
2643
datetime.timedelta(0, 3600)
2644
>>> rfc3339_duration_to_delta("PT24H")
2645
datetime.timedelta(1)
2646
>>> rfc3339_duration_to_delta("P1W")
2647
datetime.timedelta(7)
2648
>>> rfc3339_duration_to_delta("PT5M30S")
2649
datetime.timedelta(0, 330)
2650
>>> rfc3339_duration_to_delta("P1DT3M20S")
2651
datetime.timedelta(1, 200)
2654
# Parsing an RFC 3339 duration with regular expressions is not
2655
# possible - there would have to be multiple places for the same
2656
# values, like seconds. The current code, while more esoteric, is
2657
# cleaner without depending on a parsing library. If Python had a
2658
# built-in library for parsing we would use it, but we'd like to
2659
# avoid excessive use of external libraries.
2661
# New type for defining tokens, syntax, and semantics all-in-one
2662
Token = collections.namedtuple("Token", (
2663
"regexp", # To match token; if "value" is not None, must have
2664
# a "group" containing digits
2665
"value", # datetime.timedelta or None
2666
"followers")) # Tokens valid after this token
2667
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2668
# the "duration" ABNF definition in RFC 3339, Appendix A.
2669
token_end = Token(re.compile(r"$"), None, frozenset())
2670
token_second = Token(re.compile(r"(\d+)S"),
2671
datetime.timedelta(seconds=1),
2672
frozenset((token_end, )))
2673
token_minute = Token(re.compile(r"(\d+)M"),
2674
datetime.timedelta(minutes=1),
2675
frozenset((token_second, token_end)))
2676
token_hour = Token(re.compile(r"(\d+)H"),
2677
datetime.timedelta(hours=1),
2678
frozenset((token_minute, token_end)))
2679
token_time = Token(re.compile(r"T"),
2681
frozenset((token_hour, token_minute,
2683
token_day = Token(re.compile(r"(\d+)D"),
2684
datetime.timedelta(days=1),
2685
frozenset((token_time, token_end)))
2686
token_month = Token(re.compile(r"(\d+)M"),
2687
datetime.timedelta(weeks=4),
2688
frozenset((token_day, token_end)))
2689
token_year = Token(re.compile(r"(\d+)Y"),
2690
datetime.timedelta(weeks=52),
2691
frozenset((token_month, token_end)))
2692
token_week = Token(re.compile(r"(\d+)W"),
2693
datetime.timedelta(weeks=1),
2694
frozenset((token_end, )))
2695
token_duration = Token(re.compile(r"P"), None,
2696
frozenset((token_year, token_month,
2697
token_day, token_time,
2699
# Define starting values:
2701
value = datetime.timedelta()
2703
# Following valid tokens
2704
followers = frozenset((token_duration, ))
2705
# String left to parse
2707
# Loop until end token is found
2708
while found_token is not token_end:
2709
# Search for any currently valid tokens
2710
for token in followers:
2711
match = token.regexp.match(s)
2712
if match is not None:
2714
if token.value is not None:
2715
# Value found, parse digits
2716
factor = int(match.group(1), 10)
2717
# Add to value so far
2718
value += factor * token.value
2719
# Strip token from string
2720
s = token.regexp.sub("", s, 1)
2723
# Set valid next tokens
2724
followers = found_token.followers
2727
# No currently valid tokens were found
2728
raise ValueError("Invalid RFC 3339 duration: {!r}"
2734
2050
def string_to_delta(interval):
2735
2051
"""Parse a string and return a datetime.timedelta
2737
2053
>>> string_to_delta('7d')
2738
2054
datetime.timedelta(7)
2739
2055
>>> string_to_delta('60s')
2834
2144
parser.add_argument("--no-dbus", action="store_false",
2835
2145
dest="use_dbus", help="Do not provide D-Bus"
2836
" system bus interface", default=None)
2146
" system bus interface")
2837
2147
parser.add_argument("--no-ipv6", action="store_false",
2838
dest="use_ipv6", help="Do not use IPv6",
2148
dest="use_ipv6", help="Do not use IPv6")
2840
2149
parser.add_argument("--no-restore", action="store_false",
2841
2150
dest="restore", help="Do not restore stored"
2842
" state", default=None)
2843
parser.add_argument("--socket", type=int,
2844
help="Specify a file descriptor to a network"
2845
" socket to use instead of creating one")
2846
2152
parser.add_argument("--statedir", metavar="DIR",
2847
2153
help="Directory to save/restore state in")
2848
parser.add_argument("--foreground", action="store_true",
2849
help="Run in foreground", default=None)
2850
parser.add_argument("--no-zeroconf", action="store_false",
2851
dest="zeroconf", help="Do not use Zeroconf",
2854
2155
options = parser.parse_args()
2856
2157
if options.check:
2858
fail_count, test_count = doctest.testmod()
2859
sys.exit(os.EX_OK if fail_count == 0 else 1)
2861
2162
# Default values for config file for server-global settings
2862
server_defaults = {"interface": "",
2867
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2868
":+SIGN-DSA-SHA256",
2869
"servicename": "Mandos",
2875
"statedir": "/var/lib/mandos",
2876
"foreground": "False",
2163
server_defaults = { "interface": "",
2168
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2169
"servicename": "Mandos",
2174
"statedir": "/var/lib/mandos"
2880
2177
# Parse config file for server-global settings
2881
2178
server_config = configparser.SafeConfigParser(server_defaults)
2882
2179
del server_defaults
2883
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2180
server_config.read(os.path.join(options.configdir,
2884
2182
# Convert the SafeConfigParser object to a dict
2885
2183
server_settings = server_config.defaults()
2886
2184
# Use the appropriate methods on the non-string config options
2887
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2888
"foreground", "zeroconf"):
2185
for option in ("debug", "use_dbus", "use_ipv6"):
2889
2186
server_settings[option] = server_config.getboolean("DEFAULT",
2891
2188
if server_settings["port"]:
2892
2189
server_settings["port"] = server_config.getint("DEFAULT",
2894
if server_settings["socket"]:
2895
server_settings["socket"] = server_config.getint("DEFAULT",
2897
# Later, stdin will, and stdout and stderr might, be dup'ed
2898
# over with an opened os.devnull. But we don't want this to
2899
# happen with a supplied network socket.
2900
if 0 <= server_settings["socket"] <= 2:
2901
server_settings["socket"] = os.dup(server_settings
2903
2191
del server_config
2905
2193
# Override the settings from the config file with command line
2906
2194
# options, if set.
2907
2195
for option in ("interface", "address", "port", "debug",
2908
"priority", "servicename", "configdir", "use_dbus",
2909
"use_ipv6", "debuglevel", "restore", "statedir",
2910
"socket", "foreground", "zeroconf"):
2196
"priority", "servicename", "configdir",
2197
"use_dbus", "use_ipv6", "debuglevel", "restore",
2911
2199
value = getattr(options, option)
2912
2200
if value is not None:
2913
2201
server_settings[option] = value
2915
2203
# Force all strings to be unicode
2916
2204
for option in server_settings.keys():
2917
if isinstance(server_settings[option], bytes):
2918
server_settings[option] = (server_settings[option]
2920
# Force all boolean options to be boolean
2921
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2922
"foreground", "zeroconf"):
2923
server_settings[option] = bool(server_settings[option])
2924
# Debug implies foreground
2925
if server_settings["debug"]:
2926
server_settings["foreground"] = True
2205
if type(server_settings[option]) is str:
2206
server_settings[option] = unicode(server_settings[option])
2927
2207
# Now we have our good server settings in "server_settings"
2929
2209
##################################################################
2931
if (not server_settings["zeroconf"]
2932
and not (server_settings["port"]
2933
or server_settings["socket"] != "")):
2934
parser.error("Needs port or socket to work without Zeroconf")
2936
2211
# For convenience
2937
2212
debug = server_settings["debug"]
2938
2213
debuglevel = server_settings["debuglevel"]
2952
2225
level = getattr(logging, debuglevel.upper())
2953
2226
initlogger(debug, level)
2955
2228
if server_settings["servicename"] != "Mandos":
2956
syslogger.setFormatter(
2957
logging.Formatter('Mandos ({}) [%(process)d]:'
2958
' %(levelname)s: %(message)s'.format(
2959
server_settings["servicename"])))
2229
syslogger.setFormatter(logging.Formatter
2230
('Mandos (%s) [%%(process)d]:'
2231
' %%(levelname)s: %%(message)s'
2232
% server_settings["servicename"]))
2961
2234
# Parse config file with clients
2962
2235
client_config = configparser.SafeConfigParser(Client
2963
2236
.client_defaults)
2964
2237
client_config.read(os.path.join(server_settings["configdir"],
2965
2238
"clients.conf"))
2967
2240
global mandos_dbus_service
2968
2241
mandos_dbus_service = None
2971
if server_settings["socket"] != "":
2972
socketfd = server_settings["socket"]
2973
tcp_server = MandosServer(
2974
(server_settings["address"], server_settings["port"]),
2976
interface=(server_settings["interface"] or None),
2978
gnutls_priority=server_settings["priority"],
2982
pidfilename = "/run/mandos.pid"
2983
if not os.path.isdir("/run/."):
2984
pidfilename = "/var/run/mandos.pid"
2987
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2988
except IOError as e:
2989
logger.error("Could not open file %r", pidfilename,
2992
for name, group in (("_mandos", "_mandos"),
2993
("mandos", "mandos"),
2994
("nobody", "nogroup")):
2996
uid = pwd.getpwnam(name).pw_uid
2997
gid = pwd.getpwnam(group).pw_gid
2243
tcp_server = MandosServer((server_settings["address"],
2244
server_settings["port"]),
2246
interface=(server_settings["interface"]
2250
server_settings["priority"],
2253
pidfilename = "/var/run/mandos.pid"
2255
pidfile = open(pidfilename, "w")
2257
logger.error("Could not open file %r", pidfilename)
2260
uid = pwd.getpwnam("_mandos").pw_uid
2261
gid = pwd.getpwnam("_mandos").pw_gid
2264
uid = pwd.getpwnam("mandos").pw_uid
2265
gid = pwd.getpwnam("mandos").pw_gid
2999
2266
except KeyError:
2268
uid = pwd.getpwnam("nobody").pw_uid
2269
gid = pwd.getpwnam("nobody").pw_gid
3008
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3010
2276
except OSError as error:
3011
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3012
.format(uid, gid, os.strerror(error.errno)))
3013
if error.errno != errno.EPERM:
2277
if error[0] != errno.EPERM:
3017
2281
# Enable all possible GnuTLS debugging
3019
2283
# "Use a log level over 10 to enable all debugging options."
3020
2284
# - GnuTLS manual
3021
gnutls.global_set_log_level(11)
2285
gnutls.library.functions.gnutls_global_set_log_level(11)
2287
@gnutls.library.types.gnutls_log_func
3024
2288
def debug_gnutls(level, string):
3025
2289
logger.debug("GnuTLS: %s", string[:-1])
3027
gnutls.global_set_log_function(debug_gnutls)
2291
(gnutls.library.functions
2292
.gnutls_global_set_log_function(debug_gnutls))
3029
2294
# Redirect stdin so all checkers get /dev/null
3030
2295
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3031
2296
os.dup2(null, sys.stdin.fileno())
3035
2300
# Need to fork before connecting to D-Bus
3037
2302
# Close all input and output, do double fork, etc.
3040
# multiprocessing will use threads, so before we use GLib we need
3041
# to inform GLib that threads will be used.
2305
gobject.threads_init()
3044
2307
global main_loop
3045
2308
# From the Avahi example code
3046
2309
DBusGMainLoop(set_as_default=True)
3047
main_loop = GLib.MainLoop()
2310
main_loop = gobject.MainLoop()
3048
2311
bus = dbus.SystemBus()
3049
2312
# End of Avahi example code
3052
2315
bus_name = dbus.service.BusName("se.recompile.Mandos",
3055
old_bus_name = dbus.service.BusName(
3056
"se.bsnet.fukt.Mandos", bus,
3058
except dbus.exceptions.DBusException as e:
3059
logger.error("Disabling D-Bus:", exc_info=e)
2316
bus, do_not_queue=True)
2317
old_bus_name = (dbus.service.BusName
2318
("se.bsnet.fukt.Mandos", bus,
2320
except dbus.exceptions.NameExistsException as e:
2321
logger.error(unicode(e) + ", disabling D-Bus")
3060
2322
use_dbus = False
3061
2323
server_settings["use_dbus"] = False
3062
2324
tcp_server.use_dbus = False
3064
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3065
service = AvahiServiceToSyslog(
3066
name=server_settings["servicename"],
3067
servicetype="_mandos._tcp",
3070
if server_settings["interface"]:
3071
service.interface = if_nametoindex(
3072
server_settings["interface"].encode("utf-8"))
2325
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2326
service = AvahiServiceToSyslog(name =
2327
server_settings["servicename"],
2328
servicetype = "_mandos._tcp",
2329
protocol = protocol, bus = bus)
2330
if server_settings["interface"]:
2331
service.interface = (if_nametoindex
2332
(str(server_settings["interface"])))
3074
2334
global multiprocessing_manager
3075
2335
multiprocessing_manager = multiprocessing.Manager()
3077
2337
client_class = Client
3079
client_class = functools.partial(ClientDBus, bus=bus)
2339
client_class = functools.partial(ClientDBusTransitional,
3081
2342
client_settings = Client.config_parser(client_config)
3082
2343
old_client_settings = {}
3083
2344
clients_data = {}
3085
# This is used to redirect stdout and stderr for checker processes
3087
wnull = open(os.devnull, "w") # A writable /dev/null
3088
# Only used if server is running in foreground but not in debug
3090
if debug or not foreground:
3093
2346
# Get client data and settings from last running state.
3094
2347
if server_settings["restore"]:
3096
2349
with open(stored_state_path, "rb") as stored_state:
3097
if sys.version_info.major == 2:
3098
clients_data, old_client_settings = pickle.load(
3101
bytes_clients_data, bytes_old_client_settings = (
3102
pickle.load(stored_state, encoding="bytes"))
3103
# Fix bytes to strings
3106
clients_data = {(key.decode("utf-8")
3107
if isinstance(key, bytes)
3110
bytes_clients_data.items()}
3111
del bytes_clients_data
3112
for key in clients_data:
3113
value = {(k.decode("utf-8")
3114
if isinstance(k, bytes) else k): v
3116
clients_data[key].items()}
3117
clients_data[key] = value
3119
value["client_structure"] = [
3121
if isinstance(s, bytes)
3123
value["client_structure"]]
3125
for k in ("name", "host"):
3126
if isinstance(value[k], bytes):
3127
value[k] = value[k].decode("utf-8")
3128
# old_client_settings
3130
old_client_settings = {
3131
(key.decode("utf-8")
3132
if isinstance(key, bytes)
3135
bytes_old_client_settings.items()}
3136
del bytes_old_client_settings
3138
for value in old_client_settings.values():
3139
if isinstance(value["host"], bytes):
3140
value["host"] = (value["host"]
2350
clients_data, old_client_settings = (pickle.load
3142
2352
os.remove(stored_state_path)
3143
2353
except IOError as e:
3144
if e.errno == errno.ENOENT:
3145
logger.warning("Could not load persistent state:"
3146
" {}".format(os.strerror(e.errno)))
3148
logger.critical("Could not load persistent state:",
2354
logger.warning("Could not load persistent state: {0}"
2356
if e.errno != errno.ENOENT:
3151
2358
except EOFError as e:
3152
2359
logger.warning("Could not load persistent state: "
2360
"EOFError: {0}".format(e))
3156
2362
with PGPEngine() as pgp:
3157
for client_name, client in clients_data.items():
3158
# Skip removed clients
3159
if client_name not in client_settings:
2363
for client_name, client in clients_data.iteritems():
3162
2364
# Decide which value to use after restoring saved state.
3163
2365
# We have three different values: Old config file,
3164
2366
# new config file, and saved state.
3224
2427
clients_data[client_name] = client_settings[client_name]
3226
2429
# Create all client objects
3227
for client_name, client in clients_data.items():
2430
for client_name, client in clients_data.iteritems():
3228
2431
tcp_server.clients[client_name] = client_class(
3231
server_settings=server_settings)
2432
name = client_name, settings = client)
3233
2434
if not tcp_server.clients:
3234
2435
logger.warning("No clients defined")
3237
if pidfile is not None:
3241
print(pid, file=pidfile)
3243
logger.error("Could not write to file %r with PID %d",
2441
pidfile.write(str(pid) + "\n".encode("utf-8"))
2444
logger.error("Could not write to file %r with PID %d",
2447
# "pidfile" was never created
3246
2449
del pidfilename
3248
for termsig in (signal.SIGHUP, signal.SIGTERM):
3249
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3250
lambda: main_loop.quit() and False)
2450
signal.signal(signal.SIGINT, signal.SIG_IGN)
2452
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2453
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3254
@alternate_dbus_interfaces(
3255
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3256
class MandosDBusService(DBusObjectWithObjectManager):
2456
class MandosDBusService(DBusObjectWithProperties):
3257
2457
"""A D-Bus proxy object"""
3259
2458
def __init__(self):
3260
2459
dbus.service.Object.__init__(self, bus, "/")
3262
2460
_interface = "se.recompile.Mandos"
2462
@dbus_interface_annotations(_interface)
2464
return { "org.freedesktop.DBus.Property"
2465
".EmitsChangedSignal":
3264
2468
@dbus.service.signal(_interface, signature="o")
3265
2469
def ClientAdded(self, objpath):
3269
2473
@dbus.service.signal(_interface, signature="ss")
3270
2474
def ClientNotFound(self, fingerprint, address):
3274
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3276
2478
@dbus.service.signal(_interface, signature="os")
3277
2479
def ClientRemoved(self, objpath, name):
3281
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3283
2483
@dbus.service.method(_interface, out_signature="ao")
3284
2484
def GetAllClients(self):
3286
return dbus.Array(c.dbus_object_path for c in
3287
tcp_server.clients.values())
3289
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2486
return dbus.Array(c.dbus_object_path
2488
tcp_server.clients.itervalues())
3291
2490
@dbus.service.method(_interface,
3292
2491
out_signature="a{oa{sv}}")
3293
2492
def GetAllClientsWithProperties(self):
3295
2494
return dbus.Dictionary(
3296
{c.dbus_object_path: c.GetAll(
3297
"se.recompile.Mandos.Client")
3298
for c in tcp_server.clients.values()},
2495
((c.dbus_object_path, c.GetAll(""))
2496
for c in tcp_server.clients.itervalues()),
3299
2497
signature="oa{sv}")
3301
2499
@dbus.service.method(_interface, in_signature="o")
3302
2500
def RemoveClient(self, object_path):
3304
for c in tcp_server.clients.values():
2502
for c in tcp_server.clients.itervalues():
3305
2503
if c.dbus_object_path == object_path:
3306
2504
del tcp_server.clients[c.name]
3307
2505
c.remove_from_connection()
3308
# Don't signal the disabling
2506
# Don't signal anything except ClientRemoved
3309
2507
c.disable(quiet=True)
3310
# Emit D-Bus signal for removal
3311
self.client_removed_signal(c)
2509
self.ClientRemoved(object_path, c.name)
3313
2511
raise KeyError(object_path)
3317
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3318
out_signature="a{oa{sa{sv}}}")
3319
def GetManagedObjects(self):
3321
return dbus.Dictionary(
3322
{client.dbus_object_path:
3324
{interface: client.GetAll(interface)
3326
client._get_all_interface_names()})
3327
for client in tcp_server.clients.values()})
3329
def client_added_signal(self, client):
3330
"""Send the new standard signal and the old signal"""
3332
# New standard signal
3333
self.InterfacesAdded(
3334
client.dbus_object_path,
3336
{interface: client.GetAll(interface)
3338
client._get_all_interface_names()}))
3340
self.ClientAdded(client.dbus_object_path)
3342
def client_removed_signal(self, client):
3343
"""Send the new standard signal and the old signal"""
3345
# New standard signal
3346
self.InterfacesRemoved(
3347
client.dbus_object_path,
3348
client._get_all_interface_names())
3350
self.ClientRemoved(client.dbus_object_path,
3353
mandos_dbus_service = MandosDBusService()
3355
# Save modules to variables to exempt the modules from being
3356
# unloaded before the function registered with atexit() is run.
3357
mp = multiprocessing
2515
class MandosDBusServiceTransitional(MandosDBusService):
2516
__metaclass__ = AlternateDBusNamesMetaclass
2517
mandos_dbus_service = MandosDBusServiceTransitional()
3361
2520
"Cleanup function; run on exit"
3365
mp.active_children()
2523
multiprocessing.active_children()
3367
2524
if not (tcp_server.clients or client_settings):
3370
2527
# Store client before exiting. Secrets are encrypted with key
3371
2528
# based on what config file has. If config file is
3372
2529
# removed/edited, old secret will thus be unrecovable.
3374
2531
with PGPEngine() as pgp:
3375
for client in tcp_server.clients.values():
2532
for client in tcp_server.clients.itervalues():
3376
2533
key = client_settings[client.name]["secret"]
3377
2534
client.encrypted_secret = pgp.encrypt(client.secret,
3379
2536
client_dict = {}
3381
2538
# A list of attributes that can not be pickled
3383
exclude = {"bus", "changedstate", "secret",
3384
"checker", "server_settings"}
3385
for name, typ in inspect.getmembers(dbus.service
2540
exclude = set(("bus", "changedstate", "secret",
2542
for name, typ in (inspect.getmembers
2543
(dbus.service.Object)):
3387
2544
exclude.add(name)
3389
2546
client_dict["encrypted_secret"] = (client
3390
2547
.encrypted_secret)
3391
2548
for attr in client.client_structure:
3392
2549
if attr not in exclude:
3393
2550
client_dict[attr] = getattr(client, attr)
3395
2552
clients[client.name] = client_dict
3396
2553
del client_settings[client.name]["secret"]
3399
with tempfile.NamedTemporaryFile(
3403
dir=os.path.dirname(stored_state_path),
3404
delete=False) as stored_state:
3405
pickle.dump((clients, client_settings), stored_state,
3407
tempname = stored_state.name
2556
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2559
(stored_state_path))
2560
with os.fdopen(tempfd, "wb") as stored_state:
2561
pickle.dump((clients, client_settings), stored_state)
3408
2562
os.rename(tempname, stored_state_path)
3409
2563
except (IOError, OSError) as e:
2564
logger.warning("Could not save persistent state: {0}"
3412
2568
os.remove(tempname)
3413
2569
except NameError:
3415
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3416
logger.warning("Could not save persistent state: {}"
3417
.format(os.strerror(e.errno)))
3419
logger.warning("Could not save persistent state:",
2571
if e.errno not in set((errno.ENOENT, errno.EACCES,
3423
2575
# Delete all clients, and settings from config
3424
2576
while tcp_server.clients:
3425
2577
name, client = tcp_server.clients.popitem()
3427
2579
client.remove_from_connection()
3428
# Don't signal the disabling
2580
# Don't signal anything except ClientRemoved
3429
2581
client.disable(quiet=True)
3430
# Emit D-Bus signal for removal
3432
mandos_dbus_service.client_removed_signal(client)
2584
mandos_dbus_service.ClientRemoved(client
3433
2587
client_settings.clear()
3435
2589
atexit.register(cleanup)
3437
for client in tcp_server.clients.values():
2591
for client in tcp_server.clients.itervalues():
3439
# Emit D-Bus signal for adding
3440
mandos_dbus_service.client_added_signal(client)
2594
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3441
2595
# Need to initiate checking of clients
3442
2596
if client.enabled:
3443
2597
client.init_checker()
3445
2599
tcp_server.enable()
3446
2600
tcp_server.server_activate()
3448
2602
# Find out what port we got
3450
service.port = tcp_server.socket.getsockname()[1]
2603
service.port = tcp_server.socket.getsockname()[1]
3452
2605
logger.info("Now listening on address %r, port %d,"
3453
" flowinfo %d, scope_id %d",
3454
*tcp_server.socket.getsockname())
2606
" flowinfo %d, scope_id %d"
2607
% tcp_server.socket.getsockname())
3456
logger.info("Now listening on address %r, port %d",
3457
*tcp_server.socket.getsockname())
3459
# service.interface = tcp_server.socket.getsockname()[3]
2609
logger.info("Now listening on address %r, port %d"
2610
% tcp_server.socket.getsockname())
2612
#service.interface = tcp_server.socket.getsockname()[3]
3463
# From the Avahi example code
3466
except dbus.exceptions.DBusException as error:
3467
logger.critical("D-Bus Exception", exc_info=error)
3470
# End of Avahi example code
3472
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3473
lambda *args, **kwargs:
3474
(tcp_server.handle_request
3475
(*args[2:], **kwargs) or True))
2615
# From the Avahi example code
2618
except dbus.exceptions.DBusException as error:
2619
logger.critical("DBusException: %s", error)
2622
# End of Avahi example code
2624
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2625
lambda *args, **kwargs:
2626
(tcp_server.handle_request
2627
(*args[2:], **kwargs) or True))
3477
2629
logger.debug("Starting main loop")
3478
2630
main_loop.run()
3479
2631
except AvahiError as error:
3480
logger.critical("Avahi Error", exc_info=error)
2632
logger.critical("AvahiError: %s", error)
3483
2635
except KeyboardInterrupt: