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
212
332
class AvahiError(Exception):
213
333
def __init__(self, value, *args, **kwargs):
214
334
self.value = value
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
335
return super(AvahiError, self).__init__(value, *args,
219
339
class AvahiServiceError(AvahiError):
222
343
class AvahiGroupError(AvahiError):
226
class AvahiService(object):
227
348
"""An Avahi (Zeroconf) service.
230
351
interface: integer; avahi.IF_UNSPEC or an interface index.
231
352
Used to optionally bind to the specified interface.
232
353
name: string; Example: 'Mandos'
233
354
type: string; Example: '_mandos._tcp'.
234
See <http://www.dns-sd.org/ServiceTypes.html>
355
See <https://www.iana.org/assignments/service-names-port-numbers>
235
356
port: integer; what port to announce
236
357
TXT: list of strings; TXT record for the service
237
358
domain: string; Domain to publish on, default to .local if empty.
374
517
follow_name_owner_changes=True),
375
518
avahi.DBUS_INTERFACE_SERVER)
376
519
self.server.connect_to_signal("StateChanged",
377
self.server_state_changed)
520
self.server_state_changed)
378
521
self.server_state_changed(self.server.GetState())
380
524
class AvahiServiceToSyslog(AvahiService):
525
def rename(self, *args, **kwargs):
382
526
"""Add the new name to the syslog messages"""
383
ret = AvahiService.rename(self)
384
syslogger.setFormatter(logging.Formatter
385
('Mandos ({0}) [%(process)d]:'
386
' %(levelname)s: %(message)s'
527
ret = super(AvahiServiceToSyslog, self).rename(*args,
529
syslogger.setFormatter(logging.Formatter(
530
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
390
def timedelta_to_milliseconds(td):
391
"Convert a datetime.timedelta() to milliseconds"
392
return ((td.days * 24 * 60 * 60 * 1000)
393
+ (td.seconds * 1000)
394
+ (td.microseconds // 1000))
396
class Client(object):
535
# Pretend that we have a GnuTLS module
537
"""This isn't so much a class as it is a module-like namespace."""
539
library = ctypes.util.find_library("gnutls")
541
library = ctypes.util.find_library("gnutls-deb0")
542
_library = ctypes.cdll.LoadLibrary(library)
545
# Unless otherwise indicated, the constants and types below are
546
# all from the gnutls/gnutls.h C header file.
557
E_NO_CERTIFICATE_FOUND = -49
562
KEYID_USE_SHA256 = 1 # gnutls/x509.h
563
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
566
class session_int(ctypes.Structure):
568
session_t = ctypes.POINTER(session_int)
570
class certificate_credentials_st(ctypes.Structure):
572
certificate_credentials_t = ctypes.POINTER(
573
certificate_credentials_st)
574
certificate_type_t = ctypes.c_int
576
class datum_t(ctypes.Structure):
577
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
578
('size', ctypes.c_uint)]
580
class openpgp_crt_int(ctypes.Structure):
582
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
583
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
584
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
585
credentials_type_t = ctypes.c_int
586
transport_ptr_t = ctypes.c_void_p
587
close_request_t = ctypes.c_int
590
class Error(Exception):
591
def __init__(self, message=None, code=None, args=()):
592
# Default usage is by a message string, but if a return
593
# code is passed, convert it to a string with
596
if message is None and code is not None:
597
message = gnutls.strerror(code)
598
return super(gnutls.Error, self).__init__(
601
class CertificateSecurityError(Error):
607
self._c_object = gnutls.certificate_credentials_t()
608
gnutls.certificate_allocate_credentials(
609
ctypes.byref(self._c_object))
610
self.type = gnutls.CRD_CERTIFICATE
613
gnutls.certificate_free_credentials(self._c_object)
616
def __init__(self, socket, credentials=None):
617
self._c_object = gnutls.session_t()
618
gnutls_flags = gnutls.CLIENT
619
if gnutls.check_version(b"3.5.6"):
620
gnutls_flags |= gnutls.NO_TICKETS
622
gnutls_flags |= gnutls.ENABLE_RAWPK
623
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
625
gnutls.set_default_priority(self._c_object)
626
gnutls.transport_set_ptr(self._c_object, socket.fileno())
627
gnutls.handshake_set_private_extensions(self._c_object,
630
if credentials is None:
631
credentials = gnutls.Credentials()
632
gnutls.credentials_set(self._c_object, credentials.type,
633
ctypes.cast(credentials._c_object,
635
self.credentials = credentials
638
gnutls.deinit(self._c_object)
641
return gnutls.handshake(self._c_object)
643
def send(self, data):
647
data_len -= gnutls.record_send(self._c_object,
652
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
654
# Error handling functions
655
def _error_code(result):
656
"""A function to raise exceptions on errors, suitable
657
for the 'restype' attribute on ctypes functions"""
660
if result == gnutls.E_NO_CERTIFICATE_FOUND:
661
raise gnutls.CertificateSecurityError(code=result)
662
raise gnutls.Error(code=result)
664
def _retry_on_error(result, func, arguments):
665
"""A function to retry on some errors, suitable
666
for the 'errcheck' attribute on ctypes functions"""
668
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
669
return _error_code(result)
670
result = func(*arguments)
673
# Unless otherwise indicated, the function declarations below are
674
# all from the gnutls/gnutls.h C header file.
677
priority_set_direct = _library.gnutls_priority_set_direct
678
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
679
ctypes.POINTER(ctypes.c_char_p)]
680
priority_set_direct.restype = _error_code
682
init = _library.gnutls_init
683
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
684
init.restype = _error_code
686
set_default_priority = _library.gnutls_set_default_priority
687
set_default_priority.argtypes = [session_t]
688
set_default_priority.restype = _error_code
690
record_send = _library.gnutls_record_send
691
record_send.argtypes = [session_t, ctypes.c_void_p,
693
record_send.restype = ctypes.c_ssize_t
694
record_send.errcheck = _retry_on_error
696
certificate_allocate_credentials = (
697
_library.gnutls_certificate_allocate_credentials)
698
certificate_allocate_credentials.argtypes = [
699
ctypes.POINTER(certificate_credentials_t)]
700
certificate_allocate_credentials.restype = _error_code
702
certificate_free_credentials = (
703
_library.gnutls_certificate_free_credentials)
704
certificate_free_credentials.argtypes = [
705
certificate_credentials_t]
706
certificate_free_credentials.restype = None
708
handshake_set_private_extensions = (
709
_library.gnutls_handshake_set_private_extensions)
710
handshake_set_private_extensions.argtypes = [session_t,
712
handshake_set_private_extensions.restype = None
714
credentials_set = _library.gnutls_credentials_set
715
credentials_set.argtypes = [session_t, credentials_type_t,
717
credentials_set.restype = _error_code
719
strerror = _library.gnutls_strerror
720
strerror.argtypes = [ctypes.c_int]
721
strerror.restype = ctypes.c_char_p
723
certificate_type_get = _library.gnutls_certificate_type_get
724
certificate_type_get.argtypes = [session_t]
725
certificate_type_get.restype = _error_code
727
certificate_get_peers = _library.gnutls_certificate_get_peers
728
certificate_get_peers.argtypes = [session_t,
729
ctypes.POINTER(ctypes.c_uint)]
730
certificate_get_peers.restype = ctypes.POINTER(datum_t)
732
global_set_log_level = _library.gnutls_global_set_log_level
733
global_set_log_level.argtypes = [ctypes.c_int]
734
global_set_log_level.restype = None
736
global_set_log_function = _library.gnutls_global_set_log_function
737
global_set_log_function.argtypes = [log_func]
738
global_set_log_function.restype = None
740
deinit = _library.gnutls_deinit
741
deinit.argtypes = [session_t]
742
deinit.restype = None
744
handshake = _library.gnutls_handshake
745
handshake.argtypes = [session_t]
746
handshake.restype = _error_code
747
handshake.errcheck = _retry_on_error
749
transport_set_ptr = _library.gnutls_transport_set_ptr
750
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
751
transport_set_ptr.restype = None
753
bye = _library.gnutls_bye
754
bye.argtypes = [session_t, close_request_t]
755
bye.restype = _error_code
756
bye.errcheck = _retry_on_error
758
check_version = _library.gnutls_check_version
759
check_version.argtypes = [ctypes.c_char_p]
760
check_version.restype = ctypes.c_char_p
762
_need_version = b"3.3.0"
763
if check_version(_need_version) is None:
764
raise self.Error("Needs GnuTLS {} or later"
765
.format(_need_version))
767
_tls_rawpk_version = b"3.6.6"
768
has_rawpk = bool(check_version(_tls_rawpk_version))
772
class pubkey_st(ctypes.Structure):
774
pubkey_t = ctypes.POINTER(pubkey_st)
776
x509_crt_fmt_t = ctypes.c_int
778
# All the function declarations below are from
780
pubkey_init = _library.gnutls_pubkey_init
781
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
782
pubkey_init.restype = _error_code
784
pubkey_import = _library.gnutls_pubkey_import
785
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
787
pubkey_import.restype = _error_code
789
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
790
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
791
ctypes.POINTER(ctypes.c_ubyte),
792
ctypes.POINTER(ctypes.c_size_t)]
793
pubkey_get_key_id.restype = _error_code
795
pubkey_deinit = _library.gnutls_pubkey_deinit
796
pubkey_deinit.argtypes = [pubkey_t]
797
pubkey_deinit.restype = None
799
# All the function declarations below are from
802
openpgp_crt_init = _library.gnutls_openpgp_crt_init
803
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
804
openpgp_crt_init.restype = _error_code
806
openpgp_crt_import = _library.gnutls_openpgp_crt_import
807
openpgp_crt_import.argtypes = [openpgp_crt_t,
808
ctypes.POINTER(datum_t),
810
openpgp_crt_import.restype = _error_code
812
openpgp_crt_verify_self = \
813
_library.gnutls_openpgp_crt_verify_self
814
openpgp_crt_verify_self.argtypes = [
817
ctypes.POINTER(ctypes.c_uint),
819
openpgp_crt_verify_self.restype = _error_code
821
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
822
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
823
openpgp_crt_deinit.restype = None
825
openpgp_crt_get_fingerprint = (
826
_library.gnutls_openpgp_crt_get_fingerprint)
827
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
831
openpgp_crt_get_fingerprint.restype = _error_code
833
if check_version(b"3.6.4"):
834
certificate_type_get2 = _library.gnutls_certificate_type_get2
835
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
836
certificate_type_get2.restype = _error_code
838
# Remove non-public functions
839
del _error_code, _retry_on_error
842
def call_pipe(connection, # : multiprocessing.Connection
843
func, *args, **kwargs):
844
"""This function is meant to be called by multiprocessing.Process
846
This function runs func(*args, **kwargs), and writes the resulting
847
return value on the provided multiprocessing.Connection.
849
connection.send(func(*args, **kwargs))
397
854
"""A representation of a client host served by this server.
400
857
approved: bool(); 'None' if not yet approved/disapproved
401
858
approval_delay: datetime.timedelta(); Time to wait for approval
402
859
approval_duration: datetime.timedelta(); Duration of one approval
403
checker: subprocess.Popen(); a running checker process used
404
to see if the client lives.
405
'None' if no process is running.
406
checker_callback_tag: a gobject event source tag, or None
860
checker: multiprocessing.Process(); a running checker process used
861
to see if the client lives. 'None' if no process is
863
checker_callback_tag: a GLib event source tag, or None
407
864
checker_command: string; External command which is run to check
408
865
if client lives. %() expansions are done at
409
866
runtime with vars(self) as dict, so that for
410
867
instance %(name)s can be used in the command.
411
checker_initiator_tag: a gobject event source tag, or None
868
checker_initiator_tag: a GLib event source tag, or None
412
869
created: datetime.datetime(); (UTC) object creation
413
870
client_structure: Object describing what attributes a client has
414
871
and is used for storing the client at exit
415
872
current_checker_command: string; current running checker_command
416
disable_initiator_tag: a gobject event source tag, or None
873
disable_initiator_tag: a GLib event source tag, or None
418
875
fingerprint: string (40 or 32 hexadecimal digits); used to
419
uniquely identify the client
876
uniquely identify an OpenPGP client
877
key_id: string (64 hexadecimal digits); used to uniquely identify
878
a client using raw public keys
420
879
host: string; available for use by the checker command
421
880
interval: datetime.timedelta(); How often to start a new checker
422
881
last_approval_request: datetime.datetime(); (UTC) or None
545
1002
self.current_checker_command = None
546
1003
self.approved = None
547
1004
self.approvals_pending = 0
548
self.changedstate = (multiprocessing_manager
549
.Condition(multiprocessing_manager
551
self.client_structure = [attr for attr in
552
self.__dict__.iterkeys()
1005
self.changedstate = multiprocessing_manager.Condition(
1006
multiprocessing_manager.Lock())
1007
self.client_structure = [attr
1008
for attr in self.__dict__.keys()
553
1009
if not attr.startswith("_")]
554
1010
self.client_structure.append("client_structure")
556
for name, t in inspect.getmembers(type(self),
1012
for name, t in inspect.getmembers(
1013
type(self), lambda obj: isinstance(obj, property)):
560
1014
if not name.startswith("_"):
561
1015
self.client_structure.append(name)
563
1017
# Send notice to process children that client state has changed
564
1018
def send_changedstate(self):
565
1019
with self.changedstate:
566
1020
self.changedstate.notify_all()
568
1022
def enable(self):
569
1023
"""Start this client's checker and timeout hooks"""
570
1024
if getattr(self, "enabled", False):
571
1025
# Already enabled
573
self.send_changedstate()
574
1027
self.expires = datetime.datetime.utcnow() + self.timeout
575
1028
self.enabled = True
576
1029
self.last_enabled = datetime.datetime.utcnow()
577
1030
self.init_checker()
1031
self.send_changedstate()
579
1033
def disable(self, quiet=True):
580
1034
"""Disable this client."""
581
1035
if not getattr(self, "enabled", False):
584
self.send_changedstate()
586
1038
logger.info("Disabling client %s", self.name)
587
if getattr(self, "disable_initiator_tag", False):
588
gobject.source_remove(self.disable_initiator_tag)
1039
if getattr(self, "disable_initiator_tag", None) is not None:
1040
GLib.source_remove(self.disable_initiator_tag)
589
1041
self.disable_initiator_tag = None
590
1042
self.expires = None
591
if getattr(self, "checker_initiator_tag", False):
592
gobject.source_remove(self.checker_initiator_tag)
1043
if getattr(self, "checker_initiator_tag", None) is not None:
1044
GLib.source_remove(self.checker_initiator_tag)
593
1045
self.checker_initiator_tag = None
594
1046
self.stop_checker()
595
1047
self.enabled = False
596
# Do not run this again if called by a gobject.timeout_add
1049
self.send_changedstate()
1050
# Do not run this again if called by a GLib.timeout_add
599
1053
def __del__(self):
602
1056
def init_checker(self):
603
1057
# Schedule a new checker to be started an 'interval' from now,
604
1058
# and every interval from then on.
605
self.checker_initiator_tag = (gobject.timeout_add
606
(self.interval_milliseconds(),
1059
if self.checker_initiator_tag is not None:
1060
GLib.source_remove(self.checker_initiator_tag)
1061
self.checker_initiator_tag = GLib.timeout_add(
1062
random.randrange(int(self.interval.total_seconds() * 1000
608
1065
# Schedule a disable() when 'timeout' has passed
609
self.disable_initiator_tag = (gobject.timeout_add
610
(self.timeout_milliseconds(),
1066
if self.disable_initiator_tag is not None:
1067
GLib.source_remove(self.disable_initiator_tag)
1068
self.disable_initiator_tag = GLib.timeout_add(
1069
int(self.timeout.total_seconds() * 1000), self.disable)
612
1070
# Also start a new checker *right now*.
613
1071
self.start_checker()
615
def checker_callback(self, pid, condition, command):
1073
def checker_callback(self, source, condition, connection,
616
1075
"""The checker has completed, so take appropriate actions."""
1076
# Read return code from connection (see call_pipe)
1077
returncode = connection.recv()
1079
if self.checker is not None:
617
1081
self.checker_callback_tag = None
618
1082
self.checker = None
619
if os.WIFEXITED(condition):
620
self.last_checker_status = os.WEXITSTATUS(condition)
1085
self.last_checker_status = returncode
1086
self.last_checker_signal = None
621
1087
if self.last_checker_status == 0:
622
1088
logger.info("Checker for %(name)s succeeded",
624
1090
self.checked_ok()
626
logger.info("Checker for %(name)s failed",
1092
logger.info("Checker for %(name)s failed", vars(self))
629
1094
self.last_checker_status = -1
1095
self.last_checker_signal = -returncode
630
1096
logger.warning("Checker for %(name)s crashed?",
633
1100
def checked_ok(self):
634
1101
"""Assert that the client has been seen, alive and well."""
635
1102
self.last_checked_ok = datetime.datetime.utcnow()
636
1103
self.last_checker_status = 0
1104
self.last_checker_signal = None
637
1105
self.bump_timeout()
639
1107
def bump_timeout(self, timeout=None):
640
1108
"""Bump up the timeout for this client."""
641
1109
if timeout is None:
642
1110
timeout = self.timeout
643
1111
if self.disable_initiator_tag is not None:
644
gobject.source_remove(self.disable_initiator_tag)
1112
GLib.source_remove(self.disable_initiator_tag)
1113
self.disable_initiator_tag = None
645
1114
if getattr(self, "enabled", False):
646
self.disable_initiator_tag = (gobject.timeout_add
647
(timedelta_to_milliseconds
648
(timeout), self.disable))
1115
self.disable_initiator_tag = GLib.timeout_add(
1116
int(timeout.total_seconds() * 1000), self.disable)
649
1117
self.expires = datetime.datetime.utcnow() + timeout
651
1119
def need_approval(self):
652
1120
self.last_approval_request = datetime.datetime.utcnow()
654
1122
def start_checker(self):
655
1123
"""Start a new checker subprocess if one is not running.
657
1125
If a checker already exists, leave it running and do
659
1127
# The reason for not killing a running checker is that if we
660
# did that, then if a checker (for some reason) started
661
# running slowly and taking more than 'interval' time, the
662
# client would inevitably timeout, since no checker would get
663
# a chance to run to completion. If we instead leave running
1128
# did that, and if a checker (for some reason) started running
1129
# slowly and taking more than 'interval' time, then the client
1130
# would inevitably timeout, since no checker would get a
1131
# chance to run to completion. If we instead leave running
664
1132
# checkers alone, the checker would have to take more time
665
1133
# than 'timeout' for the client to be disabled, which is as it
668
# If a checker exists, make sure it is not a zombie
670
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
except (AttributeError, OSError) as error:
672
if (isinstance(error, OSError)
673
and error.errno != errno.ECHILD):
677
logger.warning("Checker was a zombie")
678
gobject.source_remove(self.checker_callback_tag)
679
self.checker_callback(pid, status,
680
self.current_checker_command)
1136
if self.checker is not None and not self.checker.is_alive():
1137
logger.warning("Checker was not alive; joining")
681
1140
# Start a new checker if needed
682
1141
if self.checker is None:
1142
# Escape attributes for the shell
1144
attr: shlex.quote(str(getattr(self, attr)))
1145
for attr in self.runtime_expansions}
684
# In case checker_command has exactly one % operator
685
command = self.checker_command % self.host
687
# Escape attributes for the shell
688
escaped_attrs = dict(
690
re.escape(unicode(str(getattr(self, attr, "")),
694
self.runtime_expansions)
697
command = self.checker_command % escaped_attrs
698
except TypeError as error:
699
logger.error('Could not format string "%s"',
700
self.checker_command, exc_info=error)
701
return True # Try again later
1147
command = self.checker_command % escaped_attrs
1148
except TypeError as error:
1149
logger.error('Could not format string "%s"',
1150
self.checker_command,
1152
return True # Try again later
702
1153
self.current_checker_command = command
704
logger.info("Starting checker %r for %s",
706
# We don't need to redirect stdout and stderr, since
707
# in normal mode, that is already done by daemon(),
708
# and in debug mode we don't want to. (Stdin is
709
# always replaced by /dev/null.)
710
self.checker = subprocess.Popen(command,
713
self.checker_callback_tag = (gobject.child_watch_add
715
self.checker_callback,
717
# The checker may have completed before the gobject
718
# watch was added. Check for this.
719
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
721
gobject.source_remove(self.checker_callback_tag)
722
self.checker_callback(pid, status, command)
723
except OSError as error:
724
logger.error("Failed to start subprocess",
726
# Re-run this periodically if run by gobject.timeout_add
1154
logger.info("Starting checker %r for %s", command,
1156
# We don't need to redirect stdout and stderr, since
1157
# in normal mode, that is already done by daemon(),
1158
# and in debug mode we don't want to. (Stdin is
1159
# always replaced by /dev/null.)
1160
# The exception is when not debugging but nevertheless
1161
# running in the foreground; use the previously
1163
popen_args = {"close_fds": True,
1166
if (not self.server_settings["debug"]
1167
and self.server_settings["foreground"]):
1168
popen_args.update({"stdout": wnull,
1170
pipe = multiprocessing.Pipe(duplex=False)
1171
self.checker = multiprocessing.Process(
1173
args=(pipe[1], subprocess.call, command),
1175
self.checker.start()
1176
self.checker_callback_tag = GLib.io_add_watch(
1177
GLib.IOChannel.unix_new(pipe[0].fileno()),
1178
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1179
self.checker_callback, pipe[0], command)
1180
# Re-run this periodically if run by GLib.timeout_add
729
1183
def stop_checker(self):
730
1184
"""Force the checker process, if any, to stop."""
731
1185
if self.checker_callback_tag:
732
gobject.source_remove(self.checker_callback_tag)
1186
GLib.source_remove(self.checker_callback_tag)
733
1187
self.checker_callback_tag = None
734
1188
if getattr(self, "checker", None) is None:
736
1190
logger.debug("Stopping checker for %(name)s", vars(self))
738
self.checker.terminate()
740
#if self.checker.poll() is None:
741
# self.checker.kill()
742
except OSError as error:
743
if error.errno != errno.ESRCH: # No such process
1191
self.checker.terminate()
745
1192
self.checker = None
748
def dbus_service_property(dbus_interface, signature="v",
749
access="readwrite", byte_arrays=False):
1195
def dbus_service_property(dbus_interface,
750
1199
"""Decorators for marking methods of a DBusObjectWithProperties to
751
1200
become properties on the D-Bus.
753
1202
The decorated method will be called with no arguments by "Get"
754
1203
and with one argument by "Set".
756
1205
The parameters, where they are supported, are the same as
757
1206
dbus.service.method, except there is only "signature", since the
758
1207
type from Get() and the type sent to Set() is the same.
834
class DBusObjectWithProperties(dbus.service.Object):
835
"""A D-Bus object with properties.
837
Classes inheriting from this can use the dbus_service_property
838
decorator to expose methods as D-Bus properties. It exposes the
839
standard Get(), Set(), and GetAll() methods on the D-Bus.
1290
class DBusObjectWithAnnotations(dbus.service.Object):
1291
"""A D-Bus object with annotations.
1293
Classes inheriting from this can use the dbus_annotations
1294
decorator to add annotations to methods or signals.
843
1298
def _is_dbus_thing(thing):
844
1299
"""Returns a function testing if an attribute is a D-Bus thing
846
1301
If called like _is_dbus_thing("method") it returns a function
847
1302
suitable for use as predicate to inspect.getmembers().
849
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1304
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
852
1307
def _get_all_dbus_things(self, thing):
853
1308
"""Returns a generator of (name, attribute) pairs
855
return ((getattr(athing.__get__(self), "_dbus_name",
1310
return ((getattr(athing.__get__(self), "_dbus_name", name),
857
1311
athing.__get__(self))
858
1312
for cls in self.__class__.__mro__
859
1313
for name, athing in
860
inspect.getmembers(cls,
861
self._is_dbus_thing(thing)))
1314
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1316
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1318
path_keyword='object_path',
1319
connection_keyword='connection')
1320
def Introspect(self, object_path, connection):
1321
"""Overloading of standard D-Bus method.
1323
Inserts annotation tags on methods and signals.
1325
xmlstring = dbus.service.Object.Introspect(self, object_path,
1328
document = xml.dom.minidom.parseString(xmlstring)
1330
for if_tag in document.getElementsByTagName("interface"):
1331
# Add annotation tags
1332
for typ in ("method", "signal"):
1333
for tag in if_tag.getElementsByTagName(typ):
1335
for name, prop in (self.
1336
_get_all_dbus_things(typ)):
1337
if (name == tag.getAttribute("name")
1338
and prop._dbus_interface
1339
== if_tag.getAttribute("name")):
1340
annots.update(getattr(
1341
prop, "_dbus_annotations", {}))
1342
for name, value in annots.items():
1343
ann_tag = document.createElement(
1345
ann_tag.setAttribute("name", name)
1346
ann_tag.setAttribute("value", value)
1347
tag.appendChild(ann_tag)
1348
# Add interface annotation tags
1349
for annotation, value in dict(
1350
itertools.chain.from_iterable(
1351
annotations().items()
1352
for name, annotations
1353
in self._get_all_dbus_things("interface")
1354
if name == if_tag.getAttribute("name")
1356
ann_tag = document.createElement("annotation")
1357
ann_tag.setAttribute("name", annotation)
1358
ann_tag.setAttribute("value", value)
1359
if_tag.appendChild(ann_tag)
1360
# Fix argument name for the Introspect method itself
1361
if (if_tag.getAttribute("name")
1362
== dbus.INTROSPECTABLE_IFACE):
1363
for cn in if_tag.getElementsByTagName("method"):
1364
if cn.getAttribute("name") == "Introspect":
1365
for arg in cn.getElementsByTagName("arg"):
1366
if (arg.getAttribute("direction")
1368
arg.setAttribute("name",
1370
xmlstring = document.toxml("utf-8")
1372
except (AttributeError, xml.dom.DOMException,
1373
xml.parsers.expat.ExpatError) as error:
1374
logger.error("Failed to override Introspection method",
1379
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1380
"""A D-Bus object with properties.
1382
Classes inheriting from this can use the dbus_service_property
1383
decorator to expose methods as D-Bus properties. It exposes the
1384
standard Get(), Set(), and GetAll() methods on the D-Bus.
863
1387
def _get_dbus_property(self, interface_name, property_name):
864
1388
"""Returns a bound method if one exists which is a D-Bus
865
1389
property with the specified name and interface.
867
for cls in self.__class__.__mro__:
868
for name, value in (inspect.getmembers
870
self._is_dbus_thing("property"))):
1391
for cls in self.__class__.__mro__:
1392
for name, value in inspect.getmembers(
1393
cls, self._is_dbus_thing("property")):
871
1394
if (value._dbus_name == property_name
872
1395
and value._dbus_interface == interface_name):
873
1396
return value.__get__(self)
875
1398
# No such property
876
raise DBusPropertyNotFound(self.dbus_object_path + ":"
877
+ interface_name + "."
880
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1399
raise DBusPropertyNotFound("{}:{}.{}".format(
1400
self.dbus_object_path, interface_name, property_name))
1403
def _get_all_interface_names(cls):
1404
"""Get a sequence of all interfaces supported by an object"""
1405
return (name for name in set(getattr(getattr(x, attr),
1406
"_dbus_interface", None)
1407
for x in (inspect.getmro(cls))
1409
if name is not None)
1411
@dbus.service.method(dbus.PROPERTIES_IFACE,
881
1413
out_signature="v")
882
1414
def Get(self, interface_name, property_name):
883
1415
"""Standard D-Bus property Get() method, see D-Bus standard.
1013
1543
return xmlstring
1016
def datetime_to_dbus (dt, variant_level=0):
1547
dbus.OBJECT_MANAGER_IFACE
1548
except AttributeError:
1549
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1552
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1553
"""A D-Bus object with an ObjectManager.
1555
Classes inheriting from this exposes the standard
1556
GetManagedObjects call and the InterfacesAdded and
1557
InterfacesRemoved signals on the standard
1558
"org.freedesktop.DBus.ObjectManager" interface.
1560
Note: No signals are sent automatically; they must be sent
1563
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1564
out_signature="a{oa{sa{sv}}}")
1565
def GetManagedObjects(self):
1566
"""This function must be overridden"""
1567
raise NotImplementedError()
1569
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1570
signature="oa{sa{sv}}")
1571
def InterfacesAdded(self, object_path, interfaces_and_properties):
1574
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1575
def InterfacesRemoved(self, object_path, interfaces):
1578
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1580
path_keyword='object_path',
1581
connection_keyword='connection')
1582
def Introspect(self, object_path, connection):
1583
"""Overloading of standard D-Bus method.
1585
Override return argument name of GetManagedObjects to be
1586
"objpath_interfaces_and_properties"
1588
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1592
document = xml.dom.minidom.parseString(xmlstring)
1594
for if_tag in document.getElementsByTagName("interface"):
1595
# Fix argument name for the GetManagedObjects method
1596
if (if_tag.getAttribute("name")
1597
== dbus.OBJECT_MANAGER_IFACE):
1598
for cn in if_tag.getElementsByTagName("method"):
1599
if (cn.getAttribute("name")
1600
== "GetManagedObjects"):
1601
for arg in cn.getElementsByTagName("arg"):
1602
if (arg.getAttribute("direction")
1606
"objpath_interfaces"
1608
xmlstring = document.toxml("utf-8")
1610
except (AttributeError, xml.dom.DOMException,
1611
xml.parsers.expat.ExpatError) as error:
1612
logger.error("Failed to override Introspection method",
1617
def datetime_to_dbus(dt, variant_level=0):
1017
1618
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1019
return dbus.String("", variant_level = variant_level)
1020
return dbus.String(dt.isoformat(),
1021
variant_level=variant_level)
1024
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1026
"""Applied to an empty subclass of a D-Bus object, this metaclass
1027
will add additional D-Bus attributes matching a certain pattern.
1620
return dbus.String("", variant_level=variant_level)
1621
return dbus.String(dt.isoformat(), variant_level=variant_level)
1624
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1625
"""A class decorator; applied to a subclass of
1626
dbus.service.Object, it will add alternate D-Bus attributes with
1627
interface names according to the "alt_interface_names" mapping.
1630
@alternate_dbus_interfaces({"org.example.Interface":
1631
"net.example.AlternateInterface"})
1632
class SampleDBusObject(dbus.service.Object):
1633
@dbus.service.method("org.example.Interface")
1634
def SampleDBusMethod():
1637
The above "SampleDBusMethod" on "SampleDBusObject" will be
1638
reachable via two interfaces: "org.example.Interface" and
1639
"net.example.AlternateInterface", the latter of which will have
1640
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1641
"true", unless "deprecate" is passed with a False value.
1643
This works for methods and signals, and also for D-Bus properties
1644
(from DBusObjectWithProperties) and interfaces (from the
1645
dbus_interface_annotations decorator).
1029
def __new__(mcs, name, bases, attr):
1030
# Go through all the base classes which could have D-Bus
1031
# methods, signals, or properties in them
1032
old_interface_names = []
1033
for base in (b for b in bases
1034
if issubclass(b, dbus.service.Object)):
1035
# Go though all attributes of the base class
1036
for attrname, attribute in inspect.getmembers(base):
1649
for orig_interface_name, alt_interface_name in (
1650
alt_interface_names.items()):
1652
interface_names = set()
1653
# Go though all attributes of the class
1654
for attrname, attribute in inspect.getmembers(cls):
1037
1655
# Ignore non-D-Bus attributes, and D-Bus attributes
1038
1656
# with the wrong interface name
1039
1657
if (not hasattr(attribute, "_dbus_interface")
1040
or not attribute._dbus_interface
1041
.startswith("se.recompile.Mandos")):
1658
or not attribute._dbus_interface.startswith(
1659
orig_interface_name)):
1043
1661
# Create an alternate D-Bus interface name based on
1044
1662
# the current name
1045
alt_interface = (attribute._dbus_interface
1046
.replace("se.recompile.Mandos",
1047
"se.bsnet.fukt.Mandos"))
1048
if alt_interface != attribute._dbus_interface:
1049
old_interface_names.append(alt_interface)
1663
alt_interface = attribute._dbus_interface.replace(
1664
orig_interface_name, alt_interface_name)
1665
interface_names.add(alt_interface)
1050
1666
# Is this a D-Bus signal?
1051
1667
if getattr(attribute, "_dbus_is_signal", False):
1052
# Extract the original non-method function by
1054
nonmethod_func = (dict(
1668
# Extract the original non-method undecorated
1669
# function by black magic
1670
if sys.version_info.major == 2:
1671
nonmethod_func = (dict(
1055
1672
zip(attribute.func_code.co_freevars,
1056
attribute.__closure__))["func"]
1673
attribute.__closure__))
1674
["func"].cell_contents)
1676
nonmethod_func = (dict(
1677
zip(attribute.__code__.co_freevars,
1678
attribute.__closure__))
1679
["func"].cell_contents)
1058
1680
# Create a new, but exactly alike, function
1059
1681
# object, and decorate it to be a new D-Bus signal
1060
1682
# with the alternate D-Bus interface name
1061
new_function = (dbus.service.signal
1063
attribute._dbus_signature)
1064
(types.FunctionType(
1065
nonmethod_func.func_code,
1066
nonmethod_func.func_globals,
1067
nonmethod_func.func_name,
1068
nonmethod_func.func_defaults,
1069
nonmethod_func.func_closure)))
1683
new_function = copy_function(nonmethod_func)
1684
new_function = (dbus.service.signal(
1686
attribute._dbus_signature)(new_function))
1070
1687
# Copy annotations, if any
1072
new_function._dbus_annotations = (
1073
dict(attribute._dbus_annotations))
1689
new_function._dbus_annotations = dict(
1690
attribute._dbus_annotations)
1074
1691
except AttributeError:
1076
1694
# Define a creator of a function to call both the
1077
# old and new functions, so both the old and new
1078
# signals gets sent when the function is called
1695
# original and alternate functions, so both the
1696
# original and alternate signals gets sent when
1697
# the function is called
1079
1698
def fixscope(func1, func2):
1080
1699
"""This function is a scope container to pass
1081
1700
func1 and func2 to the "call_both" function
1082
1701
outside of its arguments"""
1703
@functools.wraps(func2)
1083
1704
def call_both(*args, **kwargs):
1084
1705
"""This function will emit two D-Bus
1085
1706
signals by calling func1 and func2"""
1086
1707
func1(*args, **kwargs)
1087
1708
func2(*args, **kwargs)
1709
# Make wrapper function look like a D-Bus
1711
for name, attr in inspect.getmembers(func2):
1712
if name.startswith("_dbus_"):
1713
setattr(call_both, name, attr)
1088
1715
return call_both
1089
1716
# Create the "call_both" function and add it to
1091
attr[attrname] = fixscope(attribute,
1718
attr[attrname] = fixscope(attribute, new_function)
1093
1719
# Is this a D-Bus method?
1094
1720
elif getattr(attribute, "_dbus_is_method", False):
1095
1721
# Create a new, but exactly alike, function
1096
1722
# object. Decorate it to be a new D-Bus method
1097
1723
# with the alternate D-Bus interface name. Add it
1098
1724
# to the class.
1099
attr[attrname] = (dbus.service.method
1101
attribute._dbus_in_signature,
1102
attribute._dbus_out_signature)
1104
(attribute.func_code,
1105
attribute.func_globals,
1106
attribute.func_name,
1107
attribute.func_defaults,
1108
attribute.func_closure)))
1726
dbus.service.method(
1728
attribute._dbus_in_signature,
1729
attribute._dbus_out_signature)
1730
(copy_function(attribute)))
1109
1731
# Copy annotations, if any
1111
attr[attrname]._dbus_annotations = (
1112
dict(attribute._dbus_annotations))
1733
attr[attrname]._dbus_annotations = dict(
1734
attribute._dbus_annotations)
1113
1735
except AttributeError:
1115
1737
# Is this a D-Bus property?
1143
1758
# object. Decorate it to be a new D-Bus interface
1144
1759
# with the alternate D-Bus interface name. Add it
1145
1760
# to the class.
1146
attr[attrname] = (dbus_interface_annotations
1149
(attribute.func_code,
1150
attribute.func_globals,
1151
attribute.func_name,
1152
attribute.func_defaults,
1153
attribute.func_closure)))
1154
# Deprecate all old interfaces
1155
iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1156
for old_interface_name in old_interface_names:
1157
@dbus_interface_annotations(old_interface_name)
1159
return { "org.freedesktop.DBus.Deprecated": "true" }
1160
# Find an unused name
1161
for aname in (iname.format(i) for i in itertools.count()):
1162
if aname not in attr:
1165
return type.__new__(mcs, name, bases, attr)
1762
dbus_interface_annotations(alt_interface)
1763
(copy_function(attribute)))
1765
# Deprecate all alternate interfaces
1766
iname = "_AlternateDBusNames_interface_annotation{}"
1767
for interface_name in interface_names:
1769
@dbus_interface_annotations(interface_name)
1771
return {"org.freedesktop.DBus.Deprecated":
1773
# Find an unused name
1774
for aname in (iname.format(i)
1775
for i in itertools.count()):
1776
if aname not in attr:
1780
# Replace the class with a new subclass of it with
1781
# methods, signals, etc. as created above.
1782
if sys.version_info.major == 2:
1783
cls = type(b"{}Alternate".format(cls.__name__),
1786
cls = type("{}Alternate".format(cls.__name__),
1793
@alternate_dbus_interfaces({"se.recompile.Mandos":
1794
"se.bsnet.fukt.Mandos"})
1168
1795
class ClientDBus(Client, DBusObjectWithProperties):
1169
1796
"""A Client class using D-Bus
1172
1799
dbus_object_path: dbus.ObjectPath
1173
1800
bus: dbus.SystemBus()
1176
1803
runtime_expansions = (Client.runtime_expansions
1177
+ ("dbus_object_path",))
1804
+ ("dbus_object_path", ))
1806
_interface = "se.recompile.Mandos.Client"
1179
1808
# dbus.service.Object doesn't use super(), so we can't either.
1181
def __init__(self, bus = None, *args, **kwargs):
1810
def __init__(self, bus=None, *args, **kwargs):
1183
1812
Client.__init__(self, *args, **kwargs)
1184
1813
# Only now, when this client is initialized, can it show up on
1186
client_object_name = unicode(self.name).translate(
1815
client_object_name = str(self.name).translate(
1187
1816
{ord("."): ord("_"),
1188
1817
ord("-"): ord("_")})
1189
self.dbus_object_path = (dbus.ObjectPath
1190
("/clients/" + client_object_name))
1818
self.dbus_object_path = dbus.ObjectPath(
1819
"/clients/" + client_object_name)
1191
1820
DBusObjectWithProperties.__init__(self, self.bus,
1192
1821
self.dbus_object_path)
1194
def notifychangeproperty(transform_func,
1195
dbus_name, type_func=lambda x: x,
1823
def notifychangeproperty(transform_func, dbus_name,
1824
type_func=lambda x: x,
1826
invalidate_only=False,
1827
_interface=_interface):
1197
1828
""" Modify a variable so that it's a property which announces
1198
1829
its changes to DBus.
1200
1831
transform_fun: Function that takes a value and a variant_level
1201
1832
and transforms it to a D-Bus type.
1202
1833
dbus_name: D-Bus name of the variable
1350
1985
server to mandos-client
1354
1989
# Rejected - signal
1355
1990
@dbus.service.signal(_interface, signature="s")
1356
1991
def Rejected(self, reason):
1360
1995
# NeedApproval - signal
1361
1996
@dbus.service.signal(_interface, signature="tb")
1362
1997
def NeedApproval(self, timeout, default):
1364
1999
return self.need_approval()
1368
2003
# Approve - method
1369
2004
@dbus.service.method(_interface, in_signature="b")
1370
2005
def Approve(self, value):
1371
2006
self.approve(value)
1373
2008
# CheckedOK - method
1374
2009
@dbus.service.method(_interface)
1375
2010
def CheckedOK(self):
1376
2011
self.checked_ok()
1378
2013
# Enable - method
2014
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1379
2015
@dbus.service.method(_interface)
1380
2016
def Enable(self):
1384
2020
# StartChecker - method
2021
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1385
2022
@dbus.service.method(_interface)
1386
2023
def StartChecker(self):
1388
2025
self.start_checker()
1390
2027
# Disable - method
2028
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1391
2029
@dbus.service.method(_interface)
1392
2030
def Disable(self):
1396
2034
# StopChecker - method
2035
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
2036
@dbus.service.method(_interface)
1398
2037
def StopChecker(self):
1399
2038
self.stop_checker()
1403
2042
# ApprovalPending - property
1404
2043
@dbus_service_property(_interface, signature="b", access="read")
1405
2044
def ApprovalPending_dbus_property(self):
1406
2045
return dbus.Boolean(bool(self.approvals_pending))
1408
2047
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
2048
@dbus_service_property(_interface,
1410
2050
access="readwrite")
1411
2051
def ApprovedByDefault_dbus_property(self, value=None):
1412
2052
if value is None: # get
1413
2053
return dbus.Boolean(self.approved_by_default)
1414
2054
self.approved_by_default = bool(value)
1416
2056
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
2057
@dbus_service_property(_interface,
1418
2059
access="readwrite")
1419
2060
def ApprovalDelay_dbus_property(self, value=None):
1420
2061
if value is None: # get
1421
return dbus.UInt64(self.approval_delay_milliseconds())
2062
return dbus.UInt64(self.approval_delay.total_seconds()
1422
2064
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1424
2066
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
2067
@dbus_service_property(_interface,
1426
2069
access="readwrite")
1427
2070
def ApprovalDuration_dbus_property(self, value=None):
1428
2071
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
2072
return dbus.UInt64(self.approval_duration.total_seconds()
1431
2074
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1433
2076
# Name - property
2078
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1434
2079
@dbus_service_property(_interface, signature="s", access="read")
1435
2080
def Name_dbus_property(self):
1436
2081
return dbus.String(self.name)
2085
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2086
@dbus_service_property(_interface, signature="s", access="read")
2087
def KeyID_dbus_property(self):
2088
return dbus.String(self.key_id)
1438
2090
# Fingerprint - property
2092
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1439
2093
@dbus_service_property(_interface, signature="s", access="read")
1440
2094
def Fingerprint_dbus_property(self):
1441
2095
return dbus.String(self.fingerprint)
1443
2097
# Host - property
1444
@dbus_service_property(_interface, signature="s",
2098
@dbus_service_property(_interface,
1445
2100
access="readwrite")
1446
2101
def Host_dbus_property(self, value=None):
1447
2102
if value is None: # get
1448
2103
return dbus.String(self.host)
1449
self.host = unicode(value)
2104
self.host = str(value)
1451
2106
# Created - property
2108
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1452
2109
@dbus_service_property(_interface, signature="s", access="read")
1453
2110
def Created_dbus_property(self):
1454
2111
return datetime_to_dbus(self.created)
1456
2113
# LastEnabled - property
1457
2114
@dbus_service_property(_interface, signature="s", access="read")
1458
2115
def LastEnabled_dbus_property(self):
1459
2116
return datetime_to_dbus(self.last_enabled)
1461
2118
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
2119
@dbus_service_property(_interface,
1463
2121
access="readwrite")
1464
2122
def Enabled_dbus_property(self, value=None):
1465
2123
if value is None: # get
1472
2130
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
2131
@dbus_service_property(_interface,
1474
2133
access="readwrite")
1475
2134
def LastCheckedOK_dbus_property(self, value=None):
1476
2135
if value is not None:
1477
2136
self.checked_ok()
1479
2138
return datetime_to_dbus(self.last_checked_ok)
1481
2140
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
2141
@dbus_service_property(_interface, signature="n", access="read")
1484
2142
def LastCheckerStatus_dbus_property(self):
1485
2143
return dbus.Int16(self.last_checker_status)
1487
2145
# Expires - property
1488
2146
@dbus_service_property(_interface, signature="s", access="read")
1489
2147
def Expires_dbus_property(self):
1490
2148
return datetime_to_dbus(self.expires)
1492
2150
# LastApprovalRequest - property
1493
2151
@dbus_service_property(_interface, signature="s", access="read")
1494
2152
def LastApprovalRequest_dbus_property(self):
1495
2153
return datetime_to_dbus(self.last_approval_request)
1497
2155
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
2156
@dbus_service_property(_interface,
1499
2158
access="readwrite")
1500
2159
def Timeout_dbus_property(self, value=None):
1501
2160
if value is None: # get
1502
return dbus.UInt64(self.timeout_milliseconds())
2161
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2162
old_timeout = self.timeout
1503
2163
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
2164
# Reschedule disabling
1505
2165
if self.enabled:
1506
2166
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:
2167
self.expires += self.timeout - old_timeout
2168
if self.expires <= now:
1510
2169
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
2172
if (getattr(self, "disable_initiator_tag", None)
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2175
GLib.source_remove(self.disable_initiator_tag)
2176
self.disable_initiator_tag = GLib.timeout_add(
2177
int((self.expires - now).total_seconds() * 1000),
1524
2180
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
2181
@dbus_service_property(_interface,
1526
2183
access="readwrite")
1527
2184
def ExtendedTimeout_dbus_property(self, value=None):
1528
2185
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2186
return dbus.UInt64(self.extended_timeout.total_seconds()
1530
2188
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1532
2190
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
2191
@dbus_service_property(_interface,
1534
2193
access="readwrite")
1535
2194
def Interval_dbus_property(self, value=None):
1536
2195
if value is None: # get
1537
return dbus.UInt64(self.interval_milliseconds())
2196
return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
2197
self.interval = datetime.timedelta(0, 0, 0, value)
1539
2198
if getattr(self, "checker_initiator_tag", None) is None:
1541
2200
if self.enabled:
1542
2201
# 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
2202
GLib.source_remove(self.checker_initiator_tag)
2203
self.checker_initiator_tag = GLib.timeout_add(
2204
value, self.start_checker)
2205
self.start_checker() # Start one now, too
1548
2207
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
2208
@dbus_service_property(_interface,
1550
2210
access="readwrite")
1551
2211
def Checker_dbus_property(self, value=None):
1552
2212
if value is None: # get
1553
2213
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
2214
self.checker_command = str(value)
1556
2216
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
2217
@dbus_service_property(_interface,
1558
2219
access="readwrite")
1559
2220
def CheckerRunning_dbus_property(self, value=None):
1560
2221
if value is None: # get
1593
2262
if data[0] == 'data':
1595
2264
if data[0] == 'function':
1596
2266
def func(*args, **kwargs):
1597
2267
self._pipe.send(('funcall', name, args, kwargs))
1598
2268
return self._pipe.recv()[1]
1601
2272
def __setattr__(self, name, value):
1602
2273
if name == '_pipe':
1603
2274
return super(ProxyClient, self).__setattr__(name, value)
1604
2275
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1611
2278
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
2279
"""A class to handle client connections.
1614
2281
Instantiated once for each connection to handle it.
1615
2282
Note: This will run in its own forked process."""
1617
2284
def handle(self):
1618
2285
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
2286
logger.info("TCP connection from: %s",
1620
unicode(self.client_address))
2287
str(self.client_address))
1621
2288
logger.debug("Pipe FD: %d",
1622
2289
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",
2291
session = gnutls.ClientSession(self.request)
2293
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2294
# "+AES-256-CBC", "+SHA1",
2295
# "+COMP-NULL", "+CTYPE-OPENPGP",
1638
2297
# Use a fallback default, since this MUST be set.
1639
2298
priority = self.server.gnutls_priority
1640
2299
if priority is None:
1641
2300
priority = "NORMAL"
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2301
gnutls.priority_set_direct(session._c_object,
2302
priority.encode("utf-8"),
1646
2305
# Start communication using the Mandos protocol
1647
2306
# Get protocol number
1648
2307
line = self.request.makefile().readline()
1649
2308
logger.debug("Protocol version: %r", line)
1651
2310
if int(line.strip().split()[0]) > 1:
2311
raise RuntimeError(line)
1653
2312
except (ValueError, IndexError, RuntimeError) as error:
1654
2313
logger.error("Unknown protocol version: %s", error)
1657
2316
# Start GnuTLS connection
1659
2318
session.handshake()
1660
except gnutls.errors.GNUTLSError as error:
2319
except gnutls.Error as error:
1661
2320
logger.warning("Handshake failed: %s", error)
1662
2321
# Do not run session.bye() here: the session is not
1663
2322
# established. Just abandon the request.
1665
2324
logger.debug("Handshake succeeded")
1667
2326
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,
2328
if gnutls.has_rawpk:
2331
key_id = self.key_id(
2332
self.peer_certificate(session))
2333
except (TypeError, gnutls.Error) as error:
2334
logger.warning("Bad certificate: %s", error)
2336
logger.debug("Key ID: %s", key_id)
2341
fpr = self.fingerprint(
2342
self.peer_certificate(session))
2343
except (TypeError, gnutls.Error) as error:
2344
logger.warning("Bad certificate: %s", error)
2346
logger.debug("Fingerprint: %s", fpr)
2349
client = ProxyClient(child_pipe, key_id, fpr,
1680
2350
self.client_address)
1681
2351
except KeyError:
1684
2354
if client.approval_delay:
1685
2355
delay = client.approval_delay
1686
2356
client.approvals_pending += 1
1687
2357
approval_required = True
1690
2360
if not client.enabled:
1691
2361
logger.info("Client %s is disabled",
1693
2363
if self.server.use_dbus:
1694
2364
# Emit D-Bus signal
1695
2365
client.Rejected("Disabled")
1698
2368
if client.approved or not client.approval_delay:
1699
#We are approved or approval is disabled
2369
# We are approved or approval is disabled
1701
2371
elif client.approved is None:
1702
2372
logger.info("Client %s needs approval",
1737
2405
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",
1747
logger.debug("Sent: %d, remaining: %d",
1748
sent, len(client.secret)
1749
- (sent_size + sent))
2408
session.send(client.secret)
2409
except gnutls.Error as error:
2410
logger.warning("gnutls send failed",
1752
2414
logger.info("Sending secret to %s", client.name)
1753
2415
# bump the timeout using extended_timeout
1754
2416
client.bump_timeout(client.extended_timeout)
1755
2417
if self.server.use_dbus:
1756
2418
# Emit D-Bus signal
1757
2419
client.GotSecret()
1760
2422
if approval_required:
1761
2423
client.approvals_pending -= 1
1764
except gnutls.errors.GNUTLSError as error:
2426
except gnutls.Error as error:
1765
2427
logger.warning("GnuTLS bye failed",
1766
2428
exc_info=error)
1769
2431
def peer_certificate(session):
1770
"Return the peer's OpenPGP certificate as a bytestring"
1771
# If not an OpenPGP certificate...
1772
if (gnutls.library.functions
1773
.gnutls_certificate_type_get(session._c_object)
1774
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1775
# ...do the normal thing
1776
return session.peer_certificate
2432
"Return the peer's certificate as a bytestring"
2434
cert_type = gnutls.certificate_type_get2(session._c_object,
2436
except AttributeError:
2437
cert_type = gnutls.certificate_type_get(session._c_object)
2438
if gnutls.has_rawpk:
2439
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2441
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2442
# If not a valid certificate type...
2443
if cert_type not in valid_cert_types:
2444
logger.info("Cert type %r not in %r", cert_type,
2446
# ...return invalid data
1777
2448
list_size = ctypes.c_uint(1)
1778
cert_list = (gnutls.library.functions
1779
.gnutls_certificate_get_peers
2449
cert_list = (gnutls.certificate_get_peers
1780
2450
(session._c_object, ctypes.byref(list_size)))
1781
2451
if not bool(cert_list) and list_size.value != 0:
1782
raise gnutls.errors.GNUTLSError("error getting peer"
2452
raise gnutls.Error("error getting peer certificate")
1784
2453
if list_size.value == 0:
1786
2455
cert = cert_list[0]
1787
2456
return ctypes.string_at(cert.data, cert.size)
2459
def key_id(certificate):
2460
"Convert a certificate bytestring to a hexdigit key ID"
2461
# New GnuTLS "datum" with the public key
2462
datum = gnutls.datum_t(
2463
ctypes.cast(ctypes.c_char_p(certificate),
2464
ctypes.POINTER(ctypes.c_ubyte)),
2465
ctypes.c_uint(len(certificate)))
2466
# XXX all these need to be created in the gnutls "module"
2467
# New empty GnuTLS certificate
2468
pubkey = gnutls.pubkey_t()
2469
gnutls.pubkey_init(ctypes.byref(pubkey))
2470
# Import the raw public key into the certificate
2471
gnutls.pubkey_import(pubkey,
2472
ctypes.byref(datum),
2473
gnutls.X509_FMT_DER)
2474
# New buffer for the key ID
2475
buf = ctypes.create_string_buffer(32)
2476
buf_len = ctypes.c_size_t(len(buf))
2477
# Get the key ID from the raw public key into the buffer
2478
gnutls.pubkey_get_key_id(
2480
gnutls.KEYID_USE_SHA256,
2481
ctypes.cast(ctypes.byref(buf),
2482
ctypes.POINTER(ctypes.c_ubyte)),
2483
ctypes.byref(buf_len))
2484
# Deinit the certificate
2485
gnutls.pubkey_deinit(pubkey)
2487
# Convert the buffer to a Python bytestring
2488
key_id = ctypes.string_at(buf, buf_len.value)
2489
# Convert the bytestring to hexadecimal notation
2490
hex_key_id = binascii.hexlify(key_id).upper()
1790
2494
def fingerprint(openpgp):
1791
2495
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1792
2496
# New GnuTLS "datum" with the OpenPGP public key
1793
datum = (gnutls.library.types
1794
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1797
ctypes.c_uint(len(openpgp))))
2497
datum = gnutls.datum_t(
2498
ctypes.cast(ctypes.c_char_p(openpgp),
2499
ctypes.POINTER(ctypes.c_ubyte)),
2500
ctypes.c_uint(len(openpgp)))
1798
2501
# New empty GnuTLS certificate
1799
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1800
(gnutls.library.functions
1801
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2502
crt = gnutls.openpgp_crt_t()
2503
gnutls.openpgp_crt_init(ctypes.byref(crt))
1802
2504
# Import the OpenPGP public key into the certificate
1803
(gnutls.library.functions
1804
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1805
gnutls.library.constants
1806
.GNUTLS_OPENPGP_FMT_RAW))
2505
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2506
gnutls.OPENPGP_FMT_RAW)
1807
2507
# Verify the self signature in the key
1808
2508
crtverify = ctypes.c_uint()
1809
(gnutls.library.functions
1810
.gnutls_openpgp_crt_verify_self(crt, 0,
1811
ctypes.byref(crtverify)))
2509
gnutls.openpgp_crt_verify_self(crt, 0,
2510
ctypes.byref(crtverify))
1812
2511
if crtverify.value != 0:
1813
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1814
raise (gnutls.errors.CertificateSecurityError
2512
gnutls.openpgp_crt_deinit(crt)
2513
raise gnutls.CertificateSecurityError(code
1816
2515
# New buffer for the fingerprint
1817
2516
buf = ctypes.create_string_buffer(20)
1818
2517
buf_len = ctypes.c_size_t()
1819
2518
# Get the fingerprint from the certificate into the buffer
1820
(gnutls.library.functions
1821
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1822
ctypes.byref(buf_len)))
2519
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2520
ctypes.byref(buf_len))
1823
2521
# Deinit the certificate
1824
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2522
gnutls.openpgp_crt_deinit(crt)
1825
2523
# Convert the buffer to a Python bytestring
1826
2524
fpr = ctypes.string_at(buf, buf_len.value)
1827
2525
# Convert the bytestring to hexadecimal notation
1832
class MultiprocessingMixIn(object):
2530
class MultiprocessingMixIn:
1833
2531
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1834
2533
def sub_process_main(self, request, address):
1836
2535
self.finish_request(request, address)
1837
2536
except Exception:
1838
2537
self.handle_error(request, address)
1839
2538
self.close_request(request)
1841
2540
def process_request(self, request, address):
1842
2541
"""Start a new process to process the request."""
1843
proc = multiprocessing.Process(target = self.sub_process_main,
2542
proc = multiprocessing.Process(target=self.sub_process_main,
2543
args=(request, address))
1850
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2548
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1851
2549
""" adds a pipe to the MixIn """
1852
2551
def process_request(self, request, client_address):
1853
2552
"""Overrides and wraps the original process_request().
1855
2554
This function creates a new pipe in self.pipe
1857
2556
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1859
2558
proc = MultiprocessingMixIn.process_request(self, request,
1860
2559
client_address)
1861
2560
self.child_pipe.close()
1862
2561
self.add_pipe(parent_pipe, proc)
1864
2563
def add_pipe(self, parent_pipe, proc):
1865
2564
"""Dummy function; override as necessary"""
1866
raise NotImplementedError
2565
raise NotImplementedError()
1869
2568
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1870
socketserver.TCPServer, object):
2569
socketserver.TCPServer):
1871
2570
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1874
2573
enabled: Boolean; whether this server is activated yet
1875
2574
interface: None or a network interface name (string)
1876
2575
use_ipv6: Boolean; to use IPv6 or not
1878
2578
def __init__(self, server_address, RequestHandlerClass,
1879
interface=None, use_ipv6=True):
2582
"""If socketfd is set, use that file descriptor instead of
2583
creating a new one with socket.socket().
1880
2585
self.interface = interface
1882
2587
self.address_family = socket.AF_INET6
2588
if socketfd is not None:
2589
# Save the file descriptor
2590
self.socketfd = socketfd
2591
# Save the original socket.socket() function
2592
self.socket_socket = socket.socket
2594
# To implement --socket, we monkey patch socket.socket.
2596
# (When socketserver.TCPServer is a new-style class, we
2597
# could make self.socket into a property instead of monkey
2598
# patching socket.socket.)
2600
# Create a one-time-only replacement for socket.socket()
2601
@functools.wraps(socket.socket)
2602
def socket_wrapper(*args, **kwargs):
2603
# Restore original function so subsequent calls are
2605
socket.socket = self.socket_socket
2606
del self.socket_socket
2607
# This time only, return a new socket object from the
2608
# saved file descriptor.
2609
return socket.fromfd(self.socketfd, *args, **kwargs)
2610
# Replace socket.socket() function with wrapper
2611
socket.socket = socket_wrapper
2612
# The socketserver.TCPServer.__init__ will call
2613
# socket.socket(), which might be our replacement,
2614
# socket_wrapper(), if socketfd was set.
1883
2615
socketserver.TCPServer.__init__(self, server_address,
1884
2616
RequestHandlerClass)
1885
2618
def server_bind(self):
1886
2619
"""This overrides the normal server_bind() function
1887
2620
to bind to an interface if one was specified, and also NOT to
1888
2621
bind to an address or port if they were not specified."""
2622
global SO_BINDTODEVICE
1889
2623
if self.interface is not None:
1890
2624
if SO_BINDTODEVICE is None:
1891
logger.error("SO_BINDTODEVICE does not exist;"
1892
" cannot bind to interface %s",
1896
self.socket.setsockopt(socket.SOL_SOCKET,
1900
except socket.error as error:
1901
if error[0] == errno.EPERM:
1902
logger.error("No permission to"
1903
" bind to interface %s",
1905
elif error[0] == errno.ENOPROTOOPT:
1906
logger.error("SO_BINDTODEVICE not available;"
1907
" cannot bind to interface %s",
2625
# Fall back to a hard-coded value which seems to be
2627
logger.warning("SO_BINDTODEVICE not found, trying 25")
2628
SO_BINDTODEVICE = 25
2630
self.socket.setsockopt(
2631
socket.SOL_SOCKET, SO_BINDTODEVICE,
2632
(self.interface + "\0").encode("utf-8"))
2633
except socket.error as error:
2634
if error.errno == errno.EPERM:
2635
logger.error("No permission to bind to"
2636
" interface %s", self.interface)
2637
elif error.errno == errno.ENOPROTOOPT:
2638
logger.error("SO_BINDTODEVICE not available;"
2639
" cannot bind to interface %s",
2641
elif error.errno == errno.ENODEV:
2642
logger.error("Interface %s does not exist,"
2643
" cannot bind", self.interface)
1911
2646
# Only bind(2) the socket if we really need to.
1912
2647
if self.server_address[0] or self.server_address[1]:
2648
if self.server_address[1]:
2649
self.allow_reuse_address = True
1913
2650
if not self.server_address[0]:
1914
2651
if self.address_family == socket.AF_INET6:
1915
any_address = "::" # in6addr_any
2652
any_address = "::" # in6addr_any
1917
any_address = socket.INADDR_ANY
2654
any_address = "0.0.0.0" # INADDR_ANY
1918
2655
self.server_address = (any_address,
1919
2656
self.server_address[1])
1920
2657
elif not self.server_address[1]:
1921
self.server_address = (self.server_address[0],
2658
self.server_address = (self.server_address[0], 0)
1923
2659
# if self.interface:
1924
2660
# self.server_address = (self.server_address[0],
1950
2691
self.gnutls_priority = gnutls_priority
1951
2692
IPv6_TCPServer.__init__(self, server_address,
1952
2693
RequestHandlerClass,
1953
interface = interface,
1954
use_ipv6 = use_ipv6)
2694
interface=interface,
1955
2698
def server_activate(self):
1956
2699
if self.enabled:
1957
2700
return socketserver.TCPServer.server_activate(self)
1959
2702
def enable(self):
1960
2703
self.enabled = True
1962
2705
def add_pipe(self, parent_pipe, proc):
1963
2706
# Call "handle_ipc" for both data and EOF events
1964
gobject.io_add_watch(parent_pipe.fileno(),
1965
gobject.IO_IN | gobject.IO_HUP,
1966
functools.partial(self.handle_ipc,
1971
def handle_ipc(self, source, condition, parent_pipe=None,
1972
proc = None, client_object=None):
1974
gobject.IO_IN: "IN", # There is data to read.
1975
gobject.IO_OUT: "OUT", # Data can be written (without
1977
gobject.IO_PRI: "PRI", # There is urgent data to read.
1978
gobject.IO_ERR: "ERR", # Error condition.
1979
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1980
# broken, usually for pipes and
1983
conditions_string = ' | '.join(name
1985
condition_names.iteritems()
1986
if cond & condition)
2708
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2709
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2710
functools.partial(self.handle_ipc,
2711
parent_pipe=parent_pipe,
2714
def handle_ipc(self, source, condition,
2717
client_object=None):
1987
2718
# error, or the other end of multiprocessing.Pipe has closed
1988
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2719
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1989
2720
# Wait for other process to exit
1993
2724
# Read a request from the child
1994
2725
request = parent_pipe.recv()
1995
2726
command = request[0]
1997
2728
if command == 'init':
1999
address = request[2]
2001
for c in self.clients.itervalues():
2002
if c.fingerprint == fpr:
2729
key_id = request[1].decode("ascii")
2730
fpr = request[2].decode("ascii")
2731
address = request[3]
2733
for c in self.clients.values():
2734
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2735
"27AE41E4649B934CA495991B7852B855"):
2737
if key_id and c.key_id == key_id:
2740
if fpr and c.fingerprint == fpr:
2006
logger.info("Client not found for fingerprint: %s, ad"
2007
"dress: %s", fpr, address)
2744
logger.info("Client not found for key ID: %s, address"
2745
": %s", key_id or fpr, address)
2008
2746
if self.use_dbus:
2009
2747
# Emit D-Bus signal
2010
mandos_dbus_service.ClientNotFound(fpr,
2748
mandos_dbus_service.ClientNotFound(key_id or fpr,
2012
2750
parent_pipe.send(False)
2015
gobject.io_add_watch(parent_pipe.fileno(),
2016
gobject.IO_IN | gobject.IO_HUP,
2017
functools.partial(self.handle_ipc,
2754
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2755
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2756
functools.partial(self.handle_ipc,
2757
parent_pipe=parent_pipe,
2759
client_object=client))
2023
2760
parent_pipe.send(True)
2024
2761
# remove the old hook in favor of the new above hook on
2028
2765
funcname = request[1]
2029
2766
args = request[2]
2030
2767
kwargs = request[3]
2032
2769
parent_pipe.send(('data', getattr(client_object,
2033
2770
funcname)(*args,
2036
2773
if command == 'getattr':
2037
2774
attrname = request[1]
2038
if callable(client_object.__getattribute__(attrname)):
2039
parent_pipe.send(('function',))
2775
if isinstance(client_object.__getattribute__(attrname),
2776
collections.abc.Callable):
2777
parent_pipe.send(('function', ))
2041
parent_pipe.send(('data', client_object
2042
.__getattribute__(attrname)))
2780
'data', client_object.__getattribute__(attrname)))
2044
2782
if command == 'setattr':
2045
2783
attrname = request[1]
2046
2784
value = request[2]
2047
2785
setattr(client_object, attrname, value)
2790
def rfc3339_duration_to_delta(duration):
2791
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2793
>>> timedelta = datetime.timedelta
2794
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2796
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2798
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2800
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2802
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2804
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2806
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2811
# Parsing an RFC 3339 duration with regular expressions is not
2812
# possible - there would have to be multiple places for the same
2813
# values, like seconds. The current code, while more esoteric, is
2814
# cleaner without depending on a parsing library. If Python had a
2815
# built-in library for parsing we would use it, but we'd like to
2816
# avoid excessive use of external libraries.
2818
# New type for defining tokens, syntax, and semantics all-in-one
2819
Token = collections.namedtuple("Token", (
2820
"regexp", # To match token; if "value" is not None, must have
2821
# a "group" containing digits
2822
"value", # datetime.timedelta or None
2823
"followers")) # Tokens valid after this token
2824
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2825
# the "duration" ABNF definition in RFC 3339, Appendix A.
2826
token_end = Token(re.compile(r"$"), None, frozenset())
2827
token_second = Token(re.compile(r"(\d+)S"),
2828
datetime.timedelta(seconds=1),
2829
frozenset((token_end, )))
2830
token_minute = Token(re.compile(r"(\d+)M"),
2831
datetime.timedelta(minutes=1),
2832
frozenset((token_second, token_end)))
2833
token_hour = Token(re.compile(r"(\d+)H"),
2834
datetime.timedelta(hours=1),
2835
frozenset((token_minute, token_end)))
2836
token_time = Token(re.compile(r"T"),
2838
frozenset((token_hour, token_minute,
2840
token_day = Token(re.compile(r"(\d+)D"),
2841
datetime.timedelta(days=1),
2842
frozenset((token_time, token_end)))
2843
token_month = Token(re.compile(r"(\d+)M"),
2844
datetime.timedelta(weeks=4),
2845
frozenset((token_day, token_end)))
2846
token_year = Token(re.compile(r"(\d+)Y"),
2847
datetime.timedelta(weeks=52),
2848
frozenset((token_month, token_end)))
2849
token_week = Token(re.compile(r"(\d+)W"),
2850
datetime.timedelta(weeks=1),
2851
frozenset((token_end, )))
2852
token_duration = Token(re.compile(r"P"), None,
2853
frozenset((token_year, token_month,
2854
token_day, token_time,
2856
# Define starting values:
2858
value = datetime.timedelta()
2860
# Following valid tokens
2861
followers = frozenset((token_duration, ))
2862
# String left to parse
2864
# Loop until end token is found
2865
while found_token is not token_end:
2866
# Search for any currently valid tokens
2867
for token in followers:
2868
match = token.regexp.match(s)
2869
if match is not None:
2871
if token.value is not None:
2872
# Value found, parse digits
2873
factor = int(match.group(1), 10)
2874
# Add to value so far
2875
value += factor * token.value
2876
# Strip token from string
2877
s = token.regexp.sub("", s, 1)
2880
# Set valid next tokens
2881
followers = found_token.followers
2884
# No currently valid tokens were found
2885
raise ValueError("Invalid RFC 3339 duration: {!r}"
2052
2891
def string_to_delta(interval):
2053
2892
"""Parse a string and return a datetime.timedelta
2055
>>> string_to_delta('7d')
2056
datetime.timedelta(7)
2057
>>> string_to_delta('60s')
2058
datetime.timedelta(0, 60)
2059
>>> string_to_delta('60m')
2060
datetime.timedelta(0, 3600)
2061
>>> string_to_delta('24h')
2062
datetime.timedelta(1)
2063
>>> string_to_delta('1w')
2064
datetime.timedelta(7)
2065
>>> string_to_delta('5m 30s')
2066
datetime.timedelta(0, 330)
2894
>>> string_to_delta('7d') == datetime.timedelta(7)
2896
>>> string_to_delta('60s') == datetime.timedelta(0, 60)
2898
>>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2900
>>> string_to_delta('24h') == datetime.timedelta(1)
2902
>>> string_to_delta('1w') == datetime.timedelta(7)
2904
>>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
2909
return rfc3339_duration_to_delta(interval)
2068
2913
timevalue = datetime.timedelta(0)
2069
2914
for s in interval.split():
2071
suffix = unicode(s[-1])
2072
2917
value = int(s[:-1])
2073
2918
if suffix == "d":
2074
2919
delta = datetime.timedelta(value)
2147
2991
parser.add_argument("--no-dbus", action="store_false",
2148
2992
dest="use_dbus", help="Do not provide D-Bus"
2149
" system bus interface")
2993
" system bus interface", default=None)
2150
2994
parser.add_argument("--no-ipv6", action="store_false",
2151
dest="use_ipv6", help="Do not use IPv6")
2995
dest="use_ipv6", help="Do not use IPv6",
2152
2997
parser.add_argument("--no-restore", action="store_false",
2153
2998
dest="restore", help="Do not restore stored"
2999
" state", default=None)
3000
parser.add_argument("--socket", type=int,
3001
help="Specify a file descriptor to a network"
3002
" socket to use instead of creating one")
2155
3003
parser.add_argument("--statedir", metavar="DIR",
2156
3004
help="Directory to save/restore state in")
3005
parser.add_argument("--foreground", action="store_true",
3006
help="Run in foreground", default=None)
3007
parser.add_argument("--no-zeroconf", action="store_false",
3008
dest="zeroconf", help="Do not use Zeroconf",
2158
3011
options = parser.parse_args()
2165
3013
# Default values for config file for server-global settings
2166
server_defaults = { "interface": "",
2171
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2172
"servicename": "Mandos",
2177
"statedir": "/var/lib/mandos"
3014
if gnutls.has_rawpk:
3015
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3016
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3018
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3019
":+SIGN-DSA-SHA256")
3020
server_defaults = {"interface": "",
3024
"priority": priority,
3025
"servicename": "Mandos",
3031
"statedir": "/var/lib/mandos",
3032
"foreground": "False",
2180
3037
# Parse config file for server-global settings
2181
server_config = configparser.SafeConfigParser(server_defaults)
3038
server_config = configparser.ConfigParser(server_defaults)
2182
3039
del server_defaults
2183
server_config.read(os.path.join(options.configdir,
2185
# Convert the SafeConfigParser object to a dict
3040
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3041
# Convert the ConfigParser object to a dict
2186
3042
server_settings = server_config.defaults()
2187
3043
# Use the appropriate methods on the non-string config options
2188
for option in ("debug", "use_dbus", "use_ipv6"):
3044
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3045
"foreground", "zeroconf"):
2189
3046
server_settings[option] = server_config.getboolean("DEFAULT",
2191
3048
if server_settings["port"]:
2192
3049
server_settings["port"] = server_config.getint("DEFAULT",
3051
if server_settings["socket"]:
3052
server_settings["socket"] = server_config.getint("DEFAULT",
3054
# Later, stdin will, and stdout and stderr might, be dup'ed
3055
# over with an opened os.devnull. But we don't want this to
3056
# happen with a supplied network socket.
3057
if 0 <= server_settings["socket"] <= 2:
3058
server_settings["socket"] = os.dup(server_settings
2194
3060
del server_config
2196
3062
# Override the settings from the config file with command line
2197
3063
# options, if set.
2198
3064
for option in ("interface", "address", "port", "debug",
2199
"priority", "servicename", "configdir",
2200
"use_dbus", "use_ipv6", "debuglevel", "restore",
3065
"priority", "servicename", "configdir", "use_dbus",
3066
"use_ipv6", "debuglevel", "restore", "statedir",
3067
"socket", "foreground", "zeroconf"):
2202
3068
value = getattr(options, option)
2203
3069
if value is not None:
2204
3070
server_settings[option] = value
2206
3072
# Force all strings to be unicode
2207
3073
for option in server_settings.keys():
2208
if type(server_settings[option]) is str:
2209
server_settings[option] = unicode(server_settings[option])
3074
if isinstance(server_settings[option], bytes):
3075
server_settings[option] = (server_settings[option]
3077
# Force all boolean options to be boolean
3078
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3079
"foreground", "zeroconf"):
3080
server_settings[option] = bool(server_settings[option])
3081
# Debug implies foreground
3082
if server_settings["debug"]:
3083
server_settings["foreground"] = True
2210
3084
# Now we have our good server settings in "server_settings"
2212
3086
##################################################################
3088
if (not server_settings["zeroconf"]
3089
and not (server_settings["port"]
3090
or server_settings["socket"] != "")):
3091
parser.error("Needs port or socket to work without Zeroconf")
2214
3093
# For convenience
2215
3094
debug = server_settings["debug"]
2216
3095
debuglevel = server_settings["debuglevel"]
3164
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2277
3166
except OSError as error:
2278
if error[0] != errno.EPERM:
3167
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3168
.format(uid, gid, os.strerror(error.errno)))
3169
if error.errno != errno.EPERM:
2282
3173
# Enable all possible GnuTLS debugging
2284
3175
# "Use a log level over 10 to enable all debugging options."
2285
3176
# - GnuTLS manual
2286
gnutls.library.functions.gnutls_global_set_log_level(11)
2288
@gnutls.library.types.gnutls_log_func
3177
gnutls.global_set_log_level(11)
2289
3180
def debug_gnutls(level, string):
2290
3181
logger.debug("GnuTLS: %s", string[:-1])
2292
(gnutls.library.functions
2293
.gnutls_global_set_log_function(debug_gnutls))
3183
gnutls.global_set_log_function(debug_gnutls)
2295
3185
# Redirect stdin so all checkers get /dev/null
2296
3186
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2297
3187
os.dup2(null, sys.stdin.fileno())
2301
3191
# Need to fork before connecting to D-Bus
2303
3193
# Close all input and output, do double fork, etc.
2306
gobject.threads_init()
3196
if gi.version_info < (3, 10, 2):
3197
# multiprocessing will use threads, so before we use GLib we
3198
# need to inform GLib that threads will be used.
2308
3201
global main_loop
2309
3202
# From the Avahi example code
2310
3203
DBusGMainLoop(set_as_default=True)
2311
main_loop = gobject.MainLoop()
3204
main_loop = GLib.MainLoop()
2312
3205
bus = dbus.SystemBus()
2313
3206
# End of Avahi example code
2316
3209
bus_name = dbus.service.BusName("se.recompile.Mandos",
2317
bus, do_not_queue=True)
2318
old_bus_name = (dbus.service.BusName
2319
("se.bsnet.fukt.Mandos", bus,
2321
except dbus.exceptions.NameExistsException as e:
3212
old_bus_name = dbus.service.BusName(
3213
"se.bsnet.fukt.Mandos", bus,
3215
except dbus.exceptions.DBusException as e:
2322
3216
logger.error("Disabling D-Bus:", exc_info=e)
2323
3217
use_dbus = False
2324
3218
server_settings["use_dbus"] = False
2325
3219
tcp_server.use_dbus = False
2326
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2327
service = AvahiServiceToSyslog(name =
2328
server_settings["servicename"],
2329
servicetype = "_mandos._tcp",
2330
protocol = protocol, bus = bus)
2331
if server_settings["interface"]:
2332
service.interface = (if_nametoindex
2333
(str(server_settings["interface"])))
3221
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3222
service = AvahiServiceToSyslog(
3223
name=server_settings["servicename"],
3224
servicetype="_mandos._tcp",
3227
if server_settings["interface"]:
3228
service.interface = if_nametoindex(
3229
server_settings["interface"].encode("utf-8"))
2335
3231
global multiprocessing_manager
2336
3232
multiprocessing_manager = multiprocessing.Manager()
2338
3234
client_class = Client
2340
client_class = functools.partial(ClientDBusTransitional,
3236
client_class = functools.partial(ClientDBus, bus=bus)
2343
3238
client_settings = Client.config_parser(client_config)
2344
3239
old_client_settings = {}
2345
3240
clients_data = {}
3242
# This is used to redirect stdout and stderr for checker processes
3244
wnull = open(os.devnull, "w") # A writable /dev/null
3245
# Only used if server is running in foreground but not in debug
3247
if debug or not foreground:
2347
3250
# Get client data and settings from last running state.
2348
3251
if server_settings["restore"]:
2350
3253
with open(stored_state_path, "rb") as stored_state:
2351
clients_data, old_client_settings = (pickle.load
3254
if sys.version_info.major == 2:
3255
clients_data, old_client_settings = pickle.load(
3258
bytes_clients_data, bytes_old_client_settings = (
3259
pickle.load(stored_state, encoding="bytes"))
3260
# Fix bytes to strings
3263
clients_data = {(key.decode("utf-8")
3264
if isinstance(key, bytes)
3267
bytes_clients_data.items()}
3268
del bytes_clients_data
3269
for key in clients_data:
3270
value = {(k.decode("utf-8")
3271
if isinstance(k, bytes) else k): v
3273
clients_data[key].items()}
3274
clients_data[key] = value
3276
value["client_structure"] = [
3278
if isinstance(s, bytes)
3280
value["client_structure"]]
3281
# .name, .host, and .checker_command
3282
for k in ("name", "host", "checker_command"):
3283
if isinstance(value[k], bytes):
3284
value[k] = value[k].decode("utf-8")
3285
if "key_id" not in value:
3286
value["key_id"] = ""
3287
elif "fingerprint" not in value:
3288
value["fingerprint"] = ""
3289
# old_client_settings
3291
old_client_settings = {
3292
(key.decode("utf-8")
3293
if isinstance(key, bytes)
3296
bytes_old_client_settings.items()}
3297
del bytes_old_client_settings
3298
# .host and .checker_command
3299
for value in old_client_settings.values():
3300
for attribute in ("host", "checker_command"):
3301
if isinstance(value[attribute], bytes):
3302
value[attribute] = (value[attribute]
2353
3304
os.remove(stored_state_path)
2354
3305
except IOError as e:
2355
3306
if e.errno == errno.ENOENT:
2356
logger.warning("Could not load persistent state: {0}"
2357
.format(os.strerror(e.errno)))
3307
logger.warning("Could not load persistent state:"
3308
" {}".format(os.strerror(e.errno)))
2359
3310
logger.critical("Could not load persistent state:",
2362
3313
except EOFError as e:
2363
3314
logger.warning("Could not load persistent state: "
2364
"EOFError:", exc_info=e)
2366
3318
with PGPEngine() as pgp:
2367
for client_name, client in clients_data.iteritems():
3319
for client_name, client in clients_data.items():
3320
# Skip removed clients
3321
if client_name not in client_settings:
2368
3324
# Decide which value to use after restoring saved state.
2369
3325
# We have three different values: Old config file,
2370
3326
# new config file, and saved state.
2428
3384
for client_name in (set(client_settings)
2429
3385
- set(old_client_settings)):
2430
3386
clients_data[client_name] = client_settings[client_name]
2432
3388
# Create all client objects
2433
for client_name, client in clients_data.iteritems():
3389
for client_name, client in clients_data.items():
2434
3390
tcp_server.clients[client_name] = client_class(
2435
name = client_name, settings = client)
3393
server_settings=server_settings)
2437
3395
if not tcp_server.clients:
2438
3396
logger.warning("No clients defined")
2444
pidfile.write(str(pid) + "\n".encode("utf-8"))
2447
logger.error("Could not write to file %r with PID %d",
2450
# "pidfile" was never created
3399
if pidfile is not None:
3403
print(pid, file=pidfile)
3405
logger.error("Could not write to file %r with PID %d",
2452
3408
del pidfilename
2453
signal.signal(signal.SIGINT, signal.SIG_IGN)
2455
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2456
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3410
for termsig in (signal.SIGHUP, signal.SIGTERM):
3411
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3412
lambda: main_loop.quit() and False)
2459
class MandosDBusService(DBusObjectWithProperties):
3416
@alternate_dbus_interfaces(
3417
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3418
class MandosDBusService(DBusObjectWithObjectManager):
2460
3419
"""A D-Bus proxy object"""
2461
3421
def __init__(self):
2462
3422
dbus.service.Object.__init__(self, bus, "/")
2463
3424
_interface = "se.recompile.Mandos"
2465
@dbus_interface_annotations(_interface)
2467
return { "org.freedesktop.DBus.Property"
2468
".EmitsChangedSignal":
2471
3426
@dbus.service.signal(_interface, signature="o")
2472
3427
def ClientAdded(self, objpath):
2476
3431
@dbus.service.signal(_interface, signature="ss")
2477
def ClientNotFound(self, fingerprint, address):
3432
def ClientNotFound(self, key_id, address):
3436
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2481
3438
@dbus.service.signal(_interface, signature="os")
2482
3439
def ClientRemoved(self, objpath, name):
3443
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2486
3445
@dbus.service.method(_interface, out_signature="ao")
2487
3446
def GetAllClients(self):
2489
return dbus.Array(c.dbus_object_path
2491
tcp_server.clients.itervalues())
3448
return dbus.Array(c.dbus_object_path for c in
3449
tcp_server.clients.values())
3451
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2493
3453
@dbus.service.method(_interface,
2494
3454
out_signature="a{oa{sv}}")
2495
3455
def GetAllClientsWithProperties(self):
2497
3457
return dbus.Dictionary(
2498
((c.dbus_object_path, c.GetAll(""))
2499
for c in tcp_server.clients.itervalues()),
3458
{c.dbus_object_path: c.GetAll(
3459
"se.recompile.Mandos.Client")
3460
for c in tcp_server.clients.values()},
2500
3461
signature="oa{sv}")
2502
3463
@dbus.service.method(_interface, in_signature="o")
2503
3464
def RemoveClient(self, object_path):
2505
for c in tcp_server.clients.itervalues():
3466
for c in tcp_server.clients.values():
2506
3467
if c.dbus_object_path == object_path:
2507
3468
del tcp_server.clients[c.name]
2508
3469
c.remove_from_connection()
2509
# Don't signal anything except ClientRemoved
3470
# Don't signal the disabling
2510
3471
c.disable(quiet=True)
2512
self.ClientRemoved(object_path, c.name)
3472
# Emit D-Bus signal for removal
3473
self.client_removed_signal(c)
2514
3475
raise KeyError(object_path)
2518
class MandosDBusServiceTransitional(MandosDBusService):
2519
__metaclass__ = AlternateDBusNamesMetaclass
2520
mandos_dbus_service = MandosDBusServiceTransitional()
3479
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3480
out_signature="a{oa{sa{sv}}}")
3481
def GetManagedObjects(self):
3483
return dbus.Dictionary(
3484
{client.dbus_object_path:
3486
{interface: client.GetAll(interface)
3488
client._get_all_interface_names()})
3489
for client in tcp_server.clients.values()})
3491
def client_added_signal(self, client):
3492
"""Send the new standard signal and the old signal"""
3494
# New standard signal
3495
self.InterfacesAdded(
3496
client.dbus_object_path,
3498
{interface: client.GetAll(interface)
3500
client._get_all_interface_names()}))
3502
self.ClientAdded(client.dbus_object_path)
3504
def client_removed_signal(self, client):
3505
"""Send the new standard signal and the old signal"""
3507
# New standard signal
3508
self.InterfacesRemoved(
3509
client.dbus_object_path,
3510
client._get_all_interface_names())
3512
self.ClientRemoved(client.dbus_object_path,
3515
mandos_dbus_service = MandosDBusService()
3517
# Save modules to variables to exempt the modules from being
3518
# unloaded before the function registered with atexit() is run.
3519
mp = multiprocessing
2523
3523
"Cleanup function; run on exit"
2526
multiprocessing.active_children()
3527
mp.active_children()
2527
3529
if not (tcp_server.clients or client_settings):
2530
3532
# Store client before exiting. Secrets are encrypted with key
2531
3533
# based on what config file has. If config file is
2532
3534
# removed/edited, old secret will thus be unrecovable.
2534
3536
with PGPEngine() as pgp:
2535
for client in tcp_server.clients.itervalues():
3537
for client in tcp_server.clients.values():
2536
3538
key = client_settings[client.name]["secret"]
2537
3539
client.encrypted_secret = pgp.encrypt(client.secret,
2539
3541
client_dict = {}
2541
3543
# A list of attributes that can not be pickled
2543
exclude = set(("bus", "changedstate", "secret",
2545
for name, typ in (inspect.getmembers
2546
(dbus.service.Object)):
3545
exclude = {"bus", "changedstate", "secret",
3546
"checker", "server_settings"}
3547
for name, typ in inspect.getmembers(dbus.service
2547
3549
exclude.add(name)
2549
3551
client_dict["encrypted_secret"] = (client
2550
3552
.encrypted_secret)
2551
3553
for attr in client.client_structure:
2552
3554
if attr not in exclude:
2553
3555
client_dict[attr] = getattr(client, attr)
2555
3557
clients[client.name] = client_dict
2556
3558
del client_settings[client.name]["secret"]
2559
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2562
(stored_state_path))
2563
with os.fdopen(tempfd, "wb") as stored_state:
2564
pickle.dump((clients, client_settings), stored_state)
3561
with tempfile.NamedTemporaryFile(
3565
dir=os.path.dirname(stored_state_path),
3566
delete=False) as stored_state:
3567
pickle.dump((clients, client_settings), stored_state,
3569
tempname = stored_state.name
2565
3570
os.rename(tempname, stored_state_path)
2566
3571
except (IOError, OSError) as e: