63
import cPickle as pickle
70
import cPickle as pickle
64
73
import multiprocessing
70
82
import dbus.service
83
from gi.repository import GLib
73
84
from dbus.mainloop.glib import DBusGMainLoop
76
87
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:
81
94
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
95
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
84
99
from IN import SO_BINDTODEVICE
85
100
except ImportError:
86
SO_BINDTODEVICE = None
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:
89
119
stored_state_file = "clients.pickle"
91
121
logger = logging.getLogger()
92
syslogger = (logging.handlers.SysLogHandler
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
100
127
except (OSError, AttributeError):
101
129
def if_nametoindex(interface):
102
130
"Get an interface index the hard way, i.e. using fcntl()"
103
131
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
104
132
with contextlib.closing(socket.socket()) as s:
105
133
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
110
136
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__,
113
155
def initlogger(debug, level=logging.WARNING):
114
156
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
116
162
syslogger.setFormatter(logging.Formatter
117
163
('Mandos [%(process)d]: %(levelname)s:'
119
165
logger.addHandler(syslogger)
122
168
console = logging.StreamHandler()
123
169
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
168
226
os.rmdir(self.tempdir)
169
227
self.tempdir = None
171
229
def password_encode(self, password):
172
230
# Passphrase can not be empty and can not contain newlines or
173
231
# NUL bytes. So we prefix it and hex encode it.
174
return b"mandos" + binascii.hexlify(password)
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"))
176
240
def encrypt(self, data, password):
177
self.gnupg.passphrase = self.password_encode(password)
178
with open(os.devnull) as devnull:
180
proc = self.gnupg.run(['--symmetric'],
181
create_fhs=['stdin', 'stdout'],
182
attach_fhs={'stderr': devnull})
183
with contextlib.closing(proc.handles['stdin']) as f:
185
with contextlib.closing(proc.handles['stdout']) as f:
186
ciphertext = f.read()
190
self.gnupg.passphrase = None
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:
191
256
return ciphertext
193
258
def decrypt(self, data, password):
194
self.gnupg.passphrase = self.password_encode(password)
195
with open(os.devnull) as devnull:
197
proc = self.gnupg.run(['--decrypt'],
198
create_fhs=['stdin', 'stdout'],
199
attach_fhs={'stderr': devnull})
200
with contextlib.closing(proc.handles['stdin'] ) as f:
202
with contextlib.closing(proc.handles['stdout']) as f:
203
decrypted_plaintext = f.read()
207
self.gnupg.passphrase = None
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:
208
274
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
212
304
class AvahiError(Exception):
213
305
def __init__(self, value, *args, **kwargs):
214
306
self.value = value
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
307
return super(AvahiError, self).__init__(value, *args,
219
311
class AvahiServiceError(AvahiError):
222
315
class AvahiGroupError(AvahiError):
226
319
class AvahiService(object):
227
320
"""An Avahi (Zeroconf) service.
230
323
interface: integer; avahi.IF_UNSPEC or an interface index.
231
324
Used to optionally bind to the specified interface.
232
325
name: string; Example: 'Mandos'
233
326
type: string; Example: '_mandos._tcp'.
234
See <http://www.dns-sd.org/ServiceTypes.html>
327
See <https://www.iana.org/assignments/service-names-port-numbers>
235
328
port: integer; what port to announce
236
329
TXT: list of strings; TXT record for the service
237
330
domain: string; Domain to publish on, default to .local if empty.
366
489
follow_name_owner_changes=True),
367
490
avahi.DBUS_INTERFACE_SERVER)
368
491
self.server.connect_to_signal("StateChanged",
369
self.server_state_changed)
492
self.server_state_changed)
370
493
self.server_state_changed(self.server.GetState())
372
496
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
374
498
"""Add the new name to the syslog messages"""
375
ret = AvahiService.rename(self)
376
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
500
syslogger.setFormatter(logging.Formatter(
501
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
382
def timedelta_to_milliseconds(td):
383
"Convert a datetime.timedelta() to milliseconds"
384
return ((td.days * 24 * 60 * 60 * 1000)
385
+ (td.seconds * 1000)
386
+ (td.microseconds // 1000))
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))
388
780
class Client(object):
389
781
"""A representation of a client host served by this server.
392
784
approved: bool(); 'None' if not yet approved/disapproved
393
785
approval_delay: datetime.timedelta(); Time to wait for approval
541
924
self.current_checker_command = None
542
925
self.approved = None
543
926
self.approvals_pending = 0
544
self.changedstate = (multiprocessing_manager
545
.Condition(multiprocessing_manager
547
self.client_structure = [attr for attr in
548
self.__dict__.iterkeys()
927
self.changedstate = multiprocessing_manager.Condition(
928
multiprocessing_manager.Lock())
929
self.client_structure = [attr
930
for attr in self.__dict__.keys()
549
931
if not attr.startswith("_")]
550
932
self.client_structure.append("client_structure")
552
for name, t in inspect.getmembers(type(self),
934
for name, t in inspect.getmembers(
935
type(self), lambda obj: isinstance(obj, property)):
556
936
if not name.startswith("_"):
557
937
self.client_structure.append(name)
559
939
# Send notice to process children that client state has changed
560
940
def send_changedstate(self):
561
941
with self.changedstate:
562
942
self.changedstate.notify_all()
564
944
def enable(self):
565
945
"""Start this client's checker and timeout hooks"""
566
946
if getattr(self, "enabled", False):
567
947
# Already enabled
569
self.send_changedstate()
570
949
self.expires = datetime.datetime.utcnow() + self.timeout
571
950
self.enabled = True
572
951
self.last_enabled = datetime.datetime.utcnow()
573
952
self.init_checker()
953
self.send_changedstate()
575
955
def disable(self, quiet=True):
576
956
"""Disable this client."""
577
957
if not getattr(self, "enabled", False):
580
self.send_changedstate()
582
960
logger.info("Disabling client %s", self.name)
583
if getattr(self, "disable_initiator_tag", False):
584
gobject.source_remove(self.disable_initiator_tag)
961
if getattr(self, "disable_initiator_tag", None) is not None:
962
GLib.source_remove(self.disable_initiator_tag)
585
963
self.disable_initiator_tag = None
586
964
self.expires = None
587
if getattr(self, "checker_initiator_tag", False):
588
gobject.source_remove(self.checker_initiator_tag)
965
if getattr(self, "checker_initiator_tag", None) is not None:
966
GLib.source_remove(self.checker_initiator_tag)
589
967
self.checker_initiator_tag = None
590
968
self.stop_checker()
591
969
self.enabled = False
592
# Do not run this again if called by a gobject.timeout_add
971
self.send_changedstate()
972
# Do not run this again if called by a GLib.timeout_add
595
975
def __del__(self):
598
978
def init_checker(self):
599
979
# Schedule a new checker to be started an 'interval' from now,
600
980
# and every interval from then on.
601
self.checker_initiator_tag = (gobject.timeout_add
602
(self.interval_milliseconds(),
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),
604
986
# Schedule a disable() when 'timeout' has passed
605
self.disable_initiator_tag = (gobject.timeout_add
606
(self.timeout_milliseconds(),
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)
608
991
# Also start a new checker *right now*.
609
992
self.start_checker()
611
def checker_callback(self, pid, condition, command):
994
def checker_callback(self, source, condition, connection,
612
996
"""The checker has completed, so take appropriate actions."""
613
997
self.checker_callback_tag = None
614
998
self.checker = None
615
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
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
617
1006
if self.last_checker_status == 0:
618
1007
logger.info("Checker for %(name)s succeeded",
620
1009
self.checked_ok()
622
logger.info("Checker for %(name)s failed",
1011
logger.info("Checker for %(name)s failed", vars(self))
625
1013
self.last_checker_status = -1
1014
self.last_checker_signal = -returncode
626
1015
logger.warning("Checker for %(name)s crashed?",
629
1019
def checked_ok(self):
630
1020
"""Assert that the client has been seen, alive and well."""
631
1021
self.last_checked_ok = datetime.datetime.utcnow()
632
1022
self.last_checker_status = 0
1023
self.last_checker_signal = None
633
1024
self.bump_timeout()
635
1026
def bump_timeout(self, timeout=None):
636
1027
"""Bump up the timeout for this client."""
637
1028
if timeout is None:
638
1029
timeout = self.timeout
639
1030
if self.disable_initiator_tag is not None:
640
gobject.source_remove(self.disable_initiator_tag)
1031
GLib.source_remove(self.disable_initiator_tag)
1032
self.disable_initiator_tag = None
641
1033
if getattr(self, "enabled", False):
642
self.disable_initiator_tag = (gobject.timeout_add
643
(timedelta_to_milliseconds
644
(timeout), self.disable))
1034
self.disable_initiator_tag = GLib.timeout_add(
1035
int(timeout.total_seconds() * 1000), self.disable)
645
1036
self.expires = datetime.datetime.utcnow() + timeout
647
1038
def need_approval(self):
648
1039
self.last_approval_request = datetime.datetime.utcnow()
650
1041
def start_checker(self):
651
1042
"""Start a new checker subprocess if one is not running.
653
1044
If a checker already exists, leave it running and do
655
1046
# The reason for not killing a running checker is that if we
656
# did that, then if a checker (for some reason) started
657
# running slowly and taking more than 'interval' time, the
658
# client would inevitably timeout, since no checker would get
659
# a chance to run to completion. If we instead leave running
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
660
1051
# checkers alone, the checker would have to take more time
661
1052
# than 'timeout' for the client to be disabled, which is as it
664
# If a checker exists, make sure it is not a zombie
666
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
667
except (AttributeError, OSError) as error:
668
if (isinstance(error, OSError)
669
and error.errno != errno.ECHILD):
673
logger.warning("Checker was a zombie")
674
gobject.source_remove(self.checker_callback_tag)
675
self.checker_callback(pid, status,
676
self.current_checker_command)
1055
if self.checker is not None and not self.checker.is_alive():
1056
logger.warning("Checker was not alive; joining")
677
1059
# Start a new checker if needed
678
1060
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}
680
# In case checker_command has exactly one % operator
681
command = self.checker_command % self.host
683
# Escape attributes for the shell
684
escaped_attrs = dict(
686
re.escape(unicode(str(getattr(self, attr, "")),
690
self.runtime_expansions)
693
command = self.checker_command % escaped_attrs
694
except TypeError as error:
695
logger.error('Could not format string "%s":'
696
' %s', self.checker_command, error)
697
return True # Try again later
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
698
1072
self.current_checker_command = command
700
logger.info("Starting checker %r for %s",
702
# We don't need to redirect stdout and stderr, since
703
# in normal mode, that is already done by daemon(),
704
# and in debug mode we don't want to. (Stdin is
705
# always replaced by /dev/null.)
706
self.checker = subprocess.Popen(command,
709
self.checker_callback_tag = (gobject.child_watch_add
711
self.checker_callback,
713
# The checker may have completed before the gobject
714
# watch was added. Check for this.
715
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
717
gobject.source_remove(self.checker_callback_tag)
718
self.checker_callback(pid, status, command)
719
except OSError as error:
720
logger.error("Failed to start subprocess: %s",
722
# Re-run this periodically if run by gobject.timeout_add
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
725
1101
def stop_checker(self):
726
1102
"""Force the checker process, if any, to stop."""
727
1103
if self.checker_callback_tag:
728
gobject.source_remove(self.checker_callback_tag)
1104
GLib.source_remove(self.checker_callback_tag)
729
1105
self.checker_callback_tag = None
730
1106
if getattr(self, "checker", None) is None:
732
1108
logger.debug("Stopping checker for %(name)s", vars(self))
734
os.kill(self.checker.pid, signal.SIGTERM)
736
#if self.checker.poll() is None:
737
# os.kill(self.checker.pid, signal.SIGKILL)
738
except OSError as error:
739
if error.errno != errno.ESRCH: # No such process
1109
self.checker.terminate()
741
1110
self.checker = None
744
def dbus_service_property(dbus_interface, signature="v",
745
access="readwrite", byte_arrays=False):
1113
def dbus_service_property(dbus_interface,
746
1117
"""Decorators for marking methods of a DBusObjectWithProperties to
747
1118
become properties on the D-Bus.
749
1120
The decorated method will be called with no arguments by "Get"
750
1121
and with one argument by "Set".
752
1123
The parameters, where they are supported, are the same as
753
1124
dbus.service.method, except there is only "signature", since the
754
1125
type from Get() and the type sent to Set() is the same.
793
class DBusObjectWithProperties(dbus.service.Object):
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.
1216
def _is_dbus_thing(thing):
1217
"""Returns a function testing if an attribute is a D-Bus thing
1219
If called like _is_dbus_thing("method") it returns a function
1220
suitable for use as predicate to inspect.getmembers().
1222
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1225
def _get_all_dbus_things(self, thing):
1226
"""Returns a generator of (name, attribute) pairs
1228
return ((getattr(athing.__get__(self), "_dbus_name", name),
1229
athing.__get__(self))
1230
for cls in self.__class__.__mro__
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):
794
1298
"""A D-Bus object with properties.
796
1300
Classes inheriting from this can use the dbus_service_property
797
1301
decorator to expose methods as D-Bus properties. It exposes the
798
1302
standard Get(), Set(), and GetAll() methods on the D-Bus.
802
def _is_dbus_property(obj):
803
return getattr(obj, "_dbus_is_property", False)
805
def _get_all_dbus_properties(self):
806
"""Returns a generator of (name, attribute) pairs
808
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
809
for cls in self.__class__.__mro__
811
inspect.getmembers(cls, self._is_dbus_property))
813
1305
def _get_dbus_property(self, interface_name, property_name):
814
1306
"""Returns a bound method if one exists which is a D-Bus
815
1307
property with the specified name and interface.
817
for cls in self.__class__.__mro__:
818
for name, value in (inspect.getmembers
819
(cls, self._is_dbus_property)):
1309
for cls in self.__class__.__mro__:
1310
for name, value in inspect.getmembers(
1311
cls, self._is_dbus_thing("property")):
820
1312
if (value._dbus_name == property_name
821
1313
and value._dbus_interface == interface_name):
822
1314
return value.__get__(self)
824
1316
# No such property
825
raise DBusPropertyNotFound(self.dbus_object_path + ":"
826
+ interface_name + "."
829
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
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,
830
1331
out_signature="v")
831
1332
def Get(self, interface_name, property_name):
832
1333
"""Standard D-Bus property Get() method, see D-Bus standard.
876
1380
if not hasattr(value, "variant_level"):
877
1381
properties[name] = value
879
properties[name] = type(value)(value, variant_level=
880
value.variant_level+1)
1383
properties[name] = type(value)(
1384
value, variant_level=value.variant_level + 1)
881
1385
return dbus.Dictionary(properties, signature="sv")
1387
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1388
def PropertiesChanged(self, interface_name, changed_properties,
1389
invalidated_properties):
1390
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
883
1395
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
884
1396
out_signature="s",
885
1397
path_keyword='object_path',
886
1398
connection_keyword='connection')
887
1399
def Introspect(self, object_path, connection):
888
"""Standard D-Bus method, overloaded to insert property tags.
1400
"""Overloading of standard D-Bus method.
1402
Inserts property tags and interface annotation tags.
890
xmlstring = dbus.service.Object.Introspect(self, object_path,
1404
xmlstring = DBusObjectWithAnnotations.Introspect(self,
893
1408
document = xml.dom.minidom.parseString(xmlstring)
894
1410
def make_tag(document, name, prop):
895
1411
e = document.createElement("property")
896
1412
e.setAttribute("name", name)
897
1413
e.setAttribute("type", prop._dbus_signature)
898
1414
e.setAttribute("access", prop._dbus_access)
900
1417
for if_tag in document.getElementsByTagName("interface"):
901
1419
for tag in (make_tag(document, name, prop)
903
in self._get_all_dbus_properties()
1421
in self._get_all_dbus_things("property")
904
1422
if prop._dbus_interface
905
1423
== if_tag.getAttribute("name")):
906
1424
if_tag.appendChild(tag)
1425
# Add annotation tags for properties
1426
for tag in if_tag.getElementsByTagName("property"):
1428
for name, prop in self._get_all_dbus_things(
1430
if (name == tag.getAttribute("name")
1431
and prop._dbus_interface
1432
== if_tag.getAttribute("name")):
1433
annots.update(getattr(
1434
prop, "_dbus_annotations", {}))
1435
for name, value in annots.items():
1436
ann_tag = document.createElement(
1438
ann_tag.setAttribute("name", name)
1439
ann_tag.setAttribute("value", value)
1440
tag.appendChild(ann_tag)
907
1441
# Add the names to the return values for the
908
1442
# "org.freedesktop.DBus.Properties" methods
909
1443
if (if_tag.getAttribute("name")
924
1458
except (AttributeError, xml.dom.DOMException,
925
1459
xml.parsers.expat.ExpatError) as error:
926
1460
logger.error("Failed to override Introspection method",
931
def datetime_to_dbus (dt, variant_level=0):
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):
932
1537
"""Convert a UTC datetime.datetime() to a D-Bus type."""
934
return dbus.String("", variant_level = variant_level)
935
return dbus.String(dt.isoformat(),
936
variant_level=variant_level)
939
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
941
"""Applied to an empty subclass of a D-Bus object, this metaclass
942
will add additional D-Bus attributes matching a certain pattern.
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).
944
def __new__(mcs, name, bases, attr):
945
# Go through all the base classes which could have D-Bus
946
# methods, signals, or properties in them
947
for base in (b for b in bases
948
if issubclass(b, dbus.service.Object)):
949
# Go though all attributes of the base class
950
for attrname, attribute in inspect.getmembers(base):
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):
951
1574
# Ignore non-D-Bus attributes, and D-Bus attributes
952
1575
# with the wrong interface name
953
1576
if (not hasattr(attribute, "_dbus_interface")
954
or not attribute._dbus_interface
955
.startswith("se.recompile.Mandos")):
1577
or not attribute._dbus_interface.startswith(
1578
orig_interface_name)):
957
1580
# Create an alternate D-Bus interface name based on
958
1581
# the current name
959
alt_interface = (attribute._dbus_interface
960
.replace("se.recompile.Mandos",
961
"se.bsnet.fukt.Mandos"))
1582
alt_interface = attribute._dbus_interface.replace(
1583
orig_interface_name, alt_interface_name)
1584
interface_names.add(alt_interface)
962
1585
# Is this a D-Bus signal?
963
1586
if getattr(attribute, "_dbus_is_signal", False):
964
# Extract the original non-method function by
966
nonmethod_func = (dict(
1587
# Extract the original non-method undecorated
1588
# function by black magic
1589
if sys.version_info.major == 2:
1590
nonmethod_func = (dict(
967
1591
zip(attribute.func_code.co_freevars,
968
attribute.__closure__))["func"]
1592
attribute.__closure__))
1593
["func"].cell_contents)
1595
nonmethod_func = (dict(
1596
zip(attribute.__code__.co_freevars,
1597
attribute.__closure__))
1598
["func"].cell_contents)
970
1599
# Create a new, but exactly alike, function
971
1600
# object, and decorate it to be a new D-Bus signal
972
1601
# with the alternate D-Bus interface name
973
new_function = (dbus.service.signal
975
attribute._dbus_signature)
977
nonmethod_func.func_code,
978
nonmethod_func.func_globals,
979
nonmethod_func.func_name,
980
nonmethod_func.func_defaults,
981
nonmethod_func.func_closure)))
1602
new_function = copy_function(nonmethod_func)
1603
new_function = (dbus.service.signal(
1605
attribute._dbus_signature)(new_function))
1606
# Copy annotations, if any
1608
new_function._dbus_annotations = dict(
1609
attribute._dbus_annotations)
1610
except AttributeError:
982
1613
# Define a creator of a function to call both the
983
# old and new functions, so both the old and new
984
# signals gets sent when the function is called
1614
# original and alternate functions, so both the
1615
# original and alternate signals gets sent when
1616
# the function is called
985
1617
def fixscope(func1, func2):
986
1618
"""This function is a scope container to pass
987
1619
func1 and func2 to the "call_both" function
988
1620
outside of its arguments"""
1622
@functools.wraps(func2)
989
1623
def call_both(*args, **kwargs):
990
1624
"""This function will emit two D-Bus
991
1625
signals by calling func1 and func2"""
992
1626
func1(*args, **kwargs)
993
1627
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)
994
1634
return call_both
995
1635
# Create the "call_both" function and add it to
997
attr[attrname] = fixscope(attribute,
1637
attr[attrname] = fixscope(attribute, new_function)
999
1638
# Is this a D-Bus method?
1000
1639
elif getattr(attribute, "_dbus_is_method", False):
1001
1640
# Create a new, but exactly alike, function
1002
1641
# object. Decorate it to be a new D-Bus method
1003
1642
# with the alternate D-Bus interface name. Add it
1004
1643
# to the class.
1005
attr[attrname] = (dbus.service.method
1007
attribute._dbus_in_signature,
1008
attribute._dbus_out_signature)
1010
(attribute.func_code,
1011
attribute.func_globals,
1012
attribute.func_name,
1013
attribute.func_defaults,
1014
attribute.func_closure)))
1645
dbus.service.method(
1647
attribute._dbus_in_signature,
1648
attribute._dbus_out_signature)
1649
(copy_function(attribute)))
1650
# Copy annotations, if any
1652
attr[attrname]._dbus_annotations = dict(
1653
attribute._dbus_annotations)
1654
except AttributeError:
1015
1656
# Is this a D-Bus property?
1016
1657
elif getattr(attribute, "_dbus_is_property", False):
1017
1658
# Create a new, but exactly alike, function
1018
1659
# object, and decorate it to be a new D-Bus
1019
1660
# property with the alternate D-Bus interface
1020
1661
# name. Add it to the class.
1021
attr[attrname] = (dbus_service_property
1023
attribute._dbus_signature,
1024
attribute._dbus_access,
1026
._dbus_get_args_options
1029
(attribute.func_code,
1030
attribute.func_globals,
1031
attribute.func_name,
1032
attribute.func_defaults,
1033
attribute.func_closure)))
1034
return type.__new__(mcs, name, bases, attr)
1662
attr[attrname] = (dbus_service_property(
1663
alt_interface, attribute._dbus_signature,
1664
attribute._dbus_access,
1665
attribute._dbus_get_args_options
1667
(copy_function(attribute)))
1668
# Copy annotations, if any
1670
attr[attrname]._dbus_annotations = dict(
1671
attribute._dbus_annotations)
1672
except AttributeError:
1674
# Is this a D-Bus interface?
1675
elif getattr(attribute, "_dbus_is_interface", False):
1676
# Create a new, but exactly alike, function
1677
# object. Decorate it to be a new D-Bus interface
1678
# with the alternate D-Bus interface name. Add it
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"})
1037
1714
class ClientDBus(Client, DBusObjectWithProperties):
1038
1715
"""A Client class using D-Bus
1041
1718
dbus_object_path: dbus.ObjectPath
1042
1719
bus: dbus.SystemBus()
1045
1722
runtime_expansions = (Client.runtime_expansions
1046
+ ("dbus_object_path",))
1723
+ ("dbus_object_path", ))
1725
_interface = "se.recompile.Mandos.Client"
1048
1727
# dbus.service.Object doesn't use super(), so we can't either.
1050
def __init__(self, bus = None, *args, **kwargs):
1729
def __init__(self, bus=None, *args, **kwargs):
1052
1731
Client.__init__(self, *args, **kwargs)
1053
1732
# Only now, when this client is initialized, can it show up on
1055
client_object_name = unicode(self.name).translate(
1734
client_object_name = str(self.name).translate(
1056
1735
{ord("."): ord("_"),
1057
1736
ord("-"): ord("_")})
1058
self.dbus_object_path = (dbus.ObjectPath
1059
("/clients/" + client_object_name))
1737
self.dbus_object_path = dbus.ObjectPath(
1738
"/clients/" + client_object_name)
1060
1739
DBusObjectWithProperties.__init__(self, self.bus,
1061
1740
self.dbus_object_path)
1063
def notifychangeproperty(transform_func,
1064
dbus_name, type_func=lambda x: x,
1742
def notifychangeproperty(transform_func, dbus_name,
1743
type_func=lambda x: x,
1745
invalidate_only=False,
1746
_interface=_interface):
1066
1747
""" Modify a variable so that it's a property which announces
1067
1748
its changes to DBus.
1069
1750
transform_fun: Function that takes a value and a variant_level
1070
1751
and transforms it to a D-Bus type.
1071
1752
dbus_name: D-Bus name of the variable
1214
1904
server to mandos-client
1218
1908
# Rejected - signal
1219
1909
@dbus.service.signal(_interface, signature="s")
1220
1910
def Rejected(self, reason):
1224
1914
# NeedApproval - signal
1225
1915
@dbus.service.signal(_interface, signature="tb")
1226
1916
def NeedApproval(self, timeout, default):
1228
1918
return self.need_approval()
1232
1922
# Approve - method
1233
1923
@dbus.service.method(_interface, in_signature="b")
1234
1924
def Approve(self, value):
1235
1925
self.approve(value)
1237
1927
# CheckedOK - method
1238
1928
@dbus.service.method(_interface)
1239
1929
def CheckedOK(self):
1240
1930
self.checked_ok()
1242
1932
# Enable - method
1933
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1243
1934
@dbus.service.method(_interface)
1244
1935
def Enable(self):
1248
1939
# StartChecker - method
1940
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1249
1941
@dbus.service.method(_interface)
1250
1942
def StartChecker(self):
1252
1944
self.start_checker()
1254
1946
# Disable - method
1947
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1255
1948
@dbus.service.method(_interface)
1256
1949
def Disable(self):
1260
1953
# StopChecker - method
1954
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1261
1955
@dbus.service.method(_interface)
1262
1956
def StopChecker(self):
1263
1957
self.stop_checker()
1267
1961
# ApprovalPending - property
1268
1962
@dbus_service_property(_interface, signature="b", access="read")
1269
1963
def ApprovalPending_dbus_property(self):
1270
1964
return dbus.Boolean(bool(self.approvals_pending))
1272
1966
# ApprovedByDefault - property
1273
@dbus_service_property(_interface, signature="b",
1967
@dbus_service_property(_interface,
1274
1969
access="readwrite")
1275
1970
def ApprovedByDefault_dbus_property(self, value=None):
1276
1971
if value is None: # get
1277
1972
return dbus.Boolean(self.approved_by_default)
1278
1973
self.approved_by_default = bool(value)
1280
1975
# ApprovalDelay - property
1281
@dbus_service_property(_interface, signature="t",
1976
@dbus_service_property(_interface,
1282
1978
access="readwrite")
1283
1979
def ApprovalDelay_dbus_property(self, value=None):
1284
1980
if value is None: # get
1285
return dbus.UInt64(self.approval_delay_milliseconds())
1981
return dbus.UInt64(self.approval_delay.total_seconds()
1286
1983
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1288
1985
# ApprovalDuration - property
1289
@dbus_service_property(_interface, signature="t",
1986
@dbus_service_property(_interface,
1290
1988
access="readwrite")
1291
1989
def ApprovalDuration_dbus_property(self, value=None):
1292
1990
if value is None: # get
1293
return dbus.UInt64(timedelta_to_milliseconds(
1294
self.approval_duration))
1991
return dbus.UInt64(self.approval_duration.total_seconds()
1295
1993
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1297
1995
# Name - property
1997
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1298
1998
@dbus_service_property(_interface, signature="s", access="read")
1299
1999
def Name_dbus_property(self):
1300
2000
return dbus.String(self.name)
1302
2002
# Fingerprint - property
2004
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1303
2005
@dbus_service_property(_interface, signature="s", access="read")
1304
2006
def Fingerprint_dbus_property(self):
1305
2007
return dbus.String(self.fingerprint)
1307
2009
# Host - property
1308
@dbus_service_property(_interface, signature="s",
2010
@dbus_service_property(_interface,
1309
2012
access="readwrite")
1310
2013
def Host_dbus_property(self, value=None):
1311
2014
if value is None: # get
1312
2015
return dbus.String(self.host)
1313
self.host = unicode(value)
2016
self.host = str(value)
1315
2018
# Created - property
2020
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1316
2021
@dbus_service_property(_interface, signature="s", access="read")
1317
2022
def Created_dbus_property(self):
1318
2023
return datetime_to_dbus(self.created)
1320
2025
# LastEnabled - property
1321
2026
@dbus_service_property(_interface, signature="s", access="read")
1322
2027
def LastEnabled_dbus_property(self):
1323
2028
return datetime_to_dbus(self.last_enabled)
1325
2030
# Enabled - property
1326
@dbus_service_property(_interface, signature="b",
2031
@dbus_service_property(_interface,
1327
2033
access="readwrite")
1328
2034
def Enabled_dbus_property(self, value=None):
1329
2035
if value is None: # get
1336
2042
# LastCheckedOK - property
1337
@dbus_service_property(_interface, signature="s",
2043
@dbus_service_property(_interface,
1338
2045
access="readwrite")
1339
2046
def LastCheckedOK_dbus_property(self, value=None):
1340
2047
if value is not None:
1341
2048
self.checked_ok()
1343
2050
return datetime_to_dbus(self.last_checked_ok)
1345
2052
# LastCheckerStatus - property
1346
@dbus_service_property(_interface, signature="n",
2053
@dbus_service_property(_interface, signature="n", access="read")
1348
2054
def LastCheckerStatus_dbus_property(self):
1349
2055
return dbus.Int16(self.last_checker_status)
1351
2057
# Expires - property
1352
2058
@dbus_service_property(_interface, signature="s", access="read")
1353
2059
def Expires_dbus_property(self):
1354
2060
return datetime_to_dbus(self.expires)
1356
2062
# LastApprovalRequest - property
1357
2063
@dbus_service_property(_interface, signature="s", access="read")
1358
2064
def LastApprovalRequest_dbus_property(self):
1359
2065
return datetime_to_dbus(self.last_approval_request)
1361
2067
# Timeout - property
1362
@dbus_service_property(_interface, signature="t",
2068
@dbus_service_property(_interface,
1363
2070
access="readwrite")
1364
2071
def Timeout_dbus_property(self, value=None):
1365
2072
if value is None: # get
1366
return dbus.UInt64(self.timeout_milliseconds())
2073
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2074
old_timeout = self.timeout
1367
2075
self.timeout = datetime.timedelta(0, 0, 0, value)
1368
# Reschedule timeout
2076
# Reschedule disabling
1369
2077
if self.enabled:
1370
2078
now = datetime.datetime.utcnow()
1371
time_to_die = timedelta_to_milliseconds(
1372
(self.last_checked_ok + self.timeout) - now)
1373
if time_to_die <= 0:
2079
self.expires += self.timeout - old_timeout
2080
if self.expires <= now:
1374
2081
# The timeout has passed
1377
self.expires = (now +
1378
datetime.timedelta(milliseconds =
1380
2084
if (getattr(self, "disable_initiator_tag", None)
1383
gobject.source_remove(self.disable_initiator_tag)
1384
self.disable_initiator_tag = (gobject.timeout_add
2087
GLib.source_remove(self.disable_initiator_tag)
2088
self.disable_initiator_tag = GLib.timeout_add(
2089
int((self.expires - now).total_seconds() * 1000),
1388
2092
# ExtendedTimeout - property
1389
@dbus_service_property(_interface, signature="t",
2093
@dbus_service_property(_interface,
1390
2095
access="readwrite")
1391
2096
def ExtendedTimeout_dbus_property(self, value=None):
1392
2097
if value is None: # get
1393
return dbus.UInt64(self.extended_timeout_milliseconds())
2098
return dbus.UInt64(self.extended_timeout.total_seconds()
1394
2100
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1396
2102
# Interval - property
1397
@dbus_service_property(_interface, signature="t",
2103
@dbus_service_property(_interface,
1398
2105
access="readwrite")
1399
2106
def Interval_dbus_property(self, value=None):
1400
2107
if value is None: # get
1401
return dbus.UInt64(self.interval_milliseconds())
2108
return dbus.UInt64(self.interval.total_seconds() * 1000)
1402
2109
self.interval = datetime.timedelta(0, 0, 0, value)
1403
2110
if getattr(self, "checker_initiator_tag", None) is None:
1405
2112
if self.enabled:
1406
2113
# Reschedule checker run
1407
gobject.source_remove(self.checker_initiator_tag)
1408
self.checker_initiator_tag = (gobject.timeout_add
1409
(value, self.start_checker))
1410
self.start_checker() # Start one now, too
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
1412
2119
# Checker - property
1413
@dbus_service_property(_interface, signature="s",
2120
@dbus_service_property(_interface,
1414
2122
access="readwrite")
1415
2123
def Checker_dbus_property(self, value=None):
1416
2124
if value is None: # get
1417
2125
return dbus.String(self.checker_command)
1418
self.checker_command = unicode(value)
2126
self.checker_command = str(value)
1420
2128
# CheckerRunning - property
1421
@dbus_service_property(_interface, signature="b",
2129
@dbus_service_property(_interface,
1422
2131
access="readwrite")
1423
2132
def CheckerRunning_dbus_property(self, value=None):
1424
2133
if value is None: # get
1457
2174
if data[0] == 'data':
1459
2176
if data[0] == 'function':
1460
2178
def func(*args, **kwargs):
1461
2179
self._pipe.send(('funcall', name, args, kwargs))
1462
2180
return self._pipe.recv()[1]
1465
2184
def __setattr__(self, name, value):
1466
2185
if name == '_pipe':
1467
2186
return super(ProxyClient, self).__setattr__(name, value)
1468
2187
self._pipe.send(('setattr', name, value))
1471
class ClientDBusTransitional(ClientDBus):
1472
__metaclass__ = AlternateDBusNamesMetaclass
1475
2190
class ClientHandler(socketserver.BaseRequestHandler, object):
1476
2191
"""A class to handle client connections.
1478
2193
Instantiated once for each connection to handle it.
1479
2194
Note: This will run in its own forked process."""
1481
2196
def handle(self):
1482
2197
with contextlib.closing(self.server.child_pipe) as child_pipe:
1483
2198
logger.info("TCP connection from: %s",
1484
unicode(self.client_address))
2199
str(self.client_address))
1485
2200
logger.debug("Pipe FD: %d",
1486
2201
self.server.child_pipe.fileno())
1488
session = (gnutls.connection
1489
.ClientSession(self.request,
1491
.X509Credentials()))
1493
# Note: gnutls.connection.X509Credentials is really a
1494
# generic GnuTLS certificate credentials object so long as
1495
# no X.509 keys are added to it. Therefore, we can use it
1496
# here despite using OpenPGP certificates.
1498
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1499
# "+AES-256-CBC", "+SHA1",
1500
# "+COMP-NULL", "+CTYPE-OPENPGP",
2203
session = gnutls.ClientSession(self.request)
2205
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2206
# "+AES-256-CBC", "+SHA1",
2207
# "+COMP-NULL", "+CTYPE-OPENPGP",
1502
2209
# Use a fallback default, since this MUST be set.
1503
2210
priority = self.server.gnutls_priority
1504
2211
if priority is None:
1505
2212
priority = "NORMAL"
1506
(gnutls.library.functions
1507
.gnutls_priority_set_direct(session._c_object,
2213
gnutls.priority_set_direct(session._c_object,
2214
priority.encode("utf-8"),
1510
2217
# Start communication using the Mandos protocol
1511
2218
# Get protocol number
1512
2219
line = self.request.makefile().readline()
1513
2220
logger.debug("Protocol version: %r", line)
1515
2222
if int(line.strip().split()[0]) > 1:
2223
raise RuntimeError(line)
1517
2224
except (ValueError, IndexError, RuntimeError) as error:
1518
2225
logger.error("Unknown protocol version: %s", error)
1521
2228
# Start GnuTLS connection
1523
2230
session.handshake()
1524
except gnutls.errors.GNUTLSError as error:
2231
except gnutls.Error as error:
1525
2232
logger.warning("Handshake failed: %s", error)
1526
2233
# Do not run session.bye() here: the session is not
1527
2234
# established. Just abandon the request.
1529
2236
logger.debug("Handshake succeeded")
1531
2238
approval_required = False
1534
fpr = self.fingerprint(self.peer_certificate
1537
gnutls.errors.GNUTLSError) as error:
2241
fpr = self.fingerprint(
2242
self.peer_certificate(session))
2243
except (TypeError, gnutls.Error) as error:
1538
2244
logger.warning("Bad certificate: %s", error)
1540
2246
logger.debug("Fingerprint: %s", fpr)
1543
2249
client = ProxyClient(child_pipe, fpr,
1544
2250
self.client_address)
1545
2251
except KeyError:
1548
2254
if client.approval_delay:
1549
2255
delay = client.approval_delay
1550
2256
client.approvals_pending += 1
1551
2257
approval_required = True
1554
2260
if not client.enabled:
1555
2261
logger.info("Client %s is disabled",
1557
2263
if self.server.use_dbus:
1558
2264
# Emit D-Bus signal
1559
2265
client.Rejected("Disabled")
1562
2268
if client.approved or not client.approval_delay:
1563
#We are approved or approval is disabled
2269
# We are approved or approval is disabled
1565
2271
elif client.approved is None:
1566
2272
logger.info("Client %s needs approval",
1601
2305
delay -= time2 - time
1604
while sent_size < len(client.secret):
1606
sent = session.send(client.secret[sent_size:])
1607
except gnutls.errors.GNUTLSError as error:
1608
logger.warning("gnutls send failed")
1610
logger.debug("Sent: %d, remaining: %d",
1611
sent, len(client.secret)
1612
- (sent_size + sent))
2308
session.send(client.secret)
2309
except gnutls.Error as error:
2310
logger.warning("gnutls send failed",
1615
2314
logger.info("Sending secret to %s", client.name)
1616
2315
# bump the timeout using extended_timeout
1617
2316
client.bump_timeout(client.extended_timeout)
1618
2317
if self.server.use_dbus:
1619
2318
# Emit D-Bus signal
1620
2319
client.GotSecret()
1623
2322
if approval_required:
1624
2323
client.approvals_pending -= 1
1627
except gnutls.errors.GNUTLSError as error:
1628
logger.warning("GnuTLS bye failed")
2326
except gnutls.Error as error:
2327
logger.warning("GnuTLS bye failed",
1631
2331
def peer_certificate(session):
1632
2332
"Return the peer's OpenPGP certificate as a bytestring"
1633
2333
# If not an OpenPGP certificate...
1634
if (gnutls.library.functions
1635
.gnutls_certificate_type_get(session._c_object)
1636
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1637
# ...do the normal thing
1638
return session.peer_certificate
2334
if (gnutls.certificate_type_get(session._c_object)
2335
!= gnutls.CRT_OPENPGP):
2336
# ...return invalid data
1639
2338
list_size = ctypes.c_uint(1)
1640
cert_list = (gnutls.library.functions
1641
.gnutls_certificate_get_peers
2339
cert_list = (gnutls.certificate_get_peers
1642
2340
(session._c_object, ctypes.byref(list_size)))
1643
2341
if not bool(cert_list) and list_size.value != 0:
1644
raise gnutls.errors.GNUTLSError("error getting peer"
2342
raise gnutls.Error("error getting peer certificate")
1646
2343
if list_size.value == 0:
1648
2345
cert = cert_list[0]
1649
2346
return ctypes.string_at(cert.data, cert.size)
1652
2349
def fingerprint(openpgp):
1653
2350
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1654
2351
# New GnuTLS "datum" with the OpenPGP public key
1655
datum = (gnutls.library.types
1656
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1659
ctypes.c_uint(len(openpgp))))
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)))
1660
2356
# New empty GnuTLS certificate
1661
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1662
(gnutls.library.functions
1663
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2357
crt = gnutls.openpgp_crt_t()
2358
gnutls.openpgp_crt_init(ctypes.byref(crt))
1664
2359
# Import the OpenPGP public key into the certificate
1665
(gnutls.library.functions
1666
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1667
gnutls.library.constants
1668
.GNUTLS_OPENPGP_FMT_RAW))
2360
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2361
gnutls.OPENPGP_FMT_RAW)
1669
2362
# Verify the self signature in the key
1670
2363
crtverify = ctypes.c_uint()
1671
(gnutls.library.functions
1672
.gnutls_openpgp_crt_verify_self(crt, 0,
1673
ctypes.byref(crtverify)))
2364
gnutls.openpgp_crt_verify_self(crt, 0,
2365
ctypes.byref(crtverify))
1674
2366
if crtverify.value != 0:
1675
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1676
raise (gnutls.errors.CertificateSecurityError
2367
gnutls.openpgp_crt_deinit(crt)
2368
raise gnutls.CertificateSecurityError("Verify failed")
1678
2369
# New buffer for the fingerprint
1679
2370
buf = ctypes.create_string_buffer(20)
1680
2371
buf_len = ctypes.c_size_t()
1681
2372
# Get the fingerprint from the certificate into the buffer
1682
(gnutls.library.functions
1683
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1684
ctypes.byref(buf_len)))
2373
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2374
ctypes.byref(buf_len))
1685
2375
# Deinit the certificate
1686
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2376
gnutls.openpgp_crt_deinit(crt)
1687
2377
# Convert the buffer to a Python bytestring
1688
2378
fpr = ctypes.string_at(buf, buf_len.value)
1689
2379
# Convert the bytestring to hexadecimal notation
1694
2384
class MultiprocessingMixIn(object):
1695
2385
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1696
2387
def sub_process_main(self, request, address):
1698
2389
self.finish_request(request, address)
1699
2390
except Exception:
1700
2391
self.handle_error(request, address)
1701
2392
self.close_request(request)
1703
2394
def process_request(self, request, address):
1704
2395
"""Start a new process to process the request."""
1705
proc = multiprocessing.Process(target = self.sub_process_main,
2396
proc = multiprocessing.Process(target=self.sub_process_main,
2397
args=(request, address))
1712
2402
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1713
2403
""" adds a pipe to the MixIn """
1714
2405
def process_request(self, request, client_address):
1715
2406
"""Overrides and wraps the original process_request().
1717
2408
This function creates a new pipe in self.pipe
1719
2410
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1721
2412
proc = MultiprocessingMixIn.process_request(self, request,
1722
2413
client_address)
1723
2414
self.child_pipe.close()
1724
2415
self.add_pipe(parent_pipe, proc)
1726
2417
def add_pipe(self, parent_pipe, proc):
1727
2418
"""Dummy function; override as necessary"""
1728
raise NotImplementedError
2419
raise NotImplementedError()
1731
2422
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1732
2423
socketserver.TCPServer, object):
1733
2424
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1736
2427
enabled: Boolean; whether this server is activated yet
1737
2428
interface: None or a network interface name (string)
1738
2429
use_ipv6: Boolean; to use IPv6 or not
1740
2432
def __init__(self, server_address, RequestHandlerClass,
1741
interface=None, use_ipv6=True):
2436
"""If socketfd is set, use that file descriptor instead of
2437
creating a new one with socket.socket().
1742
2439
self.interface = interface
1744
2441
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.
1745
2469
socketserver.TCPServer.__init__(self, server_address,
1746
2470
RequestHandlerClass)
1747
2472
def server_bind(self):
1748
2473
"""This overrides the normal server_bind() function
1749
2474
to bind to an interface if one was specified, and also NOT to
1750
2475
bind to an address or port if they were not specified."""
2476
global SO_BINDTODEVICE
1751
2477
if self.interface is not None:
1752
2478
if SO_BINDTODEVICE is None:
1753
logger.error("SO_BINDTODEVICE does not exist;"
1754
" cannot bind to interface %s",
1758
self.socket.setsockopt(socket.SOL_SOCKET,
1762
except socket.error as error:
1763
if error[0] == errno.EPERM:
1764
logger.error("No permission to"
1765
" bind to interface %s",
1767
elif error[0] == errno.ENOPROTOOPT:
1768
logger.error("SO_BINDTODEVICE not available;"
1769
" cannot bind to interface %s",
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)
1773
2500
# Only bind(2) the socket if we really need to.
1774
2501
if self.server_address[0] or self.server_address[1]:
1775
2502
if not self.server_address[0]:
1776
2503
if self.address_family == socket.AF_INET6:
1777
any_address = "::" # in6addr_any
2504
any_address = "::" # in6addr_any
1779
any_address = socket.INADDR_ANY
2506
any_address = "0.0.0.0" # INADDR_ANY
1780
2507
self.server_address = (any_address,
1781
2508
self.server_address[1])
1782
2509
elif not self.server_address[1]:
1783
self.server_address = (self.server_address[0],
2510
self.server_address = (self.server_address[0], 0)
1785
2511
# if self.interface:
1786
2512
# self.server_address = (self.server_address[0],
1890
2610
funcname = request[1]
1891
2611
args = request[2]
1892
2612
kwargs = request[3]
1894
2614
parent_pipe.send(('data', getattr(client_object,
1895
2615
funcname)(*args,
1898
2618
if command == 'getattr':
1899
2619
attrname = request[1]
1900
if callable(client_object.__getattribute__(attrname)):
1901
parent_pipe.send(('function',))
2620
if isinstance(client_object.__getattribute__(attrname),
2621
collections.Callable):
2622
parent_pipe.send(('function', ))
1903
parent_pipe.send(('data', client_object
1904
.__getattribute__(attrname)))
2625
'data', client_object.__getattribute__(attrname)))
1906
2627
if command == 'setattr':
1907
2628
attrname = request[1]
1908
2629
value = request[2]
1909
2630
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}"
1914
2734
def string_to_delta(interval):
1915
2735
"""Parse a string and return a datetime.timedelta
1917
2737
>>> string_to_delta('7d')
1918
2738
datetime.timedelta(7)
1919
2739
>>> string_to_delta('60s')
2008
2834
parser.add_argument("--no-dbus", action="store_false",
2009
2835
dest="use_dbus", help="Do not provide D-Bus"
2010
" system bus interface")
2836
" system bus interface", default=None)
2011
2837
parser.add_argument("--no-ipv6", action="store_false",
2012
dest="use_ipv6", help="Do not use IPv6")
2838
dest="use_ipv6", help="Do not use IPv6",
2013
2840
parser.add_argument("--no-restore", action="store_false",
2014
2841
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")
2016
2846
parser.add_argument("--statedir", metavar="DIR",
2017
2847
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",
2019
2854
options = parser.parse_args()
2021
2856
if options.check:
2858
fail_count, test_count = doctest.testmod()
2859
sys.exit(os.EX_OK if fail_count == 0 else 1)
2026
2861
# Default values for config file for server-global settings
2027
server_defaults = { "interface": "",
2032
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2033
"servicename": "Mandos",
2038
"statedir": "/var/lib/mandos"
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",
2041
2880
# Parse config file for server-global settings
2042
2881
server_config = configparser.SafeConfigParser(server_defaults)
2043
2882
del server_defaults
2044
server_config.read(os.path.join(options.configdir,
2883
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2046
2884
# Convert the SafeConfigParser object to a dict
2047
2885
server_settings = server_config.defaults()
2048
2886
# Use the appropriate methods on the non-string config options
2049
for option in ("debug", "use_dbus", "use_ipv6"):
2887
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2888
"foreground", "zeroconf"):
2050
2889
server_settings[option] = server_config.getboolean("DEFAULT",
2052
2891
if server_settings["port"]:
2053
2892
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
2055
2903
del server_config
2057
2905
# Override the settings from the config file with command line
2058
2906
# options, if set.
2059
2907
for option in ("interface", "address", "port", "debug",
2060
"priority", "servicename", "configdir",
2061
"use_dbus", "use_ipv6", "debuglevel", "restore",
2908
"priority", "servicename", "configdir", "use_dbus",
2909
"use_ipv6", "debuglevel", "restore", "statedir",
2910
"socket", "foreground", "zeroconf"):
2063
2911
value = getattr(options, option)
2064
2912
if value is not None:
2065
2913
server_settings[option] = value
2067
2915
# Force all strings to be unicode
2068
2916
for option in server_settings.keys():
2069
if type(server_settings[option]) is str:
2070
server_settings[option] = unicode(server_settings[option])
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
2071
2927
# Now we have our good server settings in "server_settings"
2073
2929
##################################################################
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")
2075
2936
# For convenience
2076
2937
debug = server_settings["debug"]
2077
2938
debuglevel = server_settings["debuglevel"]
2089
2952
level = getattr(logging, debuglevel.upper())
2090
2953
initlogger(debug, level)
2092
2955
if server_settings["servicename"] != "Mandos":
2093
syslogger.setFormatter(logging.Formatter
2094
('Mandos (%s) [%%(process)d]:'
2095
' %%(levelname)s: %%(message)s'
2096
% server_settings["servicename"]))
2956
syslogger.setFormatter(
2957
logging.Formatter('Mandos ({}) [%(process)d]:'
2958
' %(levelname)s: %(message)s'.format(
2959
server_settings["servicename"])))
2098
2961
# Parse config file with clients
2099
2962
client_config = configparser.SafeConfigParser(Client
2100
2963
.client_defaults)
2101
2964
client_config.read(os.path.join(server_settings["configdir"],
2102
2965
"clients.conf"))
2104
2967
global mandos_dbus_service
2105
2968
mandos_dbus_service = None
2107
tcp_server = MandosServer((server_settings["address"],
2108
server_settings["port"]),
2110
interface=(server_settings["interface"]
2114
server_settings["priority"],
2117
pidfilename = "/var/run/mandos.pid"
2119
pidfile = open(pidfilename, "w")
2121
logger.error("Could not open file %r", pidfilename)
2124
uid = pwd.getpwnam("_mandos").pw_uid
2125
gid = pwd.getpwnam("_mandos").pw_gid
2128
uid = pwd.getpwnam("mandos").pw_uid
2129
gid = pwd.getpwnam("mandos").pw_gid
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
2130
2999
except KeyError:
2132
uid = pwd.getpwnam("nobody").pw_uid
2133
gid = pwd.getpwnam("nobody").pw_gid
3008
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2140
3010
except OSError as error:
2141
if error[0] != errno.EPERM:
3011
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3012
.format(uid, gid, os.strerror(error.errno)))
3013
if error.errno != errno.EPERM:
2145
3017
# Enable all possible GnuTLS debugging
2147
3019
# "Use a log level over 10 to enable all debugging options."
2148
3020
# - GnuTLS manual
2149
gnutls.library.functions.gnutls_global_set_log_level(11)
2151
@gnutls.library.types.gnutls_log_func
3021
gnutls.global_set_log_level(11)
2152
3024
def debug_gnutls(level, string):
2153
3025
logger.debug("GnuTLS: %s", string[:-1])
2155
(gnutls.library.functions
2156
.gnutls_global_set_log_function(debug_gnutls))
3027
gnutls.global_set_log_function(debug_gnutls)
2158
3029
# Redirect stdin so all checkers get /dev/null
2159
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3030
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2160
3031
os.dup2(null, sys.stdin.fileno())
2164
3035
# Need to fork before connecting to D-Bus
2166
3037
# Close all input and output, do double fork, etc.
2169
gobject.threads_init()
3040
# multiprocessing will use threads, so before we use GLib we need
3041
# to inform GLib that threads will be used.
2171
3044
global main_loop
2172
3045
# From the Avahi example code
2173
DBusGMainLoop(set_as_default=True )
2174
main_loop = gobject.MainLoop()
3046
DBusGMainLoop(set_as_default=True)
3047
main_loop = GLib.MainLoop()
2175
3048
bus = dbus.SystemBus()
2176
3049
# End of Avahi example code
2179
3052
bus_name = dbus.service.BusName("se.recompile.Mandos",
2180
bus, do_not_queue=True)
2181
old_bus_name = (dbus.service.BusName
2182
("se.bsnet.fukt.Mandos", bus,
2184
except dbus.exceptions.NameExistsException as e:
2185
logger.error(unicode(e) + ", disabling D-Bus")
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)
2186
3060
use_dbus = False
2187
3061
server_settings["use_dbus"] = False
2188
3062
tcp_server.use_dbus = False
2189
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2190
service = AvahiServiceToSyslog(name =
2191
server_settings["servicename"],
2192
servicetype = "_mandos._tcp",
2193
protocol = protocol, bus = bus)
2194
if server_settings["interface"]:
2195
service.interface = (if_nametoindex
2196
(str(server_settings["interface"])))
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"))
2198
3074
global multiprocessing_manager
2199
3075
multiprocessing_manager = multiprocessing.Manager()
2201
3077
client_class = Client
2203
client_class = functools.partial(ClientDBusTransitional,
3079
client_class = functools.partial(ClientDBus, bus=bus)
2206
3081
client_settings = Client.config_parser(client_config)
2207
3082
old_client_settings = {}
2208
3083
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:
2210
3093
# Get client data and settings from last running state.
2211
3094
if server_settings["restore"]:
2213
3096
with open(stored_state_path, "rb") as stored_state:
2214
clients_data, old_client_settings = (pickle.load
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"]
2216
3142
os.remove(stored_state_path)
2217
3143
except IOError as e:
2218
logger.warning("Could not load persistent state: {0}"
2220
if e.errno != errno.ENOENT:
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:",
2222
3151
except EOFError as e:
2223
3152
logger.warning("Could not load persistent state: "
2224
"EOFError: {0}".format(e))
2226
3156
with PGPEngine() as pgp:
2227
for client_name, client in clients_data.iteritems():
3157
for client_name, client in clients_data.items():
3158
# Skip removed clients
3159
if client_name not in client_settings:
2228
3162
# Decide which value to use after restoring saved state.
2229
3163
# We have three different values: Old config file,
2230
3164
# new config file, and saved state.
2291
3224
clients_data[client_name] = client_settings[client_name]
2293
3226
# Create all client objects
2294
for client_name, client in clients_data.iteritems():
3227
for client_name, client in clients_data.items():
2295
3228
tcp_server.clients[client_name] = client_class(
2296
name = client_name, settings = client)
3231
server_settings=server_settings)
2298
3233
if not tcp_server.clients:
2299
3234
logger.warning("No clients defined")
2305
pidfile.write(str(pid) + "\n".encode("utf-8"))
2308
logger.error("Could not write to file %r with PID %d",
2311
# "pidfile" was never created
3237
if pidfile is not None:
3241
print(pid, file=pidfile)
3243
logger.error("Could not write to file %r with PID %d",
2313
3246
del pidfilename
2314
signal.signal(signal.SIGINT, signal.SIG_IGN)
2316
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2317
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3248
for termsig in (signal.SIGHUP, signal.SIGTERM):
3249
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3250
lambda: main_loop.quit() and False)
2320
class MandosDBusService(dbus.service.Object):
3254
@alternate_dbus_interfaces(
3255
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3256
class MandosDBusService(DBusObjectWithObjectManager):
2321
3257
"""A D-Bus proxy object"""
2322
3259
def __init__(self):
2323
3260
dbus.service.Object.__init__(self, bus, "/")
2324
3262
_interface = "se.recompile.Mandos"
2326
3264
@dbus.service.signal(_interface, signature="o")
2327
3265
def ClientAdded(self, objpath):
2331
3269
@dbus.service.signal(_interface, signature="ss")
2332
3270
def ClientNotFound(self, fingerprint, address):
3274
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2336
3276
@dbus.service.signal(_interface, signature="os")
2337
3277
def ClientRemoved(self, objpath, name):
3281
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2341
3283
@dbus.service.method(_interface, out_signature="ao")
2342
3284
def GetAllClients(self):
2344
return dbus.Array(c.dbus_object_path
2346
tcp_server.clients.itervalues())
3286
return dbus.Array(c.dbus_object_path for c in
3287
tcp_server.clients.values())
3289
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2348
3291
@dbus.service.method(_interface,
2349
3292
out_signature="a{oa{sv}}")
2350
3293
def GetAllClientsWithProperties(self):
2352
3295
return dbus.Dictionary(
2353
((c.dbus_object_path, c.GetAll(""))
2354
for c in tcp_server.clients.itervalues()),
3296
{c.dbus_object_path: c.GetAll(
3297
"se.recompile.Mandos.Client")
3298
for c in tcp_server.clients.values()},
2355
3299
signature="oa{sv}")
2357
3301
@dbus.service.method(_interface, in_signature="o")
2358
3302
def RemoveClient(self, object_path):
2360
for c in tcp_server.clients.itervalues():
3304
for c in tcp_server.clients.values():
2361
3305
if c.dbus_object_path == object_path:
2362
3306
del tcp_server.clients[c.name]
2363
3307
c.remove_from_connection()
2364
# Don't signal anything except ClientRemoved
3308
# Don't signal the disabling
2365
3309
c.disable(quiet=True)
2367
self.ClientRemoved(object_path, c.name)
3310
# Emit D-Bus signal for removal
3311
self.client_removed_signal(c)
2369
3313
raise KeyError(object_path)
2373
class MandosDBusServiceTransitional(MandosDBusService):
2374
__metaclass__ = AlternateDBusNamesMetaclass
2375
mandos_dbus_service = MandosDBusServiceTransitional()
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
2378
3361
"Cleanup function; run on exit"
2381
multiprocessing.active_children()
3365
mp.active_children()
2382
3367
if not (tcp_server.clients or client_settings):
2385
3370
# Store client before exiting. Secrets are encrypted with key
2386
3371
# based on what config file has. If config file is
2387
3372
# removed/edited, old secret will thus be unrecovable.
2389
3374
with PGPEngine() as pgp:
2390
for client in tcp_server.clients.itervalues():
3375
for client in tcp_server.clients.values():
2391
3376
key = client_settings[client.name]["secret"]
2392
3377
client.encrypted_secret = pgp.encrypt(client.secret,
2394
3379
client_dict = {}
2396
3381
# A list of attributes that can not be pickled
2398
exclude = set(("bus", "changedstate", "secret",
2400
for name, typ in (inspect.getmembers
2401
(dbus.service.Object)):
3383
exclude = {"bus", "changedstate", "secret",
3384
"checker", "server_settings"}
3385
for name, typ in inspect.getmembers(dbus.service
2402
3387
exclude.add(name)
2404
3389
client_dict["encrypted_secret"] = (client
2405
3390
.encrypted_secret)
2406
3391
for attr in client.client_structure:
2407
3392
if attr not in exclude:
2408
3393
client_dict[attr] = getattr(client, attr)
2410
3395
clients[client.name] = client_dict
2411
3396
del client_settings[client.name]["secret"]
2414
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2417
(stored_state_path))
2418
with os.fdopen(tempfd, "wb") as stored_state:
2419
pickle.dump((clients, client_settings), stored_state)
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
2420
3408
os.rename(tempname, stored_state_path)
2421
3409
except (IOError, OSError) as e:
2422
logger.warning("Could not save persistent state: {0}"
2426
3412
os.remove(tempname)
2427
3413
except NameError:
2429
if e.errno not in set((errno.ENOENT, errno.EACCES,
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:",
2433
3423
# Delete all clients, and settings from config
2434
3424
while tcp_server.clients:
2435
3425
name, client = tcp_server.clients.popitem()
2437
3427
client.remove_from_connection()
2438
# Don't signal anything except ClientRemoved
3428
# Don't signal the disabling
2439
3429
client.disable(quiet=True)
3430
# Emit D-Bus signal for removal
2442
mandos_dbus_service.ClientRemoved(client
3432
mandos_dbus_service.client_removed_signal(client)
2445
3433
client_settings.clear()
2447
3435
atexit.register(cleanup)
2449
for client in tcp_server.clients.itervalues():
3437
for client in tcp_server.clients.values():
2452
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3439
# Emit D-Bus signal for adding
3440
mandos_dbus_service.client_added_signal(client)
2453
3441
# Need to initiate checking of clients
2454
3442
if client.enabled:
2455
3443
client.init_checker()
2457
3445
tcp_server.enable()
2458
3446
tcp_server.server_activate()
2460
3448
# Find out what port we got
2461
service.port = tcp_server.socket.getsockname()[1]
3450
service.port = tcp_server.socket.getsockname()[1]
2463
3452
logger.info("Now listening on address %r, port %d,"
2464
" flowinfo %d, scope_id %d"
2465
% tcp_server.socket.getsockname())
3453
" flowinfo %d, scope_id %d",
3454
*tcp_server.socket.getsockname())
2467
logger.info("Now listening on address %r, port %d"
2468
% tcp_server.socket.getsockname())
2470
#service.interface = tcp_server.socket.getsockname()[3]
3456
logger.info("Now listening on address %r, port %d",
3457
*tcp_server.socket.getsockname())
3459
# service.interface = tcp_server.socket.getsockname()[3]
2473
# From the Avahi example code
2476
except dbus.exceptions.DBusException as error:
2477
logger.critical("DBusException: %s", error)
2480
# End of Avahi example code
2482
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2483
lambda *args, **kwargs:
2484
(tcp_server.handle_request
2485
(*args[2:], **kwargs) or True))
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))
2487
3477
logger.debug("Starting main loop")
2488
3478
main_loop.run()
2489
3479
except AvahiError as error:
2490
logger.critical("AvahiError: %s", error)
3480
logger.critical("Avahi Error", exc_info=error)
2493
3483
except KeyboardInterrupt: