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
('Mandos [%(process)d]: %(levelname)s:'
192
("Mandos [%(process)d]: %(levelname)s:"
120
194
logger.addHandler(syslogger)
123
197
console = logging.StreamHandler()
124
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
198
console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
128
202
logger.addHandler(console)
129
203
logger.setLevel(level)
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
name: string; Example: 'Mandos'
233
type: string; Example: '_mandos._tcp'.
234
See <http://www.dns-sd.org/ServiceTypes.html>
353
name: string; Example: "Mandos"
354
type: string; Example: "_mandos._tcp".
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).decode(
598
"utf-8", errors="replace")
599
return super(gnutls.Error, self).__init__(
602
class CertificateSecurityError(Error):
606
def __init__(self, cls):
609
def from_param(self, obj):
610
if not isinstance(obj, self.cls):
611
raise TypeError("Not of type {}: {!r}"
612
.format(self.cls.__name__, obj))
613
return ctypes.byref(obj.from_param(obj))
615
class CastToVoidPointer:
616
def __init__(self, cls):
619
def from_param(self, obj):
620
if not isinstance(obj, self.cls):
621
raise TypeError("Not of type {}: {!r}"
622
.format(self.cls.__name__, obj))
623
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
625
class With_from_param:
627
def from_param(cls, obj):
628
return obj._as_parameter_
631
class Credentials(With_from_param):
633
self._as_parameter_ = gnutls.certificate_credentials_t()
634
gnutls.certificate_allocate_credentials(self)
635
self.type = gnutls.CRD_CERTIFICATE
638
gnutls.certificate_free_credentials(self)
640
class ClientSession(With_from_param):
641
def __init__(self, socket, credentials=None):
642
self._as_parameter_ = gnutls.session_t()
643
gnutls_flags = gnutls.CLIENT
644
if gnutls.check_version(b"3.5.6"):
645
gnutls_flags |= gnutls.NO_TICKETS
647
gnutls_flags |= gnutls.ENABLE_RAWPK
648
gnutls.init(self, gnutls_flags)
650
gnutls.set_default_priority(self)
651
gnutls.transport_set_ptr(self, socket.fileno())
652
gnutls.handshake_set_private_extensions(self, True)
654
if credentials is None:
655
credentials = gnutls.Credentials()
656
gnutls.credentials_set(self, credentials.type,
658
self.credentials = credentials
664
return gnutls.handshake(self)
666
def send(self, data):
670
data_len -= gnutls.record_send(self, data[-data_len:],
674
return gnutls.bye(self, gnutls.SHUT_RDWR)
676
# Error handling functions
677
def _error_code(result):
678
"""A function to raise exceptions on errors, suitable
679
for the "restype" attribute on ctypes functions"""
680
if result >= gnutls.E_SUCCESS:
682
if result == gnutls.E_NO_CERTIFICATE_FOUND:
683
raise gnutls.CertificateSecurityError(code=result)
684
raise gnutls.Error(code=result)
686
def _retry_on_error(result, func, arguments,
687
_error_code=_error_code):
688
"""A function to retry on some errors, suitable
689
for the "errcheck" attribute on ctypes functions"""
690
while result < gnutls.E_SUCCESS:
691
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
692
return _error_code(result)
693
result = func(*arguments)
696
# Unless otherwise indicated, the function declarations below are
697
# all from the gnutls/gnutls.h C header file.
700
priority_set_direct = _library.gnutls_priority_set_direct
701
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
702
ctypes.POINTER(ctypes.c_char_p)]
703
priority_set_direct.restype = _error_code
705
init = _library.gnutls_init
706
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
707
init.restype = _error_code
709
set_default_priority = _library.gnutls_set_default_priority
710
set_default_priority.argtypes = [ClientSession]
711
set_default_priority.restype = _error_code
713
record_send = _library.gnutls_record_send
714
record_send.argtypes = [ClientSession, ctypes.c_void_p,
716
record_send.restype = ctypes.c_ssize_t
717
record_send.errcheck = _retry_on_error
719
certificate_allocate_credentials = (
720
_library.gnutls_certificate_allocate_credentials)
721
certificate_allocate_credentials.argtypes = [
722
PointerTo(Credentials)]
723
certificate_allocate_credentials.restype = _error_code
725
certificate_free_credentials = (
726
_library.gnutls_certificate_free_credentials)
727
certificate_free_credentials.argtypes = [Credentials]
728
certificate_free_credentials.restype = None
730
handshake_set_private_extensions = (
731
_library.gnutls_handshake_set_private_extensions)
732
handshake_set_private_extensions.argtypes = [ClientSession,
734
handshake_set_private_extensions.restype = None
736
credentials_set = _library.gnutls_credentials_set
737
credentials_set.argtypes = [ClientSession, credentials_type_t,
738
CastToVoidPointer(Credentials)]
739
credentials_set.restype = _error_code
741
strerror = _library.gnutls_strerror
742
strerror.argtypes = [ctypes.c_int]
743
strerror.restype = ctypes.c_char_p
745
certificate_type_get = _library.gnutls_certificate_type_get
746
certificate_type_get.argtypes = [ClientSession]
747
certificate_type_get.restype = _error_code
749
certificate_get_peers = _library.gnutls_certificate_get_peers
750
certificate_get_peers.argtypes = [ClientSession,
751
ctypes.POINTER(ctypes.c_uint)]
752
certificate_get_peers.restype = ctypes.POINTER(datum_t)
754
global_set_log_level = _library.gnutls_global_set_log_level
755
global_set_log_level.argtypes = [ctypes.c_int]
756
global_set_log_level.restype = None
758
global_set_log_function = _library.gnutls_global_set_log_function
759
global_set_log_function.argtypes = [log_func]
760
global_set_log_function.restype = None
762
deinit = _library.gnutls_deinit
763
deinit.argtypes = [ClientSession]
764
deinit.restype = None
766
handshake = _library.gnutls_handshake
767
handshake.argtypes = [ClientSession]
768
handshake.restype = ctypes.c_int
769
handshake.errcheck = _retry_on_error
771
transport_set_ptr = _library.gnutls_transport_set_ptr
772
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
773
transport_set_ptr.restype = None
775
bye = _library.gnutls_bye
776
bye.argtypes = [ClientSession, close_request_t]
777
bye.restype = ctypes.c_int
778
bye.errcheck = _retry_on_error
780
check_version = _library.gnutls_check_version
781
check_version.argtypes = [ctypes.c_char_p]
782
check_version.restype = ctypes.c_char_p
784
_need_version = b"3.3.0"
785
if check_version(_need_version) is None:
786
raise self.Error("Needs GnuTLS {} or later"
787
.format(_need_version))
789
_tls_rawpk_version = b"3.6.6"
790
has_rawpk = bool(check_version(_tls_rawpk_version))
794
class pubkey_st(ctypes.Structure):
796
pubkey_t = ctypes.POINTER(pubkey_st)
798
x509_crt_fmt_t = ctypes.c_int
800
# All the function declarations below are from
802
pubkey_init = _library.gnutls_pubkey_init
803
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
804
pubkey_init.restype = _error_code
806
pubkey_import = _library.gnutls_pubkey_import
807
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
809
pubkey_import.restype = _error_code
811
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
812
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
813
ctypes.POINTER(ctypes.c_ubyte),
814
ctypes.POINTER(ctypes.c_size_t)]
815
pubkey_get_key_id.restype = _error_code
817
pubkey_deinit = _library.gnutls_pubkey_deinit
818
pubkey_deinit.argtypes = [pubkey_t]
819
pubkey_deinit.restype = None
821
# All the function declarations below are from
824
openpgp_crt_init = _library.gnutls_openpgp_crt_init
825
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
826
openpgp_crt_init.restype = _error_code
828
openpgp_crt_import = _library.gnutls_openpgp_crt_import
829
openpgp_crt_import.argtypes = [openpgp_crt_t,
830
ctypes.POINTER(datum_t),
832
openpgp_crt_import.restype = _error_code
834
openpgp_crt_verify_self = \
835
_library.gnutls_openpgp_crt_verify_self
836
openpgp_crt_verify_self.argtypes = [
839
ctypes.POINTER(ctypes.c_uint),
841
openpgp_crt_verify_self.restype = _error_code
843
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
844
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
845
openpgp_crt_deinit.restype = None
847
openpgp_crt_get_fingerprint = (
848
_library.gnutls_openpgp_crt_get_fingerprint)
849
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
853
openpgp_crt_get_fingerprint.restype = _error_code
855
if check_version(b"3.6.4"):
856
certificate_type_get2 = _library.gnutls_certificate_type_get2
857
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
858
certificate_type_get2.restype = _error_code
860
# Remove non-public functions
861
del _error_code, _retry_on_error
864
def call_pipe(connection, # : multiprocessing.Connection
865
func, *args, **kwargs):
866
"""This function is meant to be called by multiprocessing.Process
868
This function runs func(*args, **kwargs), and writes the resulting
869
return value on the provided multiprocessing.Connection.
871
connection.send(func(*args, **kwargs))
397
876
"""A representation of a client host served by this server.
400
approved: bool(); 'None' if not yet approved/disapproved
879
approved: bool(); None if not yet approved/disapproved
401
880
approval_delay: datetime.timedelta(); Time to wait for approval
402
881
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
882
checker: multiprocessing.Process(); a running checker process used
883
to see if the client lives. None if no process is
885
checker_callback_tag: a GLib event source tag, or None
407
886
checker_command: string; External command which is run to check
408
887
if client lives. %() expansions are done at
409
888
runtime with vars(self) as dict, so that for
410
889
instance %(name)s can be used in the command.
411
checker_initiator_tag: a gobject event source tag, or None
890
checker_initiator_tag: a GLib event source tag, or None
412
891
created: datetime.datetime(); (UTC) object creation
413
892
client_structure: Object describing what attributes a client has
414
893
and is used for storing the client at exit
415
894
current_checker_command: string; current running checker_command
416
disable_initiator_tag: a gobject event source tag, or None
895
disable_initiator_tag: a GLib event source tag, or None
418
897
fingerprint: string (40 or 32 hexadecimal digits); used to
419
uniquely identify the client
898
uniquely identify an OpenPGP client
899
key_id: string (64 hexadecimal digits); used to uniquely identify
900
a client using raw public keys
420
901
host: string; available for use by the checker command
421
902
interval: datetime.timedelta(); How often to start a new checker
422
903
last_approval_request: datetime.datetime(); (UTC) or None
545
1024
self.current_checker_command = None
546
1025
self.approved = None
547
1026
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()
1027
self.changedstate = multiprocessing_manager.Condition(
1028
multiprocessing_manager.Lock())
1029
self.client_structure = [attr
1030
for attr in self.__dict__.keys()
553
1031
if not attr.startswith("_")]
554
1032
self.client_structure.append("client_structure")
556
for name, t in inspect.getmembers(type(self),
1034
for name, t in inspect.getmembers(
1035
type(self), lambda obj: isinstance(obj, property)):
560
1036
if not name.startswith("_"):
561
1037
self.client_structure.append(name)
563
1039
# Send notice to process children that client state has changed
564
1040
def send_changedstate(self):
565
1041
with self.changedstate:
566
1042
self.changedstate.notify_all()
568
1044
def enable(self):
569
1045
"""Start this client's checker and timeout hooks"""
570
1046
if getattr(self, "enabled", False):
571
1047
# Already enabled
573
self.send_changedstate()
574
1049
self.expires = datetime.datetime.utcnow() + self.timeout
575
1050
self.enabled = True
576
1051
self.last_enabled = datetime.datetime.utcnow()
577
1052
self.init_checker()
1053
self.send_changedstate()
579
1055
def disable(self, quiet=True):
580
1056
"""Disable this client."""
581
1057
if not getattr(self, "enabled", False):
584
self.send_changedstate()
586
1060
logger.info("Disabling client %s", self.name)
587
if getattr(self, "disable_initiator_tag", False):
588
gobject.source_remove(self.disable_initiator_tag)
1061
if getattr(self, "disable_initiator_tag", None) is not None:
1062
GLib.source_remove(self.disable_initiator_tag)
589
1063
self.disable_initiator_tag = None
590
1064
self.expires = None
591
if getattr(self, "checker_initiator_tag", False):
592
gobject.source_remove(self.checker_initiator_tag)
1065
if getattr(self, "checker_initiator_tag", None) is not None:
1066
GLib.source_remove(self.checker_initiator_tag)
593
1067
self.checker_initiator_tag = None
594
1068
self.stop_checker()
595
1069
self.enabled = False
596
# Do not run this again if called by a gobject.timeout_add
1071
self.send_changedstate()
1072
# Do not run this again if called by a GLib.timeout_add
599
1075
def __del__(self):
602
1078
def init_checker(self):
603
1079
# Schedule a new checker to be started an 'interval' from now,
604
1080
# and every interval from then on.
605
self.checker_initiator_tag = (gobject.timeout_add
606
(self.interval_milliseconds(),
1081
if self.checker_initiator_tag is not None:
1082
GLib.source_remove(self.checker_initiator_tag)
1083
self.checker_initiator_tag = GLib.timeout_add(
1084
random.randrange(int(self.interval.total_seconds() * 1000
608
1087
# Schedule a disable() when 'timeout' has passed
609
self.disable_initiator_tag = (gobject.timeout_add
610
(self.timeout_milliseconds(),
1088
if self.disable_initiator_tag is not None:
1089
GLib.source_remove(self.disable_initiator_tag)
1090
self.disable_initiator_tag = GLib.timeout_add(
1091
int(self.timeout.total_seconds() * 1000), self.disable)
612
1092
# Also start a new checker *right now*.
613
1093
self.start_checker()
615
def checker_callback(self, pid, condition, command):
1095
def checker_callback(self, source, condition, connection,
616
1097
"""The checker has completed, so take appropriate actions."""
1098
# Read return code from connection (see call_pipe)
1099
returncode = connection.recv()
1101
if self.checker is not None:
617
1103
self.checker_callback_tag = None
618
1104
self.checker = None
619
if os.WIFEXITED(condition):
620
self.last_checker_status = os.WEXITSTATUS(condition)
1107
self.last_checker_status = returncode
1108
self.last_checker_signal = None
621
1109
if self.last_checker_status == 0:
622
1110
logger.info("Checker for %(name)s succeeded",
624
1112
self.checked_ok()
626
logger.info("Checker for %(name)s failed",
1114
logger.info("Checker for %(name)s failed", vars(self))
629
1116
self.last_checker_status = -1
1117
self.last_checker_signal = -returncode
630
1118
logger.warning("Checker for %(name)s crashed?",
633
1122
def checked_ok(self):
634
1123
"""Assert that the client has been seen, alive and well."""
635
1124
self.last_checked_ok = datetime.datetime.utcnow()
636
1125
self.last_checker_status = 0
1126
self.last_checker_signal = None
637
1127
self.bump_timeout()
639
1129
def bump_timeout(self, timeout=None):
640
1130
"""Bump up the timeout for this client."""
641
1131
if timeout is None:
642
1132
timeout = self.timeout
643
1133
if self.disable_initiator_tag is not None:
644
gobject.source_remove(self.disable_initiator_tag)
1134
GLib.source_remove(self.disable_initiator_tag)
1135
self.disable_initiator_tag = None
645
1136
if getattr(self, "enabled", False):
646
self.disable_initiator_tag = (gobject.timeout_add
647
(timedelta_to_milliseconds
648
(timeout), self.disable))
1137
self.disable_initiator_tag = GLib.timeout_add(
1138
int(timeout.total_seconds() * 1000), self.disable)
649
1139
self.expires = datetime.datetime.utcnow() + timeout
651
1141
def need_approval(self):
652
1142
self.last_approval_request = datetime.datetime.utcnow()
654
1144
def start_checker(self):
655
1145
"""Start a new checker subprocess if one is not running.
657
1147
If a checker already exists, leave it running and do
659
1149
# 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
1150
# did that, and if a checker (for some reason) started running
1151
# slowly and taking more than 'interval' time, then the client
1152
# would inevitably timeout, since no checker would get a
1153
# chance to run to completion. If we instead leave running
664
1154
# checkers alone, the checker would have to take more time
665
1155
# 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)
1158
if self.checker is not None and not self.checker.is_alive():
1159
logger.warning("Checker was not alive; joining")
681
1162
# Start a new checker if needed
682
1163
if self.checker is None:
1164
# Escape attributes for the shell
1166
attr: shlex.quote(str(getattr(self, attr)))
1167
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
1169
command = self.checker_command % escaped_attrs
1170
except TypeError as error:
1171
logger.error('Could not format string "%s"',
1172
self.checker_command,
1174
return True # Try again later
702
1175
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
1176
logger.info("Starting checker %r for %s", command,
1178
# We don't need to redirect stdout and stderr, since
1179
# in normal mode, that is already done by daemon(),
1180
# and in debug mode we don't want to. (Stdin is
1181
# always replaced by /dev/null.)
1182
# The exception is when not debugging but nevertheless
1183
# running in the foreground; use the previously
1185
popen_args = {"close_fds": True,
1188
if (not self.server_settings["debug"]
1189
and self.server_settings["foreground"]):
1190
popen_args.update({"stdout": wnull,
1192
pipe = multiprocessing.Pipe(duplex=False)
1193
self.checker = multiprocessing.Process(
1195
args=(pipe[1], subprocess.call, command),
1197
self.checker.start()
1198
self.checker_callback_tag = GLib.io_add_watch(
1199
GLib.IOChannel.unix_new(pipe[0].fileno()),
1200
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1201
self.checker_callback, pipe[0], command)
1202
# Re-run this periodically if run by GLib.timeout_add
729
1205
def stop_checker(self):
730
1206
"""Force the checker process, if any, to stop."""
731
1207
if self.checker_callback_tag:
732
gobject.source_remove(self.checker_callback_tag)
1208
GLib.source_remove(self.checker_callback_tag)
733
1209
self.checker_callback_tag = None
734
1210
if getattr(self, "checker", None) is None:
736
1212
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
1213
self.checker.terminate()
745
1214
self.checker = None
748
def dbus_service_property(dbus_interface, signature="v",
749
access="readwrite", byte_arrays=False):
1217
def dbus_service_property(dbus_interface,
750
1221
"""Decorators for marking methods of a DBusObjectWithProperties to
751
1222
become properties on the D-Bus.
753
1224
The decorated method will be called with no arguments by "Get"
754
1225
and with one argument by "Set".
756
1227
The parameters, where they are supported, are the same as
757
1228
dbus.service.method, except there is only "signature", since the
758
1229
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.
1312
class DBusObjectWithAnnotations(dbus.service.Object):
1313
"""A D-Bus object with annotations.
1315
Classes inheriting from this can use the dbus_annotations
1316
decorator to add annotations to methods or signals.
843
1320
def _is_dbus_thing(thing):
844
1321
"""Returns a function testing if an attribute is a D-Bus thing
846
1323
If called like _is_dbus_thing("method") it returns a function
847
1324
suitable for use as predicate to inspect.getmembers().
849
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1326
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
852
1329
def _get_all_dbus_things(self, thing):
853
1330
"""Returns a generator of (name, attribute) pairs
855
return ((getattr(athing.__get__(self), "_dbus_name",
1332
return ((getattr(athing.__get__(self), "_dbus_name", name),
857
1333
athing.__get__(self))
858
1334
for cls in self.__class__.__mro__
859
1335
for name, athing in
860
inspect.getmembers(cls,
861
self._is_dbus_thing(thing)))
1336
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1338
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1340
path_keyword="object_path",
1341
connection_keyword="connection")
1342
def Introspect(self, object_path, connection):
1343
"""Overloading of standard D-Bus method.
1345
Inserts annotation tags on methods and signals.
1347
xmlstring = dbus.service.Object.Introspect(self, object_path,
1350
document = xml.dom.minidom.parseString(xmlstring)
1352
for if_tag in document.getElementsByTagName("interface"):
1353
# Add annotation tags
1354
for typ in ("method", "signal"):
1355
for tag in if_tag.getElementsByTagName(typ):
1357
for name, prop in (self.
1358
_get_all_dbus_things(typ)):
1359
if (name == tag.getAttribute("name")
1360
and prop._dbus_interface
1361
== if_tag.getAttribute("name")):
1362
annots.update(getattr(
1363
prop, "_dbus_annotations", {}))
1364
for name, value in annots.items():
1365
ann_tag = document.createElement(
1367
ann_tag.setAttribute("name", name)
1368
ann_tag.setAttribute("value", value)
1369
tag.appendChild(ann_tag)
1370
# Add interface annotation tags
1371
for annotation, value in dict(
1372
itertools.chain.from_iterable(
1373
annotations().items()
1374
for name, annotations
1375
in self._get_all_dbus_things("interface")
1376
if name == if_tag.getAttribute("name")
1378
ann_tag = document.createElement("annotation")
1379
ann_tag.setAttribute("name", annotation)
1380
ann_tag.setAttribute("value", value)
1381
if_tag.appendChild(ann_tag)
1382
# Fix argument name for the Introspect method itself
1383
if (if_tag.getAttribute("name")
1384
== dbus.INTROSPECTABLE_IFACE):
1385
for cn in if_tag.getElementsByTagName("method"):
1386
if cn.getAttribute("name") == "Introspect":
1387
for arg in cn.getElementsByTagName("arg"):
1388
if (arg.getAttribute("direction")
1390
arg.setAttribute("name",
1392
xmlstring = document.toxml("utf-8")
1394
except (AttributeError, xml.dom.DOMException,
1395
xml.parsers.expat.ExpatError) as error:
1396
logger.error("Failed to override Introspection method",
1401
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1402
"""A D-Bus object with properties.
1404
Classes inheriting from this can use the dbus_service_property
1405
decorator to expose methods as D-Bus properties. It exposes the
1406
standard Get(), Set(), and GetAll() methods on the D-Bus.
863
1409
def _get_dbus_property(self, interface_name, property_name):
864
1410
"""Returns a bound method if one exists which is a D-Bus
865
1411
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"))):
1413
for cls in self.__class__.__mro__:
1414
for name, value in inspect.getmembers(
1415
cls, self._is_dbus_thing("property")):
871
1416
if (value._dbus_name == property_name
872
1417
and value._dbus_interface == interface_name):
873
1418
return value.__get__(self)
875
1420
# No such property
876
raise DBusPropertyNotFound(self.dbus_object_path + ":"
877
+ interface_name + "."
880
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1421
raise DBusPropertyNotFound("{}:{}.{}".format(
1422
self.dbus_object_path, interface_name, property_name))
1425
def _get_all_interface_names(cls):
1426
"""Get a sequence of all interfaces supported by an object"""
1427
return (name for name in set(getattr(getattr(x, attr),
1428
"_dbus_interface", None)
1429
for x in (inspect.getmro(cls))
1431
if name is not None)
1433
@dbus.service.method(dbus.PROPERTIES_IFACE,
881
1435
out_signature="v")
882
1436
def Get(self, interface_name, property_name):
883
1437
"""Standard D-Bus property Get() method, see D-Bus standard.
1013
1565
return xmlstring
1016
def datetime_to_dbus (dt, variant_level=0):
1569
dbus.OBJECT_MANAGER_IFACE
1570
except AttributeError:
1571
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1574
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1575
"""A D-Bus object with an ObjectManager.
1577
Classes inheriting from this exposes the standard
1578
GetManagedObjects call and the InterfacesAdded and
1579
InterfacesRemoved signals on the standard
1580
"org.freedesktop.DBus.ObjectManager" interface.
1582
Note: No signals are sent automatically; they must be sent
1585
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1586
out_signature="a{oa{sa{sv}}}")
1587
def GetManagedObjects(self):
1588
"""This function must be overridden"""
1589
raise NotImplementedError()
1591
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1592
signature="oa{sa{sv}}")
1593
def InterfacesAdded(self, object_path, interfaces_and_properties):
1596
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1597
def InterfacesRemoved(self, object_path, interfaces):
1600
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1602
path_keyword="object_path",
1603
connection_keyword="connection")
1604
def Introspect(self, object_path, connection):
1605
"""Overloading of standard D-Bus method.
1607
Override return argument name of GetManagedObjects to be
1608
"objpath_interfaces_and_properties"
1610
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1614
document = xml.dom.minidom.parseString(xmlstring)
1616
for if_tag in document.getElementsByTagName("interface"):
1617
# Fix argument name for the GetManagedObjects method
1618
if (if_tag.getAttribute("name")
1619
== dbus.OBJECT_MANAGER_IFACE):
1620
for cn in if_tag.getElementsByTagName("method"):
1621
if (cn.getAttribute("name")
1622
== "GetManagedObjects"):
1623
for arg in cn.getElementsByTagName("arg"):
1624
if (arg.getAttribute("direction")
1628
"objpath_interfaces"
1630
xmlstring = document.toxml("utf-8")
1632
except (AttributeError, xml.dom.DOMException,
1633
xml.parsers.expat.ExpatError) as error:
1634
logger.error("Failed to override Introspection method",
1639
def datetime_to_dbus(dt, variant_level=0):
1017
1640
"""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.
1642
return dbus.String("", variant_level=variant_level)
1643
return dbus.String(dt.isoformat(), variant_level=variant_level)
1646
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1647
"""A class decorator; applied to a subclass of
1648
dbus.service.Object, it will add alternate D-Bus attributes with
1649
interface names according to the "alt_interface_names" mapping.
1652
@alternate_dbus_interfaces({"org.example.Interface":
1653
"net.example.AlternateInterface"})
1654
class SampleDBusObject(dbus.service.Object):
1655
@dbus.service.method("org.example.Interface")
1656
def SampleDBusMethod():
1659
The above "SampleDBusMethod" on "SampleDBusObject" will be
1660
reachable via two interfaces: "org.example.Interface" and
1661
"net.example.AlternateInterface", the latter of which will have
1662
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1663
"true", unless "deprecate" is passed with a False value.
1665
This works for methods and signals, and also for D-Bus properties
1666
(from DBusObjectWithProperties) and interfaces (from the
1667
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):
1671
for orig_interface_name, alt_interface_name in (
1672
alt_interface_names.items()):
1674
interface_names = set()
1675
# Go though all attributes of the class
1676
for attrname, attribute in inspect.getmembers(cls):
1037
1677
# Ignore non-D-Bus attributes, and D-Bus attributes
1038
1678
# with the wrong interface name
1039
1679
if (not hasattr(attribute, "_dbus_interface")
1040
or not attribute._dbus_interface
1041
.startswith("se.recompile.Mandos")):
1680
or not attribute._dbus_interface.startswith(
1681
orig_interface_name)):
1043
1683
# Create an alternate D-Bus interface name based on
1044
1684
# 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)
1685
alt_interface = attribute._dbus_interface.replace(
1686
orig_interface_name, alt_interface_name)
1687
interface_names.add(alt_interface)
1050
1688
# Is this a D-Bus signal?
1051
1689
if getattr(attribute, "_dbus_is_signal", False):
1052
# Extract the original non-method function by
1054
nonmethod_func = (dict(
1690
# Extract the original non-method undecorated
1691
# function by black magic
1692
if sys.version_info.major == 2:
1693
nonmethod_func = (dict(
1055
1694
zip(attribute.func_code.co_freevars,
1056
attribute.__closure__))["func"]
1695
attribute.__closure__))
1696
["func"].cell_contents)
1698
nonmethod_func = (dict(
1699
zip(attribute.__code__.co_freevars,
1700
attribute.__closure__))
1701
["func"].cell_contents)
1058
1702
# Create a new, but exactly alike, function
1059
1703
# object, and decorate it to be a new D-Bus signal
1060
1704
# 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)))
1705
new_function = copy_function(nonmethod_func)
1706
new_function = (dbus.service.signal(
1708
attribute._dbus_signature)(new_function))
1070
1709
# Copy annotations, if any
1072
new_function._dbus_annotations = (
1073
dict(attribute._dbus_annotations))
1711
new_function._dbus_annotations = dict(
1712
attribute._dbus_annotations)
1074
1713
except AttributeError:
1076
1716
# 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
1717
# original and alternate functions, so both the
1718
# original and alternate signals gets sent when
1719
# the function is called
1079
1720
def fixscope(func1, func2):
1080
1721
"""This function is a scope container to pass
1081
1722
func1 and func2 to the "call_both" function
1082
1723
outside of its arguments"""
1725
@functools.wraps(func2)
1083
1726
def call_both(*args, **kwargs):
1084
1727
"""This function will emit two D-Bus
1085
1728
signals by calling func1 and func2"""
1086
1729
func1(*args, **kwargs)
1087
1730
func2(*args, **kwargs)
1731
# Make wrapper function look like a D-Bus
1733
for name, attr in inspect.getmembers(func2):
1734
if name.startswith("_dbus_"):
1735
setattr(call_both, name, attr)
1088
1737
return call_both
1089
1738
# Create the "call_both" function and add it to
1091
attr[attrname] = fixscope(attribute,
1740
attr[attrname] = fixscope(attribute, new_function)
1093
1741
# Is this a D-Bus method?
1094
1742
elif getattr(attribute, "_dbus_is_method", False):
1095
1743
# Create a new, but exactly alike, function
1096
1744
# object. Decorate it to be a new D-Bus method
1097
1745
# with the alternate D-Bus interface name. Add it
1098
1746
# 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)))
1748
dbus.service.method(
1750
attribute._dbus_in_signature,
1751
attribute._dbus_out_signature)
1752
(copy_function(attribute)))
1109
1753
# Copy annotations, if any
1111
attr[attrname]._dbus_annotations = (
1112
dict(attribute._dbus_annotations))
1755
attr[attrname]._dbus_annotations = dict(
1756
attribute._dbus_annotations)
1113
1757
except AttributeError:
1115
1759
# Is this a D-Bus property?
1143
1780
# object. Decorate it to be a new D-Bus interface
1144
1781
# with the alternate D-Bus interface name. Add it
1145
1782
# 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)
1784
dbus_interface_annotations(alt_interface)
1785
(copy_function(attribute)))
1787
# Deprecate all alternate interfaces
1788
iname = "_AlternateDBusNames_interface_annotation{}"
1789
for interface_name in interface_names:
1791
@dbus_interface_annotations(interface_name)
1793
return {"org.freedesktop.DBus.Deprecated":
1795
# Find an unused name
1796
for aname in (iname.format(i)
1797
for i in itertools.count()):
1798
if aname not in attr:
1802
# Replace the class with a new subclass of it with
1803
# methods, signals, etc. as created above.
1804
if sys.version_info.major == 2:
1805
cls = type(b"{}Alternate".format(cls.__name__),
1808
cls = type("{}Alternate".format(cls.__name__),
1815
@alternate_dbus_interfaces({"se.recompile.Mandos":
1816
"se.bsnet.fukt.Mandos"})
1168
1817
class ClientDBus(Client, DBusObjectWithProperties):
1169
1818
"""A Client class using D-Bus
1172
1821
dbus_object_path: dbus.ObjectPath
1173
1822
bus: dbus.SystemBus()
1176
1825
runtime_expansions = (Client.runtime_expansions
1177
+ ("dbus_object_path",))
1826
+ ("dbus_object_path", ))
1828
_interface = "se.recompile.Mandos.Client"
1179
1830
# dbus.service.Object doesn't use super(), so we can't either.
1181
def __init__(self, bus = None, *args, **kwargs):
1832
def __init__(self, bus=None, *args, **kwargs):
1183
1834
Client.__init__(self, *args, **kwargs)
1184
1835
# Only now, when this client is initialized, can it show up on
1186
client_object_name = unicode(self.name).translate(
1837
client_object_name = str(self.name).translate(
1187
1838
{ord("."): ord("_"),
1188
1839
ord("-"): ord("_")})
1189
self.dbus_object_path = (dbus.ObjectPath
1190
("/clients/" + client_object_name))
1840
self.dbus_object_path = dbus.ObjectPath(
1841
"/clients/" + client_object_name)
1191
1842
DBusObjectWithProperties.__init__(self, self.bus,
1192
1843
self.dbus_object_path)
1194
def notifychangeproperty(transform_func,
1195
dbus_name, type_func=lambda x: x,
1845
def notifychangeproperty(transform_func, dbus_name,
1846
type_func=lambda x: x,
1848
invalidate_only=False,
1849
_interface=_interface):
1197
1850
""" Modify a variable so that it's a property which announces
1198
1851
its changes to DBus.
1200
1853
transform_fun: Function that takes a value and a variant_level
1201
1854
and transforms it to a D-Bus type.
1202
1855
dbus_name: D-Bus name of the variable
1350
2007
server to mandos-client
1354
2011
# Rejected - signal
1355
2012
@dbus.service.signal(_interface, signature="s")
1356
2013
def Rejected(self, reason):
1360
2017
# NeedApproval - signal
1361
2018
@dbus.service.signal(_interface, signature="tb")
1362
2019
def NeedApproval(self, timeout, default):
1364
2021
return self.need_approval()
1368
2025
# Approve - method
1369
2026
@dbus.service.method(_interface, in_signature="b")
1370
2027
def Approve(self, value):
1371
2028
self.approve(value)
1373
2030
# CheckedOK - method
1374
2031
@dbus.service.method(_interface)
1375
2032
def CheckedOK(self):
1376
2033
self.checked_ok()
1378
2035
# Enable - method
2036
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1379
2037
@dbus.service.method(_interface)
1380
2038
def Enable(self):
1384
2042
# StartChecker - method
2043
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1385
2044
@dbus.service.method(_interface)
1386
2045
def StartChecker(self):
1388
2047
self.start_checker()
1390
2049
# Disable - method
2050
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1391
2051
@dbus.service.method(_interface)
1392
2052
def Disable(self):
1396
2056
# StopChecker - method
2057
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
2058
@dbus.service.method(_interface)
1398
2059
def StopChecker(self):
1399
2060
self.stop_checker()
1403
2064
# ApprovalPending - property
1404
2065
@dbus_service_property(_interface, signature="b", access="read")
1405
2066
def ApprovalPending_dbus_property(self):
1406
2067
return dbus.Boolean(bool(self.approvals_pending))
1408
2069
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
2070
@dbus_service_property(_interface,
1410
2072
access="readwrite")
1411
2073
def ApprovedByDefault_dbus_property(self, value=None):
1412
2074
if value is None: # get
1413
2075
return dbus.Boolean(self.approved_by_default)
1414
2076
self.approved_by_default = bool(value)
1416
2078
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
2079
@dbus_service_property(_interface,
1418
2081
access="readwrite")
1419
2082
def ApprovalDelay_dbus_property(self, value=None):
1420
2083
if value is None: # get
1421
return dbus.UInt64(self.approval_delay_milliseconds())
2084
return dbus.UInt64(self.approval_delay.total_seconds()
1422
2086
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1424
2088
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
2089
@dbus_service_property(_interface,
1426
2091
access="readwrite")
1427
2092
def ApprovalDuration_dbus_property(self, value=None):
1428
2093
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
2094
return dbus.UInt64(self.approval_duration.total_seconds()
1431
2096
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1433
2098
# Name - property
2100
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1434
2101
@dbus_service_property(_interface, signature="s", access="read")
1435
2102
def Name_dbus_property(self):
1436
2103
return dbus.String(self.name)
2107
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2108
@dbus_service_property(_interface, signature="s", access="read")
2109
def KeyID_dbus_property(self):
2110
return dbus.String(self.key_id)
1438
2112
# Fingerprint - property
2114
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1439
2115
@dbus_service_property(_interface, signature="s", access="read")
1440
2116
def Fingerprint_dbus_property(self):
1441
2117
return dbus.String(self.fingerprint)
1443
2119
# Host - property
1444
@dbus_service_property(_interface, signature="s",
2120
@dbus_service_property(_interface,
1445
2122
access="readwrite")
1446
2123
def Host_dbus_property(self, value=None):
1447
2124
if value is None: # get
1448
2125
return dbus.String(self.host)
1449
self.host = unicode(value)
2126
self.host = str(value)
1451
2128
# Created - property
2130
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1452
2131
@dbus_service_property(_interface, signature="s", access="read")
1453
2132
def Created_dbus_property(self):
1454
2133
return datetime_to_dbus(self.created)
1456
2135
# LastEnabled - property
1457
2136
@dbus_service_property(_interface, signature="s", access="read")
1458
2137
def LastEnabled_dbus_property(self):
1459
2138
return datetime_to_dbus(self.last_enabled)
1461
2140
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
2141
@dbus_service_property(_interface,
1463
2143
access="readwrite")
1464
2144
def Enabled_dbus_property(self, value=None):
1465
2145
if value is None: # get
1472
2152
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
2153
@dbus_service_property(_interface,
1474
2155
access="readwrite")
1475
2156
def LastCheckedOK_dbus_property(self, value=None):
1476
2157
if value is not None:
1477
2158
self.checked_ok()
1479
2160
return datetime_to_dbus(self.last_checked_ok)
1481
2162
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
2163
@dbus_service_property(_interface, signature="n", access="read")
1484
2164
def LastCheckerStatus_dbus_property(self):
1485
2165
return dbus.Int16(self.last_checker_status)
1487
2167
# Expires - property
1488
2168
@dbus_service_property(_interface, signature="s", access="read")
1489
2169
def Expires_dbus_property(self):
1490
2170
return datetime_to_dbus(self.expires)
1492
2172
# LastApprovalRequest - property
1493
2173
@dbus_service_property(_interface, signature="s", access="read")
1494
2174
def LastApprovalRequest_dbus_property(self):
1495
2175
return datetime_to_dbus(self.last_approval_request)
1497
2177
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
2178
@dbus_service_property(_interface,
1499
2180
access="readwrite")
1500
2181
def Timeout_dbus_property(self, value=None):
1501
2182
if value is None: # get
1502
return dbus.UInt64(self.timeout_milliseconds())
2183
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2184
old_timeout = self.timeout
1503
2185
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
2186
# Reschedule disabling
1505
2187
if self.enabled:
1506
2188
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:
2189
self.expires += self.timeout - old_timeout
2190
if self.expires <= now:
1510
2191
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
2194
if (getattr(self, "disable_initiator_tag", None)
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
2197
GLib.source_remove(self.disable_initiator_tag)
2198
self.disable_initiator_tag = GLib.timeout_add(
2199
int((self.expires - now).total_seconds() * 1000),
1524
2202
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
2203
@dbus_service_property(_interface,
1526
2205
access="readwrite")
1527
2206
def ExtendedTimeout_dbus_property(self, value=None):
1528
2207
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
2208
return dbus.UInt64(self.extended_timeout.total_seconds()
1530
2210
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1532
2212
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
2213
@dbus_service_property(_interface,
1534
2215
access="readwrite")
1535
2216
def Interval_dbus_property(self, value=None):
1536
2217
if value is None: # get
1537
return dbus.UInt64(self.interval_milliseconds())
2218
return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
2219
self.interval = datetime.timedelta(0, 0, 0, value)
1539
2220
if getattr(self, "checker_initiator_tag", None) is None:
1541
2222
if self.enabled:
1542
2223
# 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
2224
GLib.source_remove(self.checker_initiator_tag)
2225
self.checker_initiator_tag = GLib.timeout_add(
2226
value, self.start_checker)
2227
self.start_checker() # Start one now, too
1548
2229
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
2230
@dbus_service_property(_interface,
1550
2232
access="readwrite")
1551
2233
def Checker_dbus_property(self, value=None):
1552
2234
if value is None: # get
1553
2235
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
2236
self.checker_command = str(value)
1556
2238
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
2239
@dbus_service_property(_interface,
1558
2241
access="readwrite")
1559
2242
def CheckerRunning_dbus_property(self, value=None):
1560
2243
if value is None: # get
1563
2246
self.start_checker()
1565
2248
self.stop_checker()
1567
2250
# ObjectPath - property
2252
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2253
"org.freedesktop.DBus.Deprecated": "true"})
1568
2254
@dbus_service_property(_interface, signature="o", access="read")
1569
2255
def ObjectPath_dbus_property(self):
1570
return self.dbus_object_path # is already a dbus.ObjectPath
2256
return self.dbus_object_path # is already a dbus.ObjectPath
1572
2258
# Secret = property
1573
@dbus_service_property(_interface, signature="ay",
1574
access="write", byte_arrays=True)
2260
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2262
@dbus_service_property(_interface,
1575
2266
def Secret_dbus_property(self, value):
1576
self.secret = str(value)
2267
self.secret = bytes(value)
1581
class ProxyClient(object):
1582
def __init__(self, child_pipe, fpr, address):
2273
def __init__(self, child_pipe, key_id, fpr, address):
1583
2274
self._pipe = child_pipe
1584
self._pipe.send(('init', fpr, address))
2275
self._pipe.send(("init", key_id, fpr, address))
1585
2276
if not self._pipe.recv():
2277
raise KeyError(key_id or fpr)
1588
2279
def __getattribute__(self, name):
1590
2281
return super(ProxyClient, self).__getattribute__(name)
1591
self._pipe.send(('getattr', name))
2282
self._pipe.send(("getattr", name))
1592
2283
data = self._pipe.recv()
1593
if data[0] == 'data':
2284
if data[0] == "data":
1595
if data[0] == 'function':
2286
if data[0] == "function":
1596
2288
def func(*args, **kwargs):
1597
self._pipe.send(('funcall', name, args, kwargs))
2289
self._pipe.send(("funcall", name, args, kwargs))
1598
2290
return self._pipe.recv()[1]
1601
2294
def __setattr__(self, name, value):
1603
2296
return super(ProxyClient, self).__setattr__(name, value)
1604
self._pipe.send(('setattr', name, value))
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
2297
self._pipe.send(("setattr", name, value))
1611
2300
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
2301
"""A class to handle client connections.
1614
2303
Instantiated once for each connection to handle it.
1615
2304
Note: This will run in its own forked process."""
1617
2306
def handle(self):
1618
2307
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
2308
logger.info("TCP connection from: %s",
1620
unicode(self.client_address))
2309
str(self.client_address))
1621
2310
logger.debug("Pipe FD: %d",
1622
2311
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",
2313
session = gnutls.ClientSession(self.request)
2315
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2316
# "+AES-256-CBC", "+SHA1",
2317
# "+COMP-NULL", "+CTYPE-OPENPGP",
1638
2319
# Use a fallback default, since this MUST be set.
1639
2320
priority = self.server.gnutls_priority
1640
2321
if priority is None:
1641
2322
priority = "NORMAL"
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
2323
gnutls.priority_set_direct(session,
2324
priority.encode("utf-8"), None)
1646
2326
# Start communication using the Mandos protocol
1647
2327
# Get protocol number
1648
2328
line = self.request.makefile().readline()
1649
2329
logger.debug("Protocol version: %r", line)
1651
2331
if int(line.strip().split()[0]) > 1:
2332
raise RuntimeError(line)
1653
2333
except (ValueError, IndexError, RuntimeError) as error:
1654
2334
logger.error("Unknown protocol version: %s", error)
1657
2337
# Start GnuTLS connection
1659
2339
session.handshake()
1660
except gnutls.errors.GNUTLSError as error:
2340
except gnutls.Error as error:
1661
2341
logger.warning("Handshake failed: %s", error)
1662
2342
# Do not run session.bye() here: the session is not
1663
2343
# established. Just abandon the request.
1665
2345
logger.debug("Handshake succeeded")
1667
2347
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,
2349
if gnutls.has_rawpk:
2352
key_id = self.key_id(
2353
self.peer_certificate(session))
2354
except (TypeError, gnutls.Error) as error:
2355
logger.warning("Bad certificate: %s", error)
2357
logger.debug("Key ID: %s",
2358
key_id.decode("utf-8",
2364
fpr = self.fingerprint(
2365
self.peer_certificate(session))
2366
except (TypeError, gnutls.Error) as error:
2367
logger.warning("Bad certificate: %s", error)
2369
logger.debug("Fingerprint: %s", fpr)
2372
client = ProxyClient(child_pipe, key_id, fpr,
1680
2373
self.client_address)
1681
2374
except KeyError:
1684
2377
if client.approval_delay:
1685
2378
delay = client.approval_delay
1686
2379
client.approvals_pending += 1
1687
2380
approval_required = True
1690
2383
if not client.enabled:
1691
2384
logger.info("Client %s is disabled",
1693
2386
if self.server.use_dbus:
1694
2387
# Emit D-Bus signal
1695
2388
client.Rejected("Disabled")
1698
2391
if client.approved or not client.approval_delay:
1699
#We are approved or approval is disabled
2392
# We are approved or approval is disabled
1701
2394
elif client.approved is None:
1702
2395
logger.info("Client %s needs approval",
1737
2428
delay -= time2 - time
1740
while sent_size < len(client.secret):
1742
sent = session.send(client.secret[sent_size:])
1743
except gnutls.errors.GNUTLSError as error:
1744
logger.warning("gnutls send failed")
1746
logger.debug("Sent: %d, remaining: %d",
1747
sent, len(client.secret)
1748
- (sent_size + sent))
2431
session.send(client.secret)
2432
except gnutls.Error as error:
2433
logger.warning("gnutls send failed",
1751
2437
logger.info("Sending secret to %s", client.name)
1752
2438
# bump the timeout using extended_timeout
1753
2439
client.bump_timeout(client.extended_timeout)
1754
2440
if self.server.use_dbus:
1755
2441
# Emit D-Bus signal
1756
2442
client.GotSecret()
1759
2445
if approval_required:
1760
2446
client.approvals_pending -= 1
1763
except gnutls.errors.GNUTLSError as error:
1764
logger.warning("GnuTLS bye failed")
2449
except gnutls.Error as error:
2450
logger.warning("GnuTLS bye failed",
1767
2454
def peer_certificate(session):
1768
"Return the peer's OpenPGP certificate as a bytestring"
1769
# If not an OpenPGP certificate...
1770
if (gnutls.library.functions
1771
.gnutls_certificate_type_get(session._c_object)
1772
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1773
# ...do the normal thing
1774
return session.peer_certificate
2455
"Return the peer's certificate as a bytestring"
2457
cert_type = gnutls.certificate_type_get2(
2458
session, gnutls.CTYPE_PEERS)
2459
except AttributeError:
2460
cert_type = gnutls.certificate_type_get(session)
2461
if gnutls.has_rawpk:
2462
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2464
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2465
# If not a valid certificate type...
2466
if cert_type not in valid_cert_types:
2467
logger.info("Cert type %r not in %r", cert_type,
2469
# ...return invalid data
1775
2471
list_size = ctypes.c_uint(1)
1776
cert_list = (gnutls.library.functions
1777
.gnutls_certificate_get_peers
1778
(session._c_object, ctypes.byref(list_size)))
2472
cert_list = (gnutls.certificate_get_peers
2473
(session, ctypes.byref(list_size)))
1779
2474
if not bool(cert_list) and list_size.value != 0:
1780
raise gnutls.errors.GNUTLSError("error getting peer"
2475
raise gnutls.Error("error getting peer certificate")
1782
2476
if list_size.value == 0:
1784
2478
cert = cert_list[0]
1785
2479
return ctypes.string_at(cert.data, cert.size)
2482
def key_id(certificate):
2483
"Convert a certificate bytestring to a hexdigit key ID"
2484
# New GnuTLS "datum" with the public key
2485
datum = gnutls.datum_t(
2486
ctypes.cast(ctypes.c_char_p(certificate),
2487
ctypes.POINTER(ctypes.c_ubyte)),
2488
ctypes.c_uint(len(certificate)))
2489
# XXX all these need to be created in the gnutls "module"
2490
# New empty GnuTLS certificate
2491
pubkey = gnutls.pubkey_t()
2492
gnutls.pubkey_init(ctypes.byref(pubkey))
2493
# Import the raw public key into the certificate
2494
gnutls.pubkey_import(pubkey,
2495
ctypes.byref(datum),
2496
gnutls.X509_FMT_DER)
2497
# New buffer for the key ID
2498
buf = ctypes.create_string_buffer(32)
2499
buf_len = ctypes.c_size_t(len(buf))
2500
# Get the key ID from the raw public key into the buffer
2501
gnutls.pubkey_get_key_id(
2503
gnutls.KEYID_USE_SHA256,
2504
ctypes.cast(ctypes.byref(buf),
2505
ctypes.POINTER(ctypes.c_ubyte)),
2506
ctypes.byref(buf_len))
2507
# Deinit the certificate
2508
gnutls.pubkey_deinit(pubkey)
2510
# Convert the buffer to a Python bytestring
2511
key_id = ctypes.string_at(buf, buf_len.value)
2512
# Convert the bytestring to hexadecimal notation
2513
hex_key_id = binascii.hexlify(key_id).upper()
1788
2517
def fingerprint(openpgp):
1789
2518
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1790
2519
# New GnuTLS "datum" with the OpenPGP public key
1791
datum = (gnutls.library.types
1792
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1795
ctypes.c_uint(len(openpgp))))
2520
datum = gnutls.datum_t(
2521
ctypes.cast(ctypes.c_char_p(openpgp),
2522
ctypes.POINTER(ctypes.c_ubyte)),
2523
ctypes.c_uint(len(openpgp)))
1796
2524
# New empty GnuTLS certificate
1797
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1798
(gnutls.library.functions
1799
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2525
crt = gnutls.openpgp_crt_t()
2526
gnutls.openpgp_crt_init(ctypes.byref(crt))
1800
2527
# Import the OpenPGP public key into the certificate
1801
(gnutls.library.functions
1802
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1803
gnutls.library.constants
1804
.GNUTLS_OPENPGP_FMT_RAW))
2528
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2529
gnutls.OPENPGP_FMT_RAW)
1805
2530
# Verify the self signature in the key
1806
2531
crtverify = ctypes.c_uint()
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
2532
gnutls.openpgp_crt_verify_self(crt, 0,
2533
ctypes.byref(crtverify))
1810
2534
if crtverify.value != 0:
1811
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
raise (gnutls.errors.CertificateSecurityError
2535
gnutls.openpgp_crt_deinit(crt)
2536
raise gnutls.CertificateSecurityError(code
1814
2538
# New buffer for the fingerprint
1815
2539
buf = ctypes.create_string_buffer(20)
1816
2540
buf_len = ctypes.c_size_t()
1817
2541
# Get the fingerprint from the certificate into the buffer
1818
(gnutls.library.functions
1819
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1820
ctypes.byref(buf_len)))
2542
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2543
ctypes.byref(buf_len))
1821
2544
# Deinit the certificate
1822
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2545
gnutls.openpgp_crt_deinit(crt)
1823
2546
# Convert the buffer to a Python bytestring
1824
2547
fpr = ctypes.string_at(buf, buf_len.value)
1825
2548
# Convert the bytestring to hexadecimal notation
1830
class MultiprocessingMixIn(object):
2553
class MultiprocessingMixIn:
1831
2554
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1832
2556
def sub_process_main(self, request, address):
1834
2558
self.finish_request(request, address)
1835
2559
except Exception:
1836
2560
self.handle_error(request, address)
1837
2561
self.close_request(request)
1839
2563
def process_request(self, request, address):
1840
2564
"""Start a new process to process the request."""
1841
proc = multiprocessing.Process(target = self.sub_process_main,
2565
proc = multiprocessing.Process(target=self.sub_process_main,
2566
args=(request, address))
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2571
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1849
2572
""" adds a pipe to the MixIn """
1850
2574
def process_request(self, request, client_address):
1851
2575
"""Overrides and wraps the original process_request().
1853
2577
This function creates a new pipe in self.pipe
1855
2579
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1857
2581
proc = MultiprocessingMixIn.process_request(self, request,
1858
2582
client_address)
1859
2583
self.child_pipe.close()
1860
2584
self.add_pipe(parent_pipe, proc)
1862
2586
def add_pipe(self, parent_pipe, proc):
1863
2587
"""Dummy function; override as necessary"""
1864
raise NotImplementedError
2588
raise NotImplementedError()
1867
2591
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1868
socketserver.TCPServer, object):
1869
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2592
socketserver.TCPServer):
2593
"""IPv6-capable TCP server. Accepts None as address and/or port
1872
2596
enabled: Boolean; whether this server is activated yet
1873
2597
interface: None or a network interface name (string)
1874
2598
use_ipv6: Boolean; to use IPv6 or not
1876
2601
def __init__(self, server_address, RequestHandlerClass,
1877
interface=None, use_ipv6=True):
2605
"""If socketfd is set, use that file descriptor instead of
2606
creating a new one with socket.socket().
1878
2608
self.interface = interface
1880
2610
self.address_family = socket.AF_INET6
2611
if socketfd is not None:
2612
# Save the file descriptor
2613
self.socketfd = socketfd
2614
# Save the original socket.socket() function
2615
self.socket_socket = socket.socket
2617
# To implement --socket, we monkey patch socket.socket.
2619
# (When socketserver.TCPServer is a new-style class, we
2620
# could make self.socket into a property instead of monkey
2621
# patching socket.socket.)
2623
# Create a one-time-only replacement for socket.socket()
2624
@functools.wraps(socket.socket)
2625
def socket_wrapper(*args, **kwargs):
2626
# Restore original function so subsequent calls are
2628
socket.socket = self.socket_socket
2629
del self.socket_socket
2630
# This time only, return a new socket object from the
2631
# saved file descriptor.
2632
return socket.fromfd(self.socketfd, *args, **kwargs)
2633
# Replace socket.socket() function with wrapper
2634
socket.socket = socket_wrapper
2635
# The socketserver.TCPServer.__init__ will call
2636
# socket.socket(), which might be our replacement,
2637
# socket_wrapper(), if socketfd was set.
1881
2638
socketserver.TCPServer.__init__(self, server_address,
1882
2639
RequestHandlerClass)
1883
2641
def server_bind(self):
1884
2642
"""This overrides the normal server_bind() function
1885
2643
to bind to an interface if one was specified, and also NOT to
1886
2644
bind to an address or port if they were not specified."""
2645
global SO_BINDTODEVICE
1887
2646
if self.interface is not None:
1888
2647
if SO_BINDTODEVICE is None:
1889
logger.error("SO_BINDTODEVICE does not exist;"
1890
" cannot bind to interface %s",
1894
self.socket.setsockopt(socket.SOL_SOCKET,
1898
except socket.error as error:
1899
if error[0] == errno.EPERM:
1900
logger.error("No permission to"
1901
" bind to interface %s",
1903
elif error[0] == errno.ENOPROTOOPT:
1904
logger.error("SO_BINDTODEVICE not available;"
1905
" cannot bind to interface %s",
2648
# Fall back to a hard-coded value which seems to be
2650
logger.warning("SO_BINDTODEVICE not found, trying 25")
2651
SO_BINDTODEVICE = 25
2653
self.socket.setsockopt(
2654
socket.SOL_SOCKET, SO_BINDTODEVICE,
2655
(self.interface + "\0").encode("utf-8"))
2656
except socket.error as error:
2657
if error.errno == errno.EPERM:
2658
logger.error("No permission to bind to"
2659
" interface %s", self.interface)
2660
elif error.errno == errno.ENOPROTOOPT:
2661
logger.error("SO_BINDTODEVICE not available;"
2662
" cannot bind to interface %s",
2664
elif error.errno == errno.ENODEV:
2665
logger.error("Interface %s does not exist,"
2666
" cannot bind", self.interface)
1909
2669
# Only bind(2) the socket if we really need to.
1910
2670
if self.server_address[0] or self.server_address[1]:
2671
if self.server_address[1]:
2672
self.allow_reuse_address = True
1911
2673
if not self.server_address[0]:
1912
2674
if self.address_family == socket.AF_INET6:
1913
any_address = "::" # in6addr_any
2675
any_address = "::" # in6addr_any
1915
any_address = socket.INADDR_ANY
2677
any_address = "0.0.0.0" # INADDR_ANY
1916
2678
self.server_address = (any_address,
1917
2679
self.server_address[1])
1918
2680
elif not self.server_address[1]:
1919
self.server_address = (self.server_address[0],
2681
self.server_address = (self.server_address[0], 0)
1921
2682
# if self.interface:
1922
2683
# self.server_address = (self.server_address[0],
1948
2714
self.gnutls_priority = gnutls_priority
1949
2715
IPv6_TCPServer.__init__(self, server_address,
1950
2716
RequestHandlerClass,
1951
interface = interface,
1952
use_ipv6 = use_ipv6)
2717
interface=interface,
1953
2721
def server_activate(self):
1954
2722
if self.enabled:
1955
2723
return socketserver.TCPServer.server_activate(self)
1957
2725
def enable(self):
1958
2726
self.enabled = True
1960
2728
def add_pipe(self, parent_pipe, proc):
1961
2729
# Call "handle_ipc" for both data and EOF events
1962
gobject.io_add_watch(parent_pipe.fileno(),
1963
gobject.IO_IN | gobject.IO_HUP,
1964
functools.partial(self.handle_ipc,
1969
def handle_ipc(self, source, condition, parent_pipe=None,
1970
proc = None, client_object=None):
1972
gobject.IO_IN: "IN", # There is data to read.
1973
gobject.IO_OUT: "OUT", # Data can be written (without
1975
gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
gobject.IO_ERR: "ERR", # Error condition.
1977
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1978
# broken, usually for pipes and
1981
conditions_string = ' | '.join(name
1983
condition_names.iteritems()
1984
if cond & condition)
2731
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2732
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2733
functools.partial(self.handle_ipc,
2734
parent_pipe=parent_pipe,
2737
def handle_ipc(self, source, condition,
2740
client_object=None):
1985
2741
# error, or the other end of multiprocessing.Pipe has closed
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2742
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1987
2743
# Wait for other process to exit
1991
2747
# Read a request from the child
1992
2748
request = parent_pipe.recv()
1993
2749
command = request[0]
1995
if command == 'init':
1997
address = request[2]
1999
for c in self.clients.itervalues():
2000
if c.fingerprint == fpr:
2751
if command == "init":
2752
key_id = request[1].decode("ascii")
2753
fpr = request[2].decode("ascii")
2754
address = request[3]
2756
for c in self.clients.values():
2757
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2758
"27AE41E4649B934CA495991B7852B855"):
2760
if key_id and c.key_id == key_id:
2763
if fpr and c.fingerprint == fpr:
2004
logger.info("Client not found for fingerprint: %s, ad"
2005
"dress: %s", fpr, address)
2767
logger.info("Client not found for key ID: %s, address"
2768
": %s", key_id or fpr, address)
2006
2769
if self.use_dbus:
2007
2770
# Emit D-Bus signal
2008
mandos_dbus_service.ClientNotFound(fpr,
2771
mandos_dbus_service.ClientNotFound(key_id or fpr,
2010
2773
parent_pipe.send(False)
2013
gobject.io_add_watch(parent_pipe.fileno(),
2014
gobject.IO_IN | gobject.IO_HUP,
2015
functools.partial(self.handle_ipc,
2777
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2778
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2779
functools.partial(self.handle_ipc,
2780
parent_pipe=parent_pipe,
2782
client_object=client))
2021
2783
parent_pipe.send(True)
2022
2784
# remove the old hook in favor of the new above hook on
2025
if command == 'funcall':
2787
if command == "funcall":
2026
2788
funcname = request[1]
2027
2789
args = request[2]
2028
2790
kwargs = request[3]
2030
parent_pipe.send(('data', getattr(client_object,
2792
parent_pipe.send(("data", getattr(client_object,
2031
2793
funcname)(*args,
2034
if command == 'getattr':
2796
if command == "getattr":
2035
2797
attrname = request[1]
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2798
if isinstance(client_object.__getattribute__(attrname),
2799
collections.abc.Callable):
2800
parent_pipe.send(("function", ))
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2042
if command == 'setattr':
2803
"data", client_object.__getattribute__(attrname)))
2805
if command == "setattr":
2043
2806
attrname = request[1]
2044
2807
value = request[2]
2045
2808
setattr(client_object, attrname, value)
2813
def rfc3339_duration_to_delta(duration):
2814
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2816
>>> timedelta = datetime.timedelta
2817
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2819
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2821
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2823
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2825
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2827
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2829
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2834
# Parsing an RFC 3339 duration with regular expressions is not
2835
# possible - there would have to be multiple places for the same
2836
# values, like seconds. The current code, while more esoteric, is
2837
# cleaner without depending on a parsing library. If Python had a
2838
# built-in library for parsing we would use it, but we'd like to
2839
# avoid excessive use of external libraries.
2841
# New type for defining tokens, syntax, and semantics all-in-one
2842
Token = collections.namedtuple("Token", (
2843
"regexp", # To match token; if "value" is not None, must have
2844
# a "group" containing digits
2845
"value", # datetime.timedelta or None
2846
"followers")) # Tokens valid after this token
2847
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2848
# the "duration" ABNF definition in RFC 3339, Appendix A.
2849
token_end = Token(re.compile(r"$"), None, frozenset())
2850
token_second = Token(re.compile(r"(\d+)S"),
2851
datetime.timedelta(seconds=1),
2852
frozenset((token_end, )))
2853
token_minute = Token(re.compile(r"(\d+)M"),
2854
datetime.timedelta(minutes=1),
2855
frozenset((token_second, token_end)))
2856
token_hour = Token(re.compile(r"(\d+)H"),
2857
datetime.timedelta(hours=1),
2858
frozenset((token_minute, token_end)))
2859
token_time = Token(re.compile(r"T"),
2861
frozenset((token_hour, token_minute,
2863
token_day = Token(re.compile(r"(\d+)D"),
2864
datetime.timedelta(days=1),
2865
frozenset((token_time, token_end)))
2866
token_month = Token(re.compile(r"(\d+)M"),
2867
datetime.timedelta(weeks=4),
2868
frozenset((token_day, token_end)))
2869
token_year = Token(re.compile(r"(\d+)Y"),
2870
datetime.timedelta(weeks=52),
2871
frozenset((token_month, token_end)))
2872
token_week = Token(re.compile(r"(\d+)W"),
2873
datetime.timedelta(weeks=1),
2874
frozenset((token_end, )))
2875
token_duration = Token(re.compile(r"P"), None,
2876
frozenset((token_year, token_month,
2877
token_day, token_time,
2879
# Define starting values:
2881
value = datetime.timedelta()
2883
# Following valid tokens
2884
followers = frozenset((token_duration, ))
2885
# String left to parse
2887
# Loop until end token is found
2888
while found_token is not token_end:
2889
# Search for any currently valid tokens
2890
for token in followers:
2891
match = token.regexp.match(s)
2892
if match is not None:
2894
if token.value is not None:
2895
# Value found, parse digits
2896
factor = int(match.group(1), 10)
2897
# Add to value so far
2898
value += factor * token.value
2899
# Strip token from string
2900
s = token.regexp.sub("", s, 1)
2903
# Set valid next tokens
2904
followers = found_token.followers
2907
# No currently valid tokens were found
2908
raise ValueError("Invalid RFC 3339 duration: {!r}"
2050
2914
def string_to_delta(interval):
2051
2915
"""Parse a string and return a datetime.timedelta
2053
>>> string_to_delta('7d')
2054
datetime.timedelta(7)
2055
>>> string_to_delta('60s')
2056
datetime.timedelta(0, 60)
2057
>>> string_to_delta('60m')
2058
datetime.timedelta(0, 3600)
2059
>>> string_to_delta('24h')
2060
datetime.timedelta(1)
2061
>>> string_to_delta('1w')
2062
datetime.timedelta(7)
2063
>>> string_to_delta('5m 30s')
2064
datetime.timedelta(0, 330)
2917
>>> string_to_delta("7d") == datetime.timedelta(7)
2919
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2921
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2923
>>> string_to_delta("24h") == datetime.timedelta(1)
2925
>>> string_to_delta("1w") == datetime.timedelta(7)
2927
>>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2932
return rfc3339_duration_to_delta(interval)
2066
2936
timevalue = datetime.timedelta(0)
2067
2937
for s in interval.split():
2069
suffix = unicode(s[-1])
2070
2940
value = int(s[:-1])
2071
2941
if suffix == "d":
2072
2942
delta = datetime.timedelta(value)
2145
3014
parser.add_argument("--no-dbus", action="store_false",
2146
3015
dest="use_dbus", help="Do not provide D-Bus"
2147
" system bus interface")
3016
" system bus interface", default=None)
2148
3017
parser.add_argument("--no-ipv6", action="store_false",
2149
dest="use_ipv6", help="Do not use IPv6")
3018
dest="use_ipv6", help="Do not use IPv6",
2150
3020
parser.add_argument("--no-restore", action="store_false",
2151
3021
dest="restore", help="Do not restore stored"
3022
" state", default=None)
3023
parser.add_argument("--socket", type=int,
3024
help="Specify a file descriptor to a network"
3025
" socket to use instead of creating one")
2153
3026
parser.add_argument("--statedir", metavar="DIR",
2154
3027
help="Directory to save/restore state in")
3028
parser.add_argument("--foreground", action="store_true",
3029
help="Run in foreground", default=None)
3030
parser.add_argument("--no-zeroconf", action="store_false",
3031
dest="zeroconf", help="Do not use Zeroconf",
2156
3034
options = parser.parse_args()
2163
3036
# Default values for config file for server-global settings
2164
server_defaults = { "interface": "",
2169
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2170
"servicename": "Mandos",
2175
"statedir": "/var/lib/mandos"
3037
if gnutls.has_rawpk:
3038
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3039
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3041
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3042
":+SIGN-DSA-SHA256")
3043
server_defaults = {"interface": "",
3047
"priority": priority,
3048
"servicename": "Mandos",
3054
"statedir": "/var/lib/mandos",
3055
"foreground": "False",
2178
3060
# Parse config file for server-global settings
2179
server_config = configparser.SafeConfigParser(server_defaults)
3061
server_config = configparser.ConfigParser(server_defaults)
2180
3062
del server_defaults
2181
server_config.read(os.path.join(options.configdir,
2183
# Convert the SafeConfigParser object to a dict
3063
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3064
# Convert the ConfigParser object to a dict
2184
3065
server_settings = server_config.defaults()
2185
3066
# Use the appropriate methods on the non-string config options
2186
for option in ("debug", "use_dbus", "use_ipv6"):
3067
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3068
"foreground", "zeroconf"):
2187
3069
server_settings[option] = server_config.getboolean("DEFAULT",
2189
3071
if server_settings["port"]:
2190
3072
server_settings["port"] = server_config.getint("DEFAULT",
3074
if server_settings["socket"]:
3075
server_settings["socket"] = server_config.getint("DEFAULT",
3077
# Later, stdin will, and stdout and stderr might, be dup'ed
3078
# over with an opened os.devnull. But we don't want this to
3079
# happen with a supplied network socket.
3080
if 0 <= server_settings["socket"] <= 2:
3081
server_settings["socket"] = os.dup(server_settings
2192
3083
del server_config
2194
3085
# Override the settings from the config file with command line
2195
3086
# options, if set.
2196
3087
for option in ("interface", "address", "port", "debug",
2197
"priority", "servicename", "configdir",
2198
"use_dbus", "use_ipv6", "debuglevel", "restore",
3088
"priority", "servicename", "configdir", "use_dbus",
3089
"use_ipv6", "debuglevel", "restore", "statedir",
3090
"socket", "foreground", "zeroconf"):
2200
3091
value = getattr(options, option)
2201
3092
if value is not None:
2202
3093
server_settings[option] = value
2204
3095
# Force all strings to be unicode
2205
3096
for option in server_settings.keys():
2206
if type(server_settings[option]) is str:
2207
server_settings[option] = unicode(server_settings[option])
3097
if isinstance(server_settings[option], bytes):
3098
server_settings[option] = (server_settings[option]
3100
# Force all boolean options to be boolean
3101
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3102
"foreground", "zeroconf"):
3103
server_settings[option] = bool(server_settings[option])
3104
# Debug implies foreground
3105
if server_settings["debug"]:
3106
server_settings["foreground"] = True
2208
3107
# Now we have our good server settings in "server_settings"
2210
3109
##################################################################
3111
if (not server_settings["zeroconf"]
3112
and not (server_settings["port"]
3113
or server_settings["socket"] != "")):
3114
parser.error("Needs port or socket to work without Zeroconf")
2212
3116
# For convenience
2213
3117
debug = server_settings["debug"]
2214
3118
debuglevel = server_settings["debuglevel"]
3187
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2274
3189
except OSError as error:
2275
if error[0] != errno.EPERM:
3190
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3191
.format(uid, gid, os.strerror(error.errno)))
3192
if error.errno != errno.EPERM:
2279
3196
# Enable all possible GnuTLS debugging
2281
3198
# "Use a log level over 10 to enable all debugging options."
2282
3199
# - GnuTLS manual
2283
gnutls.library.functions.gnutls_global_set_log_level(11)
2285
@gnutls.library.types.gnutls_log_func
3200
gnutls.global_set_log_level(11)
2286
3203
def debug_gnutls(level, string):
2287
logger.debug("GnuTLS: %s", string[:-1])
2289
(gnutls.library.functions
2290
.gnutls_global_set_log_function(debug_gnutls))
3204
logger.debug("GnuTLS: %s",
3205
string[:-1].decode("utf-8",
3208
gnutls.global_set_log_function(debug_gnutls)
2292
3210
# Redirect stdin so all checkers get /dev/null
2293
3211
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2294
3212
os.dup2(null, sys.stdin.fileno())
2298
3216
# Need to fork before connecting to D-Bus
2300
3218
# Close all input and output, do double fork, etc.
2303
gobject.threads_init()
3221
if gi.version_info < (3, 10, 2):
3222
# multiprocessing will use threads, so before we use GLib we
3223
# need to inform GLib that threads will be used.
2305
3226
global main_loop
2306
3227
# From the Avahi example code
2307
3228
DBusGMainLoop(set_as_default=True)
2308
main_loop = gobject.MainLoop()
3229
main_loop = GLib.MainLoop()
2309
3230
bus = dbus.SystemBus()
2310
3231
# End of Avahi example code
2313
3234
bus_name = dbus.service.BusName("se.recompile.Mandos",
2314
bus, do_not_queue=True)
2315
old_bus_name = (dbus.service.BusName
2316
("se.bsnet.fukt.Mandos", bus,
2318
except dbus.exceptions.NameExistsException as e:
2319
logger.error(unicode(e) + ", disabling D-Bus")
3237
old_bus_name = dbus.service.BusName(
3238
"se.bsnet.fukt.Mandos", bus,
3240
except dbus.exceptions.DBusException as e:
3241
logger.error("Disabling D-Bus:", exc_info=e)
2320
3242
use_dbus = False
2321
3243
server_settings["use_dbus"] = False
2322
3244
tcp_server.use_dbus = False
2323
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2324
service = AvahiServiceToSyslog(name =
2325
server_settings["servicename"],
2326
servicetype = "_mandos._tcp",
2327
protocol = protocol, bus = bus)
2328
if server_settings["interface"]:
2329
service.interface = (if_nametoindex
2330
(str(server_settings["interface"])))
3246
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3247
service = AvahiServiceToSyslog(
3248
name=server_settings["servicename"],
3249
servicetype="_mandos._tcp",
3252
if server_settings["interface"]:
3253
service.interface = if_nametoindex(
3254
server_settings["interface"].encode("utf-8"))
2332
3256
global multiprocessing_manager
2333
3257
multiprocessing_manager = multiprocessing.Manager()
2335
3259
client_class = Client
2337
client_class = functools.partial(ClientDBusTransitional,
3261
client_class = functools.partial(ClientDBus, bus=bus)
2340
3263
client_settings = Client.config_parser(client_config)
2341
3264
old_client_settings = {}
2342
3265
clients_data = {}
3267
# This is used to redirect stdout and stderr for checker processes
3269
wnull = open(os.devnull, "w") # A writable /dev/null
3270
# Only used if server is running in foreground but not in debug
3272
if debug or not foreground:
2344
3275
# Get client data and settings from last running state.
2345
3276
if server_settings["restore"]:
2347
3278
with open(stored_state_path, "rb") as stored_state:
2348
clients_data, old_client_settings = (pickle.load
3279
if sys.version_info.major == 2:
3280
clients_data, old_client_settings = pickle.load(
3283
bytes_clients_data, bytes_old_client_settings = (
3284
pickle.load(stored_state, encoding="bytes"))
3285
# Fix bytes to strings
3288
clients_data = {(key.decode("utf-8")
3289
if isinstance(key, bytes)
3292
bytes_clients_data.items()}
3293
del bytes_clients_data
3294
for key in clients_data:
3295
value = {(k.decode("utf-8")
3296
if isinstance(k, bytes) else k): v
3298
clients_data[key].items()}
3299
clients_data[key] = value
3301
value["client_structure"] = [
3303
if isinstance(s, bytes)
3305
value["client_structure"]]
3306
# .name, .host, and .checker_command
3307
for k in ("name", "host", "checker_command"):
3308
if isinstance(value[k], bytes):
3309
value[k] = value[k].decode("utf-8")
3310
if "key_id" not in value:
3311
value["key_id"] = ""
3312
elif "fingerprint" not in value:
3313
value["fingerprint"] = ""
3314
# old_client_settings
3316
old_client_settings = {
3317
(key.decode("utf-8")
3318
if isinstance(key, bytes)
3321
bytes_old_client_settings.items()}
3322
del bytes_old_client_settings
3323
# .host and .checker_command
3324
for value in old_client_settings.values():
3325
for attribute in ("host", "checker_command"):
3326
if isinstance(value[attribute], bytes):
3327
value[attribute] = (value[attribute]
2350
3329
os.remove(stored_state_path)
2351
3330
except IOError as e:
2352
logger.warning("Could not load persistent state: {0}"
2354
if e.errno != errno.ENOENT:
3331
if e.errno == errno.ENOENT:
3332
logger.warning("Could not load persistent state:"
3333
" {}".format(os.strerror(e.errno)))
3335
logger.critical("Could not load persistent state:",
2356
3338
except EOFError as e:
2357
3339
logger.warning("Could not load persistent state: "
2358
"EOFError: {0}".format(e))
2360
3343
with PGPEngine() as pgp:
2361
for client_name, client in clients_data.iteritems():
3344
for client_name, client in clients_data.items():
3345
# Skip removed clients
3346
if client_name not in client_settings:
2362
3349
# Decide which value to use after restoring saved state.
2363
3350
# We have three different values: Old config file,
2364
3351
# new config file, and saved state.
2422
3409
for client_name in (set(client_settings)
2423
3410
- set(old_client_settings)):
2424
3411
clients_data[client_name] = client_settings[client_name]
2426
3413
# Create all client objects
2427
for client_name, client in clients_data.iteritems():
3414
for client_name, client in clients_data.items():
2428
3415
tcp_server.clients[client_name] = client_class(
2429
name = client_name, settings = client)
3418
server_settings=server_settings)
2431
3420
if not tcp_server.clients:
2432
3421
logger.warning("No clients defined")
2438
pidfile.write(str(pid) + "\n".encode("utf-8"))
2441
logger.error("Could not write to file %r with PID %d",
2444
# "pidfile" was never created
3424
if pidfile is not None:
3428
print(pid, file=pidfile)
3430
logger.error("Could not write to file %r with PID %d",
2446
3433
del pidfilename
2447
signal.signal(signal.SIGINT, signal.SIG_IGN)
2449
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2450
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3435
for termsig in (signal.SIGHUP, signal.SIGTERM):
3436
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3437
lambda: main_loop.quit() and False)
2453
class MandosDBusService(DBusObjectWithProperties):
3441
@alternate_dbus_interfaces(
3442
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3443
class MandosDBusService(DBusObjectWithObjectManager):
2454
3444
"""A D-Bus proxy object"""
2455
3446
def __init__(self):
2456
3447
dbus.service.Object.__init__(self, bus, "/")
2457
3449
_interface = "se.recompile.Mandos"
2459
@dbus_interface_annotations(_interface)
2461
return { "org.freedesktop.DBus.Property"
2462
".EmitsChangedSignal":
2465
3451
@dbus.service.signal(_interface, signature="o")
2466
3452
def ClientAdded(self, objpath):
2470
3456
@dbus.service.signal(_interface, signature="ss")
2471
def ClientNotFound(self, fingerprint, address):
3457
def ClientNotFound(self, key_id, address):
3461
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2475
3463
@dbus.service.signal(_interface, signature="os")
2476
3464
def ClientRemoved(self, objpath, name):
3468
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2480
3470
@dbus.service.method(_interface, out_signature="ao")
2481
3471
def GetAllClients(self):
2483
return dbus.Array(c.dbus_object_path
2485
tcp_server.clients.itervalues())
3473
return dbus.Array(c.dbus_object_path for c in
3474
tcp_server.clients.values())
3476
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2487
3478
@dbus.service.method(_interface,
2488
3479
out_signature="a{oa{sv}}")
2489
3480
def GetAllClientsWithProperties(self):
2491
3482
return dbus.Dictionary(
2492
((c.dbus_object_path, c.GetAll(""))
2493
for c in tcp_server.clients.itervalues()),
3483
{c.dbus_object_path: c.GetAll(
3484
"se.recompile.Mandos.Client")
3485
for c in tcp_server.clients.values()},
2494
3486
signature="oa{sv}")
2496
3488
@dbus.service.method(_interface, in_signature="o")
2497
3489
def RemoveClient(self, object_path):
2499
for c in tcp_server.clients.itervalues():
3491
for c in tcp_server.clients.values():
2500
3492
if c.dbus_object_path == object_path:
2501
3493
del tcp_server.clients[c.name]
2502
3494
c.remove_from_connection()
2503
# Don't signal anything except ClientRemoved
3495
# Don't signal the disabling
2504
3496
c.disable(quiet=True)
2506
self.ClientRemoved(object_path, c.name)
3497
# Emit D-Bus signal for removal
3498
self.client_removed_signal(c)
2508
3500
raise KeyError(object_path)
2512
class MandosDBusServiceTransitional(MandosDBusService):
2513
__metaclass__ = AlternateDBusNamesMetaclass
2514
mandos_dbus_service = MandosDBusServiceTransitional()
3504
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3505
out_signature="a{oa{sa{sv}}}")
3506
def GetManagedObjects(self):
3508
return dbus.Dictionary(
3509
{client.dbus_object_path:
3511
{interface: client.GetAll(interface)
3513
client._get_all_interface_names()})
3514
for client in tcp_server.clients.values()})
3516
def client_added_signal(self, client):
3517
"""Send the new standard signal and the old signal"""
3519
# New standard signal
3520
self.InterfacesAdded(
3521
client.dbus_object_path,
3523
{interface: client.GetAll(interface)
3525
client._get_all_interface_names()}))
3527
self.ClientAdded(client.dbus_object_path)
3529
def client_removed_signal(self, client):
3530
"""Send the new standard signal and the old signal"""
3532
# New standard signal
3533
self.InterfacesRemoved(
3534
client.dbus_object_path,
3535
client._get_all_interface_names())
3537
self.ClientRemoved(client.dbus_object_path,
3540
mandos_dbus_service = MandosDBusService()
3542
# Save modules to variables to exempt the modules from being
3543
# unloaded before the function registered with atexit() is run.
3544
mp = multiprocessing
2517
3548
"Cleanup function; run on exit"
2520
multiprocessing.active_children()
3552
mp.active_children()
2521
3554
if not (tcp_server.clients or client_settings):
2524
3557
# Store client before exiting. Secrets are encrypted with key
2525
3558
# based on what config file has. If config file is
2526
3559
# removed/edited, old secret will thus be unrecovable.
2528
3561
with PGPEngine() as pgp:
2529
for client in tcp_server.clients.itervalues():
3562
for client in tcp_server.clients.values():
2530
3563
key = client_settings[client.name]["secret"]
2531
3564
client.encrypted_secret = pgp.encrypt(client.secret,
2533
3566
client_dict = {}
2535
3568
# A list of attributes that can not be pickled
2537
exclude = set(("bus", "changedstate", "secret",
2539
for name, typ in (inspect.getmembers
2540
(dbus.service.Object)):
3570
exclude = {"bus", "changedstate", "secret",
3571
"checker", "server_settings"}
3572
for name, typ in inspect.getmembers(dbus.service
2541
3574
exclude.add(name)
2543
3576
client_dict["encrypted_secret"] = (client
2544
3577
.encrypted_secret)
2545
3578
for attr in client.client_structure:
2546
3579
if attr not in exclude:
2547
3580
client_dict[attr] = getattr(client, attr)
2549
3582
clients[client.name] = client_dict
2550
3583
del client_settings[client.name]["secret"]
2553
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2556
(stored_state_path))
2557
with os.fdopen(tempfd, "wb") as stored_state:
2558
pickle.dump((clients, client_settings), stored_state)
3586
with tempfile.NamedTemporaryFile(
3590
dir=os.path.dirname(stored_state_path),
3591
delete=False) as stored_state:
3592
pickle.dump((clients, client_settings), stored_state,
3594
tempname = stored_state.name
2559
3595
os.rename(tempname, stored_state_path)
2560
3596
except (IOError, OSError) as e:
2561
logger.warning("Could not save persistent state: {0}"
2565
3599
os.remove(tempname)
2566
3600
except NameError:
2568
if e.errno not in set((errno.ENOENT, errno.EACCES,
3602
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3603
logger.warning("Could not save persistent state: {}"
3604
.format(os.strerror(e.errno)))
3606
logger.warning("Could not save persistent state:",
2572
3610
# Delete all clients, and settings from config
2573
3611
while tcp_server.clients:
2574
3612
name, client = tcp_server.clients.popitem()
2576
3614
client.remove_from_connection()
2577
# Don't signal anything except ClientRemoved
3615
# Don't signal the disabling
2578
3616
client.disable(quiet=True)
3617
# Emit D-Bus signal for removal
2581
mandos_dbus_service.ClientRemoved(client
3619
mandos_dbus_service.client_removed_signal(client)
2584
3620
client_settings.clear()
2586
3622
atexit.register(cleanup)
2588
for client in tcp_server.clients.itervalues():
3624
for client in tcp_server.clients.values():
2591
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3626
# Emit D-Bus signal for adding
3627
mandos_dbus_service.client_added_signal(client)
2592
3628
# Need to initiate checking of clients
2593
3629
if client.enabled:
2594
3630
client.init_checker()
2596
3632
tcp_server.enable()
2597
3633
tcp_server.server_activate()
2599
3635
# Find out what port we got
2600
service.port = tcp_server.socket.getsockname()[1]
3637
service.port = tcp_server.socket.getsockname()[1]
2602
3639
logger.info("Now listening on address %r, port %d,"
2603
3640
" flowinfo %d, scope_id %d",