70
import cPickle as pickle
63
import cPickle as pickle
73
64
import multiprocessing
82
71
import dbus.service
83
from gi.repository import GLib
84
74
from dbus.mainloop.glib import DBusGMainLoop
87
77
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
94
82
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
95
83
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
99
85
from IN import SO_BINDTODEVICE
100
86
except ImportError:
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
115
if sys.version_info.major == 2:
87
SO_BINDTODEVICE = None
119
90
stored_state_file = "clients.pickle"
121
92
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
127
101
except (OSError, AttributeError):
129
102
def if_nametoindex(interface):
130
103
"Get an interface index the hard way, i.e. using fcntl()"
131
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
132
105
with contextlib.closing(socket.socket()) as s:
133
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
136
111
return interface_index
139
def copy_function(func):
140
"""Make a copy of a function"""
141
if sys.version_info.major == 2:
142
return types.FunctionType(func.func_code,
148
return types.FunctionType(func.__code__,
155
114
def initlogger(debug, level=logging.WARNING):
156
115
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
162
117
syslogger.setFormatter(logging.Formatter
163
118
('Mandos [%(process)d]: %(levelname)s:'
165
120
logger.addHandler(syslogger)
168
123
console = logging.StreamHandler()
169
124
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
226
169
os.rmdir(self.tempdir)
227
170
self.tempdir = None
229
172
def password_encode(self, password):
230
173
# Passphrase can not be empty and can not contain newlines or
231
174
# NUL bytes. So we prefix it and hex encode it.
232
encoded = b"mandos" + binascii.hexlify(password)
233
if len(encoded) > 2048:
234
# GnuPG can't handle long passwords, so encode differently
235
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
236
.replace(b"\n", b"\\n")
237
.replace(b"\0", b"\\x00"))
175
return b"mandos" + binascii.hexlify(password)
240
177
def encrypt(self, data, password):
241
passphrase = self.password_encode(password)
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
244
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
254
if proc.returncode != 0:
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
191
self.gnupg.passphrase = None
256
192
return ciphertext
258
194
def decrypt(self, data, password):
259
passphrase = self.password_encode(password)
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
262
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
272
if proc.returncode != 0:
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
208
self.gnupg.passphrase = None
274
209
return decrypted_plaintext
277
# Pretend that we have an Avahi module
279
"""This isn't so much a class as it is a module-like namespace."""
280
IF_UNSPEC = -1 # avahi-common/address.h
281
PROTO_UNSPEC = -1 # avahi-common/address.h
282
PROTO_INET = 0 # avahi-common/address.h
283
PROTO_INET6 = 1 # avahi-common/address.h
284
DBUS_NAME = "org.freedesktop.Avahi"
285
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
286
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(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
303
213
class AvahiError(Exception):
304
214
def __init__(self, value, *args, **kwargs):
305
215
self.value = value
306
return super(AvahiError, self).__init__(value, *args,
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
310
220
class AvahiServiceError(AvahiError):
314
223
class AvahiGroupError(AvahiError):
318
227
class AvahiService(object):
319
228
"""An Avahi (Zeroconf) service.
322
231
interface: integer; avahi.IF_UNSPEC or an interface index.
323
232
Used to optionally bind to the specified interface.
324
233
name: string; Example: 'Mandos'
325
234
type: string; Example: '_mandos._tcp'.
326
See <https://www.iana.org/assignments/service-names-port-numbers>
235
See <http://www.dns-sd.org/ServiceTypes.html>
327
236
port: integer; what port to announce
328
237
TXT: list of strings; TXT record for the service
329
238
domain: string; Domain to publish on, default to .local if empty.
488
367
follow_name_owner_changes=True),
489
368
avahi.DBUS_INTERFACE_SERVER)
490
369
self.server.connect_to_signal("StateChanged",
491
self.server_state_changed)
370
self.server_state_changed)
492
371
self.server_state_changed(self.server.GetState())
495
373
class AvahiServiceToSyslog(AvahiService):
496
def rename(self, *args, **kwargs):
497
375
"""Add the new name to the syslog messages"""
498
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
499
syslogger.setFormatter(logging.Formatter(
500
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos (%s) [%%(process)d]:'
379
' %%(levelname)s: %%(message)s'
505
# Pretend that we have a GnuTLS module
506
class gnutls(object):
507
"""This isn't so much a class as it is a module-like namespace."""
509
library = ctypes.util.find_library("gnutls")
511
library = ctypes.util.find_library("gnutls-deb0")
512
_library = ctypes.cdll.LoadLibrary(library)
515
# Unless otherwise indicated, the constants and types below are
516
# all from the gnutls/gnutls.h C header file.
527
E_NO_CERTIFICATE_FOUND = -49
532
KEYID_USE_SHA256 = 1 # gnutls/x509.h
533
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
536
class session_int(ctypes.Structure):
538
session_t = ctypes.POINTER(session_int)
540
class certificate_credentials_st(ctypes.Structure):
542
certificate_credentials_t = ctypes.POINTER(
543
certificate_credentials_st)
544
certificate_type_t = ctypes.c_int
546
class datum_t(ctypes.Structure):
547
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
548
('size', ctypes.c_uint)]
550
class openpgp_crt_int(ctypes.Structure):
552
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
553
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
554
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
555
credentials_type_t = ctypes.c_int
556
transport_ptr_t = ctypes.c_void_p
557
close_request_t = ctypes.c_int
560
class Error(Exception):
561
def __init__(self, message=None, code=None, args=()):
562
# Default usage is by a message string, but if a return
563
# code is passed, convert it to a string with
566
if message is None and code is not None:
567
message = gnutls.strerror(code)
568
return super(gnutls.Error, self).__init__(
571
class CertificateSecurityError(Error):
575
class Credentials(object):
577
self._c_object = gnutls.certificate_credentials_t()
578
gnutls.certificate_allocate_credentials(
579
ctypes.byref(self._c_object))
580
self.type = gnutls.CRD_CERTIFICATE
583
gnutls.certificate_free_credentials(self._c_object)
585
class ClientSession(object):
586
def __init__(self, socket, credentials=None):
587
self._c_object = gnutls.session_t()
588
gnutls_flags = gnutls.CLIENT
589
if gnutls.check_version(b"3.5.6"):
590
gnutls_flags |= gnutls.NO_TICKETS
592
gnutls_flags |= gnutls.ENABLE_RAWPK
593
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
595
gnutls.set_default_priority(self._c_object)
596
gnutls.transport_set_ptr(self._c_object, socket.fileno())
597
gnutls.handshake_set_private_extensions(self._c_object,
600
if credentials is None:
601
credentials = gnutls.Credentials()
602
gnutls.credentials_set(self._c_object, credentials.type,
603
ctypes.cast(credentials._c_object,
605
self.credentials = credentials
608
gnutls.deinit(self._c_object)
611
return gnutls.handshake(self._c_object)
613
def send(self, data):
617
data_len -= gnutls.record_send(self._c_object,
622
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
624
# Error handling functions
625
def _error_code(result):
626
"""A function to raise exceptions on errors, suitable
627
for the 'restype' attribute on ctypes functions"""
630
if result == gnutls.E_NO_CERTIFICATE_FOUND:
631
raise gnutls.CertificateSecurityError(code=result)
632
raise gnutls.Error(code=result)
634
def _retry_on_error(result, func, arguments):
635
"""A function to retry on some errors, suitable
636
for the 'errcheck' attribute on ctypes functions"""
638
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
639
return _error_code(result)
640
result = func(*arguments)
643
# Unless otherwise indicated, the function declarations below are
644
# all from the gnutls/gnutls.h C header file.
647
priority_set_direct = _library.gnutls_priority_set_direct
648
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
649
ctypes.POINTER(ctypes.c_char_p)]
650
priority_set_direct.restype = _error_code
652
init = _library.gnutls_init
653
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
654
init.restype = _error_code
656
set_default_priority = _library.gnutls_set_default_priority
657
set_default_priority.argtypes = [session_t]
658
set_default_priority.restype = _error_code
660
record_send = _library.gnutls_record_send
661
record_send.argtypes = [session_t, ctypes.c_void_p,
663
record_send.restype = ctypes.c_ssize_t
664
record_send.errcheck = _retry_on_error
666
certificate_allocate_credentials = (
667
_library.gnutls_certificate_allocate_credentials)
668
certificate_allocate_credentials.argtypes = [
669
ctypes.POINTER(certificate_credentials_t)]
670
certificate_allocate_credentials.restype = _error_code
672
certificate_free_credentials = (
673
_library.gnutls_certificate_free_credentials)
674
certificate_free_credentials.argtypes = [
675
certificate_credentials_t]
676
certificate_free_credentials.restype = None
678
handshake_set_private_extensions = (
679
_library.gnutls_handshake_set_private_extensions)
680
handshake_set_private_extensions.argtypes = [session_t,
682
handshake_set_private_extensions.restype = None
684
credentials_set = _library.gnutls_credentials_set
685
credentials_set.argtypes = [session_t, credentials_type_t,
687
credentials_set.restype = _error_code
689
strerror = _library.gnutls_strerror
690
strerror.argtypes = [ctypes.c_int]
691
strerror.restype = ctypes.c_char_p
693
certificate_type_get = _library.gnutls_certificate_type_get
694
certificate_type_get.argtypes = [session_t]
695
certificate_type_get.restype = _error_code
697
certificate_get_peers = _library.gnutls_certificate_get_peers
698
certificate_get_peers.argtypes = [session_t,
699
ctypes.POINTER(ctypes.c_uint)]
700
certificate_get_peers.restype = ctypes.POINTER(datum_t)
702
global_set_log_level = _library.gnutls_global_set_log_level
703
global_set_log_level.argtypes = [ctypes.c_int]
704
global_set_log_level.restype = None
706
global_set_log_function = _library.gnutls_global_set_log_function
707
global_set_log_function.argtypes = [log_func]
708
global_set_log_function.restype = None
710
deinit = _library.gnutls_deinit
711
deinit.argtypes = [session_t]
712
deinit.restype = None
714
handshake = _library.gnutls_handshake
715
handshake.argtypes = [session_t]
716
handshake.restype = _error_code
717
handshake.errcheck = _retry_on_error
719
transport_set_ptr = _library.gnutls_transport_set_ptr
720
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
721
transport_set_ptr.restype = None
723
bye = _library.gnutls_bye
724
bye.argtypes = [session_t, close_request_t]
725
bye.restype = _error_code
726
bye.errcheck = _retry_on_error
728
check_version = _library.gnutls_check_version
729
check_version.argtypes = [ctypes.c_char_p]
730
check_version.restype = ctypes.c_char_p
732
_need_version = b"3.3.0"
733
if check_version(_need_version) is None:
734
raise self.Error("Needs GnuTLS {} or later"
735
.format(_need_version))
737
_tls_rawpk_version = b"3.6.6"
738
has_rawpk = bool(check_version(_tls_rawpk_version))
742
class pubkey_st(ctypes.Structure):
744
pubkey_t = ctypes.POINTER(pubkey_st)
746
x509_crt_fmt_t = ctypes.c_int
748
# All the function declarations below are from gnutls/abstract.h
749
pubkey_init = _library.gnutls_pubkey_init
750
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
751
pubkey_init.restype = _error_code
753
pubkey_import = _library.gnutls_pubkey_import
754
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
756
pubkey_import.restype = _error_code
758
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
759
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
760
ctypes.POINTER(ctypes.c_ubyte),
761
ctypes.POINTER(ctypes.c_size_t)]
762
pubkey_get_key_id.restype = _error_code
764
pubkey_deinit = _library.gnutls_pubkey_deinit
765
pubkey_deinit.argtypes = [pubkey_t]
766
pubkey_deinit.restype = None
768
# All the function declarations below are from gnutls/openpgp.h
770
openpgp_crt_init = _library.gnutls_openpgp_crt_init
771
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
772
openpgp_crt_init.restype = _error_code
774
openpgp_crt_import = _library.gnutls_openpgp_crt_import
775
openpgp_crt_import.argtypes = [openpgp_crt_t,
776
ctypes.POINTER(datum_t),
778
openpgp_crt_import.restype = _error_code
780
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
781
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
782
ctypes.POINTER(ctypes.c_uint)]
783
openpgp_crt_verify_self.restype = _error_code
785
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
786
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
787
openpgp_crt_deinit.restype = None
789
openpgp_crt_get_fingerprint = (
790
_library.gnutls_openpgp_crt_get_fingerprint)
791
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
795
openpgp_crt_get_fingerprint.restype = _error_code
797
if check_version(b"3.6.4"):
798
certificate_type_get2 = _library.gnutls_certificate_type_get2
799
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
800
certificate_type_get2.restype = _error_code
802
# Remove non-public functions
803
del _error_code, _retry_on_error
806
def call_pipe(connection, # : multiprocessing.Connection
807
func, *args, **kwargs):
808
"""This function is meant to be called by multiprocessing.Process
810
This function runs func(*args, **kwargs), and writes the resulting
811
return value on the provided multiprocessing.Connection.
813
connection.send(func(*args, **kwargs))
383
def timedelta_to_milliseconds(td):
384
"Convert a datetime.timedelta() to milliseconds"
385
return ((td.days * 24 * 60 * 60 * 1000)
386
+ (td.seconds * 1000)
387
+ (td.microseconds // 1000))
817
389
class Client(object):
818
390
"""A representation of a client host served by this server.
821
393
approved: bool(); 'None' if not yet approved/disapproved
822
394
approval_delay: datetime.timedelta(); Time to wait for approval
823
395
approval_duration: datetime.timedelta(); Duration of one approval
824
checker: multiprocessing.Process(); a running checker process used
825
to see if the client lives. 'None' if no process is
827
checker_callback_tag: a GLib event source tag, or None
396
checker: subprocess.Popen(); a running checker process used
397
to see if the client lives.
398
'None' if no process is running.
399
checker_callback_tag: a gobject event source tag, or None
828
400
checker_command: string; External command which is run to check
829
401
if client lives. %() expansions are done at
830
402
runtime with vars(self) as dict, so that for
831
403
instance %(name)s can be used in the command.
832
checker_initiator_tag: a GLib event source tag, or None
404
checker_initiator_tag: a gobject event source tag, or None
833
405
created: datetime.datetime(); (UTC) object creation
834
406
client_structure: Object describing what attributes a client has
835
407
and is used for storing the client at exit
836
408
current_checker_command: string; current running checker_command
837
disable_initiator_tag: a GLib event source tag, or None
409
disable_initiator_tag: a gobject event source tag, or None
839
411
fingerprint: string (40 or 32 hexadecimal digits); used to
840
uniquely identify an OpenPGP client
841
key_id: string (64 hexadecimal digits); used to uniquely identify
842
a client using raw public keys
412
uniquely identify the client
843
413
host: string; available for use by the checker command
844
414
interval: datetime.timedelta(); How often to start a new checker
845
415
last_approval_request: datetime.datetime(); (UTC) or None
966
542
self.current_checker_command = None
967
543
self.approved = None
968
544
self.approvals_pending = 0
969
self.changedstate = multiprocessing_manager.Condition(
970
multiprocessing_manager.Lock())
971
self.client_structure = [attr
972
for attr in self.__dict__.keys()
545
self.changedstate = (multiprocessing_manager
546
.Condition(multiprocessing_manager
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
973
550
if not attr.startswith("_")]
974
551
self.client_structure.append("client_structure")
976
for name, t in inspect.getmembers(
977
type(self), lambda obj: isinstance(obj, property)):
553
for name, t in inspect.getmembers(type(self),
978
557
if not name.startswith("_"):
979
558
self.client_structure.append(name)
981
560
# Send notice to process children that client state has changed
982
561
def send_changedstate(self):
983
562
with self.changedstate:
984
563
self.changedstate.notify_all()
986
565
def enable(self):
987
566
"""Start this client's checker and timeout hooks"""
988
567
if getattr(self, "enabled", False):
989
568
# Already enabled
570
self.send_changedstate()
991
571
self.expires = datetime.datetime.utcnow() + self.timeout
992
572
self.enabled = True
993
573
self.last_enabled = datetime.datetime.utcnow()
994
574
self.init_checker()
995
self.send_changedstate()
997
576
def disable(self, quiet=True):
998
577
"""Disable this client."""
999
578
if not getattr(self, "enabled", False):
581
self.send_changedstate()
1002
583
logger.info("Disabling client %s", self.name)
1003
if getattr(self, "disable_initiator_tag", None) is not None:
1004
GLib.source_remove(self.disable_initiator_tag)
584
if getattr(self, "disable_initiator_tag", False):
585
gobject.source_remove(self.disable_initiator_tag)
1005
586
self.disable_initiator_tag = None
1006
587
self.expires = None
1007
if getattr(self, "checker_initiator_tag", None) is not None:
1008
GLib.source_remove(self.checker_initiator_tag)
588
if getattr(self, "checker_initiator_tag", False):
589
gobject.source_remove(self.checker_initiator_tag)
1009
590
self.checker_initiator_tag = None
1010
591
self.stop_checker()
1011
592
self.enabled = False
1013
self.send_changedstate()
1014
# Do not run this again if called by a GLib.timeout_add
593
# Do not run this again if called by a gobject.timeout_add
1017
596
def __del__(self):
1020
599
def init_checker(self):
1021
600
# Schedule a new checker to be started an 'interval' from now,
1022
601
# and every interval from then on.
1023
if self.checker_initiator_tag is not None:
1024
GLib.source_remove(self.checker_initiator_tag)
1025
self.checker_initiator_tag = GLib.timeout_add(
1026
int(self.interval.total_seconds() * 1000),
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
1028
605
# Schedule a disable() when 'timeout' has passed
1029
if self.disable_initiator_tag is not None:
1030
GLib.source_remove(self.disable_initiator_tag)
1031
self.disable_initiator_tag = GLib.timeout_add(
1032
int(self.timeout.total_seconds() * 1000), self.disable)
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
1033
609
# Also start a new checker *right now*.
1034
610
self.start_checker()
1036
def checker_callback(self, source, condition, connection,
612
def checker_callback(self, pid, condition, command):
1038
613
"""The checker has completed, so take appropriate actions."""
1039
# Read return code from connection (see call_pipe)
1040
returncode = connection.recv()
1043
614
self.checker_callback_tag = None
1044
615
self.checker = None
1047
self.last_checker_status = returncode
1048
self.last_checker_signal = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
1049
618
if self.last_checker_status == 0:
1050
619
logger.info("Checker for %(name)s succeeded",
1052
621
self.checked_ok()
1054
logger.info("Checker for %(name)s failed", vars(self))
623
logger.info("Checker for %(name)s failed",
1056
626
self.last_checker_status = -1
1057
self.last_checker_signal = -returncode
1058
627
logger.warning("Checker for %(name)s crashed?",
1062
630
def checked_ok(self):
1063
631
"""Assert that the client has been seen, alive and well."""
1064
632
self.last_checked_ok = datetime.datetime.utcnow()
1065
633
self.last_checker_status = 0
1066
self.last_checker_signal = None
1067
634
self.bump_timeout()
1069
636
def bump_timeout(self, timeout=None):
1070
637
"""Bump up the timeout for this client."""
1071
638
if timeout is None:
1072
639
timeout = self.timeout
1073
640
if self.disable_initiator_tag is not None:
1074
GLib.source_remove(self.disable_initiator_tag)
1075
self.disable_initiator_tag = None
641
gobject.source_remove(self.disable_initiator_tag)
1076
642
if getattr(self, "enabled", False):
1077
self.disable_initiator_tag = GLib.timeout_add(
1078
int(timeout.total_seconds() * 1000), self.disable)
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
1079
646
self.expires = datetime.datetime.utcnow() + timeout
1081
648
def need_approval(self):
1082
649
self.last_approval_request = datetime.datetime.utcnow()
1084
651
def start_checker(self):
1085
652
"""Start a new checker subprocess if one is not running.
1087
654
If a checker already exists, leave it running and do
1089
656
# The reason for not killing a running checker is that if we
1090
# did that, and if a checker (for some reason) started running
1091
# slowly and taking more than 'interval' time, then the client
1092
# would inevitably timeout, since no checker would get a
1093
# chance to run to completion. If we instead leave running
657
# did that, then if a checker (for some reason) started
658
# running slowly and taking more than 'interval' time, the
659
# client would inevitably timeout, since no checker would get
660
# a chance to run to completion. If we instead leave running
1094
661
# checkers alone, the checker would have to take more time
1095
662
# than 'timeout' for the client to be disabled, which is as it
1098
if self.checker is not None and not self.checker.is_alive():
1099
logger.warning("Checker was not alive; joining")
665
# If a checker exists, make sure it is not a zombie
667
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
668
except (AttributeError, OSError) as error:
669
if (isinstance(error, OSError)
670
and error.errno != errno.ECHILD):
674
logger.warning("Checker was a zombie")
675
gobject.source_remove(self.checker_callback_tag)
676
self.checker_callback(pid, status,
677
self.current_checker_command)
1102
678
# Start a new checker if needed
1103
679
if self.checker is None:
1104
# Escape attributes for the shell
1106
attr: re.escape(str(getattr(self, attr)))
1107
for attr in self.runtime_expansions}
1109
command = self.checker_command % escaped_attrs
1110
except TypeError as error:
1111
logger.error('Could not format string "%s"',
1112
self.checker_command,
1114
return True # Try again later
681
# In case checker_command has exactly one % operator
682
command = self.checker_command % self.host
684
# Escape attributes for the shell
685
escaped_attrs = dict(
687
re.escape(unicode(str(getattr(self, attr, "")),
691
self.runtime_expansions)
694
command = self.checker_command % escaped_attrs
695
except TypeError as error:
696
logger.error('Could not format string "%s":'
697
' %s', self.checker_command, error)
698
return True # Try again later
1115
699
self.current_checker_command = command
1116
logger.info("Starting checker %r for %s", command,
1118
# We don't need to redirect stdout and stderr, since
1119
# in normal mode, that is already done by daemon(),
1120
# and in debug mode we don't want to. (Stdin is
1121
# always replaced by /dev/null.)
1122
# The exception is when not debugging but nevertheless
1123
# running in the foreground; use the previously
1125
popen_args = {"close_fds": True,
1128
if (not self.server_settings["debug"]
1129
and self.server_settings["foreground"]):
1130
popen_args.update({"stdout": wnull,
1132
pipe = multiprocessing.Pipe(duplex=False)
1133
self.checker = multiprocessing.Process(
1135
args=(pipe[1], subprocess.call, command),
1137
self.checker.start()
1138
self.checker_callback_tag = GLib.io_add_watch(
1139
pipe[0].fileno(), GLib.IO_IN,
1140
self.checker_callback, pipe[0], command)
1141
# Re-run this periodically if run by GLib.timeout_add
701
logger.info("Starting checker %r for %s",
703
# We don't need to redirect stdout and stderr, since
704
# in normal mode, that is already done by daemon(),
705
# and in debug mode we don't want to. (Stdin is
706
# always replaced by /dev/null.)
707
self.checker = subprocess.Popen(command,
710
self.checker_callback_tag = (gobject.child_watch_add
712
self.checker_callback,
714
# The checker may have completed before the gobject
715
# watch was added. Check for this.
716
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
718
gobject.source_remove(self.checker_callback_tag)
719
self.checker_callback(pid, status, command)
720
except OSError as error:
721
logger.error("Failed to start subprocess: %s",
723
# Re-run this periodically if run by gobject.timeout_add
1144
726
def stop_checker(self):
1145
727
"""Force the checker process, if any, to stop."""
1146
728
if self.checker_callback_tag:
1147
GLib.source_remove(self.checker_callback_tag)
729
gobject.source_remove(self.checker_callback_tag)
1148
730
self.checker_callback_tag = None
1149
731
if getattr(self, "checker", None) is None:
1151
733
logger.debug("Stopping checker for %(name)s", vars(self))
1152
self.checker.terminate()
735
os.kill(self.checker.pid, signal.SIGTERM)
737
#if self.checker.poll() is None:
738
# os.kill(self.checker.pid, signal.SIGKILL)
739
except OSError as error:
740
if error.errno != errno.ESRCH: # No such process
1153
742
self.checker = None
1156
def dbus_service_property(dbus_interface,
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
1160
747
"""Decorators for marking methods of a DBusObjectWithProperties to
1161
748
become properties on the D-Bus.
1163
750
The decorated method will be called with no arguments by "Get"
1164
751
and with one argument by "Set".
1166
753
The parameters, where they are supported, are the same as
1167
754
dbus.service.method, except there is only "signature", since the
1168
755
type from Get() and the type sent to Set() is the same.
1251
class DBusObjectWithAnnotations(dbus.service.Object):
1252
"""A D-Bus object with annotations.
1254
Classes inheriting from this can use the dbus_annotations
1255
decorator to add annotations to methods or signals.
813
class DBusObjectWithProperties(dbus.service.Object):
814
"""A D-Bus object with properties.
816
Classes inheriting from this can use the dbus_service_property
817
decorator to expose methods as D-Bus properties. It exposes the
818
standard Get(), Set(), and GetAll() methods on the D-Bus.
1259
822
def _is_dbus_thing(thing):
1260
823
"""Returns a function testing if an attribute is a D-Bus thing
1262
825
If called like _is_dbus_thing("method") it returns a function
1263
826
suitable for use as predicate to inspect.getmembers().
1265
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
828
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1268
831
def _get_all_dbus_things(self, thing):
1269
832
"""Returns a generator of (name, attribute) pairs
1271
return ((getattr(athing.__get__(self), "_dbus_name", name),
834
return ((athing.__get__(self)._dbus_name,
1272
835
athing.__get__(self))
1273
836
for cls in self.__class__.__mro__
1274
837
for name, athing in
1275
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1277
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1279
path_keyword='object_path',
1280
connection_keyword='connection')
1281
def Introspect(self, object_path, connection):
1282
"""Overloading of standard D-Bus method.
1284
Inserts annotation tags on methods and signals.
1286
xmlstring = dbus.service.Object.Introspect(self, object_path,
1289
document = xml.dom.minidom.parseString(xmlstring)
1291
for if_tag in document.getElementsByTagName("interface"):
1292
# Add annotation tags
1293
for typ in ("method", "signal"):
1294
for tag in if_tag.getElementsByTagName(typ):
1296
for name, prop in (self.
1297
_get_all_dbus_things(typ)):
1298
if (name == tag.getAttribute("name")
1299
and prop._dbus_interface
1300
== if_tag.getAttribute("name")):
1301
annots.update(getattr(
1302
prop, "_dbus_annotations", {}))
1303
for name, value in annots.items():
1304
ann_tag = document.createElement(
1306
ann_tag.setAttribute("name", name)
1307
ann_tag.setAttribute("value", value)
1308
tag.appendChild(ann_tag)
1309
# Add interface annotation tags
1310
for annotation, value in dict(
1311
itertools.chain.from_iterable(
1312
annotations().items()
1313
for name, annotations
1314
in self._get_all_dbus_things("interface")
1315
if name == if_tag.getAttribute("name")
1317
ann_tag = document.createElement("annotation")
1318
ann_tag.setAttribute("name", annotation)
1319
ann_tag.setAttribute("value", value)
1320
if_tag.appendChild(ann_tag)
1321
# Fix argument name for the Introspect method itself
1322
if (if_tag.getAttribute("name")
1323
== dbus.INTROSPECTABLE_IFACE):
1324
for cn in if_tag.getElementsByTagName("method"):
1325
if cn.getAttribute("name") == "Introspect":
1326
for arg in cn.getElementsByTagName("arg"):
1327
if (arg.getAttribute("direction")
1329
arg.setAttribute("name",
1331
xmlstring = document.toxml("utf-8")
1333
except (AttributeError, xml.dom.DOMException,
1334
xml.parsers.expat.ExpatError) as error:
1335
logger.error("Failed to override Introspection method",
1340
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1341
"""A D-Bus object with properties.
1343
Classes inheriting from this can use the dbus_service_property
1344
decorator to expose methods as D-Bus properties. It exposes the
1345
standard Get(), Set(), and GetAll() methods on the D-Bus.
838
inspect.getmembers(cls,
839
self._is_dbus_thing(thing)))
1348
841
def _get_dbus_property(self, interface_name, property_name):
1349
842
"""Returns a bound method if one exists which is a D-Bus
1350
843
property with the specified name and interface.
1352
for cls in self.__class__.__mro__:
1353
for name, value in inspect.getmembers(
1354
cls, self._is_dbus_thing("property")):
845
for cls in self.__class__.__mro__:
846
for name, value in (inspect.getmembers
848
self._is_dbus_thing("property"))):
1355
849
if (value._dbus_name == property_name
1356
850
and value._dbus_interface == interface_name):
1357
851
return value.__get__(self)
1359
853
# No such property
1360
raise DBusPropertyNotFound("{}:{}.{}".format(
1361
self.dbus_object_path, interface_name, property_name))
1364
def _get_all_interface_names(cls):
1365
"""Get a sequence of all interfaces supported by an object"""
1366
return (name for name in set(getattr(getattr(x, attr),
1367
"_dbus_interface", None)
1368
for x in (inspect.getmro(cls))
1370
if name is not None)
1372
@dbus.service.method(dbus.PROPERTIES_IFACE,
854
raise DBusPropertyNotFound(self.dbus_object_path + ":"
855
+ interface_name + "."
858
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1374
859
out_signature="v")
1375
860
def Get(self, interface_name, property_name):
1376
861
"""Standard D-Bus property Get() method, see D-Bus standard.
1501
968
except (AttributeError, xml.dom.DOMException,
1502
969
xml.parsers.expat.ExpatError) as error:
1503
970
logger.error("Failed to override Introspection method",
1509
dbus.OBJECT_MANAGER_IFACE
1510
except AttributeError:
1511
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1514
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1515
"""A D-Bus object with an ObjectManager.
1517
Classes inheriting from this exposes the standard
1518
GetManagedObjects call and the InterfacesAdded and
1519
InterfacesRemoved signals on the standard
1520
"org.freedesktop.DBus.ObjectManager" interface.
1522
Note: No signals are sent automatically; they must be sent
1525
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1526
out_signature="a{oa{sa{sv}}}")
1527
def GetManagedObjects(self):
1528
"""This function must be overridden"""
1529
raise NotImplementedError()
1531
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1532
signature="oa{sa{sv}}")
1533
def InterfacesAdded(self, object_path, interfaces_and_properties):
1536
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1537
def InterfacesRemoved(self, object_path, interfaces):
1540
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1542
path_keyword='object_path',
1543
connection_keyword='connection')
1544
def Introspect(self, object_path, connection):
1545
"""Overloading of standard D-Bus method.
1547
Override return argument name of GetManagedObjects to be
1548
"objpath_interfaces_and_properties"
1550
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1554
document = xml.dom.minidom.parseString(xmlstring)
1556
for if_tag in document.getElementsByTagName("interface"):
1557
# Fix argument name for the GetManagedObjects method
1558
if (if_tag.getAttribute("name")
1559
== dbus.OBJECT_MANAGER_IFACE):
1560
for cn in if_tag.getElementsByTagName("method"):
1561
if (cn.getAttribute("name")
1562
== "GetManagedObjects"):
1563
for arg in cn.getElementsByTagName("arg"):
1564
if (arg.getAttribute("direction")
1568
"objpath_interfaces"
1570
xmlstring = document.toxml("utf-8")
1572
except (AttributeError, xml.dom.DOMException,
1573
xml.parsers.expat.ExpatError) as error:
1574
logger.error("Failed to override Introspection method",
1579
def datetime_to_dbus(dt, variant_level=0):
975
def datetime_to_dbus (dt, variant_level=0):
1580
976
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1582
return dbus.String("", variant_level=variant_level)
1583
return dbus.String(dt.isoformat(), variant_level=variant_level)
1586
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1587
"""A class decorator; applied to a subclass of
1588
dbus.service.Object, it will add alternate D-Bus attributes with
1589
interface names according to the "alt_interface_names" mapping.
1592
@alternate_dbus_interfaces({"org.example.Interface":
1593
"net.example.AlternateInterface"})
1594
class SampleDBusObject(dbus.service.Object):
1595
@dbus.service.method("org.example.Interface")
1596
def SampleDBusMethod():
1599
The above "SampleDBusMethod" on "SampleDBusObject" will be
1600
reachable via two interfaces: "org.example.Interface" and
1601
"net.example.AlternateInterface", the latter of which will have
1602
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1603
"true", unless "deprecate" is passed with a False value.
1605
This works for methods and signals, and also for D-Bus properties
1606
(from DBusObjectWithProperties) and interfaces (from the
1607
dbus_interface_annotations decorator).
978
return dbus.String("", variant_level = variant_level)
979
return dbus.String(dt.isoformat(),
980
variant_level=variant_level)
983
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
985
"""Applied to an empty subclass of a D-Bus object, this metaclass
986
will add additional D-Bus attributes matching a certain pattern.
1611
for orig_interface_name, alt_interface_name in (
1612
alt_interface_names.items()):
1614
interface_names = set()
1615
# Go though all attributes of the class
1616
for attrname, attribute in inspect.getmembers(cls):
988
def __new__(mcs, name, bases, attr):
989
# Go through all the base classes which could have D-Bus
990
# methods, signals, or properties in them
991
old_interface_names = []
992
for base in (b for b in bases
993
if issubclass(b, dbus.service.Object)):
994
# Go though all attributes of the base class
995
for attrname, attribute in inspect.getmembers(base):
1617
996
# Ignore non-D-Bus attributes, and D-Bus attributes
1618
997
# with the wrong interface name
1619
998
if (not hasattr(attribute, "_dbus_interface")
1620
or not attribute._dbus_interface.startswith(
1621
orig_interface_name)):
999
or not attribute._dbus_interface
1000
.startswith("se.recompile.Mandos")):
1623
1002
# Create an alternate D-Bus interface name based on
1624
1003
# the current name
1625
alt_interface = attribute._dbus_interface.replace(
1626
orig_interface_name, alt_interface_name)
1627
interface_names.add(alt_interface)
1004
alt_interface = (attribute._dbus_interface
1005
.replace("se.recompile.Mandos",
1006
"se.bsnet.fukt.Mandos"))
1007
if alt_interface != attribute._dbus_interface:
1008
old_interface_names.append(alt_interface)
1628
1009
# Is this a D-Bus signal?
1629
1010
if getattr(attribute, "_dbus_is_signal", False):
1630
# Extract the original non-method undecorated
1631
# function by black magic
1632
if sys.version_info.major == 2:
1633
nonmethod_func = (dict(
1011
# Extract the original non-method function by
1013
nonmethod_func = (dict(
1634
1014
zip(attribute.func_code.co_freevars,
1635
attribute.__closure__))
1636
["func"].cell_contents)
1638
nonmethod_func = (dict(
1639
zip(attribute.__code__.co_freevars,
1640
attribute.__closure__))
1641
["func"].cell_contents)
1015
attribute.__closure__))["func"]
1642
1017
# Create a new, but exactly alike, function
1643
1018
# object, and decorate it to be a new D-Bus signal
1644
1019
# with the alternate D-Bus interface name
1645
new_function = copy_function(nonmethod_func)
1646
new_function = (dbus.service.signal(
1648
attribute._dbus_signature)(new_function))
1649
# Copy annotations, if any
1651
new_function._dbus_annotations = dict(
1652
attribute._dbus_annotations)
1653
except AttributeError:
1020
new_function = (dbus.service.signal
1022
attribute._dbus_signature)
1023
(types.FunctionType(
1024
nonmethod_func.func_code,
1025
nonmethod_func.func_globals,
1026
nonmethod_func.func_name,
1027
nonmethod_func.func_defaults,
1028
nonmethod_func.func_closure)))
1656
1029
# Define a creator of a function to call both the
1657
# original and alternate functions, so both the
1658
# original and alternate signals gets sent when
1659
# the function is called
1030
# old and new functions, so both the old and new
1031
# signals gets sent when the function is called
1660
1032
def fixscope(func1, func2):
1661
1033
"""This function is a scope container to pass
1662
1034
func1 and func2 to the "call_both" function
1663
1035
outside of its arguments"""
1665
@functools.wraps(func2)
1666
1036
def call_both(*args, **kwargs):
1667
1037
"""This function will emit two D-Bus
1668
1038
signals by calling func1 and func2"""
1669
1039
func1(*args, **kwargs)
1670
1040
func2(*args, **kwargs)
1671
# Make wrapper function look like a D-Bus
1673
for name, attr in inspect.getmembers(func2):
1674
if name.startswith("_dbus_"):
1675
setattr(call_both, name, attr)
1677
1041
return call_both
1678
1042
# Create the "call_both" function and add it to
1680
attr[attrname] = fixscope(attribute, new_function)
1044
attr[attrname] = fixscope(attribute,
1681
1046
# Is this a D-Bus method?
1682
1047
elif getattr(attribute, "_dbus_is_method", False):
1683
1048
# Create a new, but exactly alike, function
1684
1049
# object. Decorate it to be a new D-Bus method
1685
1050
# with the alternate D-Bus interface name. Add it
1686
1051
# to the class.
1688
dbus.service.method(
1690
attribute._dbus_in_signature,
1691
attribute._dbus_out_signature)
1692
(copy_function(attribute)))
1693
# Copy annotations, if any
1695
attr[attrname]._dbus_annotations = dict(
1696
attribute._dbus_annotations)
1697
except AttributeError:
1052
attr[attrname] = (dbus.service.method
1054
attribute._dbus_in_signature,
1055
attribute._dbus_out_signature)
1057
(attribute.func_code,
1058
attribute.func_globals,
1059
attribute.func_name,
1060
attribute.func_defaults,
1061
attribute.func_closure)))
1699
1062
# Is this a D-Bus property?
1700
1063
elif getattr(attribute, "_dbus_is_property", False):
1701
1064
# Create a new, but exactly alike, function
1702
1065
# object, and decorate it to be a new D-Bus
1703
1066
# property with the alternate D-Bus interface
1704
1067
# name. Add it to the class.
1705
attr[attrname] = (dbus_service_property(
1706
alt_interface, attribute._dbus_signature,
1707
attribute._dbus_access,
1708
attribute._dbus_get_args_options
1710
(copy_function(attribute)))
1711
# Copy annotations, if any
1713
attr[attrname]._dbus_annotations = dict(
1714
attribute._dbus_annotations)
1715
except AttributeError:
1068
attr[attrname] = (dbus_service_property
1070
attribute._dbus_signature,
1071
attribute._dbus_access,
1073
._dbus_get_args_options
1076
(attribute.func_code,
1077
attribute.func_globals,
1078
attribute.func_name,
1079
attribute.func_defaults,
1080
attribute.func_closure)))
1717
1081
# Is this a D-Bus interface?
1718
1082
elif getattr(attribute, "_dbus_is_interface", False):
1719
1083
# Create a new, but exactly alike, function
1720
1084
# object. Decorate it to be a new D-Bus interface
1721
1085
# with the alternate D-Bus interface name. Add it
1722
1086
# to the class.
1724
dbus_interface_annotations(alt_interface)
1725
(copy_function(attribute)))
1727
# Deprecate all alternate interfaces
1728
iname = "_AlternateDBusNames_interface_annotation{}"
1729
for interface_name in interface_names:
1731
@dbus_interface_annotations(interface_name)
1733
return {"org.freedesktop.DBus.Deprecated":
1735
# Find an unused name
1736
for aname in (iname.format(i)
1737
for i in itertools.count()):
1738
if aname not in attr:
1742
# Replace the class with a new subclass of it with
1743
# methods, signals, etc. as created above.
1744
if sys.version_info.major == 2:
1745
cls = type(b"{}Alternate".format(cls.__name__),
1748
cls = type("{}Alternate".format(cls.__name__),
1755
@alternate_dbus_interfaces({"se.recompile.Mandos":
1756
"se.bsnet.fukt.Mandos"})
1087
attr[attrname] = (dbus_interface_annotations
1090
(attribute.func_code,
1091
attribute.func_globals,
1092
attribute.func_name,
1093
attribute.func_defaults,
1094
attribute.func_closure)))
1095
# Deprecate all old interfaces
1096
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1097
for old_interface_name in old_interface_names:
1098
@dbus_interface_annotations(old_interface_name)
1100
return { "org.freedesktop.DBus.Deprecated": "true" }
1101
# Find an unused name
1102
for aname in (basename.format(i) for i in
1104
if aname not in attr:
1107
return type.__new__(mcs, name, bases, attr)
1757
1110
class ClientDBus(Client, DBusObjectWithProperties):
1758
1111
"""A Client class using D-Bus
1761
1114
dbus_object_path: dbus.ObjectPath
1762
1115
bus: dbus.SystemBus()
1765
1118
runtime_expansions = (Client.runtime_expansions
1766
+ ("dbus_object_path", ))
1768
_interface = "se.recompile.Mandos.Client"
1119
+ ("dbus_object_path",))
1770
1121
# dbus.service.Object doesn't use super(), so we can't either.
1772
def __init__(self, bus=None, *args, **kwargs):
1123
def __init__(self, bus = None, *args, **kwargs):
1774
1125
Client.__init__(self, *args, **kwargs)
1775
1126
# Only now, when this client is initialized, can it show up on
1777
client_object_name = str(self.name).translate(
1128
client_object_name = unicode(self.name).translate(
1778
1129
{ord("."): ord("_"),
1779
1130
ord("-"): ord("_")})
1780
self.dbus_object_path = dbus.ObjectPath(
1781
"/clients/" + client_object_name)
1131
self.dbus_object_path = (dbus.ObjectPath
1132
("/clients/" + client_object_name))
1782
1133
DBusObjectWithProperties.__init__(self, self.bus,
1783
1134
self.dbus_object_path)
1785
def notifychangeproperty(transform_func, dbus_name,
1786
type_func=lambda x: x,
1788
invalidate_only=False,
1789
_interface=_interface):
1136
def notifychangeproperty(transform_func,
1137
dbus_name, type_func=lambda x: x,
1790
1139
""" Modify a variable so that it's a property which announces
1791
1140
its changes to DBus.
1793
1142
transform_fun: Function that takes a value and a variant_level
1794
1143
and transforms it to a D-Bus type.
1795
1144
dbus_name: D-Bus name of the variable
1947
1294
server to mandos-client
1951
1298
# Rejected - signal
1952
1299
@dbus.service.signal(_interface, signature="s")
1953
1300
def Rejected(self, reason):
1957
1304
# NeedApproval - signal
1958
1305
@dbus.service.signal(_interface, signature="tb")
1959
1306
def NeedApproval(self, timeout, default):
1961
1308
return self.need_approval()
1965
1312
# Approve - method
1966
1313
@dbus.service.method(_interface, in_signature="b")
1967
1314
def Approve(self, value):
1968
1315
self.approve(value)
1970
1317
# CheckedOK - method
1971
1318
@dbus.service.method(_interface)
1972
1319
def CheckedOK(self):
1973
1320
self.checked_ok()
1975
1322
# Enable - method
1976
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1977
1323
@dbus.service.method(_interface)
1978
1324
def Enable(self):
1982
1328
# StartChecker - method
1983
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1984
1329
@dbus.service.method(_interface)
1985
1330
def StartChecker(self):
1987
1332
self.start_checker()
1989
1334
# Disable - method
1990
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1991
1335
@dbus.service.method(_interface)
1992
1336
def Disable(self):
1996
1340
# StopChecker - method
1997
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1998
1341
@dbus.service.method(_interface)
1999
1342
def StopChecker(self):
2000
1343
self.stop_checker()
2004
1347
# ApprovalPending - property
2005
1348
@dbus_service_property(_interface, signature="b", access="read")
2006
1349
def ApprovalPending_dbus_property(self):
2007
1350
return dbus.Boolean(bool(self.approvals_pending))
2009
1352
# ApprovedByDefault - property
2010
@dbus_service_property(_interface,
1353
@dbus_service_property(_interface, signature="b",
2012
1354
access="readwrite")
2013
1355
def ApprovedByDefault_dbus_property(self, value=None):
2014
1356
if value is None: # get
2015
1357
return dbus.Boolean(self.approved_by_default)
2016
1358
self.approved_by_default = bool(value)
2018
1360
# ApprovalDelay - property
2019
@dbus_service_property(_interface,
1361
@dbus_service_property(_interface, signature="t",
2021
1362
access="readwrite")
2022
1363
def ApprovalDelay_dbus_property(self, value=None):
2023
1364
if value is None: # get
2024
return dbus.UInt64(self.approval_delay.total_seconds()
1365
return dbus.UInt64(self.approval_delay_milliseconds())
2026
1366
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2028
1368
# ApprovalDuration - property
2029
@dbus_service_property(_interface,
1369
@dbus_service_property(_interface, signature="t",
2031
1370
access="readwrite")
2032
1371
def ApprovalDuration_dbus_property(self, value=None):
2033
1372
if value is None: # get
2034
return dbus.UInt64(self.approval_duration.total_seconds()
1373
return dbus.UInt64(timedelta_to_milliseconds(
1374
self.approval_duration))
2036
1375
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2038
1377
# Name - property
2040
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2041
1378
@dbus_service_property(_interface, signature="s", access="read")
2042
1379
def Name_dbus_property(self):
2043
1380
return dbus.String(self.name)
2047
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2048
@dbus_service_property(_interface, signature="s", access="read")
2049
def KeyID_dbus_property(self):
2050
return dbus.String(self.key_id)
2052
1382
# Fingerprint - property
2054
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2055
1383
@dbus_service_property(_interface, signature="s", access="read")
2056
1384
def Fingerprint_dbus_property(self):
2057
1385
return dbus.String(self.fingerprint)
2059
1387
# Host - property
2060
@dbus_service_property(_interface,
1388
@dbus_service_property(_interface, signature="s",
2062
1389
access="readwrite")
2063
1390
def Host_dbus_property(self, value=None):
2064
1391
if value is None: # get
2065
1392
return dbus.String(self.host)
2066
self.host = str(value)
1393
self.host = unicode(value)
2068
1395
# Created - property
2070
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2071
1396
@dbus_service_property(_interface, signature="s", access="read")
2072
1397
def Created_dbus_property(self):
2073
1398
return datetime_to_dbus(self.created)
2075
1400
# LastEnabled - property
2076
1401
@dbus_service_property(_interface, signature="s", access="read")
2077
1402
def LastEnabled_dbus_property(self):
2078
1403
return datetime_to_dbus(self.last_enabled)
2080
1405
# Enabled - property
2081
@dbus_service_property(_interface,
1406
@dbus_service_property(_interface, signature="b",
2083
1407
access="readwrite")
2084
1408
def Enabled_dbus_property(self, value=None):
2085
1409
if value is None: # get
2092
1416
# LastCheckedOK - property
2093
@dbus_service_property(_interface,
1417
@dbus_service_property(_interface, signature="s",
2095
1418
access="readwrite")
2096
1419
def LastCheckedOK_dbus_property(self, value=None):
2097
1420
if value is not None:
2098
1421
self.checked_ok()
2100
1423
return datetime_to_dbus(self.last_checked_ok)
2102
1425
# LastCheckerStatus - property
2103
@dbus_service_property(_interface, signature="n", access="read")
1426
@dbus_service_property(_interface, signature="n",
2104
1428
def LastCheckerStatus_dbus_property(self):
2105
1429
return dbus.Int16(self.last_checker_status)
2107
1431
# Expires - property
2108
1432
@dbus_service_property(_interface, signature="s", access="read")
2109
1433
def Expires_dbus_property(self):
2110
1434
return datetime_to_dbus(self.expires)
2112
1436
# LastApprovalRequest - property
2113
1437
@dbus_service_property(_interface, signature="s", access="read")
2114
1438
def LastApprovalRequest_dbus_property(self):
2115
1439
return datetime_to_dbus(self.last_approval_request)
2117
1441
# Timeout - property
2118
@dbus_service_property(_interface,
1442
@dbus_service_property(_interface, signature="t",
2120
1443
access="readwrite")
2121
1444
def Timeout_dbus_property(self, value=None):
2122
1445
if value is None: # get
2123
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2124
old_timeout = self.timeout
1446
return dbus.UInt64(self.timeout_milliseconds())
2125
1447
self.timeout = datetime.timedelta(0, 0, 0, value)
2126
# Reschedule disabling
1448
# Reschedule timeout
2127
1449
if self.enabled:
2128
1450
now = datetime.datetime.utcnow()
2129
self.expires += self.timeout - old_timeout
2130
if self.expires <= now:
1451
time_to_die = timedelta_to_milliseconds(
1452
(self.last_checked_ok + self.timeout) - now)
1453
if time_to_die <= 0:
2131
1454
# The timeout has passed
1457
self.expires = (now +
1458
datetime.timedelta(milliseconds =
2134
1460
if (getattr(self, "disable_initiator_tag", None)
2137
GLib.source_remove(self.disable_initiator_tag)
2138
self.disable_initiator_tag = GLib.timeout_add(
2139
int((self.expires - now).total_seconds() * 1000),
1463
gobject.source_remove(self.disable_initiator_tag)
1464
self.disable_initiator_tag = (gobject.timeout_add
2142
1468
# ExtendedTimeout - property
2143
@dbus_service_property(_interface,
1469
@dbus_service_property(_interface, signature="t",
2145
1470
access="readwrite")
2146
1471
def ExtendedTimeout_dbus_property(self, value=None):
2147
1472
if value is None: # get
2148
return dbus.UInt64(self.extended_timeout.total_seconds()
1473
return dbus.UInt64(self.extended_timeout_milliseconds())
2150
1474
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2152
1476
# Interval - property
2153
@dbus_service_property(_interface,
1477
@dbus_service_property(_interface, signature="t",
2155
1478
access="readwrite")
2156
1479
def Interval_dbus_property(self, value=None):
2157
1480
if value is None: # get
2158
return dbus.UInt64(self.interval.total_seconds() * 1000)
1481
return dbus.UInt64(self.interval_milliseconds())
2159
1482
self.interval = datetime.timedelta(0, 0, 0, value)
2160
1483
if getattr(self, "checker_initiator_tag", None) is None:
2162
1485
if self.enabled:
2163
1486
# Reschedule checker run
2164
GLib.source_remove(self.checker_initiator_tag)
2165
self.checker_initiator_tag = GLib.timeout_add(
2166
value, self.start_checker)
2167
self.start_checker() # Start one now, too
1487
gobject.source_remove(self.checker_initiator_tag)
1488
self.checker_initiator_tag = (gobject.timeout_add
1489
(value, self.start_checker))
1490
self.start_checker() # Start one now, too
2169
1492
# Checker - property
2170
@dbus_service_property(_interface,
1493
@dbus_service_property(_interface, signature="s",
2172
1494
access="readwrite")
2173
1495
def Checker_dbus_property(self, value=None):
2174
1496
if value is None: # get
2175
1497
return dbus.String(self.checker_command)
2176
self.checker_command = str(value)
1498
self.checker_command = unicode(value)
2178
1500
# CheckerRunning - property
2179
@dbus_service_property(_interface,
1501
@dbus_service_property(_interface, signature="b",
2181
1502
access="readwrite")
2182
1503
def CheckerRunning_dbus_property(self, value=None):
2183
1504
if value is None: # get
2224
1537
if data[0] == 'data':
2226
1539
if data[0] == 'function':
2228
1540
def func(*args, **kwargs):
2229
1541
self._pipe.send(('funcall', name, args, kwargs))
2230
1542
return self._pipe.recv()[1]
2234
1545
def __setattr__(self, name, value):
2235
1546
if name == '_pipe':
2236
1547
return super(ProxyClient, self).__setattr__(name, value)
2237
1548
self._pipe.send(('setattr', name, value))
1551
class ClientDBusTransitional(ClientDBus):
1552
__metaclass__ = AlternateDBusNamesMetaclass
2240
1555
class ClientHandler(socketserver.BaseRequestHandler, object):
2241
1556
"""A class to handle client connections.
2243
1558
Instantiated once for each connection to handle it.
2244
1559
Note: This will run in its own forked process."""
2246
1561
def handle(self):
2247
1562
with contextlib.closing(self.server.child_pipe) as child_pipe:
2248
1563
logger.info("TCP connection from: %s",
2249
str(self.client_address))
1564
unicode(self.client_address))
2250
1565
logger.debug("Pipe FD: %d",
2251
1566
self.server.child_pipe.fileno())
2253
session = gnutls.ClientSession(self.request)
2255
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2256
# "+AES-256-CBC", "+SHA1",
2257
# "+COMP-NULL", "+CTYPE-OPENPGP",
1568
session = (gnutls.connection
1569
.ClientSession(self.request,
1571
.X509Credentials()))
1573
# Note: gnutls.connection.X509Credentials is really a
1574
# generic GnuTLS certificate credentials object so long as
1575
# no X.509 keys are added to it. Therefore, we can use it
1576
# here despite using OpenPGP certificates.
1578
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1579
# "+AES-256-CBC", "+SHA1",
1580
# "+COMP-NULL", "+CTYPE-OPENPGP",
2259
1582
# Use a fallback default, since this MUST be set.
2260
1583
priority = self.server.gnutls_priority
2261
1584
if priority is None:
2262
1585
priority = "NORMAL"
2263
gnutls.priority_set_direct(session._c_object,
2264
priority.encode("utf-8"),
1586
(gnutls.library.functions
1587
.gnutls_priority_set_direct(session._c_object,
2267
1590
# Start communication using the Mandos protocol
2268
1591
# Get protocol number
2269
1592
line = self.request.makefile().readline()
2270
1593
logger.debug("Protocol version: %r", line)
2272
1595
if int(line.strip().split()[0]) > 1:
2273
raise RuntimeError(line)
2274
1597
except (ValueError, IndexError, RuntimeError) as error:
2275
1598
logger.error("Unknown protocol version: %s", error)
2278
1601
# Start GnuTLS connection
2280
1603
session.handshake()
2281
except gnutls.Error as error:
1604
except gnutls.errors.GNUTLSError as error:
2282
1605
logger.warning("Handshake failed: %s", error)
2283
1606
# Do not run session.bye() here: the session is not
2284
1607
# established. Just abandon the request.
2286
1609
logger.debug("Handshake succeeded")
2288
1611
approval_required = False
2290
if gnutls.has_rawpk:
2293
key_id = self.key_id(
2294
self.peer_certificate(session))
2295
except (TypeError, gnutls.Error) as error:
2296
logger.warning("Bad certificate: %s", error)
2298
logger.debug("Key ID: %s", key_id)
2303
fpr = self.fingerprint(
2304
self.peer_certificate(session))
2305
except (TypeError, gnutls.Error) as error:
2306
logger.warning("Bad certificate: %s", error)
2308
logger.debug("Fingerprint: %s", fpr)
2311
client = ProxyClient(child_pipe, key_id, fpr,
1614
fpr = self.fingerprint(self.peer_certificate
1617
gnutls.errors.GNUTLSError) as error:
1618
logger.warning("Bad certificate: %s", error)
1620
logger.debug("Fingerprint: %s", fpr)
1623
client = ProxyClient(child_pipe, fpr,
2312
1624
self.client_address)
2313
1625
except KeyError:
2316
1628
if client.approval_delay:
2317
1629
delay = client.approval_delay
2318
1630
client.approvals_pending += 1
2319
1631
approval_required = True
2322
1634
if not client.enabled:
2323
1635
logger.info("Client %s is disabled",
2325
1637
if self.server.use_dbus:
2326
1638
# Emit D-Bus signal
2327
1639
client.Rejected("Disabled")
2330
1642
if client.approved or not client.approval_delay:
2331
# We are approved or approval is disabled
1643
#We are approved or approval is disabled
2333
1645
elif client.approved is None:
2334
1646
logger.info("Client %s needs approval",
2367
1681
delay -= time2 - time
2370
session.send(client.secret)
2371
except gnutls.Error as error:
2372
logger.warning("gnutls send failed",
1684
while sent_size < len(client.secret):
1686
sent = session.send(client.secret[sent_size:])
1687
except gnutls.errors.GNUTLSError as error:
1688
logger.warning("gnutls send failed")
1690
logger.debug("Sent: %d, remaining: %d",
1691
sent, len(client.secret)
1692
- (sent_size + sent))
2376
1695
logger.info("Sending secret to %s", client.name)
2377
1696
# bump the timeout using extended_timeout
2378
1697
client.bump_timeout(client.extended_timeout)
2379
1698
if self.server.use_dbus:
2380
1699
# Emit D-Bus signal
2381
1700
client.GotSecret()
2384
1703
if approval_required:
2385
1704
client.approvals_pending -= 1
2388
except gnutls.Error as error:
2389
logger.warning("GnuTLS bye failed",
1707
except gnutls.errors.GNUTLSError as error:
1708
logger.warning("GnuTLS bye failed")
2393
1711
def peer_certificate(session):
2394
"Return the peer's certificate as a bytestring"
2396
cert_type = gnutls.certificate_type_get2(session._c_object,
2398
except AttributeError:
2399
cert_type = gnutls.certificate_type_get(session._c_object)
2400
if gnutls.has_rawpk:
2401
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2403
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2404
# If not a valid certificate type...
2405
if cert_type not in valid_cert_types:
2406
logger.info("Cert type %r not in %r", cert_type,
2408
# ...return invalid data
1712
"Return the peer's OpenPGP certificate as a bytestring"
1713
# If not an OpenPGP certificate...
1714
if (gnutls.library.functions
1715
.gnutls_certificate_type_get(session._c_object)
1716
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1717
# ...do the normal thing
1718
return session.peer_certificate
2410
1719
list_size = ctypes.c_uint(1)
2411
cert_list = (gnutls.certificate_get_peers
1720
cert_list = (gnutls.library.functions
1721
.gnutls_certificate_get_peers
2412
1722
(session._c_object, ctypes.byref(list_size)))
2413
1723
if not bool(cert_list) and list_size.value != 0:
2414
raise gnutls.Error("error getting peer certificate")
1724
raise gnutls.errors.GNUTLSError("error getting peer"
2415
1726
if list_size.value == 0:
2417
1728
cert = cert_list[0]
2418
1729
return ctypes.string_at(cert.data, cert.size)
2421
def key_id(certificate):
2422
"Convert a certificate bytestring to a hexdigit key ID"
2423
# New GnuTLS "datum" with the public key
2424
datum = gnutls.datum_t(
2425
ctypes.cast(ctypes.c_char_p(certificate),
2426
ctypes.POINTER(ctypes.c_ubyte)),
2427
ctypes.c_uint(len(certificate)))
2428
# XXX all these need to be created in the gnutls "module"
2429
# New empty GnuTLS certificate
2430
pubkey = gnutls.pubkey_t()
2431
gnutls.pubkey_init(ctypes.byref(pubkey))
2432
# Import the raw public key into the certificate
2433
gnutls.pubkey_import(pubkey,
2434
ctypes.byref(datum),
2435
gnutls.X509_FMT_DER)
2436
# New buffer for the key ID
2437
buf = ctypes.create_string_buffer(32)
2438
buf_len = ctypes.c_size_t(len(buf))
2439
# Get the key ID from the raw public key into the buffer
2440
gnutls.pubkey_get_key_id(pubkey,
2441
gnutls.KEYID_USE_SHA256,
2442
ctypes.cast(ctypes.byref(buf),
2443
ctypes.POINTER(ctypes.c_ubyte)),
2444
ctypes.byref(buf_len))
2445
# Deinit the certificate
2446
gnutls.pubkey_deinit(pubkey)
2448
# Convert the buffer to a Python bytestring
2449
key_id = ctypes.string_at(buf, buf_len.value)
2450
# Convert the bytestring to hexadecimal notation
2451
hex_key_id = binascii.hexlify(key_id).upper()
2455
1732
def fingerprint(openpgp):
2456
1733
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2457
1734
# New GnuTLS "datum" with the OpenPGP public key
2458
datum = gnutls.datum_t(
2459
ctypes.cast(ctypes.c_char_p(openpgp),
2460
ctypes.POINTER(ctypes.c_ubyte)),
2461
ctypes.c_uint(len(openpgp)))
1735
datum = (gnutls.library.types
1736
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1739
ctypes.c_uint(len(openpgp))))
2462
1740
# New empty GnuTLS certificate
2463
crt = gnutls.openpgp_crt_t()
2464
gnutls.openpgp_crt_init(ctypes.byref(crt))
1741
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1742
(gnutls.library.functions
1743
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2465
1744
# Import the OpenPGP public key into the certificate
2466
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2467
gnutls.OPENPGP_FMT_RAW)
1745
(gnutls.library.functions
1746
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1747
gnutls.library.constants
1748
.GNUTLS_OPENPGP_FMT_RAW))
2468
1749
# Verify the self signature in the key
2469
1750
crtverify = ctypes.c_uint()
2470
gnutls.openpgp_crt_verify_self(crt, 0,
2471
ctypes.byref(crtverify))
1751
(gnutls.library.functions
1752
.gnutls_openpgp_crt_verify_self(crt, 0,
1753
ctypes.byref(crtverify)))
2472
1754
if crtverify.value != 0:
2473
gnutls.openpgp_crt_deinit(crt)
2474
raise gnutls.CertificateSecurityError(code
1755
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1756
raise (gnutls.errors.CertificateSecurityError
2476
1758
# New buffer for the fingerprint
2477
1759
buf = ctypes.create_string_buffer(20)
2478
1760
buf_len = ctypes.c_size_t()
2479
1761
# Get the fingerprint from the certificate into the buffer
2480
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2481
ctypes.byref(buf_len))
1762
(gnutls.library.functions
1763
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1764
ctypes.byref(buf_len)))
2482
1765
# Deinit the certificate
2483
gnutls.openpgp_crt_deinit(crt)
1766
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2484
1767
# Convert the buffer to a Python bytestring
2485
1768
fpr = ctypes.string_at(buf, buf_len.value)
2486
1769
# Convert the bytestring to hexadecimal notation
2491
1774
class MultiprocessingMixIn(object):
2492
1775
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2494
1776
def sub_process_main(self, request, address):
2496
1778
self.finish_request(request, address)
2497
1779
except Exception:
2498
1780
self.handle_error(request, address)
2499
1781
self.close_request(request)
2501
1783
def process_request(self, request, address):
2502
1784
"""Start a new process to process the request."""
2503
proc = multiprocessing.Process(target=self.sub_process_main,
2504
args=(request, address))
1785
proc = multiprocessing.Process(target = self.sub_process_main,
2509
1792
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2510
1793
""" adds a pipe to the MixIn """
2512
1794
def process_request(self, request, client_address):
2513
1795
"""Overrides and wraps the original process_request().
2515
1797
This function creates a new pipe in self.pipe
2517
1799
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2519
1801
proc = MultiprocessingMixIn.process_request(self, request,
2520
1802
client_address)
2521
1803
self.child_pipe.close()
2522
1804
self.add_pipe(parent_pipe, proc)
2524
1806
def add_pipe(self, parent_pipe, proc):
2525
1807
"""Dummy function; override as necessary"""
2526
raise NotImplementedError()
1808
raise NotImplementedError
2529
1811
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2530
1812
socketserver.TCPServer, object):
2531
1813
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2534
1816
enabled: Boolean; whether this server is activated yet
2535
1817
interface: None or a network interface name (string)
2536
1818
use_ipv6: Boolean; to use IPv6 or not
2539
1820
def __init__(self, server_address, RequestHandlerClass,
2543
"""If socketfd is set, use that file descriptor instead of
2544
creating a new one with socket.socket().
1821
interface=None, use_ipv6=True):
2546
1822
self.interface = interface
2548
1824
self.address_family = socket.AF_INET6
2549
if socketfd is not None:
2550
# Save the file descriptor
2551
self.socketfd = socketfd
2552
# Save the original socket.socket() function
2553
self.socket_socket = socket.socket
2555
# To implement --socket, we monkey patch socket.socket.
2557
# (When socketserver.TCPServer is a new-style class, we
2558
# could make self.socket into a property instead of monkey
2559
# patching socket.socket.)
2561
# Create a one-time-only replacement for socket.socket()
2562
@functools.wraps(socket.socket)
2563
def socket_wrapper(*args, **kwargs):
2564
# Restore original function so subsequent calls are
2566
socket.socket = self.socket_socket
2567
del self.socket_socket
2568
# This time only, return a new socket object from the
2569
# saved file descriptor.
2570
return socket.fromfd(self.socketfd, *args, **kwargs)
2571
# Replace socket.socket() function with wrapper
2572
socket.socket = socket_wrapper
2573
# The socketserver.TCPServer.__init__ will call
2574
# socket.socket(), which might be our replacement,
2575
# socket_wrapper(), if socketfd was set.
2576
1825
socketserver.TCPServer.__init__(self, server_address,
2577
1826
RequestHandlerClass)
2579
1827
def server_bind(self):
2580
1828
"""This overrides the normal server_bind() function
2581
1829
to bind to an interface if one was specified, and also NOT to
2582
1830
bind to an address or port if they were not specified."""
2583
global SO_BINDTODEVICE
2584
1831
if self.interface is not None:
2585
1832
if SO_BINDTODEVICE is None:
2586
# Fall back to a hard-coded value which seems to be
2588
logger.warning("SO_BINDTODEVICE not found, trying 25")
2589
SO_BINDTODEVICE = 25
2591
self.socket.setsockopt(
2592
socket.SOL_SOCKET, SO_BINDTODEVICE,
2593
(self.interface + "\0").encode("utf-8"))
2594
except socket.error as error:
2595
if error.errno == errno.EPERM:
2596
logger.error("No permission to bind to"
2597
" interface %s", self.interface)
2598
elif error.errno == errno.ENOPROTOOPT:
2599
logger.error("SO_BINDTODEVICE not available;"
2600
" cannot bind to interface %s",
2602
elif error.errno == errno.ENODEV:
2603
logger.error("Interface %s does not exist,"
2604
" cannot bind", self.interface)
1833
logger.error("SO_BINDTODEVICE does not exist;"
1834
" cannot bind to interface %s",
1838
self.socket.setsockopt(socket.SOL_SOCKET,
1842
except socket.error as error:
1843
if error[0] == errno.EPERM:
1844
logger.error("No permission to"
1845
" bind to interface %s",
1847
elif error[0] == errno.ENOPROTOOPT:
1848
logger.error("SO_BINDTODEVICE not available;"
1849
" cannot bind to interface %s",
2607
1853
# Only bind(2) the socket if we really need to.
2608
1854
if self.server_address[0] or self.server_address[1]:
2609
if self.server_address[1]:
2610
self.allow_reuse_address = True
2611
1855
if not self.server_address[0]:
2612
1856
if self.address_family == socket.AF_INET6:
2613
any_address = "::" # in6addr_any
1857
any_address = "::" # in6addr_any
2615
any_address = "0.0.0.0" # INADDR_ANY
1859
any_address = socket.INADDR_ANY
2616
1860
self.server_address = (any_address,
2617
1861
self.server_address[1])
2618
1862
elif not self.server_address[1]:
2619
self.server_address = (self.server_address[0], 0)
1863
self.server_address = (self.server_address[0],
2620
1865
# if self.interface:
2621
1866
# self.server_address = (self.server_address[0],
2652
1892
self.gnutls_priority = gnutls_priority
2653
1893
IPv6_TCPServer.__init__(self, server_address,
2654
1894
RequestHandlerClass,
2655
interface=interface,
1895
interface = interface,
1896
use_ipv6 = use_ipv6)
2659
1897
def server_activate(self):
2660
1898
if self.enabled:
2661
1899
return socketserver.TCPServer.server_activate(self)
2663
1901
def enable(self):
2664
1902
self.enabled = True
2666
1904
def add_pipe(self, parent_pipe, proc):
2667
1905
# Call "handle_ipc" for both data and EOF events
2669
parent_pipe.fileno(),
2670
GLib.IO_IN | GLib.IO_HUP,
2671
functools.partial(self.handle_ipc,
2672
parent_pipe=parent_pipe,
2675
def handle_ipc(self, source, condition,
2678
client_object=None):
1906
gobject.io_add_watch(parent_pipe.fileno(),
1907
gobject.IO_IN | gobject.IO_HUP,
1908
functools.partial(self.handle_ipc,
1913
def handle_ipc(self, source, condition, parent_pipe=None,
1914
proc = None, client_object=None):
1916
gobject.IO_IN: "IN", # There is data to read.
1917
gobject.IO_OUT: "OUT", # Data can be written (without
1919
gobject.IO_PRI: "PRI", # There is urgent data to read.
1920
gobject.IO_ERR: "ERR", # Error condition.
1921
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1922
# broken, usually for pipes and
1925
conditions_string = ' | '.join(name
1927
condition_names.iteritems()
1928
if cond & condition)
2679
1929
# error, or the other end of multiprocessing.Pipe has closed
2680
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1930
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2681
1931
# Wait for other process to exit
2685
1935
# Read a request from the child
2686
1936
request = parent_pipe.recv()
2687
1937
command = request[0]
2689
1939
if command == 'init':
2690
key_id = request[1].decode("ascii")
2691
fpr = request[2].decode("ascii")
2692
address = request[3]
2694
for c in self.clients.values():
2695
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2697
if key_id and c.key_id == key_id:
2700
if fpr and c.fingerprint == fpr:
1941
address = request[2]
1943
for c in self.clients.itervalues():
1944
if c.fingerprint == fpr:
2704
logger.info("Client not found for key ID: %s, address"
2705
": %s", key_id or fpr, address)
1948
logger.info("Client not found for fingerprint: %s, ad"
1949
"dress: %s", fpr, address)
2706
1950
if self.use_dbus:
2707
1951
# Emit D-Bus signal
2708
mandos_dbus_service.ClientNotFound(key_id or fpr,
1952
mandos_dbus_service.ClientNotFound(fpr,
2710
1954
parent_pipe.send(False)
2714
parent_pipe.fileno(),
2715
GLib.IO_IN | GLib.IO_HUP,
2716
functools.partial(self.handle_ipc,
2717
parent_pipe=parent_pipe,
2719
client_object=client))
1957
gobject.io_add_watch(parent_pipe.fileno(),
1958
gobject.IO_IN | gobject.IO_HUP,
1959
functools.partial(self.handle_ipc,
2720
1965
parent_pipe.send(True)
2721
1966
# remove the old hook in favor of the new above hook on
2725
1970
funcname = request[1]
2726
1971
args = request[2]
2727
1972
kwargs = request[3]
2729
1974
parent_pipe.send(('data', getattr(client_object,
2730
1975
funcname)(*args,
2733
1978
if command == 'getattr':
2734
1979
attrname = request[1]
2735
if isinstance(client_object.__getattribute__(attrname),
2736
collections.Callable):
2737
parent_pipe.send(('function', ))
1980
if callable(client_object.__getattribute__(attrname)):
1981
parent_pipe.send(('function',))
2740
'data', client_object.__getattribute__(attrname)))
1983
parent_pipe.send(('data', client_object
1984
.__getattribute__(attrname)))
2742
1986
if command == 'setattr':
2743
1987
attrname = request[1]
2744
1988
value = request[2]
2745
1989
setattr(client_object, attrname, value)
2750
def rfc3339_duration_to_delta(duration):
2751
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2753
>>> rfc3339_duration_to_delta("P7D")
2754
datetime.timedelta(7)
2755
>>> rfc3339_duration_to_delta("PT60S")
2756
datetime.timedelta(0, 60)
2757
>>> rfc3339_duration_to_delta("PT60M")
2758
datetime.timedelta(0, 3600)
2759
>>> rfc3339_duration_to_delta("PT24H")
2760
datetime.timedelta(1)
2761
>>> rfc3339_duration_to_delta("P1W")
2762
datetime.timedelta(7)
2763
>>> rfc3339_duration_to_delta("PT5M30S")
2764
datetime.timedelta(0, 330)
2765
>>> rfc3339_duration_to_delta("P1DT3M20S")
2766
datetime.timedelta(1, 200)
2769
# Parsing an RFC 3339 duration with regular expressions is not
2770
# possible - there would have to be multiple places for the same
2771
# values, like seconds. The current code, while more esoteric, is
2772
# cleaner without depending on a parsing library. If Python had a
2773
# built-in library for parsing we would use it, but we'd like to
2774
# avoid excessive use of external libraries.
2776
# New type for defining tokens, syntax, and semantics all-in-one
2777
Token = collections.namedtuple("Token", (
2778
"regexp", # To match token; if "value" is not None, must have
2779
# a "group" containing digits
2780
"value", # datetime.timedelta or None
2781
"followers")) # Tokens valid after this token
2782
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2783
# the "duration" ABNF definition in RFC 3339, Appendix A.
2784
token_end = Token(re.compile(r"$"), None, frozenset())
2785
token_second = Token(re.compile(r"(\d+)S"),
2786
datetime.timedelta(seconds=1),
2787
frozenset((token_end, )))
2788
token_minute = Token(re.compile(r"(\d+)M"),
2789
datetime.timedelta(minutes=1),
2790
frozenset((token_second, token_end)))
2791
token_hour = Token(re.compile(r"(\d+)H"),
2792
datetime.timedelta(hours=1),
2793
frozenset((token_minute, token_end)))
2794
token_time = Token(re.compile(r"T"),
2796
frozenset((token_hour, token_minute,
2798
token_day = Token(re.compile(r"(\d+)D"),
2799
datetime.timedelta(days=1),
2800
frozenset((token_time, token_end)))
2801
token_month = Token(re.compile(r"(\d+)M"),
2802
datetime.timedelta(weeks=4),
2803
frozenset((token_day, token_end)))
2804
token_year = Token(re.compile(r"(\d+)Y"),
2805
datetime.timedelta(weeks=52),
2806
frozenset((token_month, token_end)))
2807
token_week = Token(re.compile(r"(\d+)W"),
2808
datetime.timedelta(weeks=1),
2809
frozenset((token_end, )))
2810
token_duration = Token(re.compile(r"P"), None,
2811
frozenset((token_year, token_month,
2812
token_day, token_time,
2814
# Define starting values:
2816
value = datetime.timedelta()
2818
# Following valid tokens
2819
followers = frozenset((token_duration, ))
2820
# String left to parse
2822
# Loop until end token is found
2823
while found_token is not token_end:
2824
# Search for any currently valid tokens
2825
for token in followers:
2826
match = token.regexp.match(s)
2827
if match is not None:
2829
if token.value is not None:
2830
# Value found, parse digits
2831
factor = int(match.group(1), 10)
2832
# Add to value so far
2833
value += factor * token.value
2834
# Strip token from string
2835
s = token.regexp.sub("", s, 1)
2838
# Set valid next tokens
2839
followers = found_token.followers
2842
# No currently valid tokens were found
2843
raise ValueError("Invalid RFC 3339 duration: {!r}"
2849
1994
def string_to_delta(interval):
2850
1995
"""Parse a string and return a datetime.timedelta
2852
1997
>>> string_to_delta('7d')
2853
1998
datetime.timedelta(7)
2854
1999
>>> string_to_delta('60s')
2949
2088
parser.add_argument("--no-dbus", action="store_false",
2950
2089
dest="use_dbus", help="Do not provide D-Bus"
2951
" system bus interface", default=None)
2090
" system bus interface")
2952
2091
parser.add_argument("--no-ipv6", action="store_false",
2953
dest="use_ipv6", help="Do not use IPv6",
2092
dest="use_ipv6", help="Do not use IPv6")
2955
2093
parser.add_argument("--no-restore", action="store_false",
2956
2094
dest="restore", help="Do not restore stored"
2957
" state", default=None)
2958
parser.add_argument("--socket", type=int,
2959
help="Specify a file descriptor to a network"
2960
" socket to use instead of creating one")
2961
2096
parser.add_argument("--statedir", metavar="DIR",
2962
2097
help="Directory to save/restore state in")
2963
parser.add_argument("--foreground", action="store_true",
2964
help="Run in foreground", default=None)
2965
parser.add_argument("--no-zeroconf", action="store_false",
2966
dest="zeroconf", help="Do not use Zeroconf",
2969
2099
options = parser.parse_args()
2971
2101
if options.check:
2973
fail_count, test_count = doctest.testmod()
2974
sys.exit(os.EX_OK if fail_count == 0 else 1)
2976
2106
# Default values for config file for server-global settings
2977
if gnutls.has_rawpk:
2978
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2979
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2981
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2982
":+SIGN-DSA-SHA256")
2983
server_defaults = {"interface": "",
2987
"priority": priority,
2988
"servicename": "Mandos",
2994
"statedir": "/var/lib/mandos",
2995
"foreground": "False",
2107
server_defaults = { "interface": "",
2112
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2113
"servicename": "Mandos",
2118
"statedir": "/var/lib/mandos"
3000
2121
# Parse config file for server-global settings
3001
2122
server_config = configparser.SafeConfigParser(server_defaults)
3002
2123
del server_defaults
3003
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2124
server_config.read(os.path.join(options.configdir,
3004
2126
# Convert the SafeConfigParser object to a dict
3005
2127
server_settings = server_config.defaults()
3006
2128
# Use the appropriate methods on the non-string config options
3007
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3008
"foreground", "zeroconf"):
2129
for option in ("debug", "use_dbus", "use_ipv6"):
3009
2130
server_settings[option] = server_config.getboolean("DEFAULT",
3011
2132
if server_settings["port"]:
3012
2133
server_settings["port"] = server_config.getint("DEFAULT",
3014
if server_settings["socket"]:
3015
server_settings["socket"] = server_config.getint("DEFAULT",
3017
# Later, stdin will, and stdout and stderr might, be dup'ed
3018
# over with an opened os.devnull. But we don't want this to
3019
# happen with a supplied network socket.
3020
if 0 <= server_settings["socket"] <= 2:
3021
server_settings["socket"] = os.dup(server_settings
3023
2135
del server_config
3025
2137
# Override the settings from the config file with command line
3026
2138
# options, if set.
3027
2139
for option in ("interface", "address", "port", "debug",
3028
"priority", "servicename", "configdir", "use_dbus",
3029
"use_ipv6", "debuglevel", "restore", "statedir",
3030
"socket", "foreground", "zeroconf"):
2140
"priority", "servicename", "configdir",
2141
"use_dbus", "use_ipv6", "debuglevel", "restore",
3031
2143
value = getattr(options, option)
3032
2144
if value is not None:
3033
2145
server_settings[option] = value
3035
2147
# Force all strings to be unicode
3036
2148
for option in server_settings.keys():
3037
if isinstance(server_settings[option], bytes):
3038
server_settings[option] = (server_settings[option]
3040
# Force all boolean options to be boolean
3041
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3042
"foreground", "zeroconf"):
3043
server_settings[option] = bool(server_settings[option])
3044
# Debug implies foreground
3045
if server_settings["debug"]:
3046
server_settings["foreground"] = True
2149
if type(server_settings[option]) is str:
2150
server_settings[option] = unicode(server_settings[option])
3047
2151
# Now we have our good server settings in "server_settings"
3049
2153
##################################################################
3051
if (not server_settings["zeroconf"]
3052
and not (server_settings["port"]
3053
or server_settings["socket"] != "")):
3054
parser.error("Needs port or socket to work without Zeroconf")
3056
2155
# For convenience
3057
2156
debug = server_settings["debug"]
3058
2157
debuglevel = server_settings["debuglevel"]
3072
2169
level = getattr(logging, debuglevel.upper())
3073
2170
initlogger(debug, level)
3075
2172
if server_settings["servicename"] != "Mandos":
3076
syslogger.setFormatter(
3077
logging.Formatter('Mandos ({}) [%(process)d]:'
3078
' %(levelname)s: %(message)s'.format(
3079
server_settings["servicename"])))
2173
syslogger.setFormatter(logging.Formatter
2174
('Mandos (%s) [%%(process)d]:'
2175
' %%(levelname)s: %%(message)s'
2176
% server_settings["servicename"]))
3081
2178
# Parse config file with clients
3082
2179
client_config = configparser.SafeConfigParser(Client
3083
2180
.client_defaults)
3084
2181
client_config.read(os.path.join(server_settings["configdir"],
3085
2182
"clients.conf"))
3087
2184
global mandos_dbus_service
3088
2185
mandos_dbus_service = None
3091
if server_settings["socket"] != "":
3092
socketfd = server_settings["socket"]
3093
tcp_server = MandosServer(
3094
(server_settings["address"], server_settings["port"]),
3096
interface=(server_settings["interface"] or None),
3098
gnutls_priority=server_settings["priority"],
3102
pidfilename = "/run/mandos.pid"
3103
if not os.path.isdir("/run/."):
3104
pidfilename = "/var/run/mandos.pid"
3107
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3108
except IOError as e:
3109
logger.error("Could not open file %r", pidfilename,
3112
for name, group in (("_mandos", "_mandos"),
3113
("mandos", "mandos"),
3114
("nobody", "nogroup")):
3116
uid = pwd.getpwnam(name).pw_uid
3117
gid = pwd.getpwnam(group).pw_gid
2187
tcp_server = MandosServer((server_settings["address"],
2188
server_settings["port"]),
2190
interface=(server_settings["interface"]
2194
server_settings["priority"],
2197
pidfilename = "/var/run/mandos.pid"
2199
pidfile = open(pidfilename, "w")
2201
logger.error("Could not open file %r", pidfilename)
2204
uid = pwd.getpwnam("_mandos").pw_uid
2205
gid = pwd.getpwnam("_mandos").pw_gid
2208
uid = pwd.getpwnam("mandos").pw_uid
2209
gid = pwd.getpwnam("mandos").pw_gid
3119
2210
except KeyError:
2212
uid = pwd.getpwnam("nobody").pw_uid
2213
gid = pwd.getpwnam("nobody").pw_gid
3128
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3130
2220
except OSError as error:
3131
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3132
.format(uid, gid, os.strerror(error.errno)))
3133
if error.errno != errno.EPERM:
2221
if error[0] != errno.EPERM:
3137
2225
# Enable all possible GnuTLS debugging
3139
2227
# "Use a log level over 10 to enable all debugging options."
3140
2228
# - GnuTLS manual
3141
gnutls.global_set_log_level(11)
2229
gnutls.library.functions.gnutls_global_set_log_level(11)
2231
@gnutls.library.types.gnutls_log_func
3144
2232
def debug_gnutls(level, string):
3145
2233
logger.debug("GnuTLS: %s", string[:-1])
3147
gnutls.global_set_log_function(debug_gnutls)
2235
(gnutls.library.functions
2236
.gnutls_global_set_log_function(debug_gnutls))
3149
2238
# Redirect stdin so all checkers get /dev/null
3150
2239
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3151
2240
os.dup2(null, sys.stdin.fileno())
3155
2244
# Need to fork before connecting to D-Bus
3157
2246
# Close all input and output, do double fork, etc.
3160
# multiprocessing will use threads, so before we use GLib we need
3161
# to inform GLib that threads will be used.
2249
gobject.threads_init()
3164
2251
global main_loop
3165
2252
# From the Avahi example code
3166
2253
DBusGMainLoop(set_as_default=True)
3167
main_loop = GLib.MainLoop()
2254
main_loop = gobject.MainLoop()
3168
2255
bus = dbus.SystemBus()
3169
2256
# End of Avahi example code
3172
2259
bus_name = dbus.service.BusName("se.recompile.Mandos",
3175
old_bus_name = dbus.service.BusName(
3176
"se.bsnet.fukt.Mandos", bus,
3178
except dbus.exceptions.DBusException as e:
3179
logger.error("Disabling D-Bus:", exc_info=e)
2260
bus, do_not_queue=True)
2261
old_bus_name = (dbus.service.BusName
2262
("se.bsnet.fukt.Mandos", bus,
2264
except dbus.exceptions.NameExistsException as e:
2265
logger.error(unicode(e) + ", disabling D-Bus")
3180
2266
use_dbus = False
3181
2267
server_settings["use_dbus"] = False
3182
2268
tcp_server.use_dbus = False
3184
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3185
service = AvahiServiceToSyslog(
3186
name=server_settings["servicename"],
3187
servicetype="_mandos._tcp",
3190
if server_settings["interface"]:
3191
service.interface = if_nametoindex(
3192
server_settings["interface"].encode("utf-8"))
2269
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2270
service = AvahiServiceToSyslog(name =
2271
server_settings["servicename"],
2272
servicetype = "_mandos._tcp",
2273
protocol = protocol, bus = bus)
2274
if server_settings["interface"]:
2275
service.interface = (if_nametoindex
2276
(str(server_settings["interface"])))
3194
2278
global multiprocessing_manager
3195
2279
multiprocessing_manager = multiprocessing.Manager()
3197
2281
client_class = Client
3199
client_class = functools.partial(ClientDBus, bus=bus)
2283
client_class = functools.partial(ClientDBusTransitional,
3201
2286
client_settings = Client.config_parser(client_config)
3202
2287
old_client_settings = {}
3203
2288
clients_data = {}
3205
# This is used to redirect stdout and stderr for checker processes
3207
wnull = open(os.devnull, "w") # A writable /dev/null
3208
# Only used if server is running in foreground but not in debug
3210
if debug or not foreground:
3213
2290
# Get client data and settings from last running state.
3214
2291
if server_settings["restore"]:
3216
2293
with open(stored_state_path, "rb") as stored_state:
3217
if sys.version_info.major == 2:
3218
clients_data, old_client_settings = pickle.load(
3221
bytes_clients_data, bytes_old_client_settings = (
3222
pickle.load(stored_state, encoding="bytes"))
3223
# Fix bytes to strings
3226
clients_data = {(key.decode("utf-8")
3227
if isinstance(key, bytes)
3230
bytes_clients_data.items()}
3231
del bytes_clients_data
3232
for key in clients_data:
3233
value = {(k.decode("utf-8")
3234
if isinstance(k, bytes) else k): v
3236
clients_data[key].items()}
3237
clients_data[key] = value
3239
value["client_structure"] = [
3241
if isinstance(s, bytes)
3243
value["client_structure"]]
3245
for k in ("name", "host"):
3246
if isinstance(value[k], bytes):
3247
value[k] = value[k].decode("utf-8")
3248
if "key_id" not in value:
3249
value["key_id"] = ""
3250
elif "fingerprint" not in value:
3251
value["fingerprint"] = ""
3252
# old_client_settings
3254
old_client_settings = {
3255
(key.decode("utf-8")
3256
if isinstance(key, bytes)
3259
bytes_old_client_settings.items()}
3260
del bytes_old_client_settings
3262
for value in old_client_settings.values():
3263
if isinstance(value["host"], bytes):
3264
value["host"] = (value["host"]
2294
clients_data, old_client_settings = (pickle.load
3266
2296
os.remove(stored_state_path)
3267
2297
except IOError as e:
3268
if e.errno == errno.ENOENT:
3269
logger.warning("Could not load persistent state:"
3270
" {}".format(os.strerror(e.errno)))
3272
logger.critical("Could not load persistent state:",
2298
logger.warning("Could not load persistent state: {0}"
2300
if e.errno != errno.ENOENT:
3275
2302
except EOFError as e:
3276
2303
logger.warning("Could not load persistent state: "
2304
"EOFError: {0}".format(e))
3280
2306
with PGPEngine() as pgp:
3281
for client_name, client in clients_data.items():
3282
# Skip removed clients
3283
if client_name not in client_settings:
2307
for client_name, client in clients_data.iteritems():
3286
2308
# Decide which value to use after restoring saved state.
3287
2309
# We have three different values: Old config file,
3288
2310
# new config file, and saved state.
3348
2371
clients_data[client_name] = client_settings[client_name]
3350
2373
# Create all client objects
3351
for client_name, client in clients_data.items():
2374
for client_name, client in clients_data.iteritems():
3352
2375
tcp_server.clients[client_name] = client_class(
3355
server_settings=server_settings)
2376
name = client_name, settings = client)
3357
2378
if not tcp_server.clients:
3358
2379
logger.warning("No clients defined")
3361
if pidfile is not None:
3365
print(pid, file=pidfile)
3367
logger.error("Could not write to file %r with PID %d",
2385
pidfile.write(str(pid) + "\n".encode("utf-8"))
2388
logger.error("Could not write to file %r with PID %d",
2391
# "pidfile" was never created
3370
2393
del pidfilename
3372
for termsig in (signal.SIGHUP, signal.SIGTERM):
3373
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3374
lambda: main_loop.quit() and False)
2394
signal.signal(signal.SIGINT, signal.SIG_IGN)
2396
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2397
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3378
@alternate_dbus_interfaces(
3379
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3380
class MandosDBusService(DBusObjectWithObjectManager):
2400
class MandosDBusService(DBusObjectWithProperties):
3381
2401
"""A D-Bus proxy object"""
3383
2402
def __init__(self):
3384
2403
dbus.service.Object.__init__(self, bus, "/")
3386
2404
_interface = "se.recompile.Mandos"
2406
@dbus_interface_annotations(_interface)
2408
return { "org.freedesktop.DBus.Property"
2409
".EmitsChangedSignal":
3388
2412
@dbus.service.signal(_interface, signature="o")
3389
2413
def ClientAdded(self, objpath):
3393
2417
@dbus.service.signal(_interface, signature="ss")
3394
def ClientNotFound(self, key_id, address):
2418
def ClientNotFound(self, fingerprint, address):
3398
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3400
2422
@dbus.service.signal(_interface, signature="os")
3401
2423
def ClientRemoved(self, objpath, name):
3405
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3407
2427
@dbus.service.method(_interface, out_signature="ao")
3408
2428
def GetAllClients(self):
3410
return dbus.Array(c.dbus_object_path for c in
3411
tcp_server.clients.values())
3413
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2430
return dbus.Array(c.dbus_object_path
2432
tcp_server.clients.itervalues())
3415
2434
@dbus.service.method(_interface,
3416
2435
out_signature="a{oa{sv}}")
3417
2436
def GetAllClientsWithProperties(self):
3419
2438
return dbus.Dictionary(
3420
{c.dbus_object_path: c.GetAll(
3421
"se.recompile.Mandos.Client")
3422
for c in tcp_server.clients.values()},
2439
((c.dbus_object_path, c.GetAll(""))
2440
for c in tcp_server.clients.itervalues()),
3423
2441
signature="oa{sv}")
3425
2443
@dbus.service.method(_interface, in_signature="o")
3426
2444
def RemoveClient(self, object_path):
3428
for c in tcp_server.clients.values():
2446
for c in tcp_server.clients.itervalues():
3429
2447
if c.dbus_object_path == object_path:
3430
2448
del tcp_server.clients[c.name]
3431
2449
c.remove_from_connection()
3432
# Don't signal the disabling
2450
# Don't signal anything except ClientRemoved
3433
2451
c.disable(quiet=True)
3434
# Emit D-Bus signal for removal
3435
self.client_removed_signal(c)
2453
self.ClientRemoved(object_path, c.name)
3437
2455
raise KeyError(object_path)
3441
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3442
out_signature="a{oa{sa{sv}}}")
3443
def GetManagedObjects(self):
3445
return dbus.Dictionary(
3446
{client.dbus_object_path:
3448
{interface: client.GetAll(interface)
3450
client._get_all_interface_names()})
3451
for client in tcp_server.clients.values()})
3453
def client_added_signal(self, client):
3454
"""Send the new standard signal and the old signal"""
3456
# New standard signal
3457
self.InterfacesAdded(
3458
client.dbus_object_path,
3460
{interface: client.GetAll(interface)
3462
client._get_all_interface_names()}))
3464
self.ClientAdded(client.dbus_object_path)
3466
def client_removed_signal(self, client):
3467
"""Send the new standard signal and the old signal"""
3469
# New standard signal
3470
self.InterfacesRemoved(
3471
client.dbus_object_path,
3472
client._get_all_interface_names())
3474
self.ClientRemoved(client.dbus_object_path,
3477
mandos_dbus_service = MandosDBusService()
3479
# Save modules to variables to exempt the modules from being
3480
# unloaded before the function registered with atexit() is run.
3481
mp = multiprocessing
2459
class MandosDBusServiceTransitional(MandosDBusService):
2460
__metaclass__ = AlternateDBusNamesMetaclass
2461
mandos_dbus_service = MandosDBusServiceTransitional()
3485
2464
"Cleanup function; run on exit"
3489
mp.active_children()
2467
multiprocessing.active_children()
3491
2468
if not (tcp_server.clients or client_settings):
3494
2471
# Store client before exiting. Secrets are encrypted with key
3495
2472
# based on what config file has. If config file is
3496
2473
# removed/edited, old secret will thus be unrecovable.
3498
2475
with PGPEngine() as pgp:
3499
for client in tcp_server.clients.values():
2476
for client in tcp_server.clients.itervalues():
3500
2477
key = client_settings[client.name]["secret"]
3501
2478
client.encrypted_secret = pgp.encrypt(client.secret,
3503
2480
client_dict = {}
3505
2482
# A list of attributes that can not be pickled
3507
exclude = {"bus", "changedstate", "secret",
3508
"checker", "server_settings"}
3509
for name, typ in inspect.getmembers(dbus.service
2484
exclude = set(("bus", "changedstate", "secret",
2486
for name, typ in (inspect.getmembers
2487
(dbus.service.Object)):
3511
2488
exclude.add(name)
3513
2490
client_dict["encrypted_secret"] = (client
3514
2491
.encrypted_secret)
3515
2492
for attr in client.client_structure:
3516
2493
if attr not in exclude:
3517
2494
client_dict[attr] = getattr(client, attr)
3519
2496
clients[client.name] = client_dict
3520
2497
del client_settings[client.name]["secret"]
3523
with tempfile.NamedTemporaryFile(
3527
dir=os.path.dirname(stored_state_path),
3528
delete=False) as stored_state:
3529
pickle.dump((clients, client_settings), stored_state,
3531
tempname = stored_state.name
2500
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2503
(stored_state_path))
2504
with os.fdopen(tempfd, "wb") as stored_state:
2505
pickle.dump((clients, client_settings), stored_state)
3532
2506
os.rename(tempname, stored_state_path)
3533
2507
except (IOError, OSError) as e:
2508
logger.warning("Could not save persistent state: {0}"
3536
2512
os.remove(tempname)
3537
2513
except NameError:
3539
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3540
logger.warning("Could not save persistent state: {}"
3541
.format(os.strerror(e.errno)))
3543
logger.warning("Could not save persistent state:",
2515
if e.errno not in set((errno.ENOENT, errno.EACCES,
3547
2519
# Delete all clients, and settings from config
3548
2520
while tcp_server.clients:
3549
2521
name, client = tcp_server.clients.popitem()
3551
2523
client.remove_from_connection()
3552
# Don't signal the disabling
2524
# Don't signal anything except ClientRemoved
3553
2525
client.disable(quiet=True)
3554
# Emit D-Bus signal for removal
3556
mandos_dbus_service.client_removed_signal(client)
2528
mandos_dbus_service.ClientRemoved(client
3557
2531
client_settings.clear()
3559
2533
atexit.register(cleanup)
3561
for client in tcp_server.clients.values():
2535
for client in tcp_server.clients.itervalues():
3563
# Emit D-Bus signal for adding
3564
mandos_dbus_service.client_added_signal(client)
2538
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3565
2539
# Need to initiate checking of clients
3566
2540
if client.enabled:
3567
2541
client.init_checker()
3569
2543
tcp_server.enable()
3570
2544
tcp_server.server_activate()
3572
2546
# Find out what port we got
3574
service.port = tcp_server.socket.getsockname()[1]
2547
service.port = tcp_server.socket.getsockname()[1]
3576
2549
logger.info("Now listening on address %r, port %d,"
3577
" flowinfo %d, scope_id %d",
3578
*tcp_server.socket.getsockname())
2550
" flowinfo %d, scope_id %d"
2551
% tcp_server.socket.getsockname())
3580
logger.info("Now listening on address %r, port %d",
3581
*tcp_server.socket.getsockname())
3583
# service.interface = tcp_server.socket.getsockname()[3]
2553
logger.info("Now listening on address %r, port %d"
2554
% tcp_server.socket.getsockname())
2556
#service.interface = tcp_server.socket.getsockname()[3]
3587
# From the Avahi example code
3590
except dbus.exceptions.DBusException as error:
3591
logger.critical("D-Bus Exception", exc_info=error)
3594
# End of Avahi example code
3596
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3597
lambda *args, **kwargs:
3598
(tcp_server.handle_request
3599
(*args[2:], **kwargs) or True))
2559
# From the Avahi example code
2562
except dbus.exceptions.DBusException as error:
2563
logger.critical("DBusException: %s", error)
2566
# End of Avahi example code
2568
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2569
lambda *args, **kwargs:
2570
(tcp_server.handle_request
2571
(*args[2:], **kwargs) or True))
3601
2573
logger.debug("Starting main loop")
3602
2574
main_loop.run()
3603
2575
except AvahiError as error:
3604
logger.critical("Avahi Error", exc_info=error)
2576
logger.critical("AvahiError: %s", error)
3607
2579
except KeyboardInterrupt: