63
import cPickle as pickle
70
import cPickle as pickle
64
73
import multiprocessing
71
85
import dbus.service
87
from gi.repository import GLib
74
88
from dbus.mainloop.glib import DBusGMainLoop
77
91
import xml.dom.minidom
94
if sys.version_info.major == 2:
98
# Add collections.abc.Callable if it does not exist
100
collections.abc.Callable
101
except AttributeError:
103
Callable = collections.Callable
104
collections.abc = abc
107
# Add shlex.quote if it does not exist
110
except AttributeError:
111
shlex.quote = re.escape
113
# Show warnings by default
114
if not sys.warnoptions:
116
warnings.simplefilter("default")
118
# Try to find the value of SO_BINDTODEVICE:
120
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
121
# newer, and it is also the most natural place for it:
82
122
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
83
123
except AttributeError:
125
# This is where SO_BINDTODEVICE was up to and including Python
85
127
from IN import SO_BINDTODEVICE
86
128
except ImportError:
87
SO_BINDTODEVICE = None
129
# In Python 2.7 it seems to have been removed entirely.
130
# Try running the C preprocessor:
132
cc = subprocess.Popen(["cc", "--language=c", "-E",
134
stdin=subprocess.PIPE,
135
stdout=subprocess.PIPE)
136
stdout = cc.communicate(
137
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
138
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
139
except (OSError, ValueError, IndexError):
141
SO_BINDTODEVICE = None
143
if sys.version_info < (3, 2):
144
configparser.Configparser = configparser.SafeConfigParser
90
147
stored_state_file = "clients.pickle"
92
149
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
150
logging.captureWarnings(True) # Show warnings via the logging system
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
154
if_nametoindex = ctypes.cdll.LoadLibrary(
155
ctypes.util.find_library("c")).if_nametoindex
101
156
except (OSError, AttributeError):
102
158
def if_nametoindex(interface):
103
159
"Get an interface index the hard way, i.e. using fcntl()"
104
160
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
161
with contextlib.closing(socket.socket()) as s:
106
162
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
163
struct.pack(b"16s16x", interface))
164
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
165
return interface_index
168
def copy_function(func):
169
"""Make a copy of a function"""
170
if sys.version_info.major == 2:
171
return types.FunctionType(func.func_code,
177
return types.FunctionType(func.__code__,
114
184
def initlogger(debug, level=logging.WARNING):
115
185
"""init logger and add loglevel"""
188
syslogger = (logging.handlers.SysLogHandler(
189
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
117
191
syslogger.setFormatter(logging.Formatter
118
192
('Mandos [%(process)d]: %(levelname)s:'
120
194
logger.addHandler(syslogger)
123
197
console = logging.StreamHandler()
124
198
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
169
255
os.rmdir(self.tempdir)
170
256
self.tempdir = None
172
258
def password_encode(self, password):
173
259
# Passphrase can not be empty and can not contain newlines or
174
260
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
261
encoded = b"mandos" + binascii.hexlify(password)
262
if len(encoded) > 2048:
263
# GnuPG can't handle long passwords, so encode differently
264
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
265
.replace(b"\n", b"\\n")
266
.replace(b"\0", b"\\x00"))
177
269
def encrypt(self, data, password):
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
270
passphrase = self.password_encode(password)
271
with tempfile.NamedTemporaryFile(
272
dir=self.tempdir) as passfile:
273
passfile.write(passphrase)
275
proc = subprocess.Popen([self.gpg, '--symmetric',
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
283
if proc.returncode != 0:
192
285
return ciphertext
194
287
def decrypt(self, data, password):
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
288
passphrase = self.password_encode(password)
289
with tempfile.NamedTemporaryFile(
290
dir=self.tempdir) as passfile:
291
passfile.write(passphrase)
293
proc = subprocess.Popen([self.gpg, '--decrypt',
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
301
if proc.returncode != 0:
209
303
return decrypted_plaintext
306
# Pretend that we have an Avahi module
308
"""This isn't so much a class as it is a module-like namespace."""
309
IF_UNSPEC = -1 # avahi-common/address.h
310
PROTO_UNSPEC = -1 # avahi-common/address.h
311
PROTO_INET = 0 # avahi-common/address.h
312
PROTO_INET6 = 1 # avahi-common/address.h
313
DBUS_NAME = "org.freedesktop.Avahi"
314
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
315
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
DBUS_PATH_SERVER = "/"
319
def string_array_to_txt_array(t):
320
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
for s in t), signature="ay")
322
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
323
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
324
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
325
SERVER_INVALID = 0 # avahi-common/defs.h
326
SERVER_REGISTERING = 1 # avahi-common/defs.h
327
SERVER_RUNNING = 2 # avahi-common/defs.h
328
SERVER_COLLISION = 3 # avahi-common/defs.h
329
SERVER_FAILURE = 4 # avahi-common/defs.h
213
332
class AvahiError(Exception):
214
333
def __init__(self, value, *args, **kwargs):
215
334
self.value = value
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
335
return super(AvahiError, self).__init__(value, *args,
220
339
class AvahiServiceError(AvahiError):
223
343
class AvahiGroupError(AvahiError):
227
class AvahiService(object):
228
348
"""An Avahi (Zeroconf) service.
231
351
interface: integer; avahi.IF_UNSPEC or an interface index.
232
352
Used to optionally bind to the specified interface.
233
353
name: string; Example: 'Mandos'
234
354
type: string; Example: '_mandos._tcp'.
235
See <http://www.dns-sd.org/ServiceTypes.html>
355
See <https://www.iana.org/assignments/service-names-port-numbers>
236
356
port: integer; what port to announce
237
357
TXT: list of strings; TXT record for the service
238
358
domain: string; Domain to publish on, default to .local if empty.
367
517
follow_name_owner_changes=True),
368
518
avahi.DBUS_INTERFACE_SERVER)
369
519
self.server.connect_to_signal("StateChanged",
370
self.server_state_changed)
520
self.server_state_changed)
371
521
self.server_state_changed(self.server.GetState())
373
524
class AvahiServiceToSyslog(AvahiService):
525
def rename(self, *args, **kwargs):
375
526
"""Add the new name to the syslog messages"""
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos ({0}) [%(process)d]:'
379
' %(levelname)s: %(message)s'
527
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
528
syslogger.setFormatter(logging.Formatter(
529
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
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))
389
class Client(object):
534
# Pretend that we have a GnuTLS module
536
"""This isn't so much a class as it is a module-like namespace."""
538
library = ctypes.util.find_library("gnutls")
540
library = ctypes.util.find_library("gnutls-deb0")
541
_library = ctypes.cdll.LoadLibrary(library)
544
# Unless otherwise indicated, the constants and types below are
545
# all from the gnutls/gnutls.h C header file.
556
E_NO_CERTIFICATE_FOUND = -49
561
KEYID_USE_SHA256 = 1 # gnutls/x509.h
562
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
565
class session_int(ctypes.Structure):
567
session_t = ctypes.POINTER(session_int)
569
class certificate_credentials_st(ctypes.Structure):
571
certificate_credentials_t = ctypes.POINTER(
572
certificate_credentials_st)
573
certificate_type_t = ctypes.c_int
575
class datum_t(ctypes.Structure):
576
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
577
('size', ctypes.c_uint)]
579
class openpgp_crt_int(ctypes.Structure):
581
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
582
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
583
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
584
credentials_type_t = ctypes.c_int
585
transport_ptr_t = ctypes.c_void_p
586
close_request_t = ctypes.c_int
589
class Error(Exception):
590
def __init__(self, message=None, code=None, args=()):
591
# Default usage is by a message string, but if a return
592
# code is passed, convert it to a string with
595
if message is None and code is not None:
596
message = gnutls.strerror(code)
597
return super(gnutls.Error, self).__init__(
600
class CertificateSecurityError(Error):
606
self._c_object = gnutls.certificate_credentials_t()
607
gnutls.certificate_allocate_credentials(
608
ctypes.byref(self._c_object))
609
self.type = gnutls.CRD_CERTIFICATE
612
gnutls.certificate_free_credentials(self._c_object)
615
def __init__(self, socket, credentials=None):
616
self._c_object = gnutls.session_t()
617
gnutls_flags = gnutls.CLIENT
618
if gnutls.check_version(b"3.5.6"):
619
gnutls_flags |= gnutls.NO_TICKETS
621
gnutls_flags |= gnutls.ENABLE_RAWPK
622
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
624
gnutls.set_default_priority(self._c_object)
625
gnutls.transport_set_ptr(self._c_object, socket.fileno())
626
gnutls.handshake_set_private_extensions(self._c_object,
629
if credentials is None:
630
credentials = gnutls.Credentials()
631
gnutls.credentials_set(self._c_object, credentials.type,
632
ctypes.cast(credentials._c_object,
634
self.credentials = credentials
637
gnutls.deinit(self._c_object)
640
return gnutls.handshake(self._c_object)
642
def send(self, data):
646
data_len -= gnutls.record_send(self._c_object,
651
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
653
# Error handling functions
654
def _error_code(result):
655
"""A function to raise exceptions on errors, suitable
656
for the 'restype' attribute on ctypes functions"""
659
if result == gnutls.E_NO_CERTIFICATE_FOUND:
660
raise gnutls.CertificateSecurityError(code=result)
661
raise gnutls.Error(code=result)
663
def _retry_on_error(result, func, arguments):
664
"""A function to retry on some errors, suitable
665
for the 'errcheck' attribute on ctypes functions"""
667
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
668
return _error_code(result)
669
result = func(*arguments)
672
# Unless otherwise indicated, the function declarations below are
673
# all from the gnutls/gnutls.h C header file.
676
priority_set_direct = _library.gnutls_priority_set_direct
677
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
678
ctypes.POINTER(ctypes.c_char_p)]
679
priority_set_direct.restype = _error_code
681
init = _library.gnutls_init
682
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
683
init.restype = _error_code
685
set_default_priority = _library.gnutls_set_default_priority
686
set_default_priority.argtypes = [session_t]
687
set_default_priority.restype = _error_code
689
record_send = _library.gnutls_record_send
690
record_send.argtypes = [session_t, ctypes.c_void_p,
692
record_send.restype = ctypes.c_ssize_t
693
record_send.errcheck = _retry_on_error
695
certificate_allocate_credentials = (
696
_library.gnutls_certificate_allocate_credentials)
697
certificate_allocate_credentials.argtypes = [
698
ctypes.POINTER(certificate_credentials_t)]
699
certificate_allocate_credentials.restype = _error_code
701
certificate_free_credentials = (
702
_library.gnutls_certificate_free_credentials)
703
certificate_free_credentials.argtypes = [
704
certificate_credentials_t]
705
certificate_free_credentials.restype = None
707
handshake_set_private_extensions = (
708
_library.gnutls_handshake_set_private_extensions)
709
handshake_set_private_extensions.argtypes = [session_t,
711
handshake_set_private_extensions.restype = None
713
credentials_set = _library.gnutls_credentials_set
714
credentials_set.argtypes = [session_t, credentials_type_t,
716
credentials_set.restype = _error_code
718
strerror = _library.gnutls_strerror
719
strerror.argtypes = [ctypes.c_int]
720
strerror.restype = ctypes.c_char_p
722
certificate_type_get = _library.gnutls_certificate_type_get
723
certificate_type_get.argtypes = [session_t]
724
certificate_type_get.restype = _error_code
726
certificate_get_peers = _library.gnutls_certificate_get_peers
727
certificate_get_peers.argtypes = [session_t,
728
ctypes.POINTER(ctypes.c_uint)]
729
certificate_get_peers.restype = ctypes.POINTER(datum_t)
731
global_set_log_level = _library.gnutls_global_set_log_level
732
global_set_log_level.argtypes = [ctypes.c_int]
733
global_set_log_level.restype = None
735
global_set_log_function = _library.gnutls_global_set_log_function
736
global_set_log_function.argtypes = [log_func]
737
global_set_log_function.restype = None
739
deinit = _library.gnutls_deinit
740
deinit.argtypes = [session_t]
741
deinit.restype = None
743
handshake = _library.gnutls_handshake
744
handshake.argtypes = [session_t]
745
handshake.restype = _error_code
746
handshake.errcheck = _retry_on_error
748
transport_set_ptr = _library.gnutls_transport_set_ptr
749
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
750
transport_set_ptr.restype = None
752
bye = _library.gnutls_bye
753
bye.argtypes = [session_t, close_request_t]
754
bye.restype = _error_code
755
bye.errcheck = _retry_on_error
757
check_version = _library.gnutls_check_version
758
check_version.argtypes = [ctypes.c_char_p]
759
check_version.restype = ctypes.c_char_p
761
_need_version = b"3.3.0"
762
if check_version(_need_version) is None:
763
raise self.Error("Needs GnuTLS {} or later"
764
.format(_need_version))
766
_tls_rawpk_version = b"3.6.6"
767
has_rawpk = bool(check_version(_tls_rawpk_version))
771
class pubkey_st(ctypes.Structure):
773
pubkey_t = ctypes.POINTER(pubkey_st)
775
x509_crt_fmt_t = ctypes.c_int
777
# All the function declarations below are from gnutls/abstract.h
778
pubkey_init = _library.gnutls_pubkey_init
779
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
780
pubkey_init.restype = _error_code
782
pubkey_import = _library.gnutls_pubkey_import
783
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
785
pubkey_import.restype = _error_code
787
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
788
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
789
ctypes.POINTER(ctypes.c_ubyte),
790
ctypes.POINTER(ctypes.c_size_t)]
791
pubkey_get_key_id.restype = _error_code
793
pubkey_deinit = _library.gnutls_pubkey_deinit
794
pubkey_deinit.argtypes = [pubkey_t]
795
pubkey_deinit.restype = None
797
# All the function declarations below are from gnutls/openpgp.h
799
openpgp_crt_init = _library.gnutls_openpgp_crt_init
800
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
801
openpgp_crt_init.restype = _error_code
803
openpgp_crt_import = _library.gnutls_openpgp_crt_import
804
openpgp_crt_import.argtypes = [openpgp_crt_t,
805
ctypes.POINTER(datum_t),
807
openpgp_crt_import.restype = _error_code
809
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
810
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
811
ctypes.POINTER(ctypes.c_uint)]
812
openpgp_crt_verify_self.restype = _error_code
814
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
815
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
816
openpgp_crt_deinit.restype = None
818
openpgp_crt_get_fingerprint = (
819
_library.gnutls_openpgp_crt_get_fingerprint)
820
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
824
openpgp_crt_get_fingerprint.restype = _error_code
826
if check_version(b"3.6.4"):
827
certificate_type_get2 = _library.gnutls_certificate_type_get2
828
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
829
certificate_type_get2.restype = _error_code
831
# Remove non-public functions
832
del _error_code, _retry_on_error
835
def call_pipe(connection, # : multiprocessing.Connection
836
func, *args, **kwargs):
837
"""This function is meant to be called by multiprocessing.Process
839
This function runs func(*args, **kwargs), and writes the resulting
840
return value on the provided multiprocessing.Connection.
842
connection.send(func(*args, **kwargs))
390
847
"""A representation of a client host served by this server.
393
850
approved: bool(); 'None' if not yet approved/disapproved
394
851
approval_delay: datetime.timedelta(); Time to wait for approval
395
852
approval_duration: datetime.timedelta(); Duration of one approval
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
853
checker: multiprocessing.Process(); a running checker process used
854
to see if the client lives. 'None' if no process is
856
checker_callback_tag: a GLib event source tag, or None
400
857
checker_command: string; External command which is run to check
401
858
if client lives. %() expansions are done at
402
859
runtime with vars(self) as dict, so that for
403
860
instance %(name)s can be used in the command.
404
checker_initiator_tag: a gobject event source tag, or None
861
checker_initiator_tag: a GLib event source tag, or None
405
862
created: datetime.datetime(); (UTC) object creation
406
863
client_structure: Object describing what attributes a client has
407
864
and is used for storing the client at exit
408
865
current_checker_command: string; current running checker_command
409
disable_initiator_tag: a gobject event source tag, or None
866
disable_initiator_tag: a GLib event source tag, or None
411
868
fingerprint: string (40 or 32 hexadecimal digits); used to
412
uniquely identify the client
869
uniquely identify an OpenPGP client
870
key_id: string (64 hexadecimal digits); used to uniquely identify
871
a client using raw public keys
413
872
host: string; available for use by the checker command
414
873
interval: datetime.timedelta(); How often to start a new checker
415
874
last_approval_request: datetime.datetime(); (UTC) or None
542
995
self.current_checker_command = None
543
996
self.approved = None
544
997
self.approvals_pending = 0
545
self.changedstate = (multiprocessing_manager
546
.Condition(multiprocessing_manager
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
998
self.changedstate = multiprocessing_manager.Condition(
999
multiprocessing_manager.Lock())
1000
self.client_structure = [attr
1001
for attr in self.__dict__.keys()
550
1002
if not attr.startswith("_")]
551
1003
self.client_structure.append("client_structure")
553
for name, t in inspect.getmembers(type(self),
1005
for name, t in inspect.getmembers(
1006
type(self), lambda obj: isinstance(obj, property)):
557
1007
if not name.startswith("_"):
558
1008
self.client_structure.append(name)
560
1010
# Send notice to process children that client state has changed
561
1011
def send_changedstate(self):
562
1012
with self.changedstate:
563
1013
self.changedstate.notify_all()
565
1015
def enable(self):
566
1016
"""Start this client's checker and timeout hooks"""
567
1017
if getattr(self, "enabled", False):
568
1018
# Already enabled
570
self.send_changedstate()
571
1020
self.expires = datetime.datetime.utcnow() + self.timeout
572
1021
self.enabled = True
573
1022
self.last_enabled = datetime.datetime.utcnow()
574
1023
self.init_checker()
1024
self.send_changedstate()
576
1026
def disable(self, quiet=True):
577
1027
"""Disable this client."""
578
1028
if not getattr(self, "enabled", False):
581
self.send_changedstate()
583
1031
logger.info("Disabling client %s", self.name)
584
if getattr(self, "disable_initiator_tag", False):
585
gobject.source_remove(self.disable_initiator_tag)
1032
if getattr(self, "disable_initiator_tag", None) is not None:
1033
GLib.source_remove(self.disable_initiator_tag)
586
1034
self.disable_initiator_tag = None
587
1035
self.expires = None
588
if getattr(self, "checker_initiator_tag", False):
589
gobject.source_remove(self.checker_initiator_tag)
1036
if getattr(self, "checker_initiator_tag", None) is not None:
1037
GLib.source_remove(self.checker_initiator_tag)
590
1038
self.checker_initiator_tag = None
591
1039
self.stop_checker()
592
1040
self.enabled = False
593
# Do not run this again if called by a gobject.timeout_add
1042
self.send_changedstate()
1043
# Do not run this again if called by a GLib.timeout_add
596
1046
def __del__(self):
599
1049
def init_checker(self):
600
1050
# Schedule a new checker to be started an 'interval' from now,
601
1051
# and every interval from then on.
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
1052
if self.checker_initiator_tag is not None:
1053
GLib.source_remove(self.checker_initiator_tag)
1054
self.checker_initiator_tag = GLib.timeout_add(
1055
random.randrange(int(self.interval.total_seconds() * 1000
605
1058
# Schedule a disable() when 'timeout' has passed
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
1059
if self.disable_initiator_tag is not None:
1060
GLib.source_remove(self.disable_initiator_tag)
1061
self.disable_initiator_tag = GLib.timeout_add(
1062
int(self.timeout.total_seconds() * 1000), self.disable)
609
1063
# Also start a new checker *right now*.
610
1064
self.start_checker()
612
def checker_callback(self, pid, condition, command):
1066
def checker_callback(self, source, condition, connection,
613
1068
"""The checker has completed, so take appropriate actions."""
1069
# Read return code from connection (see call_pipe)
1070
returncode = connection.recv()
1072
if self.checker is not None:
614
1074
self.checker_callback_tag = None
615
1075
self.checker = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
1078
self.last_checker_status = returncode
1079
self.last_checker_signal = None
618
1080
if self.last_checker_status == 0:
619
1081
logger.info("Checker for %(name)s succeeded",
621
1083
self.checked_ok()
623
logger.info("Checker for %(name)s failed",
1085
logger.info("Checker for %(name)s failed", vars(self))
626
1087
self.last_checker_status = -1
1088
self.last_checker_signal = -returncode
627
1089
logger.warning("Checker for %(name)s crashed?",
630
1093
def checked_ok(self):
631
1094
"""Assert that the client has been seen, alive and well."""
632
1095
self.last_checked_ok = datetime.datetime.utcnow()
633
1096
self.last_checker_status = 0
1097
self.last_checker_signal = None
634
1098
self.bump_timeout()
636
1100
def bump_timeout(self, timeout=None):
637
1101
"""Bump up the timeout for this client."""
638
1102
if timeout is None:
639
1103
timeout = self.timeout
640
1104
if self.disable_initiator_tag is not None:
641
gobject.source_remove(self.disable_initiator_tag)
1105
GLib.source_remove(self.disable_initiator_tag)
1106
self.disable_initiator_tag = None
642
1107
if getattr(self, "enabled", False):
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
1108
self.disable_initiator_tag = GLib.timeout_add(
1109
int(timeout.total_seconds() * 1000), self.disable)
646
1110
self.expires = datetime.datetime.utcnow() + timeout
648
1112
def need_approval(self):
649
1113
self.last_approval_request = datetime.datetime.utcnow()
651
1115
def start_checker(self):
652
1116
"""Start a new checker subprocess if one is not running.
654
1118
If a checker already exists, leave it running and do
656
1120
# The reason for not killing a running checker is that if we
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
1121
# did that, and if a checker (for some reason) started running
1122
# slowly and taking more than 'interval' time, then the client
1123
# would inevitably timeout, since no checker would get a
1124
# chance to run to completion. If we instead leave running
661
1125
# checkers alone, the checker would have to take more time
662
1126
# than 'timeout' for the client to be disabled, which is as it
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)
1129
if self.checker is not None and not self.checker.is_alive():
1130
logger.warning("Checker was not alive; joining")
678
1133
# Start a new checker if needed
679
1134
if self.checker is None:
1135
# Escape attributes for the shell
1137
attr: shlex.quote(str(getattr(self, attr)))
1138
for attr in self.runtime_expansions}
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
self.checker_command, exc_info=error)
698
return True # Try again later
1140
command = self.checker_command % escaped_attrs
1141
except TypeError as error:
1142
logger.error('Could not format string "%s"',
1143
self.checker_command,
1145
return True # Try again later
699
1146
self.current_checker_command = command
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",
723
# Re-run this periodically if run by gobject.timeout_add
1147
logger.info("Starting checker %r for %s", command,
1149
# We don't need to redirect stdout and stderr, since
1150
# in normal mode, that is already done by daemon(),
1151
# and in debug mode we don't want to. (Stdin is
1152
# always replaced by /dev/null.)
1153
# The exception is when not debugging but nevertheless
1154
# running in the foreground; use the previously
1156
popen_args = {"close_fds": True,
1159
if (not self.server_settings["debug"]
1160
and self.server_settings["foreground"]):
1161
popen_args.update({"stdout": wnull,
1163
pipe = multiprocessing.Pipe(duplex=False)
1164
self.checker = multiprocessing.Process(
1166
args=(pipe[1], subprocess.call, command),
1168
self.checker.start()
1169
self.checker_callback_tag = GLib.io_add_watch(
1170
GLib.IOChannel.unix_new(pipe[0].fileno()),
1171
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1172
self.checker_callback, pipe[0], command)
1173
# Re-run this periodically if run by GLib.timeout_add
726
1176
def stop_checker(self):
727
1177
"""Force the checker process, if any, to stop."""
728
1178
if self.checker_callback_tag:
729
gobject.source_remove(self.checker_callback_tag)
1179
GLib.source_remove(self.checker_callback_tag)
730
1180
self.checker_callback_tag = None
731
1181
if getattr(self, "checker", None) is None:
733
1183
logger.debug("Stopping checker for %(name)s", vars(self))
735
self.checker.terminate()
737
#if self.checker.poll() is None:
738
# self.checker.kill()
739
except OSError as error:
740
if error.errno != errno.ESRCH: # No such process
1184
self.checker.terminate()
742
1185
self.checker = None
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
1188
def dbus_service_property(dbus_interface,
747
1192
"""Decorators for marking methods of a DBusObjectWithProperties to
748
1193
become properties on the D-Bus.
750
1195
The decorated method will be called with no arguments by "Get"
751
1196
and with one argument by "Set".
753
1198
The parameters, where they are supported, are the same as
754
1199
dbus.service.method, except there is only "signature", since the
755
1200
type from Get() and the type sent to Set() is the same.
831
class DBusObjectWithProperties(dbus.service.Object):
832
"""A D-Bus object with properties.
834
Classes inheriting from this can use the dbus_service_property
835
decorator to expose methods as D-Bus properties. It exposes the
836
standard Get(), Set(), and GetAll() methods on the D-Bus.
1283
class DBusObjectWithAnnotations(dbus.service.Object):
1284
"""A D-Bus object with annotations.
1286
Classes inheriting from this can use the dbus_annotations
1287
decorator to add annotations to methods or signals.
840
1291
def _is_dbus_thing(thing):
841
1292
"""Returns a function testing if an attribute is a D-Bus thing
843
1294
If called like _is_dbus_thing("method") it returns a function
844
1295
suitable for use as predicate to inspect.getmembers().
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1297
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
849
1300
def _get_all_dbus_things(self, thing):
850
1301
"""Returns a generator of (name, attribute) pairs
852
return ((getattr(athing.__get__(self), "_dbus_name",
1303
return ((getattr(athing.__get__(self), "_dbus_name", name),
854
1304
athing.__get__(self))
855
1305
for cls in self.__class__.__mro__
856
1306
for name, athing in
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
1307
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1309
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1311
path_keyword='object_path',
1312
connection_keyword='connection')
1313
def Introspect(self, object_path, connection):
1314
"""Overloading of standard D-Bus method.
1316
Inserts annotation tags on methods and signals.
1318
xmlstring = dbus.service.Object.Introspect(self, object_path,
1321
document = xml.dom.minidom.parseString(xmlstring)
1323
for if_tag in document.getElementsByTagName("interface"):
1324
# Add annotation tags
1325
for typ in ("method", "signal"):
1326
for tag in if_tag.getElementsByTagName(typ):
1328
for name, prop in (self.
1329
_get_all_dbus_things(typ)):
1330
if (name == tag.getAttribute("name")
1331
and prop._dbus_interface
1332
== if_tag.getAttribute("name")):
1333
annots.update(getattr(
1334
prop, "_dbus_annotations", {}))
1335
for name, value in annots.items():
1336
ann_tag = document.createElement(
1338
ann_tag.setAttribute("name", name)
1339
ann_tag.setAttribute("value", value)
1340
tag.appendChild(ann_tag)
1341
# Add interface annotation tags
1342
for annotation, value in dict(
1343
itertools.chain.from_iterable(
1344
annotations().items()
1345
for name, annotations
1346
in self._get_all_dbus_things("interface")
1347
if name == if_tag.getAttribute("name")
1349
ann_tag = document.createElement("annotation")
1350
ann_tag.setAttribute("name", annotation)
1351
ann_tag.setAttribute("value", value)
1352
if_tag.appendChild(ann_tag)
1353
# Fix argument name for the Introspect method itself
1354
if (if_tag.getAttribute("name")
1355
== dbus.INTROSPECTABLE_IFACE):
1356
for cn in if_tag.getElementsByTagName("method"):
1357
if cn.getAttribute("name") == "Introspect":
1358
for arg in cn.getElementsByTagName("arg"):
1359
if (arg.getAttribute("direction")
1361
arg.setAttribute("name",
1363
xmlstring = document.toxml("utf-8")
1365
except (AttributeError, xml.dom.DOMException,
1366
xml.parsers.expat.ExpatError) as error:
1367
logger.error("Failed to override Introspection method",
1372
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1373
"""A D-Bus object with properties.
1375
Classes inheriting from this can use the dbus_service_property
1376
decorator to expose methods as D-Bus properties. It exposes the
1377
standard Get(), Set(), and GetAll() methods on the D-Bus.
860
1380
def _get_dbus_property(self, interface_name, property_name):
861
1381
"""Returns a bound method if one exists which is a D-Bus
862
1382
property with the specified name and interface.
864
for cls in self.__class__.__mro__:
865
for name, value in (inspect.getmembers
867
self._is_dbus_thing("property"))):
1384
for cls in self.__class__.__mro__:
1385
for name, value in inspect.getmembers(
1386
cls, self._is_dbus_thing("property")):
868
1387
if (value._dbus_name == property_name
869
1388
and value._dbus_interface == interface_name):
870
1389
return value.__get__(self)
872
1391
# No such property
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1392
raise DBusPropertyNotFound("{}:{}.{}".format(
1393
self.dbus_object_path, interface_name, property_name))
1396
def _get_all_interface_names(cls):
1397
"""Get a sequence of all interfaces supported by an object"""
1398
return (name for name in set(getattr(getattr(x, attr),
1399
"_dbus_interface", None)
1400
for x in (inspect.getmro(cls))
1402
if name is not None)
1404
@dbus.service.method(dbus.PROPERTIES_IFACE,
878
1406
out_signature="v")
879
1407
def Get(self, interface_name, property_name):
880
1408
"""Standard D-Bus property Get() method, see D-Bus standard.
1010
1536
return xmlstring
1013
def datetime_to_dbus (dt, variant_level=0):
1540
dbus.OBJECT_MANAGER_IFACE
1541
except AttributeError:
1542
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1545
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1546
"""A D-Bus object with an ObjectManager.
1548
Classes inheriting from this exposes the standard
1549
GetManagedObjects call and the InterfacesAdded and
1550
InterfacesRemoved signals on the standard
1551
"org.freedesktop.DBus.ObjectManager" interface.
1553
Note: No signals are sent automatically; they must be sent
1556
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1557
out_signature="a{oa{sa{sv}}}")
1558
def GetManagedObjects(self):
1559
"""This function must be overridden"""
1560
raise NotImplementedError()
1562
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1563
signature="oa{sa{sv}}")
1564
def InterfacesAdded(self, object_path, interfaces_and_properties):
1567
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1568
def InterfacesRemoved(self, object_path, interfaces):
1571
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1573
path_keyword='object_path',
1574
connection_keyword='connection')
1575
def Introspect(self, object_path, connection):
1576
"""Overloading of standard D-Bus method.
1578
Override return argument name of GetManagedObjects to be
1579
"objpath_interfaces_and_properties"
1581
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1585
document = xml.dom.minidom.parseString(xmlstring)
1587
for if_tag in document.getElementsByTagName("interface"):
1588
# Fix argument name for the GetManagedObjects method
1589
if (if_tag.getAttribute("name")
1590
== dbus.OBJECT_MANAGER_IFACE):
1591
for cn in if_tag.getElementsByTagName("method"):
1592
if (cn.getAttribute("name")
1593
== "GetManagedObjects"):
1594
for arg in cn.getElementsByTagName("arg"):
1595
if (arg.getAttribute("direction")
1599
"objpath_interfaces"
1601
xmlstring = document.toxml("utf-8")
1603
except (AttributeError, xml.dom.DOMException,
1604
xml.parsers.expat.ExpatError) as error:
1605
logger.error("Failed to override Introspection method",
1610
def datetime_to_dbus(dt, variant_level=0):
1014
1611
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1016
return dbus.String("", variant_level = variant_level)
1017
return dbus.String(dt.isoformat(),
1018
variant_level=variant_level)
1021
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1023
"""Applied to an empty subclass of a D-Bus object, this metaclass
1024
will add additional D-Bus attributes matching a certain pattern.
1613
return dbus.String("", variant_level=variant_level)
1614
return dbus.String(dt.isoformat(), variant_level=variant_level)
1617
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1618
"""A class decorator; applied to a subclass of
1619
dbus.service.Object, it will add alternate D-Bus attributes with
1620
interface names according to the "alt_interface_names" mapping.
1623
@alternate_dbus_interfaces({"org.example.Interface":
1624
"net.example.AlternateInterface"})
1625
class SampleDBusObject(dbus.service.Object):
1626
@dbus.service.method("org.example.Interface")
1627
def SampleDBusMethod():
1630
The above "SampleDBusMethod" on "SampleDBusObject" will be
1631
reachable via two interfaces: "org.example.Interface" and
1632
"net.example.AlternateInterface", the latter of which will have
1633
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1634
"true", unless "deprecate" is passed with a False value.
1636
This works for methods and signals, and also for D-Bus properties
1637
(from DBusObjectWithProperties) and interfaces (from the
1638
dbus_interface_annotations decorator).
1026
def __new__(mcs, name, bases, attr):
1027
# Go through all the base classes which could have D-Bus
1028
# methods, signals, or properties in them
1029
old_interface_names = []
1030
for base in (b for b in bases
1031
if issubclass(b, dbus.service.Object)):
1032
# Go though all attributes of the base class
1033
for attrname, attribute in inspect.getmembers(base):
1642
for orig_interface_name, alt_interface_name in (
1643
alt_interface_names.items()):
1645
interface_names = set()
1646
# Go though all attributes of the class
1647
for attrname, attribute in inspect.getmembers(cls):
1034
1648
# Ignore non-D-Bus attributes, and D-Bus attributes
1035
1649
# with the wrong interface name
1036
1650
if (not hasattr(attribute, "_dbus_interface")
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1651
or not attribute._dbus_interface.startswith(
1652
orig_interface_name)):
1040
1654
# Create an alternate D-Bus interface name based on
1041
1655
# the current name
1042
alt_interface = (attribute._dbus_interface
1043
.replace("se.recompile.Mandos",
1044
"se.bsnet.fukt.Mandos"))
1045
if alt_interface != attribute._dbus_interface:
1046
old_interface_names.append(alt_interface)
1656
alt_interface = attribute._dbus_interface.replace(
1657
orig_interface_name, alt_interface_name)
1658
interface_names.add(alt_interface)
1047
1659
# Is this a D-Bus signal?
1048
1660
if getattr(attribute, "_dbus_is_signal", False):
1049
# Extract the original non-method function by
1051
nonmethod_func = (dict(
1661
# Extract the original non-method undecorated
1662
# function by black magic
1663
if sys.version_info.major == 2:
1664
nonmethod_func = (dict(
1052
1665
zip(attribute.func_code.co_freevars,
1053
attribute.__closure__))["func"]
1666
attribute.__closure__))
1667
["func"].cell_contents)
1669
nonmethod_func = (dict(
1670
zip(attribute.__code__.co_freevars,
1671
attribute.__closure__))
1672
["func"].cell_contents)
1055
1673
# Create a new, but exactly alike, function
1056
1674
# object, and decorate it to be a new D-Bus signal
1057
1675
# with the alternate D-Bus interface name
1058
new_function = (dbus.service.signal
1060
attribute._dbus_signature)
1061
(types.FunctionType(
1062
nonmethod_func.func_code,
1063
nonmethod_func.func_globals,
1064
nonmethod_func.func_name,
1065
nonmethod_func.func_defaults,
1066
nonmethod_func.func_closure)))
1676
new_function = copy_function(nonmethod_func)
1677
new_function = (dbus.service.signal(
1679
attribute._dbus_signature)(new_function))
1067
1680
# Copy annotations, if any
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1682
new_function._dbus_annotations = dict(
1683
attribute._dbus_annotations)
1071
1684
except AttributeError:
1073
1687
# Define a creator of a function to call both the
1074
# old and new functions, so both the old and new
1075
# signals gets sent when the function is called
1688
# original and alternate functions, so both the
1689
# original and alternate signals gets sent when
1690
# the function is called
1076
1691
def fixscope(func1, func2):
1077
1692
"""This function is a scope container to pass
1078
1693
func1 and func2 to the "call_both" function
1079
1694
outside of its arguments"""
1696
@functools.wraps(func2)
1080
1697
def call_both(*args, **kwargs):
1081
1698
"""This function will emit two D-Bus
1082
1699
signals by calling func1 and func2"""
1083
1700
func1(*args, **kwargs)
1084
1701
func2(*args, **kwargs)
1702
# Make wrapper function look like a D-Bus
1704
for name, attr in inspect.getmembers(func2):
1705
if name.startswith("_dbus_"):
1706
setattr(call_both, name, attr)
1085
1708
return call_both
1086
1709
# Create the "call_both" function and add it to
1088
attr[attrname] = fixscope(attribute,
1711
attr[attrname] = fixscope(attribute, new_function)
1090
1712
# Is this a D-Bus method?
1091
1713
elif getattr(attribute, "_dbus_is_method", False):
1092
1714
# Create a new, but exactly alike, function
1093
1715
# object. Decorate it to be a new D-Bus method
1094
1716
# with the alternate D-Bus interface name. Add it
1095
1717
# to the class.
1096
attr[attrname] = (dbus.service.method
1098
attribute._dbus_in_signature,
1099
attribute._dbus_out_signature)
1101
(attribute.func_code,
1102
attribute.func_globals,
1103
attribute.func_name,
1104
attribute.func_defaults,
1105
attribute.func_closure)))
1719
dbus.service.method(
1721
attribute._dbus_in_signature,
1722
attribute._dbus_out_signature)
1723
(copy_function(attribute)))
1106
1724
# Copy annotations, if any
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1726
attr[attrname]._dbus_annotations = dict(
1727
attribute._dbus_annotations)
1110
1728
except AttributeError:
1112
1730
# Is this a D-Bus property?
1140
1751
# object. Decorate it to be a new D-Bus interface
1141
1752
# with the alternate D-Bus interface name. Add it
1142
1753
# to the class.
1143
attr[attrname] = (dbus_interface_annotations
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1160
if aname not in attr:
1163
return type.__new__(mcs, name, bases, attr)
1755
dbus_interface_annotations(alt_interface)
1756
(copy_function(attribute)))
1758
# Deprecate all alternate interfaces
1759
iname = "_AlternateDBusNames_interface_annotation{}"
1760
for interface_name in interface_names:
1762
@dbus_interface_annotations(interface_name)
1764
return {"org.freedesktop.DBus.Deprecated":
1766
# Find an unused name
1767
for aname in (iname.format(i)
1768
for i in itertools.count()):
1769
if aname not in attr:
1773
# Replace the class with a new subclass of it with
1774
# methods, signals, etc. as created above.
1775
if sys.version_info.major == 2:
1776
cls = type(b"{}Alternate".format(cls.__name__),
1779
cls = type("{}Alternate".format(cls.__name__),
1786
@alternate_dbus_interfaces({"se.recompile.Mandos":
1787
"se.bsnet.fukt.Mandos"})
1166
1788
class ClientDBus(Client, DBusObjectWithProperties):
1167
1789
"""A Client class using D-Bus
1170
1792
dbus_object_path: dbus.ObjectPath
1171
1793
bus: dbus.SystemBus()
1174
1796
runtime_expansions = (Client.runtime_expansions
1175
+ ("dbus_object_path",))
1797
+ ("dbus_object_path", ))
1799
_interface = "se.recompile.Mandos.Client"
1177
1801
# dbus.service.Object doesn't use super(), so we can't either.
1179
def __init__(self, bus = None, *args, **kwargs):
1803
def __init__(self, bus=None, *args, **kwargs):
1181
1805
Client.__init__(self, *args, **kwargs)
1182
1806
# Only now, when this client is initialized, can it show up on
1184
client_object_name = unicode(self.name).translate(
1808
client_object_name = str(self.name).translate(
1185
1809
{ord("."): ord("_"),
1186
1810
ord("-"): ord("_")})
1187
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
1811
self.dbus_object_path = dbus.ObjectPath(
1812
"/clients/" + client_object_name)
1189
1813
DBusObjectWithProperties.__init__(self, self.bus,
1190
1814
self.dbus_object_path)
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1816
def notifychangeproperty(transform_func, dbus_name,
1817
type_func=lambda x: x,
1819
invalidate_only=False,
1820
_interface=_interface):
1195
1821
""" Modify a variable so that it's a property which announces
1196
1822
its changes to DBus.
1198
1824
transform_fun: Function that takes a value and a variant_level
1199
1825
and transforms it to a D-Bus type.
1200
1826
dbus_name: D-Bus name of the variable
1350
1978
server to mandos-client
1354
1982
# Rejected - signal
1355
1983
@dbus.service.signal(_interface, signature="s")
1356
1984
def Rejected(self, reason):
1360
1988
# NeedApproval - signal
1361
1989
@dbus.service.signal(_interface, signature="tb")
1362
1990
def NeedApproval(self, timeout, default):
1364
1992
return self.need_approval()
1368
1996
# Approve - method
1369
1997
@dbus.service.method(_interface, in_signature="b")
1370
1998
def Approve(self, value):
1371
1999
self.approve(value)
1373
2001
# CheckedOK - method
1374
2002
@dbus.service.method(_interface)
1375
2003
def CheckedOK(self):
1376
2004
self.checked_ok()
1378
2006
# Enable - method
2007
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1379
2008
@dbus.service.method(_interface)
1380
2009
def Enable(self):
1384
2013
# StartChecker - method
2014
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1385
2015
@dbus.service.method(_interface)
1386
2016
def StartChecker(self):
1388
2018
self.start_checker()
1390
2020
# Disable - method
2021
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1391
2022
@dbus.service.method(_interface)
1392
2023
def Disable(self):
1396
2027
# StopChecker - method
2028
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
2029
@dbus.service.method(_interface)
1398
2030
def StopChecker(self):
1399
2031
self.stop_checker()
1403
2035
# ApprovalPending - property
1404
2036
@dbus_service_property(_interface, signature="b", access="read")
1405
2037
def ApprovalPending_dbus_property(self):
1406
2038
return dbus.Boolean(bool(self.approvals_pending))
1408
2040
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
2041
@dbus_service_property(_interface,
1410
2043
access="readwrite")
1411
2044
def ApprovedByDefault_dbus_property(self, value=None):
1412
2045
if value is None: # get
1413
2046
return dbus.Boolean(self.approved_by_default)
1414
2047
self.approved_by_default = bool(value)
1416
2049
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
2050
@dbus_service_property(_interface,
1418
2052
access="readwrite")
1419
2053
def ApprovalDelay_dbus_property(self, value=None):
1420
2054
if value is None: # get
1421
return dbus.UInt64(self.approval_delay_milliseconds())
2055
return dbus.UInt64(self.approval_delay.total_seconds()
1422
2057
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1424
2059
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
2060
@dbus_service_property(_interface,
1426
2062
access="readwrite")
1427
2063
def ApprovalDuration_dbus_property(self, value=None):
1428
2064
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
2065
return dbus.UInt64(self.approval_duration.total_seconds()
1431
2067
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1433
2069
# Name - property
2071
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1434
2072
@dbus_service_property(_interface, signature="s", access="read")
1435
2073
def Name_dbus_property(self):
1436
2074
return dbus.String(self.name)
2078
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2079
@dbus_service_property(_interface, signature="s", access="read")
2080
def KeyID_dbus_property(self):
2081
return dbus.String(self.key_id)
1438
2083
# Fingerprint - property
2085
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1439
2086
@dbus_service_property(_interface, signature="s", access="read")
1440
2087
def Fingerprint_dbus_property(self):
1441
2088
return dbus.String(self.fingerprint)
1443
2090
# Host - property
1444
@dbus_service_property(_interface, signature="s",
2091
@dbus_service_property(_interface,
1445
2093
access="readwrite")
1446
2094
def Host_dbus_property(self, value=None):
1447
2095
if value is None: # get
1448
2096
return dbus.String(self.host)
1449
self.host = unicode(value)
2097
self.host = str(value)
1451
2099
# Created - property
2101
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1452
2102
@dbus_service_property(_interface, signature="s", access="read")
1453
2103
def Created_dbus_property(self):
1454
2104
return datetime_to_dbus(self.created)
1456
2106
# LastEnabled - property
1457
2107
@dbus_service_property(_interface, signature="s", access="read")
1458
2108
def LastEnabled_dbus_property(self):
1459
2109
return datetime_to_dbus(self.last_enabled)
1461
2111
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
2112
@dbus_service_property(_interface,
1463
2114
access="readwrite")
1464
2115
def Enabled_dbus_property(self, value=None):
1465
2116
if value is None: # get
1472
2123
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
2124
@dbus_service_property(_interface,
1474
2126
access="readwrite")
1475
2127
def LastCheckedOK_dbus_property(self, value=None):
1476
2128
if value is not None:
1477
2129
self.checked_ok()
1479
2131
return datetime_to_dbus(self.last_checked_ok)
1481
2133
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
2134
@dbus_service_property(_interface, signature="n", access="read")
1484
2135
def LastCheckerStatus_dbus_property(self):
1485
2136
return dbus.Int16(self.last_checker_status)
1487
2138
# Expires - property
1488
2139
@dbus_service_property(_interface, signature="s", access="read")
1489
2140
def Expires_dbus_property(self):
1490
2141
return datetime_to_dbus(self.expires)
1492
2143
# LastApprovalRequest - property
1493
2144
@dbus_service_property(_interface, signature="s", access="read")
1494
2145
def LastApprovalRequest_dbus_property(self):
1495
2146
return datetime_to_dbus(self.last_approval_request)
1497
2148
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
2149
@dbus_service_property(_interface,
1499
2151
access="readwrite")
1500
2152
def Timeout_dbus_property(self, value=None):
1501
2153
if value is None: # get
1502
return dbus.UInt64(self.timeout_milliseconds())
2154
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2155
old_timeout = self.timeout
1503
2156
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
2157
# Reschedule disabling
1505
2158
if self.enabled:
1506
2159
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
2160
self.expires += self.timeout - old_timeout
2161
if self.expires <= now:
1510
2162
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
2165
if (getattr(self, "disable_initiator_tag", None)
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2168
GLib.source_remove(self.disable_initiator_tag)
2169
self.disable_initiator_tag = GLib.timeout_add(
2170
int((self.expires - now).total_seconds() * 1000),
1524
2173
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
2174
@dbus_service_property(_interface,
1526
2176
access="readwrite")
1527
2177
def ExtendedTimeout_dbus_property(self, value=None):
1528
2178
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2179
return dbus.UInt64(self.extended_timeout.total_seconds()
1530
2181
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1532
2183
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
2184
@dbus_service_property(_interface,
1534
2186
access="readwrite")
1535
2187
def Interval_dbus_property(self, value=None):
1536
2188
if value is None: # get
1537
return dbus.UInt64(self.interval_milliseconds())
2189
return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
2190
self.interval = datetime.timedelta(0, 0, 0, value)
1539
2191
if getattr(self, "checker_initiator_tag", None) is None:
1541
2193
if self.enabled:
1542
2194
# Reschedule checker run
1543
gobject.source_remove(self.checker_initiator_tag)
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
2195
GLib.source_remove(self.checker_initiator_tag)
2196
self.checker_initiator_tag = GLib.timeout_add(
2197
value, self.start_checker)
2198
self.start_checker() # Start one now, too
1548
2200
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
2201
@dbus_service_property(_interface,
1550
2203
access="readwrite")
1551
2204
def Checker_dbus_property(self, value=None):
1552
2205
if value is None: # get
1553
2206
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
2207
self.checker_command = str(value)
1556
2209
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
2210
@dbus_service_property(_interface,
1558
2212
access="readwrite")
1559
2213
def CheckerRunning_dbus_property(self, value=None):
1560
2214
if value is None: # get
1593
2255
if data[0] == 'data':
1595
2257
if data[0] == 'function':
1596
2259
def func(*args, **kwargs):
1597
2260
self._pipe.send(('funcall', name, args, kwargs))
1598
2261
return self._pipe.recv()[1]
1601
2265
def __setattr__(self, name, value):
1602
2266
if name == '_pipe':
1603
2267
return super(ProxyClient, self).__setattr__(name, value)
1604
2268
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1611
2271
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
2272
"""A class to handle client connections.
1614
2274
Instantiated once for each connection to handle it.
1615
2275
Note: This will run in its own forked process."""
1617
2277
def handle(self):
1618
2278
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
2279
logger.info("TCP connection from: %s",
1620
unicode(self.client_address))
2280
str(self.client_address))
1621
2281
logger.debug("Pipe FD: %d",
1622
2282
self.server.child_pipe.fileno())
1624
session = (gnutls.connection
1625
.ClientSession(self.request,
1627
.X509Credentials()))
1629
# Note: gnutls.connection.X509Credentials is really a
1630
# generic GnuTLS certificate credentials object so long as
1631
# no X.509 keys are added to it. Therefore, we can use it
1632
# here despite using OpenPGP certificates.
1634
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
# "+AES-256-CBC", "+SHA1",
1636
# "+COMP-NULL", "+CTYPE-OPENPGP",
2284
session = gnutls.ClientSession(self.request)
2286
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2287
# "+AES-256-CBC", "+SHA1",
2288
# "+COMP-NULL", "+CTYPE-OPENPGP",
1638
2290
# Use a fallback default, since this MUST be set.
1639
2291
priority = self.server.gnutls_priority
1640
2292
if priority is None:
1641
2293
priority = "NORMAL"
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2294
gnutls.priority_set_direct(session._c_object,
2295
priority.encode("utf-8"),
1646
2298
# Start communication using the Mandos protocol
1647
2299
# Get protocol number
1648
2300
line = self.request.makefile().readline()
1649
2301
logger.debug("Protocol version: %r", line)
1651
2303
if int(line.strip().split()[0]) > 1:
2304
raise RuntimeError(line)
1653
2305
except (ValueError, IndexError, RuntimeError) as error:
1654
2306
logger.error("Unknown protocol version: %s", error)
1657
2309
# Start GnuTLS connection
1659
2311
session.handshake()
1660
except gnutls.errors.GNUTLSError as error:
2312
except gnutls.Error as error:
1661
2313
logger.warning("Handshake failed: %s", error)
1662
2314
# Do not run session.bye() here: the session is not
1663
2315
# established. Just abandon the request.
1665
2317
logger.debug("Handshake succeeded")
1667
2319
approval_required = False
1670
fpr = self.fingerprint(self.peer_certificate
1673
gnutls.errors.GNUTLSError) as error:
1674
logger.warning("Bad certificate: %s", error)
1676
logger.debug("Fingerprint: %s", fpr)
1679
client = ProxyClient(child_pipe, fpr,
2321
if gnutls.has_rawpk:
2324
key_id = self.key_id(
2325
self.peer_certificate(session))
2326
except (TypeError, gnutls.Error) as error:
2327
logger.warning("Bad certificate: %s", error)
2329
logger.debug("Key ID: %s", key_id)
2334
fpr = self.fingerprint(
2335
self.peer_certificate(session))
2336
except (TypeError, gnutls.Error) as error:
2337
logger.warning("Bad certificate: %s", error)
2339
logger.debug("Fingerprint: %s", fpr)
2342
client = ProxyClient(child_pipe, key_id, fpr,
1680
2343
self.client_address)
1681
2344
except KeyError:
1684
2347
if client.approval_delay:
1685
2348
delay = client.approval_delay
1686
2349
client.approvals_pending += 1
1687
2350
approval_required = True
1690
2353
if not client.enabled:
1691
2354
logger.info("Client %s is disabled",
1693
2356
if self.server.use_dbus:
1694
2357
# Emit D-Bus signal
1695
2358
client.Rejected("Disabled")
1698
2361
if client.approved or not client.approval_delay:
1699
#We are approved or approval is disabled
2362
# We are approved or approval is disabled
1701
2364
elif client.approved is None:
1702
2365
logger.info("Client %s needs approval",
1737
2398
delay -= time2 - time
1740
while sent_size < len(client.secret):
1742
sent = session.send(client.secret[sent_size:])
1743
except gnutls.errors.GNUTLSError as error:
1744
logger.warning("gnutls send failed")
1746
logger.debug("Sent: %d, remaining: %d",
1747
sent, len(client.secret)
1748
- (sent_size + sent))
2401
session.send(client.secret)
2402
except gnutls.Error as error:
2403
logger.warning("gnutls send failed",
1751
2407
logger.info("Sending secret to %s", client.name)
1752
2408
# bump the timeout using extended_timeout
1753
2409
client.bump_timeout(client.extended_timeout)
1754
2410
if self.server.use_dbus:
1755
2411
# Emit D-Bus signal
1756
2412
client.GotSecret()
1759
2415
if approval_required:
1760
2416
client.approvals_pending -= 1
1763
except gnutls.errors.GNUTLSError as error:
1764
logger.warning("GnuTLS bye failed")
2419
except gnutls.Error as error:
2420
logger.warning("GnuTLS bye failed",
1767
2424
def peer_certificate(session):
1768
"Return the peer's OpenPGP certificate as a bytestring"
1769
# If not an OpenPGP certificate...
1770
if (gnutls.library.functions
1771
.gnutls_certificate_type_get(session._c_object)
1772
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1773
# ...do the normal thing
1774
return session.peer_certificate
2425
"Return the peer's certificate as a bytestring"
2427
cert_type = gnutls.certificate_type_get2(session._c_object,
2429
except AttributeError:
2430
cert_type = gnutls.certificate_type_get(session._c_object)
2431
if gnutls.has_rawpk:
2432
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2434
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2435
# If not a valid certificate type...
2436
if cert_type not in valid_cert_types:
2437
logger.info("Cert type %r not in %r", cert_type,
2439
# ...return invalid data
1775
2441
list_size = ctypes.c_uint(1)
1776
cert_list = (gnutls.library.functions
1777
.gnutls_certificate_get_peers
2442
cert_list = (gnutls.certificate_get_peers
1778
2443
(session._c_object, ctypes.byref(list_size)))
1779
2444
if not bool(cert_list) and list_size.value != 0:
1780
raise gnutls.errors.GNUTLSError("error getting peer"
2445
raise gnutls.Error("error getting peer certificate")
1782
2446
if list_size.value == 0:
1784
2448
cert = cert_list[0]
1785
2449
return ctypes.string_at(cert.data, cert.size)
2452
def key_id(certificate):
2453
"Convert a certificate bytestring to a hexdigit key ID"
2454
# New GnuTLS "datum" with the public key
2455
datum = gnutls.datum_t(
2456
ctypes.cast(ctypes.c_char_p(certificate),
2457
ctypes.POINTER(ctypes.c_ubyte)),
2458
ctypes.c_uint(len(certificate)))
2459
# XXX all these need to be created in the gnutls "module"
2460
# New empty GnuTLS certificate
2461
pubkey = gnutls.pubkey_t()
2462
gnutls.pubkey_init(ctypes.byref(pubkey))
2463
# Import the raw public key into the certificate
2464
gnutls.pubkey_import(pubkey,
2465
ctypes.byref(datum),
2466
gnutls.X509_FMT_DER)
2467
# New buffer for the key ID
2468
buf = ctypes.create_string_buffer(32)
2469
buf_len = ctypes.c_size_t(len(buf))
2470
# Get the key ID from the raw public key into the buffer
2471
gnutls.pubkey_get_key_id(pubkey,
2472
gnutls.KEYID_USE_SHA256,
2473
ctypes.cast(ctypes.byref(buf),
2474
ctypes.POINTER(ctypes.c_ubyte)),
2475
ctypes.byref(buf_len))
2476
# Deinit the certificate
2477
gnutls.pubkey_deinit(pubkey)
2479
# Convert the buffer to a Python bytestring
2480
key_id = ctypes.string_at(buf, buf_len.value)
2481
# Convert the bytestring to hexadecimal notation
2482
hex_key_id = binascii.hexlify(key_id).upper()
1788
2486
def fingerprint(openpgp):
1789
2487
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1790
2488
# New GnuTLS "datum" with the OpenPGP public key
1791
datum = (gnutls.library.types
1792
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1795
ctypes.c_uint(len(openpgp))))
2489
datum = gnutls.datum_t(
2490
ctypes.cast(ctypes.c_char_p(openpgp),
2491
ctypes.POINTER(ctypes.c_ubyte)),
2492
ctypes.c_uint(len(openpgp)))
1796
2493
# New empty GnuTLS certificate
1797
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1798
(gnutls.library.functions
1799
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2494
crt = gnutls.openpgp_crt_t()
2495
gnutls.openpgp_crt_init(ctypes.byref(crt))
1800
2496
# Import the OpenPGP public key into the certificate
1801
(gnutls.library.functions
1802
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1803
gnutls.library.constants
1804
.GNUTLS_OPENPGP_FMT_RAW))
2497
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2498
gnutls.OPENPGP_FMT_RAW)
1805
2499
# Verify the self signature in the key
1806
2500
crtverify = ctypes.c_uint()
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
2501
gnutls.openpgp_crt_verify_self(crt, 0,
2502
ctypes.byref(crtverify))
1810
2503
if crtverify.value != 0:
1811
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
raise (gnutls.errors.CertificateSecurityError
2504
gnutls.openpgp_crt_deinit(crt)
2505
raise gnutls.CertificateSecurityError(code
1814
2507
# New buffer for the fingerprint
1815
2508
buf = ctypes.create_string_buffer(20)
1816
2509
buf_len = ctypes.c_size_t()
1817
2510
# Get the fingerprint from the certificate into the buffer
1818
(gnutls.library.functions
1819
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1820
ctypes.byref(buf_len)))
2511
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2512
ctypes.byref(buf_len))
1821
2513
# Deinit the certificate
1822
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2514
gnutls.openpgp_crt_deinit(crt)
1823
2515
# Convert the buffer to a Python bytestring
1824
2516
fpr = ctypes.string_at(buf, buf_len.value)
1825
2517
# Convert the bytestring to hexadecimal notation
1830
class MultiprocessingMixIn(object):
2522
class MultiprocessingMixIn:
1831
2523
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1832
2525
def sub_process_main(self, request, address):
1834
2527
self.finish_request(request, address)
1835
2528
except Exception:
1836
2529
self.handle_error(request, address)
1837
2530
self.close_request(request)
1839
2532
def process_request(self, request, address):
1840
2533
"""Start a new process to process the request."""
1841
proc = multiprocessing.Process(target = self.sub_process_main,
2534
proc = multiprocessing.Process(target=self.sub_process_main,
2535
args=(request, address))
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2540
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1849
2541
""" adds a pipe to the MixIn """
1850
2543
def process_request(self, request, client_address):
1851
2544
"""Overrides and wraps the original process_request().
1853
2546
This function creates a new pipe in self.pipe
1855
2548
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1857
2550
proc = MultiprocessingMixIn.process_request(self, request,
1858
2551
client_address)
1859
2552
self.child_pipe.close()
1860
2553
self.add_pipe(parent_pipe, proc)
1862
2555
def add_pipe(self, parent_pipe, proc):
1863
2556
"""Dummy function; override as necessary"""
1864
raise NotImplementedError
2557
raise NotImplementedError()
1867
2560
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1868
socketserver.TCPServer, object):
2561
socketserver.TCPServer):
1869
2562
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1872
2565
enabled: Boolean; whether this server is activated yet
1873
2566
interface: None or a network interface name (string)
1874
2567
use_ipv6: Boolean; to use IPv6 or not
1876
2570
def __init__(self, server_address, RequestHandlerClass,
1877
interface=None, use_ipv6=True):
2574
"""If socketfd is set, use that file descriptor instead of
2575
creating a new one with socket.socket().
1878
2577
self.interface = interface
1880
2579
self.address_family = socket.AF_INET6
2580
if socketfd is not None:
2581
# Save the file descriptor
2582
self.socketfd = socketfd
2583
# Save the original socket.socket() function
2584
self.socket_socket = socket.socket
2586
# To implement --socket, we monkey patch socket.socket.
2588
# (When socketserver.TCPServer is a new-style class, we
2589
# could make self.socket into a property instead of monkey
2590
# patching socket.socket.)
2592
# Create a one-time-only replacement for socket.socket()
2593
@functools.wraps(socket.socket)
2594
def socket_wrapper(*args, **kwargs):
2595
# Restore original function so subsequent calls are
2597
socket.socket = self.socket_socket
2598
del self.socket_socket
2599
# This time only, return a new socket object from the
2600
# saved file descriptor.
2601
return socket.fromfd(self.socketfd, *args, **kwargs)
2602
# Replace socket.socket() function with wrapper
2603
socket.socket = socket_wrapper
2604
# The socketserver.TCPServer.__init__ will call
2605
# socket.socket(), which might be our replacement,
2606
# socket_wrapper(), if socketfd was set.
1881
2607
socketserver.TCPServer.__init__(self, server_address,
1882
2608
RequestHandlerClass)
1883
2610
def server_bind(self):
1884
2611
"""This overrides the normal server_bind() function
1885
2612
to bind to an interface if one was specified, and also NOT to
1886
2613
bind to an address or port if they were not specified."""
2614
global SO_BINDTODEVICE
1887
2615
if self.interface is not None:
1888
2616
if SO_BINDTODEVICE is None:
1889
logger.error("SO_BINDTODEVICE does not exist;"
1890
" cannot bind to interface %s",
1894
self.socket.setsockopt(socket.SOL_SOCKET,
1898
except socket.error as error:
1899
if error[0] == errno.EPERM:
1900
logger.error("No permission to"
1901
" bind to interface %s",
1903
elif error[0] == errno.ENOPROTOOPT:
1904
logger.error("SO_BINDTODEVICE not available;"
1905
" cannot bind to interface %s",
2617
# Fall back to a hard-coded value which seems to be
2619
logger.warning("SO_BINDTODEVICE not found, trying 25")
2620
SO_BINDTODEVICE = 25
2622
self.socket.setsockopt(
2623
socket.SOL_SOCKET, SO_BINDTODEVICE,
2624
(self.interface + "\0").encode("utf-8"))
2625
except socket.error as error:
2626
if error.errno == errno.EPERM:
2627
logger.error("No permission to bind to"
2628
" interface %s", self.interface)
2629
elif error.errno == errno.ENOPROTOOPT:
2630
logger.error("SO_BINDTODEVICE not available;"
2631
" cannot bind to interface %s",
2633
elif error.errno == errno.ENODEV:
2634
logger.error("Interface %s does not exist,"
2635
" cannot bind", self.interface)
1909
2638
# Only bind(2) the socket if we really need to.
1910
2639
if self.server_address[0] or self.server_address[1]:
2640
if self.server_address[1]:
2641
self.allow_reuse_address = True
1911
2642
if not self.server_address[0]:
1912
2643
if self.address_family == socket.AF_INET6:
1913
any_address = "::" # in6addr_any
2644
any_address = "::" # in6addr_any
1915
any_address = socket.INADDR_ANY
2646
any_address = "0.0.0.0" # INADDR_ANY
1916
2647
self.server_address = (any_address,
1917
2648
self.server_address[1])
1918
2649
elif not self.server_address[1]:
1919
self.server_address = (self.server_address[0],
2650
self.server_address = (self.server_address[0], 0)
1921
2651
# if self.interface:
1922
2652
# self.server_address = (self.server_address[0],
1948
2683
self.gnutls_priority = gnutls_priority
1949
2684
IPv6_TCPServer.__init__(self, server_address,
1950
2685
RequestHandlerClass,
1951
interface = interface,
1952
use_ipv6 = use_ipv6)
2686
interface=interface,
1953
2690
def server_activate(self):
1954
2691
if self.enabled:
1955
2692
return socketserver.TCPServer.server_activate(self)
1957
2694
def enable(self):
1958
2695
self.enabled = True
1960
2697
def add_pipe(self, parent_pipe, proc):
1961
2698
# Call "handle_ipc" for both data and EOF events
1962
gobject.io_add_watch(parent_pipe.fileno(),
1963
gobject.IO_IN | gobject.IO_HUP,
1964
functools.partial(self.handle_ipc,
1969
def handle_ipc(self, source, condition, parent_pipe=None,
1970
proc = None, client_object=None):
1972
gobject.IO_IN: "IN", # There is data to read.
1973
gobject.IO_OUT: "OUT", # Data can be written (without
1975
gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
gobject.IO_ERR: "ERR", # Error condition.
1977
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1978
# broken, usually for pipes and
1981
conditions_string = ' | '.join(name
1983
condition_names.iteritems()
1984
if cond & condition)
2700
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2701
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2702
functools.partial(self.handle_ipc,
2703
parent_pipe=parent_pipe,
2706
def handle_ipc(self, source, condition,
2709
client_object=None):
1985
2710
# error, or the other end of multiprocessing.Pipe has closed
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2711
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1987
2712
# Wait for other process to exit
1991
2716
# Read a request from the child
1992
2717
request = parent_pipe.recv()
1993
2718
command = request[0]
1995
2720
if command == 'init':
1997
address = request[2]
1999
for c in self.clients.itervalues():
2000
if c.fingerprint == fpr:
2721
key_id = request[1].decode("ascii")
2722
fpr = request[2].decode("ascii")
2723
address = request[3]
2725
for c in self.clients.values():
2726
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2728
if key_id and c.key_id == key_id:
2731
if fpr and c.fingerprint == fpr:
2004
logger.info("Client not found for fingerprint: %s, ad"
2005
"dress: %s", fpr, address)
2735
logger.info("Client not found for key ID: %s, address"
2736
": %s", key_id or fpr, address)
2006
2737
if self.use_dbus:
2007
2738
# Emit D-Bus signal
2008
mandos_dbus_service.ClientNotFound(fpr,
2739
mandos_dbus_service.ClientNotFound(key_id or fpr,
2010
2741
parent_pipe.send(False)
2013
gobject.io_add_watch(parent_pipe.fileno(),
2014
gobject.IO_IN | gobject.IO_HUP,
2015
functools.partial(self.handle_ipc,
2745
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2746
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2747
functools.partial(self.handle_ipc,
2748
parent_pipe=parent_pipe,
2750
client_object=client))
2021
2751
parent_pipe.send(True)
2022
2752
# remove the old hook in favor of the new above hook on
2026
2756
funcname = request[1]
2027
2757
args = request[2]
2028
2758
kwargs = request[3]
2030
2760
parent_pipe.send(('data', getattr(client_object,
2031
2761
funcname)(*args,
2034
2764
if command == 'getattr':
2035
2765
attrname = request[1]
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2766
if isinstance(client_object.__getattribute__(attrname),
2767
collections.abc.Callable):
2768
parent_pipe.send(('function', ))
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2771
'data', client_object.__getattribute__(attrname)))
2042
2773
if command == 'setattr':
2043
2774
attrname = request[1]
2044
2775
value = request[2]
2045
2776
setattr(client_object, attrname, value)
2781
def rfc3339_duration_to_delta(duration):
2782
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2784
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2786
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2788
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2790
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2792
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2794
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2796
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2800
# Parsing an RFC 3339 duration with regular expressions is not
2801
# possible - there would have to be multiple places for the same
2802
# values, like seconds. The current code, while more esoteric, is
2803
# cleaner without depending on a parsing library. If Python had a
2804
# built-in library for parsing we would use it, but we'd like to
2805
# avoid excessive use of external libraries.
2807
# New type for defining tokens, syntax, and semantics all-in-one
2808
Token = collections.namedtuple("Token", (
2809
"regexp", # To match token; if "value" is not None, must have
2810
# a "group" containing digits
2811
"value", # datetime.timedelta or None
2812
"followers")) # Tokens valid after this token
2813
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2814
# the "duration" ABNF definition in RFC 3339, Appendix A.
2815
token_end = Token(re.compile(r"$"), None, frozenset())
2816
token_second = Token(re.compile(r"(\d+)S"),
2817
datetime.timedelta(seconds=1),
2818
frozenset((token_end, )))
2819
token_minute = Token(re.compile(r"(\d+)M"),
2820
datetime.timedelta(minutes=1),
2821
frozenset((token_second, token_end)))
2822
token_hour = Token(re.compile(r"(\d+)H"),
2823
datetime.timedelta(hours=1),
2824
frozenset((token_minute, token_end)))
2825
token_time = Token(re.compile(r"T"),
2827
frozenset((token_hour, token_minute,
2829
token_day = Token(re.compile(r"(\d+)D"),
2830
datetime.timedelta(days=1),
2831
frozenset((token_time, token_end)))
2832
token_month = Token(re.compile(r"(\d+)M"),
2833
datetime.timedelta(weeks=4),
2834
frozenset((token_day, token_end)))
2835
token_year = Token(re.compile(r"(\d+)Y"),
2836
datetime.timedelta(weeks=52),
2837
frozenset((token_month, token_end)))
2838
token_week = Token(re.compile(r"(\d+)W"),
2839
datetime.timedelta(weeks=1),
2840
frozenset((token_end, )))
2841
token_duration = Token(re.compile(r"P"), None,
2842
frozenset((token_year, token_month,
2843
token_day, token_time,
2845
# Define starting values:
2847
value = datetime.timedelta()
2849
# Following valid tokens
2850
followers = frozenset((token_duration, ))
2851
# String left to parse
2853
# Loop until end token is found
2854
while found_token is not token_end:
2855
# Search for any currently valid tokens
2856
for token in followers:
2857
match = token.regexp.match(s)
2858
if match is not None:
2860
if token.value is not None:
2861
# Value found, parse digits
2862
factor = int(match.group(1), 10)
2863
# Add to value so far
2864
value += factor * token.value
2865
# Strip token from string
2866
s = token.regexp.sub("", s, 1)
2869
# Set valid next tokens
2870
followers = found_token.followers
2873
# No currently valid tokens were found
2874
raise ValueError("Invalid RFC 3339 duration: {!r}"
2050
2880
def string_to_delta(interval):
2051
2881
"""Parse a string and return a datetime.timedelta
2053
>>> string_to_delta('7d')
2054
datetime.timedelta(7)
2055
>>> string_to_delta('60s')
2056
datetime.timedelta(0, 60)
2057
>>> string_to_delta('60m')
2058
datetime.timedelta(0, 3600)
2059
>>> string_to_delta('24h')
2060
datetime.timedelta(1)
2061
>>> string_to_delta('1w')
2062
datetime.timedelta(7)
2063
>>> string_to_delta('5m 30s')
2064
datetime.timedelta(0, 330)
2883
>>> string_to_delta('7d') == datetime.timedelta(7)
2885
>>> string_to_delta('60s') == datetime.timedelta(0, 60)
2887
>>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2889
>>> string_to_delta('24h') == datetime.timedelta(1)
2891
>>> string_to_delta('1w') == datetime.timedelta(7)
2893
>>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2898
return rfc3339_duration_to_delta(interval)
2066
2902
timevalue = datetime.timedelta(0)
2067
2903
for s in interval.split():
2069
suffix = unicode(s[-1])
2070
2906
value = int(s[:-1])
2071
2907
if suffix == "d":
2072
2908
delta = datetime.timedelta(value)
2145
2980
parser.add_argument("--no-dbus", action="store_false",
2146
2981
dest="use_dbus", help="Do not provide D-Bus"
2147
" system bus interface")
2982
" system bus interface", default=None)
2148
2983
parser.add_argument("--no-ipv6", action="store_false",
2149
dest="use_ipv6", help="Do not use IPv6")
2984
dest="use_ipv6", help="Do not use IPv6",
2150
2986
parser.add_argument("--no-restore", action="store_false",
2151
2987
dest="restore", help="Do not restore stored"
2988
" state", default=None)
2989
parser.add_argument("--socket", type=int,
2990
help="Specify a file descriptor to a network"
2991
" socket to use instead of creating one")
2153
2992
parser.add_argument("--statedir", metavar="DIR",
2154
2993
help="Directory to save/restore state in")
2994
parser.add_argument("--foreground", action="store_true",
2995
help="Run in foreground", default=None)
2996
parser.add_argument("--no-zeroconf", action="store_false",
2997
dest="zeroconf", help="Do not use Zeroconf",
2156
3000
options = parser.parse_args()
2163
3002
# Default values for config file for server-global settings
2164
server_defaults = { "interface": "",
2169
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2170
"servicename": "Mandos",
2175
"statedir": "/var/lib/mandos"
3003
if gnutls.has_rawpk:
3004
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3005
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3007
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3008
":+SIGN-DSA-SHA256")
3009
server_defaults = {"interface": "",
3013
"priority": priority,
3014
"servicename": "Mandos",
3020
"statedir": "/var/lib/mandos",
3021
"foreground": "False",
2178
3026
# Parse config file for server-global settings
2179
server_config = configparser.SafeConfigParser(server_defaults)
3027
server_config = configparser.ConfigParser(server_defaults)
2180
3028
del server_defaults
2181
server_config.read(os.path.join(options.configdir,
2183
# Convert the SafeConfigParser object to a dict
3029
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3030
# Convert the ConfigParser object to a dict
2184
3031
server_settings = server_config.defaults()
2185
3032
# Use the appropriate methods on the non-string config options
2186
for option in ("debug", "use_dbus", "use_ipv6"):
3033
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3034
"foreground", "zeroconf"):
2187
3035
server_settings[option] = server_config.getboolean("DEFAULT",
2189
3037
if server_settings["port"]:
2190
3038
server_settings["port"] = server_config.getint("DEFAULT",
3040
if server_settings["socket"]:
3041
server_settings["socket"] = server_config.getint("DEFAULT",
3043
# Later, stdin will, and stdout and stderr might, be dup'ed
3044
# over with an opened os.devnull. But we don't want this to
3045
# happen with a supplied network socket.
3046
if 0 <= server_settings["socket"] <= 2:
3047
server_settings["socket"] = os.dup(server_settings
2192
3049
del server_config
2194
3051
# Override the settings from the config file with command line
2195
3052
# options, if set.
2196
3053
for option in ("interface", "address", "port", "debug",
2197
"priority", "servicename", "configdir",
2198
"use_dbus", "use_ipv6", "debuglevel", "restore",
3054
"priority", "servicename", "configdir", "use_dbus",
3055
"use_ipv6", "debuglevel", "restore", "statedir",
3056
"socket", "foreground", "zeroconf"):
2200
3057
value = getattr(options, option)
2201
3058
if value is not None:
2202
3059
server_settings[option] = value
2204
3061
# Force all strings to be unicode
2205
3062
for option in server_settings.keys():
2206
if type(server_settings[option]) is str:
2207
server_settings[option] = unicode(server_settings[option])
3063
if isinstance(server_settings[option], bytes):
3064
server_settings[option] = (server_settings[option]
3066
# Force all boolean options to be boolean
3067
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3068
"foreground", "zeroconf"):
3069
server_settings[option] = bool(server_settings[option])
3070
# Debug implies foreground
3071
if server_settings["debug"]:
3072
server_settings["foreground"] = True
2208
3073
# Now we have our good server settings in "server_settings"
2210
3075
##################################################################
3077
if (not server_settings["zeroconf"]
3078
and not (server_settings["port"]
3079
or server_settings["socket"] != "")):
3080
parser.error("Needs port or socket to work without Zeroconf")
2212
3082
# For convenience
2213
3083
debug = server_settings["debug"]
2214
3084
debuglevel = server_settings["debuglevel"]
3153
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2274
3155
except OSError as error:
2275
if error[0] != errno.EPERM:
3156
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3157
.format(uid, gid, os.strerror(error.errno)))
3158
if error.errno != errno.EPERM:
2279
3162
# Enable all possible GnuTLS debugging
2281
3164
# "Use a log level over 10 to enable all debugging options."
2282
3165
# - GnuTLS manual
2283
gnutls.library.functions.gnutls_global_set_log_level(11)
2285
@gnutls.library.types.gnutls_log_func
3166
gnutls.global_set_log_level(11)
2286
3169
def debug_gnutls(level, string):
2287
3170
logger.debug("GnuTLS: %s", string[:-1])
2289
(gnutls.library.functions
2290
.gnutls_global_set_log_function(debug_gnutls))
3172
gnutls.global_set_log_function(debug_gnutls)
2292
3174
# Redirect stdin so all checkers get /dev/null
2293
3175
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2294
3176
os.dup2(null, sys.stdin.fileno())
2298
3180
# Need to fork before connecting to D-Bus
2300
3182
# Close all input and output, do double fork, etc.
2303
gobject.threads_init()
3185
if gi.version_info < (3, 10, 2):
3186
# multiprocessing will use threads, so before we use GLib we
3187
# need to inform GLib that threads will be used.
2305
3190
global main_loop
2306
3191
# From the Avahi example code
2307
3192
DBusGMainLoop(set_as_default=True)
2308
main_loop = gobject.MainLoop()
3193
main_loop = GLib.MainLoop()
2309
3194
bus = dbus.SystemBus()
2310
3195
# End of Avahi example code
2313
3198
bus_name = dbus.service.BusName("se.recompile.Mandos",
2314
bus, do_not_queue=True)
2315
old_bus_name = (dbus.service.BusName
2316
("se.bsnet.fukt.Mandos", bus,
2318
except dbus.exceptions.NameExistsException as e:
2319
logger.error(unicode(e) + ", disabling D-Bus")
3201
old_bus_name = dbus.service.BusName(
3202
"se.bsnet.fukt.Mandos", bus,
3204
except dbus.exceptions.DBusException as e:
3205
logger.error("Disabling D-Bus:", exc_info=e)
2320
3206
use_dbus = False
2321
3207
server_settings["use_dbus"] = False
2322
3208
tcp_server.use_dbus = False
2323
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2324
service = AvahiServiceToSyslog(name =
2325
server_settings["servicename"],
2326
servicetype = "_mandos._tcp",
2327
protocol = protocol, bus = bus)
2328
if server_settings["interface"]:
2329
service.interface = (if_nametoindex
2330
(str(server_settings["interface"])))
3210
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3211
service = AvahiServiceToSyslog(
3212
name=server_settings["servicename"],
3213
servicetype="_mandos._tcp",
3216
if server_settings["interface"]:
3217
service.interface = if_nametoindex(
3218
server_settings["interface"].encode("utf-8"))
2332
3220
global multiprocessing_manager
2333
3221
multiprocessing_manager = multiprocessing.Manager()
2335
3223
client_class = Client
2337
client_class = functools.partial(ClientDBusTransitional,
3225
client_class = functools.partial(ClientDBus, bus=bus)
2340
3227
client_settings = Client.config_parser(client_config)
2341
3228
old_client_settings = {}
2342
3229
clients_data = {}
3231
# This is used to redirect stdout and stderr for checker processes
3233
wnull = open(os.devnull, "w") # A writable /dev/null
3234
# Only used if server is running in foreground but not in debug
3236
if debug or not foreground:
2344
3239
# Get client data and settings from last running state.
2345
3240
if server_settings["restore"]:
2347
3242
with open(stored_state_path, "rb") as stored_state:
2348
clients_data, old_client_settings = (pickle.load
3243
if sys.version_info.major == 2:
3244
clients_data, old_client_settings = pickle.load(
3247
bytes_clients_data, bytes_old_client_settings = (
3248
pickle.load(stored_state, encoding="bytes"))
3249
# Fix bytes to strings
3252
clients_data = {(key.decode("utf-8")
3253
if isinstance(key, bytes)
3256
bytes_clients_data.items()}
3257
del bytes_clients_data
3258
for key in clients_data:
3259
value = {(k.decode("utf-8")
3260
if isinstance(k, bytes) else k): v
3262
clients_data[key].items()}
3263
clients_data[key] = value
3265
value["client_structure"] = [
3267
if isinstance(s, bytes)
3269
value["client_structure"]]
3270
# .name, .host, and .checker_command
3271
for k in ("name", "host", "checker_command"):
3272
if isinstance(value[k], bytes):
3273
value[k] = value[k].decode("utf-8")
3274
if "key_id" not in value:
3275
value["key_id"] = ""
3276
elif "fingerprint" not in value:
3277
value["fingerprint"] = ""
3278
# old_client_settings
3280
old_client_settings = {
3281
(key.decode("utf-8")
3282
if isinstance(key, bytes)
3285
bytes_old_client_settings.items()}
3286
del bytes_old_client_settings
3287
# .host and .checker_command
3288
for value in old_client_settings.values():
3289
for attribute in ("host", "checker_command"):
3290
if isinstance(value[attribute], bytes):
3291
value[attribute] = (value[attribute]
2350
3293
os.remove(stored_state_path)
2351
3294
except IOError as e:
2352
logger.warning("Could not load persistent state: {0}"
2354
if e.errno != errno.ENOENT:
3295
if e.errno == errno.ENOENT:
3296
logger.warning("Could not load persistent state:"
3297
" {}".format(os.strerror(e.errno)))
3299
logger.critical("Could not load persistent state:",
2356
3302
except EOFError as e:
2357
3303
logger.warning("Could not load persistent state: "
2358
"EOFError: {0}".format(e))
2360
3307
with PGPEngine() as pgp:
2361
for client_name, client in clients_data.iteritems():
3308
for client_name, client in clients_data.items():
3309
# Skip removed clients
3310
if client_name not in client_settings:
2362
3313
# Decide which value to use after restoring saved state.
2363
3314
# We have three different values: Old config file,
2364
3315
# new config file, and saved state.
2425
3375
clients_data[client_name] = client_settings[client_name]
2427
3377
# Create all client objects
2428
for client_name, client in clients_data.iteritems():
3378
for client_name, client in clients_data.items():
2429
3379
tcp_server.clients[client_name] = client_class(
2430
name = client_name, settings = client)
3382
server_settings=server_settings)
2432
3384
if not tcp_server.clients:
2433
3385
logger.warning("No clients defined")
2439
pidfile.write(str(pid) + "\n".encode("utf-8"))
2442
logger.error("Could not write to file %r with PID %d",
2445
# "pidfile" was never created
3388
if pidfile is not None:
3392
print(pid, file=pidfile)
3394
logger.error("Could not write to file %r with PID %d",
2447
3397
del pidfilename
2448
signal.signal(signal.SIGINT, signal.SIG_IGN)
2450
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2451
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3399
for termsig in (signal.SIGHUP, signal.SIGTERM):
3400
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3401
lambda: main_loop.quit() and False)
2454
class MandosDBusService(DBusObjectWithProperties):
3405
@alternate_dbus_interfaces(
3406
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3407
class MandosDBusService(DBusObjectWithObjectManager):
2455
3408
"""A D-Bus proxy object"""
2456
3410
def __init__(self):
2457
3411
dbus.service.Object.__init__(self, bus, "/")
2458
3413
_interface = "se.recompile.Mandos"
2460
@dbus_interface_annotations(_interface)
2462
return { "org.freedesktop.DBus.Property"
2463
".EmitsChangedSignal":
2466
3415
@dbus.service.signal(_interface, signature="o")
2467
3416
def ClientAdded(self, objpath):
2471
3420
@dbus.service.signal(_interface, signature="ss")
2472
def ClientNotFound(self, fingerprint, address):
3421
def ClientNotFound(self, key_id, address):
3425
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2476
3427
@dbus.service.signal(_interface, signature="os")
2477
3428
def ClientRemoved(self, objpath, name):
3432
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2481
3434
@dbus.service.method(_interface, out_signature="ao")
2482
3435
def GetAllClients(self):
2484
return dbus.Array(c.dbus_object_path
2486
tcp_server.clients.itervalues())
3437
return dbus.Array(c.dbus_object_path for c in
3438
tcp_server.clients.values())
3440
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2488
3442
@dbus.service.method(_interface,
2489
3443
out_signature="a{oa{sv}}")
2490
3444
def GetAllClientsWithProperties(self):
2492
3446
return dbus.Dictionary(
2493
((c.dbus_object_path, c.GetAll(""))
2494
for c in tcp_server.clients.itervalues()),
3447
{c.dbus_object_path: c.GetAll(
3448
"se.recompile.Mandos.Client")
3449
for c in tcp_server.clients.values()},
2495
3450
signature="oa{sv}")
2497
3452
@dbus.service.method(_interface, in_signature="o")
2498
3453
def RemoveClient(self, object_path):
2500
for c in tcp_server.clients.itervalues():
3455
for c in tcp_server.clients.values():
2501
3456
if c.dbus_object_path == object_path:
2502
3457
del tcp_server.clients[c.name]
2503
3458
c.remove_from_connection()
2504
# Don't signal anything except ClientRemoved
3459
# Don't signal the disabling
2505
3460
c.disable(quiet=True)
2507
self.ClientRemoved(object_path, c.name)
3461
# Emit D-Bus signal for removal
3462
self.client_removed_signal(c)
2509
3464
raise KeyError(object_path)
2513
class MandosDBusServiceTransitional(MandosDBusService):
2514
__metaclass__ = AlternateDBusNamesMetaclass
2515
mandos_dbus_service = MandosDBusServiceTransitional()
3468
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3469
out_signature="a{oa{sa{sv}}}")
3470
def GetManagedObjects(self):
3472
return dbus.Dictionary(
3473
{client.dbus_object_path:
3475
{interface: client.GetAll(interface)
3477
client._get_all_interface_names()})
3478
for client in tcp_server.clients.values()})
3480
def client_added_signal(self, client):
3481
"""Send the new standard signal and the old signal"""
3483
# New standard signal
3484
self.InterfacesAdded(
3485
client.dbus_object_path,
3487
{interface: client.GetAll(interface)
3489
client._get_all_interface_names()}))
3491
self.ClientAdded(client.dbus_object_path)
3493
def client_removed_signal(self, client):
3494
"""Send the new standard signal and the old signal"""
3496
# New standard signal
3497
self.InterfacesRemoved(
3498
client.dbus_object_path,
3499
client._get_all_interface_names())
3501
self.ClientRemoved(client.dbus_object_path,
3504
mandos_dbus_service = MandosDBusService()
3506
# Save modules to variables to exempt the modules from being
3507
# unloaded before the function registered with atexit() is run.
3508
mp = multiprocessing
2518
3512
"Cleanup function; run on exit"
2521
multiprocessing.active_children()
3516
mp.active_children()
2522
3518
if not (tcp_server.clients or client_settings):
2525
3521
# Store client before exiting. Secrets are encrypted with key
2526
3522
# based on what config file has. If config file is
2527
3523
# removed/edited, old secret will thus be unrecovable.
2529
3525
with PGPEngine() as pgp:
2530
for client in tcp_server.clients.itervalues():
3526
for client in tcp_server.clients.values():
2531
3527
key = client_settings[client.name]["secret"]
2532
3528
client.encrypted_secret = pgp.encrypt(client.secret,
2534
3530
client_dict = {}
2536
3532
# A list of attributes that can not be pickled
2538
exclude = set(("bus", "changedstate", "secret",
2540
for name, typ in (inspect.getmembers
2541
(dbus.service.Object)):
3534
exclude = {"bus", "changedstate", "secret",
3535
"checker", "server_settings"}
3536
for name, typ in inspect.getmembers(dbus.service
2542
3538
exclude.add(name)
2544
3540
client_dict["encrypted_secret"] = (client
2545
3541
.encrypted_secret)
2546
3542
for attr in client.client_structure:
2547
3543
if attr not in exclude:
2548
3544
client_dict[attr] = getattr(client, attr)
2550
3546
clients[client.name] = client_dict
2551
3547
del client_settings[client.name]["secret"]
2554
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2557
(stored_state_path))
2558
with os.fdopen(tempfd, "wb") as stored_state:
2559
pickle.dump((clients, client_settings), stored_state)
3550
with tempfile.NamedTemporaryFile(
3554
dir=os.path.dirname(stored_state_path),
3555
delete=False) as stored_state:
3556
pickle.dump((clients, client_settings), stored_state,
3558
tempname = stored_state.name
2560
3559
os.rename(tempname, stored_state_path)
2561
3560
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2566
3563
os.remove(tempname)
2567
3564
except NameError:
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
3566
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3567
logger.warning("Could not save persistent state: {}"
3568
.format(os.strerror(e.errno)))
3570
logger.warning("Could not save persistent state:",
2573
3574
# Delete all clients, and settings from config
2574
3575
while tcp_server.clients:
2575
3576
name, client = tcp_server.clients.popitem()
2577
3578
client.remove_from_connection()
2578
# Don't signal anything except ClientRemoved
3579
# Don't signal the disabling
2579
3580
client.disable(quiet=True)
3581
# Emit D-Bus signal for removal
2582
mandos_dbus_service.ClientRemoved(client
3583
mandos_dbus_service.client_removed_signal(client)
2585
3584
client_settings.clear()
2587
3586
atexit.register(cleanup)
2589
for client in tcp_server.clients.itervalues():
3588
for client in tcp_server.clients.values():
2592
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3590
# Emit D-Bus signal for adding
3591
mandos_dbus_service.client_added_signal(client)
2593
3592
# Need to initiate checking of clients
2594
3593
if client.enabled:
2595
3594
client.init_checker()
2597
3596
tcp_server.enable()
2598
3597
tcp_server.server_activate()
2600
3599
# Find out what port we got
2601
service.port = tcp_server.socket.getsockname()[1]
3601
service.port = tcp_server.socket.getsockname()[1]
2603
3603
logger.info("Now listening on address %r, port %d,"
2604
3604
" flowinfo %d, scope_id %d",