70
import cPickle as pickle
63
import cPickle as pickle
73
64
import multiprocessing
84
70
import dbus.service
86
from gi.repository import GLib
87
73
from dbus.mainloop.glib import DBusGMainLoop
90
76
import xml.dom.minidom
93
if sys.version_info.major == 2:
97
# Add collections.abc.Callable if it does not exist
99
collections.abc.Callable
100
except AttributeError:
102
Callable = collections.Callable
103
collections.abc = abc
106
# Show warnings by default
107
if not sys.warnoptions:
109
warnings.simplefilter("default")
111
# Try to find the value of SO_BINDTODEVICE:
113
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
114
# newer, and it is also the most natural place for it:
115
81
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
116
82
except AttributeError:
118
# This is where SO_BINDTODEVICE was up to and including Python
120
84
from IN import SO_BINDTODEVICE
121
85
except ImportError:
122
# In Python 2.7 it seems to have been removed entirely.
123
# Try running the C preprocessor:
125
cc = subprocess.Popen(["cc", "--language=c", "-E",
127
stdin=subprocess.PIPE,
128
stdout=subprocess.PIPE)
129
stdout = cc.communicate(
130
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
131
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
132
except (OSError, ValueError, IndexError):
134
SO_BINDTODEVICE = None
136
if sys.version_info < (3, 2):
137
configparser.Configparser = configparser.SafeConfigParser
86
SO_BINDTODEVICE = None
140
89
stored_state_file = "clients.pickle"
142
91
logger = logging.getLogger()
143
logging.captureWarnings(True) # Show warnings via the logging system
92
syslogger = (logging.handlers.SysLogHandler
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
147
if_nametoindex = ctypes.cdll.LoadLibrary(
148
ctypes.util.find_library("c")).if_nametoindex
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
149
100
except (OSError, AttributeError):
151
101
def if_nametoindex(interface):
152
102
"Get an interface index the hard way, i.e. using fcntl()"
153
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
154
104
with contextlib.closing(socket.socket()) as s:
155
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
156
struct.pack(b"16s16x", interface))
157
interface_index = struct.unpack("I", ifreq[16:20])[0]
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
158
110
return interface_index
161
def copy_function(func):
162
"""Make a copy of a function"""
163
if sys.version_info.major == 2:
164
return types.FunctionType(func.func_code,
170
return types.FunctionType(func.__code__,
177
113
def initlogger(debug, level=logging.WARNING):
178
114
"""init logger and add loglevel"""
181
syslogger = (logging.handlers.SysLogHandler(
182
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
184
116
syslogger.setFormatter(logging.Formatter
185
117
('Mandos [%(process)d]: %(levelname)s:'
187
119
logger.addHandler(syslogger)
190
122
console = logging.StreamHandler()
191
123
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
248
168
os.rmdir(self.tempdir)
249
169
self.tempdir = None
251
171
def password_encode(self, password):
252
172
# Passphrase can not be empty and can not contain newlines or
253
173
# NUL bytes. So we prefix it and hex encode it.
254
encoded = b"mandos" + binascii.hexlify(password)
255
if len(encoded) > 2048:
256
# GnuPG can't handle long passwords, so encode differently
257
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
258
.replace(b"\n", b"\\n")
259
.replace(b"\0", b"\\x00"))
174
return b"mandos" + binascii.hexlify(password)
262
176
def encrypt(self, data, password):
263
passphrase = self.password_encode(password)
264
with tempfile.NamedTemporaryFile(
265
dir=self.tempdir) as passfile:
266
passfile.write(passphrase)
268
proc = subprocess.Popen([self.gpg, '--symmetric',
272
stdin=subprocess.PIPE,
273
stdout=subprocess.PIPE,
274
stderr=subprocess.PIPE)
275
ciphertext, err = proc.communicate(input=data)
276
if proc.returncode != 0:
177
self.gnupg.passphrase = self.password_encode(password)
178
with open(os.devnull) as devnull:
180
proc = self.gnupg.run(['--symmetric'],
181
create_fhs=['stdin', 'stdout'],
182
attach_fhs={'stderr': devnull})
183
with contextlib.closing(proc.handles['stdin']) as f:
185
with contextlib.closing(proc.handles['stdout']) as f:
186
ciphertext = f.read()
190
self.gnupg.passphrase = None
278
191
return ciphertext
280
193
def decrypt(self, data, password):
281
passphrase = self.password_encode(password)
282
with tempfile.NamedTemporaryFile(
283
dir=self.tempdir) as passfile:
284
passfile.write(passphrase)
286
proc = subprocess.Popen([self.gpg, '--decrypt',
290
stdin=subprocess.PIPE,
291
stdout=subprocess.PIPE,
292
stderr=subprocess.PIPE)
293
decrypted_plaintext, err = proc.communicate(input=data)
294
if proc.returncode != 0:
194
self.gnupg.passphrase = self.password_encode(password)
195
with open(os.devnull) as devnull:
197
proc = self.gnupg.run(['--decrypt'],
198
create_fhs=['stdin', 'stdout'],
199
attach_fhs={'stderr': devnull})
200
with contextlib.closing(proc.handles['stdin'] ) as f:
202
with contextlib.closing(proc.handles['stdout']) as f:
203
decrypted_plaintext = f.read()
207
self.gnupg.passphrase = None
296
208
return decrypted_plaintext
299
# Pretend that we have an Avahi module
301
"""This isn't so much a class as it is a module-like namespace."""
302
IF_UNSPEC = -1 # avahi-common/address.h
303
PROTO_UNSPEC = -1 # avahi-common/address.h
304
PROTO_INET = 0 # avahi-common/address.h
305
PROTO_INET6 = 1 # avahi-common/address.h
306
DBUS_NAME = "org.freedesktop.Avahi"
307
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
308
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
309
DBUS_PATH_SERVER = "/"
312
def string_array_to_txt_array(t):
313
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
314
for s in t), signature="ay")
315
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
316
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
317
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
318
SERVER_INVALID = 0 # avahi-common/defs.h
319
SERVER_REGISTERING = 1 # avahi-common/defs.h
320
SERVER_RUNNING = 2 # avahi-common/defs.h
321
SERVER_COLLISION = 3 # avahi-common/defs.h
322
SERVER_FAILURE = 4 # avahi-common/defs.h
325
212
class AvahiError(Exception):
326
213
def __init__(self, value, *args, **kwargs):
327
214
self.value = value
328
return super(AvahiError, self).__init__(value, *args,
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
332
219
class AvahiServiceError(AvahiError):
336
222
class AvahiGroupError(AvahiError):
226
class AvahiService(object):
341
227
"""An Avahi (Zeroconf) service.
344
230
interface: integer; avahi.IF_UNSPEC or an interface index.
345
231
Used to optionally bind to the specified interface.
346
232
name: string; Example: 'Mandos'
347
233
type: string; Example: '_mandos._tcp'.
348
See <https://www.iana.org/assignments/service-names-port-numbers>
234
See <http://www.dns-sd.org/ServiceTypes.html>
349
235
port: integer; what port to announce
350
236
TXT: list of strings; TXT record for the service
351
237
domain: string; Domain to publish on, default to .local if empty.
510
366
follow_name_owner_changes=True),
511
367
avahi.DBUS_INTERFACE_SERVER)
512
368
self.server.connect_to_signal("StateChanged",
513
self.server_state_changed)
369
self.server_state_changed)
514
370
self.server_state_changed(self.server.GetState())
517
372
class AvahiServiceToSyslog(AvahiService):
518
def rename(self, *args, **kwargs):
519
374
"""Add the new name to the syslog messages"""
520
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
521
syslogger.setFormatter(logging.Formatter(
522
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
375
ret = AvahiService.rename(self)
376
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
527
# Pretend that we have a GnuTLS module
529
"""This isn't so much a class as it is a module-like namespace."""
531
library = ctypes.util.find_library("gnutls")
533
library = ctypes.util.find_library("gnutls-deb0")
534
_library = ctypes.cdll.LoadLibrary(library)
537
# Unless otherwise indicated, the constants and types below are
538
# all from the gnutls/gnutls.h C header file.
549
E_NO_CERTIFICATE_FOUND = -49
554
KEYID_USE_SHA256 = 1 # gnutls/x509.h
555
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
558
class session_int(ctypes.Structure):
560
session_t = ctypes.POINTER(session_int)
562
class certificate_credentials_st(ctypes.Structure):
564
certificate_credentials_t = ctypes.POINTER(
565
certificate_credentials_st)
566
certificate_type_t = ctypes.c_int
568
class datum_t(ctypes.Structure):
569
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
570
('size', ctypes.c_uint)]
572
class openpgp_crt_int(ctypes.Structure):
574
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
575
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
576
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
577
credentials_type_t = ctypes.c_int
578
transport_ptr_t = ctypes.c_void_p
579
close_request_t = ctypes.c_int
582
class Error(Exception):
583
def __init__(self, message=None, code=None, args=()):
584
# Default usage is by a message string, but if a return
585
# code is passed, convert it to a string with
588
if message is None and code is not None:
589
message = gnutls.strerror(code)
590
return super(gnutls.Error, self).__init__(
593
class CertificateSecurityError(Error):
599
self._c_object = gnutls.certificate_credentials_t()
600
gnutls.certificate_allocate_credentials(
601
ctypes.byref(self._c_object))
602
self.type = gnutls.CRD_CERTIFICATE
605
gnutls.certificate_free_credentials(self._c_object)
608
def __init__(self, socket, credentials=None):
609
self._c_object = gnutls.session_t()
610
gnutls_flags = gnutls.CLIENT
611
if gnutls.check_version(b"3.5.6"):
612
gnutls_flags |= gnutls.NO_TICKETS
614
gnutls_flags |= gnutls.ENABLE_RAWPK
615
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
617
gnutls.set_default_priority(self._c_object)
618
gnutls.transport_set_ptr(self._c_object, socket.fileno())
619
gnutls.handshake_set_private_extensions(self._c_object,
622
if credentials is None:
623
credentials = gnutls.Credentials()
624
gnutls.credentials_set(self._c_object, credentials.type,
625
ctypes.cast(credentials._c_object,
627
self.credentials = credentials
630
gnutls.deinit(self._c_object)
633
return gnutls.handshake(self._c_object)
635
def send(self, data):
639
data_len -= gnutls.record_send(self._c_object,
644
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
646
# Error handling functions
647
def _error_code(result):
648
"""A function to raise exceptions on errors, suitable
649
for the 'restype' attribute on ctypes functions"""
652
if result == gnutls.E_NO_CERTIFICATE_FOUND:
653
raise gnutls.CertificateSecurityError(code=result)
654
raise gnutls.Error(code=result)
656
def _retry_on_error(result, func, arguments):
657
"""A function to retry on some errors, suitable
658
for the 'errcheck' attribute on ctypes functions"""
660
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
661
return _error_code(result)
662
result = func(*arguments)
665
# Unless otherwise indicated, the function declarations below are
666
# all from the gnutls/gnutls.h C header file.
669
priority_set_direct = _library.gnutls_priority_set_direct
670
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
671
ctypes.POINTER(ctypes.c_char_p)]
672
priority_set_direct.restype = _error_code
674
init = _library.gnutls_init
675
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
676
init.restype = _error_code
678
set_default_priority = _library.gnutls_set_default_priority
679
set_default_priority.argtypes = [session_t]
680
set_default_priority.restype = _error_code
682
record_send = _library.gnutls_record_send
683
record_send.argtypes = [session_t, ctypes.c_void_p,
685
record_send.restype = ctypes.c_ssize_t
686
record_send.errcheck = _retry_on_error
688
certificate_allocate_credentials = (
689
_library.gnutls_certificate_allocate_credentials)
690
certificate_allocate_credentials.argtypes = [
691
ctypes.POINTER(certificate_credentials_t)]
692
certificate_allocate_credentials.restype = _error_code
694
certificate_free_credentials = (
695
_library.gnutls_certificate_free_credentials)
696
certificate_free_credentials.argtypes = [
697
certificate_credentials_t]
698
certificate_free_credentials.restype = None
700
handshake_set_private_extensions = (
701
_library.gnutls_handshake_set_private_extensions)
702
handshake_set_private_extensions.argtypes = [session_t,
704
handshake_set_private_extensions.restype = None
706
credentials_set = _library.gnutls_credentials_set
707
credentials_set.argtypes = [session_t, credentials_type_t,
709
credentials_set.restype = _error_code
711
strerror = _library.gnutls_strerror
712
strerror.argtypes = [ctypes.c_int]
713
strerror.restype = ctypes.c_char_p
715
certificate_type_get = _library.gnutls_certificate_type_get
716
certificate_type_get.argtypes = [session_t]
717
certificate_type_get.restype = _error_code
719
certificate_get_peers = _library.gnutls_certificate_get_peers
720
certificate_get_peers.argtypes = [session_t,
721
ctypes.POINTER(ctypes.c_uint)]
722
certificate_get_peers.restype = ctypes.POINTER(datum_t)
724
global_set_log_level = _library.gnutls_global_set_log_level
725
global_set_log_level.argtypes = [ctypes.c_int]
726
global_set_log_level.restype = None
728
global_set_log_function = _library.gnutls_global_set_log_function
729
global_set_log_function.argtypes = [log_func]
730
global_set_log_function.restype = None
732
deinit = _library.gnutls_deinit
733
deinit.argtypes = [session_t]
734
deinit.restype = None
736
handshake = _library.gnutls_handshake
737
handshake.argtypes = [session_t]
738
handshake.restype = _error_code
739
handshake.errcheck = _retry_on_error
741
transport_set_ptr = _library.gnutls_transport_set_ptr
742
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
743
transport_set_ptr.restype = None
745
bye = _library.gnutls_bye
746
bye.argtypes = [session_t, close_request_t]
747
bye.restype = _error_code
748
bye.errcheck = _retry_on_error
750
check_version = _library.gnutls_check_version
751
check_version.argtypes = [ctypes.c_char_p]
752
check_version.restype = ctypes.c_char_p
754
_need_version = b"3.3.0"
755
if check_version(_need_version) is None:
756
raise self.Error("Needs GnuTLS {} or later"
757
.format(_need_version))
759
_tls_rawpk_version = b"3.6.6"
760
has_rawpk = bool(check_version(_tls_rawpk_version))
764
class pubkey_st(ctypes.Structure):
766
pubkey_t = ctypes.POINTER(pubkey_st)
768
x509_crt_fmt_t = ctypes.c_int
770
# All the function declarations below are from gnutls/abstract.h
771
pubkey_init = _library.gnutls_pubkey_init
772
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
773
pubkey_init.restype = _error_code
775
pubkey_import = _library.gnutls_pubkey_import
776
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
778
pubkey_import.restype = _error_code
780
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
781
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
782
ctypes.POINTER(ctypes.c_ubyte),
783
ctypes.POINTER(ctypes.c_size_t)]
784
pubkey_get_key_id.restype = _error_code
786
pubkey_deinit = _library.gnutls_pubkey_deinit
787
pubkey_deinit.argtypes = [pubkey_t]
788
pubkey_deinit.restype = None
790
# All the function declarations below are from gnutls/openpgp.h
792
openpgp_crt_init = _library.gnutls_openpgp_crt_init
793
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
794
openpgp_crt_init.restype = _error_code
796
openpgp_crt_import = _library.gnutls_openpgp_crt_import
797
openpgp_crt_import.argtypes = [openpgp_crt_t,
798
ctypes.POINTER(datum_t),
800
openpgp_crt_import.restype = _error_code
802
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
803
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
804
ctypes.POINTER(ctypes.c_uint)]
805
openpgp_crt_verify_self.restype = _error_code
807
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
808
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
809
openpgp_crt_deinit.restype = None
811
openpgp_crt_get_fingerprint = (
812
_library.gnutls_openpgp_crt_get_fingerprint)
813
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
817
openpgp_crt_get_fingerprint.restype = _error_code
819
if check_version(b"3.6.4"):
820
certificate_type_get2 = _library.gnutls_certificate_type_get2
821
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
822
certificate_type_get2.restype = _error_code
824
# Remove non-public functions
825
del _error_code, _retry_on_error
828
def call_pipe(connection, # : multiprocessing.Connection
829
func, *args, **kwargs):
830
"""This function is meant to be called by multiprocessing.Process
832
This function runs func(*args, **kwargs), and writes the resulting
833
return value on the provided multiprocessing.Connection.
835
connection.send(func(*args, **kwargs))
382
def timedelta_to_milliseconds(td):
383
"Convert a datetime.timedelta() to milliseconds"
384
return ((td.days * 24 * 60 * 60 * 1000)
385
+ (td.seconds * 1000)
386
+ (td.microseconds // 1000))
388
class Client(object):
840
389
"""A representation of a client host served by this server.
843
392
approved: bool(); 'None' if not yet approved/disapproved
844
393
approval_delay: datetime.timedelta(); Time to wait for approval
845
394
approval_duration: datetime.timedelta(); Duration of one approval
846
checker: multiprocessing.Process(); a running checker process used
847
to see if the client lives. 'None' if no process is
849
checker_callback_tag: a GLib event source tag, or None
395
checker: subprocess.Popen(); a running checker process used
396
to see if the client lives.
397
'None' if no process is running.
398
checker_callback_tag: a gobject event source tag, or None
850
399
checker_command: string; External command which is run to check
851
400
if client lives. %() expansions are done at
852
401
runtime with vars(self) as dict, so that for
853
402
instance %(name)s can be used in the command.
854
checker_initiator_tag: a GLib event source tag, or None
403
checker_initiator_tag: a gobject event source tag, or None
855
404
created: datetime.datetime(); (UTC) object creation
856
405
client_structure: Object describing what attributes a client has
857
406
and is used for storing the client at exit
858
407
current_checker_command: string; current running checker_command
859
disable_initiator_tag: a GLib event source tag, or None
408
disable_initiator_tag: a gobject event source tag, or None
861
410
fingerprint: string (40 or 32 hexadecimal digits); used to
862
uniquely identify an OpenPGP client
863
key_id: string (64 hexadecimal digits); used to uniquely identify
864
a client using raw public keys
411
uniquely identify the client
865
412
host: string; available for use by the checker command
866
413
interval: datetime.timedelta(); How often to start a new checker
867
414
last_approval_request: datetime.datetime(); (UTC) or None
868
415
last_checked_ok: datetime.datetime(); (UTC) or None
869
416
last_checker_status: integer between 0 and 255 reflecting exit
870
417
status of last checker. -1 reflects crashed
871
checker, -2 means no checker completed yet.
872
last_checker_signal: The signal which killed the last checker, if
873
last_checker_status is -1
874
419
last_enabled: datetime.datetime(); (UTC) or None
875
420
name: string; from the config file, used in log messages and
876
421
D-Bus identifiers
988
541
self.current_checker_command = None
989
542
self.approved = None
990
543
self.approvals_pending = 0
991
self.changedstate = multiprocessing_manager.Condition(
992
multiprocessing_manager.Lock())
993
self.client_structure = [attr
994
for attr in self.__dict__.keys()
544
self.changedstate = (multiprocessing_manager
545
.Condition(multiprocessing_manager
547
self.client_structure = [attr for attr in
548
self.__dict__.iterkeys()
995
549
if not attr.startswith("_")]
996
550
self.client_structure.append("client_structure")
998
for name, t in inspect.getmembers(
999
type(self), lambda obj: isinstance(obj, property)):
552
for name, t in inspect.getmembers(type(self),
1000
556
if not name.startswith("_"):
1001
557
self.client_structure.append(name)
1003
559
# Send notice to process children that client state has changed
1004
560
def send_changedstate(self):
1005
561
with self.changedstate:
1006
562
self.changedstate.notify_all()
1008
564
def enable(self):
1009
565
"""Start this client's checker and timeout hooks"""
1010
566
if getattr(self, "enabled", False):
1011
567
# Already enabled
569
self.send_changedstate()
1013
570
self.expires = datetime.datetime.utcnow() + self.timeout
1014
571
self.enabled = True
1015
572
self.last_enabled = datetime.datetime.utcnow()
1016
573
self.init_checker()
1017
self.send_changedstate()
1019
575
def disable(self, quiet=True):
1020
576
"""Disable this client."""
1021
577
if not getattr(self, "enabled", False):
580
self.send_changedstate()
1024
582
logger.info("Disabling client %s", self.name)
1025
if getattr(self, "disable_initiator_tag", None) is not None:
1026
GLib.source_remove(self.disable_initiator_tag)
583
if getattr(self, "disable_initiator_tag", False):
584
gobject.source_remove(self.disable_initiator_tag)
1027
585
self.disable_initiator_tag = None
1028
586
self.expires = None
1029
if getattr(self, "checker_initiator_tag", None) is not None:
1030
GLib.source_remove(self.checker_initiator_tag)
587
if getattr(self, "checker_initiator_tag", False):
588
gobject.source_remove(self.checker_initiator_tag)
1031
589
self.checker_initiator_tag = None
1032
590
self.stop_checker()
1033
591
self.enabled = False
1035
self.send_changedstate()
1036
# Do not run this again if called by a GLib.timeout_add
592
# Do not run this again if called by a gobject.timeout_add
1039
595
def __del__(self):
1042
598
def init_checker(self):
1043
599
# Schedule a new checker to be started an 'interval' from now,
1044
600
# and every interval from then on.
1045
if self.checker_initiator_tag is not None:
1046
GLib.source_remove(self.checker_initiator_tag)
1047
self.checker_initiator_tag = GLib.timeout_add(
1048
random.randrange(int(self.interval.total_seconds() * 1000
601
self.checker_initiator_tag = (gobject.timeout_add
602
(self.interval_milliseconds(),
1051
604
# Schedule a disable() when 'timeout' has passed
1052
if self.disable_initiator_tag is not None:
1053
GLib.source_remove(self.disable_initiator_tag)
1054
self.disable_initiator_tag = GLib.timeout_add(
1055
int(self.timeout.total_seconds() * 1000), self.disable)
605
self.disable_initiator_tag = (gobject.timeout_add
606
(self.timeout_milliseconds(),
1056
608
# Also start a new checker *right now*.
1057
609
self.start_checker()
1059
def checker_callback(self, source, condition, connection,
611
def checker_callback(self, pid, condition, command):
1061
612
"""The checker has completed, so take appropriate actions."""
1062
# Read return code from connection (see call_pipe)
1063
returncode = connection.recv()
1065
if self.checker is not None:
1067
613
self.checker_callback_tag = None
1068
614
self.checker = None
1071
self.last_checker_status = returncode
1072
self.last_checker_signal = None
615
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
1073
617
if self.last_checker_status == 0:
1074
618
logger.info("Checker for %(name)s succeeded",
1076
620
self.checked_ok()
1078
logger.info("Checker for %(name)s failed", vars(self))
622
logger.info("Checker for %(name)s failed",
1080
625
self.last_checker_status = -1
1081
self.last_checker_signal = -returncode
1082
626
logger.warning("Checker for %(name)s crashed?",
1086
def checked_ok(self):
1087
"""Assert that the client has been seen, alive and well."""
1088
self.last_checked_ok = datetime.datetime.utcnow()
1089
self.last_checker_status = 0
1090
self.last_checker_signal = None
1093
def bump_timeout(self, timeout=None):
1094
"""Bump up the timeout for this client."""
629
def checked_ok(self, timeout=None):
630
"""Bump up the timeout for this client.
632
This should only be called when the client has been seen,
1095
635
if timeout is None:
1096
636
timeout = self.timeout
637
self.last_checked_ok = datetime.datetime.utcnow()
1097
638
if self.disable_initiator_tag is not None:
1098
GLib.source_remove(self.disable_initiator_tag)
1099
self.disable_initiator_tag = None
639
gobject.source_remove(self.disable_initiator_tag)
1100
640
if getattr(self, "enabled", False):
1101
self.disable_initiator_tag = GLib.timeout_add(
1102
int(timeout.total_seconds() * 1000), self.disable)
641
self.disable_initiator_tag = (gobject.timeout_add
642
(timedelta_to_milliseconds
643
(timeout), self.disable))
1103
644
self.expires = datetime.datetime.utcnow() + timeout
1105
646
def need_approval(self):
1106
647
self.last_approval_request = datetime.datetime.utcnow()
1108
649
def start_checker(self):
1109
650
"""Start a new checker subprocess if one is not running.
1111
652
If a checker already exists, leave it running and do
1113
654
# The reason for not killing a running checker is that if we
1114
# did that, and if a checker (for some reason) started running
1115
# slowly and taking more than 'interval' time, then the client
1116
# would inevitably timeout, since no checker would get a
1117
# chance to run to completion. If we instead leave running
655
# did that, then if a checker (for some reason) started
656
# running slowly and taking more than 'interval' time, the
657
# client would inevitably timeout, since no checker would get
658
# a chance to run to completion. If we instead leave running
1118
659
# checkers alone, the checker would have to take more time
1119
660
# than 'timeout' for the client to be disabled, which is as it
1122
if self.checker is not None and not self.checker.is_alive():
1123
logger.warning("Checker was not alive; joining")
663
# If a checker exists, make sure it is not a zombie
665
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
666
except (AttributeError, OSError) as error:
667
if (isinstance(error, OSError)
668
and error.errno != errno.ECHILD):
672
logger.warning("Checker was a zombie")
673
gobject.source_remove(self.checker_callback_tag)
674
self.checker_callback(pid, status,
675
self.current_checker_command)
1126
676
# Start a new checker if needed
1127
677
if self.checker is None:
1128
# Escape attributes for the shell
1130
attr: re.escape(str(getattr(self, attr)))
1131
for attr in self.runtime_expansions}
1133
command = self.checker_command % escaped_attrs
1134
except TypeError as error:
1135
logger.error('Could not format string "%s"',
1136
self.checker_command,
1138
return True # Try again later
679
# In case checker_command has exactly one % operator
680
command = self.checker_command % self.host
682
# Escape attributes for the shell
683
escaped_attrs = dict(
685
re.escape(unicode(str(getattr(self, attr, "")),
689
self.runtime_expansions)
692
command = self.checker_command % escaped_attrs
693
except TypeError as error:
694
logger.error('Could not format string "%s":'
695
' %s', self.checker_command, error)
696
return True # Try again later
1139
697
self.current_checker_command = command
1140
logger.info("Starting checker %r for %s", command,
1142
# We don't need to redirect stdout and stderr, since
1143
# in normal mode, that is already done by daemon(),
1144
# and in debug mode we don't want to. (Stdin is
1145
# always replaced by /dev/null.)
1146
# The exception is when not debugging but nevertheless
1147
# running in the foreground; use the previously
1149
popen_args = {"close_fds": True,
1152
if (not self.server_settings["debug"]
1153
and self.server_settings["foreground"]):
1154
popen_args.update({"stdout": wnull,
1156
pipe = multiprocessing.Pipe(duplex=False)
1157
self.checker = multiprocessing.Process(
1159
args=(pipe[1], subprocess.call, command),
1161
self.checker.start()
1162
self.checker_callback_tag = GLib.io_add_watch(
1163
GLib.IOChannel.unix_new(pipe[0].fileno()),
1164
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1165
self.checker_callback, pipe[0], command)
1166
# Re-run this periodically if run by GLib.timeout_add
699
logger.info("Starting checker %r for %s",
701
# We don't need to redirect stdout and stderr, since
702
# in normal mode, that is already done by daemon(),
703
# and in debug mode we don't want to. (Stdin is
704
# always replaced by /dev/null.)
705
self.checker = subprocess.Popen(command,
708
self.checker_callback_tag = (gobject.child_watch_add
710
self.checker_callback,
712
# The checker may have completed before the gobject
713
# watch was added. Check for this.
714
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
716
gobject.source_remove(self.checker_callback_tag)
717
self.checker_callback(pid, status, command)
718
except OSError as error:
719
logger.error("Failed to start subprocess: %s",
721
# Re-run this periodically if run by gobject.timeout_add
1169
724
def stop_checker(self):
1170
725
"""Force the checker process, if any, to stop."""
1171
726
if self.checker_callback_tag:
1172
GLib.source_remove(self.checker_callback_tag)
727
gobject.source_remove(self.checker_callback_tag)
1173
728
self.checker_callback_tag = None
1174
729
if getattr(self, "checker", None) is None:
1176
731
logger.debug("Stopping checker for %(name)s", vars(self))
1177
self.checker.terminate()
733
os.kill(self.checker.pid, signal.SIGTERM)
735
#if self.checker.poll() is None:
736
# os.kill(self.checker.pid, signal.SIGKILL)
737
except OSError as error:
738
if error.errno != errno.ESRCH: # No such process
1178
740
self.checker = None
1181
def dbus_service_property(dbus_interface,
743
def dbus_service_property(dbus_interface, signature="v",
744
access="readwrite", byte_arrays=False):
1185
745
"""Decorators for marking methods of a DBusObjectWithProperties to
1186
746
become properties on the D-Bus.
1188
748
The decorated method will be called with no arguments by "Get"
1189
749
and with one argument by "Set".
1191
751
The parameters, where they are supported, are the same as
1192
752
dbus.service.method, except there is only "signature", since the
1193
753
type from Get() and the type sent to Set() is the same.
1276
class DBusObjectWithAnnotations(dbus.service.Object):
1277
"""A D-Bus object with annotations.
1279
Classes inheriting from this can use the dbus_annotations
1280
decorator to add annotations to methods or signals.
1284
def _is_dbus_thing(thing):
1285
"""Returns a function testing if an attribute is a D-Bus thing
1287
If called like _is_dbus_thing("method") it returns a function
1288
suitable for use as predicate to inspect.getmembers().
1290
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1293
def _get_all_dbus_things(self, thing):
1294
"""Returns a generator of (name, attribute) pairs
1296
return ((getattr(athing.__get__(self), "_dbus_name", name),
1297
athing.__get__(self))
1298
for cls in self.__class__.__mro__
1300
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1302
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1304
path_keyword='object_path',
1305
connection_keyword='connection')
1306
def Introspect(self, object_path, connection):
1307
"""Overloading of standard D-Bus method.
1309
Inserts annotation tags on methods and signals.
1311
xmlstring = dbus.service.Object.Introspect(self, object_path,
1314
document = xml.dom.minidom.parseString(xmlstring)
1316
for if_tag in document.getElementsByTagName("interface"):
1317
# Add annotation tags
1318
for typ in ("method", "signal"):
1319
for tag in if_tag.getElementsByTagName(typ):
1321
for name, prop in (self.
1322
_get_all_dbus_things(typ)):
1323
if (name == tag.getAttribute("name")
1324
and prop._dbus_interface
1325
== if_tag.getAttribute("name")):
1326
annots.update(getattr(
1327
prop, "_dbus_annotations", {}))
1328
for name, value in annots.items():
1329
ann_tag = document.createElement(
1331
ann_tag.setAttribute("name", name)
1332
ann_tag.setAttribute("value", value)
1333
tag.appendChild(ann_tag)
1334
# Add interface annotation tags
1335
for annotation, value in dict(
1336
itertools.chain.from_iterable(
1337
annotations().items()
1338
for name, annotations
1339
in self._get_all_dbus_things("interface")
1340
if name == if_tag.getAttribute("name")
1342
ann_tag = document.createElement("annotation")
1343
ann_tag.setAttribute("name", annotation)
1344
ann_tag.setAttribute("value", value)
1345
if_tag.appendChild(ann_tag)
1346
# Fix argument name for the Introspect method itself
1347
if (if_tag.getAttribute("name")
1348
== dbus.INTROSPECTABLE_IFACE):
1349
for cn in if_tag.getElementsByTagName("method"):
1350
if cn.getAttribute("name") == "Introspect":
1351
for arg in cn.getElementsByTagName("arg"):
1352
if (arg.getAttribute("direction")
1354
arg.setAttribute("name",
1356
xmlstring = document.toxml("utf-8")
1358
except (AttributeError, xml.dom.DOMException,
1359
xml.parsers.expat.ExpatError) as error:
1360
logger.error("Failed to override Introspection method",
1365
class DBusObjectWithProperties(DBusObjectWithAnnotations):
792
class DBusObjectWithProperties(dbus.service.Object):
1366
793
"""A D-Bus object with properties.
1368
795
Classes inheriting from this can use the dbus_service_property
1369
796
decorator to expose methods as D-Bus properties. It exposes the
1370
797
standard Get(), Set(), and GetAll() methods on the D-Bus.
801
def _is_dbus_property(obj):
802
return getattr(obj, "_dbus_is_property", False)
804
def _get_all_dbus_properties(self):
805
"""Returns a generator of (name, attribute) pairs
807
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
808
for cls in self.__class__.__mro__
810
inspect.getmembers(cls, self._is_dbus_property))
1373
812
def _get_dbus_property(self, interface_name, property_name):
1374
813
"""Returns a bound method if one exists which is a D-Bus
1375
814
property with the specified name and interface.
1377
for cls in self.__class__.__mro__:
1378
for name, value in inspect.getmembers(
1379
cls, self._is_dbus_thing("property")):
816
for cls in self.__class__.__mro__:
817
for name, value in (inspect.getmembers
818
(cls, self._is_dbus_property)):
1380
819
if (value._dbus_name == property_name
1381
820
and value._dbus_interface == interface_name):
1382
821
return value.__get__(self)
1384
823
# No such property
1385
raise DBusPropertyNotFound("{}:{}.{}".format(
1386
self.dbus_object_path, interface_name, property_name))
1389
def _get_all_interface_names(cls):
1390
"""Get a sequence of all interfaces supported by an object"""
1391
return (name for name in set(getattr(getattr(x, attr),
1392
"_dbus_interface", None)
1393
for x in (inspect.getmro(cls))
1395
if name is not None)
1397
@dbus.service.method(dbus.PROPERTIES_IFACE,
824
raise DBusPropertyNotFound(self.dbus_object_path + ":"
825
+ interface_name + "."
828
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1399
829
out_signature="v")
1400
830
def Get(self, interface_name, property_name):
1401
831
"""Standard D-Bus property Get() method, see D-Bus standard.
1447
875
if not hasattr(value, "variant_level"):
1448
876
properties[name] = value
1450
properties[name] = type(value)(
1451
value, variant_level=value.variant_level + 1)
878
properties[name] = type(value)(value, variant_level=
879
value.variant_level+1)
1452
880
return dbus.Dictionary(properties, signature="sv")
1454
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1455
def PropertiesChanged(self, interface_name, changed_properties,
1456
invalidated_properties):
1457
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
1462
882
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1463
883
out_signature="s",
1464
884
path_keyword='object_path',
1465
885
connection_keyword='connection')
1466
886
def Introspect(self, object_path, connection):
1467
"""Overloading of standard D-Bus method.
1469
Inserts property tags and interface annotation tags.
887
"""Standard D-Bus method, overloaded to insert property tags.
1471
xmlstring = DBusObjectWithAnnotations.Introspect(self,
889
xmlstring = dbus.service.Object.Introspect(self, object_path,
1475
892
document = xml.dom.minidom.parseString(xmlstring)
1477
893
def make_tag(document, name, prop):
1478
894
e = document.createElement("property")
1479
895
e.setAttribute("name", name)
1480
896
e.setAttribute("type", prop._dbus_signature)
1481
897
e.setAttribute("access", prop._dbus_access)
1484
899
for if_tag in document.getElementsByTagName("interface"):
1486
900
for tag in (make_tag(document, name, prop)
1488
in self._get_all_dbus_things("property")
902
in self._get_all_dbus_properties()
1489
903
if prop._dbus_interface
1490
904
== if_tag.getAttribute("name")):
1491
905
if_tag.appendChild(tag)
1492
# Add annotation tags for properties
1493
for tag in if_tag.getElementsByTagName("property"):
1495
for name, prop in self._get_all_dbus_things(
1497
if (name == tag.getAttribute("name")
1498
and prop._dbus_interface
1499
== if_tag.getAttribute("name")):
1500
annots.update(getattr(
1501
prop, "_dbus_annotations", {}))
1502
for name, value in annots.items():
1503
ann_tag = document.createElement(
1505
ann_tag.setAttribute("name", name)
1506
ann_tag.setAttribute("value", value)
1507
tag.appendChild(ann_tag)
1508
906
# Add the names to the return values for the
1509
907
# "org.freedesktop.DBus.Properties" methods
1510
908
if (if_tag.getAttribute("name")
1525
923
except (AttributeError, xml.dom.DOMException,
1526
924
xml.parsers.expat.ExpatError) as error:
1527
925
logger.error("Failed to override Introspection method",
1533
dbus.OBJECT_MANAGER_IFACE
1534
except AttributeError:
1535
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1538
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1539
"""A D-Bus object with an ObjectManager.
1541
Classes inheriting from this exposes the standard
1542
GetManagedObjects call and the InterfacesAdded and
1543
InterfacesRemoved signals on the standard
1544
"org.freedesktop.DBus.ObjectManager" interface.
1546
Note: No signals are sent automatically; they must be sent
1549
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1550
out_signature="a{oa{sa{sv}}}")
1551
def GetManagedObjects(self):
1552
"""This function must be overridden"""
1553
raise NotImplementedError()
1555
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1556
signature="oa{sa{sv}}")
1557
def InterfacesAdded(self, object_path, interfaces_and_properties):
1560
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1561
def InterfacesRemoved(self, object_path, interfaces):
1564
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1566
path_keyword='object_path',
1567
connection_keyword='connection')
1568
def Introspect(self, object_path, connection):
1569
"""Overloading of standard D-Bus method.
1571
Override return argument name of GetManagedObjects to be
1572
"objpath_interfaces_and_properties"
1574
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1578
document = xml.dom.minidom.parseString(xmlstring)
1580
for if_tag in document.getElementsByTagName("interface"):
1581
# Fix argument name for the GetManagedObjects method
1582
if (if_tag.getAttribute("name")
1583
== dbus.OBJECT_MANAGER_IFACE):
1584
for cn in if_tag.getElementsByTagName("method"):
1585
if (cn.getAttribute("name")
1586
== "GetManagedObjects"):
1587
for arg in cn.getElementsByTagName("arg"):
1588
if (arg.getAttribute("direction")
1592
"objpath_interfaces"
1594
xmlstring = document.toxml("utf-8")
1596
except (AttributeError, xml.dom.DOMException,
1597
xml.parsers.expat.ExpatError) as error:
1598
logger.error("Failed to override Introspection method",
1603
def datetime_to_dbus(dt, variant_level=0):
930
def datetime_to_dbus (dt, variant_level=0):
1604
931
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1606
return dbus.String("", variant_level=variant_level)
1607
return dbus.String(dt.isoformat(), variant_level=variant_level)
1610
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1611
"""A class decorator; applied to a subclass of
1612
dbus.service.Object, it will add alternate D-Bus attributes with
1613
interface names according to the "alt_interface_names" mapping.
1616
@alternate_dbus_interfaces({"org.example.Interface":
1617
"net.example.AlternateInterface"})
1618
class SampleDBusObject(dbus.service.Object):
1619
@dbus.service.method("org.example.Interface")
1620
def SampleDBusMethod():
1623
The above "SampleDBusMethod" on "SampleDBusObject" will be
1624
reachable via two interfaces: "org.example.Interface" and
1625
"net.example.AlternateInterface", the latter of which will have
1626
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1627
"true", unless "deprecate" is passed with a False value.
1629
This works for methods and signals, and also for D-Bus properties
1630
(from DBusObjectWithProperties) and interfaces (from the
1631
dbus_interface_annotations decorator).
933
return dbus.String("", variant_level = variant_level)
934
return dbus.String(dt.isoformat(),
935
variant_level=variant_level)
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
"""Applied to an empty subclass of a D-Bus object, this metaclass
941
will add additional D-Bus attributes matching a certain pattern.
1635
for orig_interface_name, alt_interface_name in (
1636
alt_interface_names.items()):
1638
interface_names = set()
1639
# Go though all attributes of the class
1640
for attrname, attribute in inspect.getmembers(cls):
943
def __new__(mcs, name, bases, attr):
944
# Go through all the base classes which could have D-Bus
945
# methods, signals, or properties in them
946
for base in (b for b in bases
947
if issubclass(b, dbus.service.Object)):
948
# Go though all attributes of the base class
949
for attrname, attribute in inspect.getmembers(base):
1641
950
# Ignore non-D-Bus attributes, and D-Bus attributes
1642
951
# with the wrong interface name
1643
952
if (not hasattr(attribute, "_dbus_interface")
1644
or not attribute._dbus_interface.startswith(
1645
orig_interface_name)):
953
or not attribute._dbus_interface
954
.startswith("se.recompile.Mandos")):
1647
956
# Create an alternate D-Bus interface name based on
1648
957
# the current name
1649
alt_interface = attribute._dbus_interface.replace(
1650
orig_interface_name, alt_interface_name)
1651
interface_names.add(alt_interface)
958
alt_interface = (attribute._dbus_interface
959
.replace("se.recompile.Mandos",
960
"se.bsnet.fukt.Mandos"))
1652
961
# Is this a D-Bus signal?
1653
962
if getattr(attribute, "_dbus_is_signal", False):
1654
# Extract the original non-method undecorated
1655
# function by black magic
1656
if sys.version_info.major == 2:
1657
nonmethod_func = (dict(
963
# Extract the original non-method function by
965
nonmethod_func = (dict(
1658
966
zip(attribute.func_code.co_freevars,
1659
attribute.__closure__))
1660
["func"].cell_contents)
1662
nonmethod_func = (dict(
1663
zip(attribute.__code__.co_freevars,
1664
attribute.__closure__))
1665
["func"].cell_contents)
967
attribute.__closure__))["func"]
1666
969
# Create a new, but exactly alike, function
1667
970
# object, and decorate it to be a new D-Bus signal
1668
971
# with the alternate D-Bus interface name
1669
new_function = copy_function(nonmethod_func)
1670
new_function = (dbus.service.signal(
1672
attribute._dbus_signature)(new_function))
1673
# Copy annotations, if any
1675
new_function._dbus_annotations = dict(
1676
attribute._dbus_annotations)
1677
except AttributeError:
972
new_function = (dbus.service.signal
974
attribute._dbus_signature)
976
nonmethod_func.func_code,
977
nonmethod_func.func_globals,
978
nonmethod_func.func_name,
979
nonmethod_func.func_defaults,
980
nonmethod_func.func_closure)))
1680
981
# Define a creator of a function to call both the
1681
# original and alternate functions, so both the
1682
# original and alternate signals gets sent when
1683
# the function is called
982
# old and new functions, so both the old and new
983
# signals gets sent when the function is called
1684
984
def fixscope(func1, func2):
1685
985
"""This function is a scope container to pass
1686
986
func1 and func2 to the "call_both" function
1687
987
outside of its arguments"""
1689
@functools.wraps(func2)
1690
988
def call_both(*args, **kwargs):
1691
989
"""This function will emit two D-Bus
1692
990
signals by calling func1 and func2"""
1693
991
func1(*args, **kwargs)
1694
992
func2(*args, **kwargs)
1695
# Make wrapper function look like a D-Bus
1697
for name, attr in inspect.getmembers(func2):
1698
if name.startswith("_dbus_"):
1699
setattr(call_both, name, attr)
1701
993
return call_both
1702
994
# Create the "call_both" function and add it to
1704
attr[attrname] = fixscope(attribute, new_function)
996
attr[attrname] = fixscope(attribute,
1705
998
# Is this a D-Bus method?
1706
999
elif getattr(attribute, "_dbus_is_method", False):
1707
1000
# Create a new, but exactly alike, function
1708
1001
# object. Decorate it to be a new D-Bus method
1709
1002
# with the alternate D-Bus interface name. Add it
1710
1003
# to the class.
1712
dbus.service.method(
1714
attribute._dbus_in_signature,
1715
attribute._dbus_out_signature)
1716
(copy_function(attribute)))
1717
# Copy annotations, if any
1719
attr[attrname]._dbus_annotations = dict(
1720
attribute._dbus_annotations)
1721
except AttributeError:
1004
attr[attrname] = (dbus.service.method
1006
attribute._dbus_in_signature,
1007
attribute._dbus_out_signature)
1009
(attribute.func_code,
1010
attribute.func_globals,
1011
attribute.func_name,
1012
attribute.func_defaults,
1013
attribute.func_closure)))
1723
1014
# Is this a D-Bus property?
1724
1015
elif getattr(attribute, "_dbus_is_property", False):
1725
1016
# Create a new, but exactly alike, function
1726
1017
# object, and decorate it to be a new D-Bus
1727
1018
# property with the alternate D-Bus interface
1728
1019
# name. Add it to the class.
1729
attr[attrname] = (dbus_service_property(
1730
alt_interface, attribute._dbus_signature,
1731
attribute._dbus_access,
1732
attribute._dbus_get_args_options
1734
(copy_function(attribute)))
1735
# Copy annotations, if any
1737
attr[attrname]._dbus_annotations = dict(
1738
attribute._dbus_annotations)
1739
except AttributeError:
1741
# Is this a D-Bus interface?
1742
elif getattr(attribute, "_dbus_is_interface", False):
1743
# Create a new, but exactly alike, function
1744
# object. Decorate it to be a new D-Bus interface
1745
# with the alternate D-Bus interface name. Add it
1748
dbus_interface_annotations(alt_interface)
1749
(copy_function(attribute)))
1751
# Deprecate all alternate interfaces
1752
iname = "_AlternateDBusNames_interface_annotation{}"
1753
for interface_name in interface_names:
1755
@dbus_interface_annotations(interface_name)
1757
return {"org.freedesktop.DBus.Deprecated":
1759
# Find an unused name
1760
for aname in (iname.format(i)
1761
for i in itertools.count()):
1762
if aname not in attr:
1766
# Replace the class with a new subclass of it with
1767
# methods, signals, etc. as created above.
1768
if sys.version_info.major == 2:
1769
cls = type(b"{}Alternate".format(cls.__name__),
1772
cls = type("{}Alternate".format(cls.__name__),
1779
@alternate_dbus_interfaces({"se.recompile.Mandos":
1780
"se.bsnet.fukt.Mandos"})
1020
attr[attrname] = (dbus_service_property
1022
attribute._dbus_signature,
1023
attribute._dbus_access,
1025
._dbus_get_args_options
1028
(attribute.func_code,
1029
attribute.func_globals,
1030
attribute.func_name,
1031
attribute.func_defaults,
1032
attribute.func_closure)))
1033
return type.__new__(mcs, name, bases, attr)
1781
1036
class ClientDBus(Client, DBusObjectWithProperties):
1782
1037
"""A Client class using D-Bus
1785
1040
dbus_object_path: dbus.ObjectPath
1786
1041
bus: dbus.SystemBus()
1789
1044
runtime_expansions = (Client.runtime_expansions
1790
+ ("dbus_object_path", ))
1792
_interface = "se.recompile.Mandos.Client"
1045
+ ("dbus_object_path",))
1794
1047
# dbus.service.Object doesn't use super(), so we can't either.
1796
def __init__(self, bus=None, *args, **kwargs):
1049
def __init__(self, bus = None, *args, **kwargs):
1798
1051
Client.__init__(self, *args, **kwargs)
1799
1052
# Only now, when this client is initialized, can it show up on
1801
client_object_name = str(self.name).translate(
1054
client_object_name = unicode(self.name).translate(
1802
1055
{ord("."): ord("_"),
1803
1056
ord("-"): ord("_")})
1804
self.dbus_object_path = dbus.ObjectPath(
1805
"/clients/" + client_object_name)
1057
self.dbus_object_path = (dbus.ObjectPath
1058
("/clients/" + client_object_name))
1806
1059
DBusObjectWithProperties.__init__(self, self.bus,
1807
1060
self.dbus_object_path)
1809
def notifychangeproperty(transform_func, dbus_name,
1810
type_func=lambda x: x,
1812
invalidate_only=False,
1813
_interface=_interface):
1062
def notifychangeproperty(transform_func,
1063
dbus_name, type_func=lambda x: x,
1814
1065
""" Modify a variable so that it's a property which announces
1815
1066
its changes to DBus.
1817
1068
transform_fun: Function that takes a value and a variant_level
1818
1069
and transforms it to a D-Bus type.
1819
1070
dbus_name: D-Bus name of the variable
1821
1072
to the D-Bus. Default: no transform
1822
1073
variant_level: D-Bus variant level. Default: 1
1824
attrname = "_{}".format(dbus_name)
1075
attrname = "_{0}".format(dbus_name)
1826
1076
def setter(self, value):
1827
1077
if hasattr(self, "dbus_object_path"):
1828
1078
if (not hasattr(self, attrname) or
1829
1079
type_func(getattr(self, attrname, None))
1830
1080
!= type_func(value)):
1832
self.PropertiesChanged(
1833
_interface, dbus.Dictionary(),
1834
dbus.Array((dbus_name, )))
1836
dbus_value = transform_func(
1838
variant_level=variant_level)
1839
self.PropertyChanged(dbus.String(dbus_name),
1841
self.PropertiesChanged(
1843
dbus.Dictionary({dbus.String(dbus_name):
1081
dbus_value = transform_func(type_func(value),
1084
self.PropertyChanged(dbus.String(dbus_name),
1846
1086
setattr(self, attrname, value)
1848
1088
return property(lambda self: getattr(self, attrname), setter)
1850
1091
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1851
1092
approvals_pending = notifychangeproperty(dbus.Boolean,
1852
1093
"ApprovalPending",
1854
1095
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1855
1096
last_enabled = notifychangeproperty(datetime_to_dbus,
1857
checker = notifychangeproperty(
1858
dbus.Boolean, "CheckerRunning",
1859
type_func=lambda checker: checker is not None)
1098
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1099
type_func = lambda checker:
1100
checker is not None)
1860
1101
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1861
1102
"LastCheckedOK")
1862
last_checker_status = notifychangeproperty(dbus.Int16,
1863
"LastCheckerStatus")
1864
1103
last_approval_request = notifychangeproperty(
1865
1104
datetime_to_dbus, "LastApprovalRequest")
1866
1105
approved_by_default = notifychangeproperty(dbus.Boolean,
1867
1106
"ApprovedByDefault")
1868
approval_delay = notifychangeproperty(
1869
dbus.UInt64, "ApprovalDelay",
1870
type_func=lambda td: td.total_seconds() * 1000)
1107
approval_delay = notifychangeproperty(dbus.UInt64,
1110
timedelta_to_milliseconds)
1871
1111
approval_duration = notifychangeproperty(
1872
1112
dbus.UInt64, "ApprovalDuration",
1873
type_func=lambda td: td.total_seconds() * 1000)
1113
type_func = timedelta_to_milliseconds)
1874
1114
host = notifychangeproperty(dbus.String, "Host")
1875
timeout = notifychangeproperty(
1876
dbus.UInt64, "Timeout",
1877
type_func=lambda td: td.total_seconds() * 1000)
1115
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1117
timedelta_to_milliseconds)
1878
1118
extended_timeout = notifychangeproperty(
1879
1119
dbus.UInt64, "ExtendedTimeout",
1880
type_func=lambda td: td.total_seconds() * 1000)
1881
interval = notifychangeproperty(
1882
dbus.UInt64, "Interval",
1883
type_func=lambda td: td.total_seconds() * 1000)
1120
type_func = timedelta_to_milliseconds)
1121
interval = notifychangeproperty(dbus.UInt64,
1124
timedelta_to_milliseconds)
1884
1125
checker_command = notifychangeproperty(dbus.String, "Checker")
1885
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1886
invalidate_only=True)
1888
1127
del notifychangeproperty
1890
1129
def __del__(self, *args, **kwargs):
1892
1131
self.remove_from_connection()
1971
1211
server to mandos-client
1975
1215
# Rejected - signal
1976
1216
@dbus.service.signal(_interface, signature="s")
1977
1217
def Rejected(self, reason):
1981
1221
# NeedApproval - signal
1982
1222
@dbus.service.signal(_interface, signature="tb")
1983
1223
def NeedApproval(self, timeout, default):
1985
1225
return self.need_approval()
1989
1229
# Approve - method
1990
1230
@dbus.service.method(_interface, in_signature="b")
1991
1231
def Approve(self, value):
1992
1232
self.approve(value)
1994
1234
# CheckedOK - method
1995
1235
@dbus.service.method(_interface)
1996
1236
def CheckedOK(self):
1997
1237
self.checked_ok()
1999
1239
# Enable - method
2000
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2001
1240
@dbus.service.method(_interface)
2002
1241
def Enable(self):
2006
1245
# StartChecker - method
2007
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2008
1246
@dbus.service.method(_interface)
2009
1247
def StartChecker(self):
2011
1249
self.start_checker()
2013
1251
# Disable - method
2014
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2015
1252
@dbus.service.method(_interface)
2016
1253
def Disable(self):
2020
1257
# StopChecker - method
2021
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2022
1258
@dbus.service.method(_interface)
2023
1259
def StopChecker(self):
2024
1260
self.stop_checker()
2028
1264
# ApprovalPending - property
2029
1265
@dbus_service_property(_interface, signature="b", access="read")
2030
1266
def ApprovalPending_dbus_property(self):
2031
1267
return dbus.Boolean(bool(self.approvals_pending))
2033
1269
# ApprovedByDefault - property
2034
@dbus_service_property(_interface,
1270
@dbus_service_property(_interface, signature="b",
2036
1271
access="readwrite")
2037
1272
def ApprovedByDefault_dbus_property(self, value=None):
2038
1273
if value is None: # get
2039
1274
return dbus.Boolean(self.approved_by_default)
2040
1275
self.approved_by_default = bool(value)
2042
1277
# ApprovalDelay - property
2043
@dbus_service_property(_interface,
1278
@dbus_service_property(_interface, signature="t",
2045
1279
access="readwrite")
2046
1280
def ApprovalDelay_dbus_property(self, value=None):
2047
1281
if value is None: # get
2048
return dbus.UInt64(self.approval_delay.total_seconds()
1282
return dbus.UInt64(self.approval_delay_milliseconds())
2050
1283
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2052
1285
# ApprovalDuration - property
2053
@dbus_service_property(_interface,
1286
@dbus_service_property(_interface, signature="t",
2055
1287
access="readwrite")
2056
1288
def ApprovalDuration_dbus_property(self, value=None):
2057
1289
if value is None: # get
2058
return dbus.UInt64(self.approval_duration.total_seconds()
1290
return dbus.UInt64(timedelta_to_milliseconds(
1291
self.approval_duration))
2060
1292
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2062
1294
# Name - property
2064
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2065
1295
@dbus_service_property(_interface, signature="s", access="read")
2066
1296
def Name_dbus_property(self):
2067
1297
return dbus.String(self.name)
2071
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2072
@dbus_service_property(_interface, signature="s", access="read")
2073
def KeyID_dbus_property(self):
2074
return dbus.String(self.key_id)
2076
1299
# Fingerprint - property
2078
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2079
1300
@dbus_service_property(_interface, signature="s", access="read")
2080
1301
def Fingerprint_dbus_property(self):
2081
1302
return dbus.String(self.fingerprint)
2083
1304
# Host - property
2084
@dbus_service_property(_interface,
1305
@dbus_service_property(_interface, signature="s",
2086
1306
access="readwrite")
2087
1307
def Host_dbus_property(self, value=None):
2088
1308
if value is None: # get
2089
1309
return dbus.String(self.host)
2090
self.host = str(value)
1310
self.host = unicode(value)
2092
1312
# Created - property
2094
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2095
1313
@dbus_service_property(_interface, signature="s", access="read")
2096
1314
def Created_dbus_property(self):
2097
1315
return datetime_to_dbus(self.created)
2099
1317
# LastEnabled - property
2100
1318
@dbus_service_property(_interface, signature="s", access="read")
2101
1319
def LastEnabled_dbus_property(self):
2102
1320
return datetime_to_dbus(self.last_enabled)
2104
1322
# Enabled - property
2105
@dbus_service_property(_interface,
1323
@dbus_service_property(_interface, signature="b",
2107
1324
access="readwrite")
2108
1325
def Enabled_dbus_property(self, value=None):
2109
1326
if value is None: # get
2116
1333
# LastCheckedOK - property
2117
@dbus_service_property(_interface,
1334
@dbus_service_property(_interface, signature="s",
2119
1335
access="readwrite")
2120
1336
def LastCheckedOK_dbus_property(self, value=None):
2121
1337
if value is not None:
2122
1338
self.checked_ok()
2124
1340
return datetime_to_dbus(self.last_checked_ok)
2126
# LastCheckerStatus - property
2127
@dbus_service_property(_interface, signature="n", access="read")
2128
def LastCheckerStatus_dbus_property(self):
2129
return dbus.Int16(self.last_checker_status)
2131
1342
# Expires - property
2132
1343
@dbus_service_property(_interface, signature="s", access="read")
2133
1344
def Expires_dbus_property(self):
2134
1345
return datetime_to_dbus(self.expires)
2136
1347
# LastApprovalRequest - property
2137
1348
@dbus_service_property(_interface, signature="s", access="read")
2138
1349
def LastApprovalRequest_dbus_property(self):
2139
1350
return datetime_to_dbus(self.last_approval_request)
2141
1352
# Timeout - property
2142
@dbus_service_property(_interface,
1353
@dbus_service_property(_interface, signature="t",
2144
1354
access="readwrite")
2145
1355
def Timeout_dbus_property(self, value=None):
2146
1356
if value is None: # get
2147
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2148
old_timeout = self.timeout
1357
return dbus.UInt64(self.timeout_milliseconds())
2149
1358
self.timeout = datetime.timedelta(0, 0, 0, value)
2150
# Reschedule disabling
1359
# Reschedule timeout
2151
1360
if self.enabled:
2152
1361
now = datetime.datetime.utcnow()
2153
self.expires += self.timeout - old_timeout
2154
if self.expires <= now:
1362
time_to_die = timedelta_to_milliseconds(
1363
(self.last_checked_ok + self.timeout) - now)
1364
if time_to_die <= 0:
2155
1365
# The timeout has passed
1368
self.expires = (now +
1369
datetime.timedelta(milliseconds =
2158
1371
if (getattr(self, "disable_initiator_tag", None)
2161
GLib.source_remove(self.disable_initiator_tag)
2162
self.disable_initiator_tag = GLib.timeout_add(
2163
int((self.expires - now).total_seconds() * 1000),
1374
gobject.source_remove(self.disable_initiator_tag)
1375
self.disable_initiator_tag = (gobject.timeout_add
2166
1379
# ExtendedTimeout - property
2167
@dbus_service_property(_interface,
1380
@dbus_service_property(_interface, signature="t",
2169
1381
access="readwrite")
2170
1382
def ExtendedTimeout_dbus_property(self, value=None):
2171
1383
if value is None: # get
2172
return dbus.UInt64(self.extended_timeout.total_seconds()
1384
return dbus.UInt64(self.extended_timeout_milliseconds())
2174
1385
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2176
1387
# Interval - property
2177
@dbus_service_property(_interface,
1388
@dbus_service_property(_interface, signature="t",
2179
1389
access="readwrite")
2180
1390
def Interval_dbus_property(self, value=None):
2181
1391
if value is None: # get
2182
return dbus.UInt64(self.interval.total_seconds() * 1000)
1392
return dbus.UInt64(self.interval_milliseconds())
2183
1393
self.interval = datetime.timedelta(0, 0, 0, value)
2184
1394
if getattr(self, "checker_initiator_tag", None) is None:
2186
1396
if self.enabled:
2187
1397
# Reschedule checker run
2188
GLib.source_remove(self.checker_initiator_tag)
2189
self.checker_initiator_tag = GLib.timeout_add(
2190
value, self.start_checker)
2191
self.start_checker() # Start one now, too
1398
gobject.source_remove(self.checker_initiator_tag)
1399
self.checker_initiator_tag = (gobject.timeout_add
1400
(value, self.start_checker))
1401
self.start_checker() # Start one now, too
2193
1403
# Checker - property
2194
@dbus_service_property(_interface,
1404
@dbus_service_property(_interface, signature="s",
2196
1405
access="readwrite")
2197
1406
def Checker_dbus_property(self, value=None):
2198
1407
if value is None: # get
2199
1408
return dbus.String(self.checker_command)
2200
self.checker_command = str(value)
1409
self.checker_command = unicode(value)
2202
1411
# CheckerRunning - property
2203
@dbus_service_property(_interface,
1412
@dbus_service_property(_interface, signature="b",
2205
1413
access="readwrite")
2206
1414
def CheckerRunning_dbus_property(self, value=None):
2207
1415
if value is None: # get
2248
1448
if data[0] == 'data':
2250
1450
if data[0] == 'function':
2252
1451
def func(*args, **kwargs):
2253
1452
self._pipe.send(('funcall', name, args, kwargs))
2254
1453
return self._pipe.recv()[1]
2258
1456
def __setattr__(self, name, value):
2259
1457
if name == '_pipe':
2260
1458
return super(ProxyClient, self).__setattr__(name, value)
2261
1459
self._pipe.send(('setattr', name, value))
1462
class ClientDBusTransitional(ClientDBus):
1463
__metaclass__ = AlternateDBusNamesMetaclass
2264
1466
class ClientHandler(socketserver.BaseRequestHandler, object):
2265
1467
"""A class to handle client connections.
2267
1469
Instantiated once for each connection to handle it.
2268
1470
Note: This will run in its own forked process."""
2270
1472
def handle(self):
2271
1473
with contextlib.closing(self.server.child_pipe) as child_pipe:
2272
1474
logger.info("TCP connection from: %s",
2273
str(self.client_address))
1475
unicode(self.client_address))
2274
1476
logger.debug("Pipe FD: %d",
2275
1477
self.server.child_pipe.fileno())
2277
session = gnutls.ClientSession(self.request)
2279
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2280
# "+AES-256-CBC", "+SHA1",
2281
# "+COMP-NULL", "+CTYPE-OPENPGP",
1479
session = (gnutls.connection
1480
.ClientSession(self.request,
1482
.X509Credentials()))
1484
# Note: gnutls.connection.X509Credentials is really a
1485
# generic GnuTLS certificate credentials object so long as
1486
# no X.509 keys are added to it. Therefore, we can use it
1487
# here despite using OpenPGP certificates.
1489
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1490
# "+AES-256-CBC", "+SHA1",
1491
# "+COMP-NULL", "+CTYPE-OPENPGP",
2283
1493
# Use a fallback default, since this MUST be set.
2284
1494
priority = self.server.gnutls_priority
2285
1495
if priority is None:
2286
1496
priority = "NORMAL"
2287
gnutls.priority_set_direct(session._c_object,
2288
priority.encode("utf-8"),
1497
(gnutls.library.functions
1498
.gnutls_priority_set_direct(session._c_object,
2291
1501
# Start communication using the Mandos protocol
2292
1502
# Get protocol number
2293
1503
line = self.request.makefile().readline()
2294
1504
logger.debug("Protocol version: %r", line)
2296
1506
if int(line.strip().split()[0]) > 1:
2297
raise RuntimeError(line)
2298
1508
except (ValueError, IndexError, RuntimeError) as error:
2299
1509
logger.error("Unknown protocol version: %s", error)
2302
1512
# Start GnuTLS connection
2304
1514
session.handshake()
2305
except gnutls.Error as error:
1515
except gnutls.errors.GNUTLSError as error:
2306
1516
logger.warning("Handshake failed: %s", error)
2307
1517
# Do not run session.bye() here: the session is not
2308
1518
# established. Just abandon the request.
2310
1520
logger.debug("Handshake succeeded")
2312
1522
approval_required = False
2314
if gnutls.has_rawpk:
2317
key_id = self.key_id(
2318
self.peer_certificate(session))
2319
except (TypeError, gnutls.Error) as error:
2320
logger.warning("Bad certificate: %s", error)
2322
logger.debug("Key ID: %s", key_id)
2327
fpr = self.fingerprint(
2328
self.peer_certificate(session))
2329
except (TypeError, gnutls.Error) as error:
2330
logger.warning("Bad certificate: %s", error)
2332
logger.debug("Fingerprint: %s", fpr)
2335
client = ProxyClient(child_pipe, key_id, fpr,
1525
fpr = self.fingerprint(self.peer_certificate
1528
gnutls.errors.GNUTLSError) as error:
1529
logger.warning("Bad certificate: %s", error)
1531
logger.debug("Fingerprint: %s", fpr)
1534
client = ProxyClient(child_pipe, fpr,
2336
1535
self.client_address)
2337
1536
except KeyError:
2340
1539
if client.approval_delay:
2341
1540
delay = client.approval_delay
2342
1541
client.approvals_pending += 1
2343
1542
approval_required = True
2346
1545
if not client.enabled:
2347
1546
logger.info("Client %s is disabled",
2349
1548
if self.server.use_dbus:
2350
1549
# Emit D-Bus signal
2351
1550
client.Rejected("Disabled")
2354
1553
if client.approved or not client.approval_delay:
2355
# We are approved or approval is disabled
1554
#We are approved or approval is disabled
2357
1556
elif client.approved is None:
2358
1557
logger.info("Client %s needs approval",
2391
1592
delay -= time2 - time
2394
session.send(client.secret)
2395
except gnutls.Error as error:
2396
logger.warning("gnutls send failed",
1595
while sent_size < len(client.secret):
1597
sent = session.send(client.secret[sent_size:])
1598
except gnutls.errors.GNUTLSError as error:
1599
logger.warning("gnutls send failed")
1601
logger.debug("Sent: %d, remaining: %d",
1602
sent, len(client.secret)
1603
- (sent_size + sent))
2400
1606
logger.info("Sending secret to %s", client.name)
2401
1607
# bump the timeout using extended_timeout
2402
client.bump_timeout(client.extended_timeout)
1608
client.checked_ok(client.extended_timeout)
2403
1609
if self.server.use_dbus:
2404
1610
# Emit D-Bus signal
2405
1611
client.GotSecret()
2408
1614
if approval_required:
2409
1615
client.approvals_pending -= 1
2412
except gnutls.Error as error:
2413
logger.warning("GnuTLS bye failed",
1618
except gnutls.errors.GNUTLSError as error:
1619
logger.warning("GnuTLS bye failed")
2417
1622
def peer_certificate(session):
2418
"Return the peer's certificate as a bytestring"
2420
cert_type = gnutls.certificate_type_get2(session._c_object,
2422
except AttributeError:
2423
cert_type = gnutls.certificate_type_get(session._c_object)
2424
if gnutls.has_rawpk:
2425
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2427
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2428
# If not a valid certificate type...
2429
if cert_type not in valid_cert_types:
2430
logger.info("Cert type %r not in %r", cert_type,
2432
# ...return invalid data
1623
"Return the peer's OpenPGP certificate as a bytestring"
1624
# If not an OpenPGP certificate...
1625
if (gnutls.library.functions
1626
.gnutls_certificate_type_get(session._c_object)
1627
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1628
# ...do the normal thing
1629
return session.peer_certificate
2434
1630
list_size = ctypes.c_uint(1)
2435
cert_list = (gnutls.certificate_get_peers
1631
cert_list = (gnutls.library.functions
1632
.gnutls_certificate_get_peers
2436
1633
(session._c_object, ctypes.byref(list_size)))
2437
1634
if not bool(cert_list) and list_size.value != 0:
2438
raise gnutls.Error("error getting peer certificate")
1635
raise gnutls.errors.GNUTLSError("error getting peer"
2439
1637
if list_size.value == 0:
2441
1639
cert = cert_list[0]
2442
1640
return ctypes.string_at(cert.data, cert.size)
2445
def key_id(certificate):
2446
"Convert a certificate bytestring to a hexdigit key ID"
2447
# New GnuTLS "datum" with the public key
2448
datum = gnutls.datum_t(
2449
ctypes.cast(ctypes.c_char_p(certificate),
2450
ctypes.POINTER(ctypes.c_ubyte)),
2451
ctypes.c_uint(len(certificate)))
2452
# XXX all these need to be created in the gnutls "module"
2453
# New empty GnuTLS certificate
2454
pubkey = gnutls.pubkey_t()
2455
gnutls.pubkey_init(ctypes.byref(pubkey))
2456
# Import the raw public key into the certificate
2457
gnutls.pubkey_import(pubkey,
2458
ctypes.byref(datum),
2459
gnutls.X509_FMT_DER)
2460
# New buffer for the key ID
2461
buf = ctypes.create_string_buffer(32)
2462
buf_len = ctypes.c_size_t(len(buf))
2463
# Get the key ID from the raw public key into the buffer
2464
gnutls.pubkey_get_key_id(pubkey,
2465
gnutls.KEYID_USE_SHA256,
2466
ctypes.cast(ctypes.byref(buf),
2467
ctypes.POINTER(ctypes.c_ubyte)),
2468
ctypes.byref(buf_len))
2469
# Deinit the certificate
2470
gnutls.pubkey_deinit(pubkey)
2472
# Convert the buffer to a Python bytestring
2473
key_id = ctypes.string_at(buf, buf_len.value)
2474
# Convert the bytestring to hexadecimal notation
2475
hex_key_id = binascii.hexlify(key_id).upper()
2479
1643
def fingerprint(openpgp):
2480
1644
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2481
1645
# New GnuTLS "datum" with the OpenPGP public key
2482
datum = gnutls.datum_t(
2483
ctypes.cast(ctypes.c_char_p(openpgp),
2484
ctypes.POINTER(ctypes.c_ubyte)),
2485
ctypes.c_uint(len(openpgp)))
1646
datum = (gnutls.library.types
1647
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1650
ctypes.c_uint(len(openpgp))))
2486
1651
# New empty GnuTLS certificate
2487
crt = gnutls.openpgp_crt_t()
2488
gnutls.openpgp_crt_init(ctypes.byref(crt))
1652
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1653
(gnutls.library.functions
1654
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2489
1655
# Import the OpenPGP public key into the certificate
2490
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2491
gnutls.OPENPGP_FMT_RAW)
1656
(gnutls.library.functions
1657
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1658
gnutls.library.constants
1659
.GNUTLS_OPENPGP_FMT_RAW))
2492
1660
# Verify the self signature in the key
2493
1661
crtverify = ctypes.c_uint()
2494
gnutls.openpgp_crt_verify_self(crt, 0,
2495
ctypes.byref(crtverify))
1662
(gnutls.library.functions
1663
.gnutls_openpgp_crt_verify_self(crt, 0,
1664
ctypes.byref(crtverify)))
2496
1665
if crtverify.value != 0:
2497
gnutls.openpgp_crt_deinit(crt)
2498
raise gnutls.CertificateSecurityError(code
1666
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1667
raise (gnutls.errors.CertificateSecurityError
2500
1669
# New buffer for the fingerprint
2501
1670
buf = ctypes.create_string_buffer(20)
2502
1671
buf_len = ctypes.c_size_t()
2503
1672
# Get the fingerprint from the certificate into the buffer
2504
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2505
ctypes.byref(buf_len))
1673
(gnutls.library.functions
1674
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1675
ctypes.byref(buf_len)))
2506
1676
# Deinit the certificate
2507
gnutls.openpgp_crt_deinit(crt)
1677
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2508
1678
# Convert the buffer to a Python bytestring
2509
1679
fpr = ctypes.string_at(buf, buf_len.value)
2510
1680
# Convert the bytestring to hexadecimal notation
2515
class MultiprocessingMixIn:
1685
class MultiprocessingMixIn(object):
2516
1686
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2518
1687
def sub_process_main(self, request, address):
2520
1689
self.finish_request(request, address)
2521
1690
except Exception:
2522
1691
self.handle_error(request, address)
2523
1692
self.close_request(request)
2525
1694
def process_request(self, request, address):
2526
1695
"""Start a new process to process the request."""
2527
proc = multiprocessing.Process(target=self.sub_process_main,
2528
args=(request, address))
1696
proc = multiprocessing.Process(target = self.sub_process_main,
2533
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1703
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2534
1704
""" adds a pipe to the MixIn """
2536
1705
def process_request(self, request, client_address):
2537
1706
"""Overrides and wraps the original process_request().
2539
1708
This function creates a new pipe in self.pipe
2541
1710
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2543
1712
proc = MultiprocessingMixIn.process_request(self, request,
2544
1713
client_address)
2545
1714
self.child_pipe.close()
2546
1715
self.add_pipe(parent_pipe, proc)
2548
1717
def add_pipe(self, parent_pipe, proc):
2549
1718
"""Dummy function; override as necessary"""
2550
raise NotImplementedError()
1719
raise NotImplementedError
2553
1722
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2554
socketserver.TCPServer):
1723
socketserver.TCPServer, object):
2555
1724
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2558
1727
enabled: Boolean; whether this server is activated yet
2559
1728
interface: None or a network interface name (string)
2560
1729
use_ipv6: Boolean; to use IPv6 or not
2563
1731
def __init__(self, server_address, RequestHandlerClass,
2567
"""If socketfd is set, use that file descriptor instead of
2568
creating a new one with socket.socket().
1732
interface=None, use_ipv6=True):
2570
1733
self.interface = interface
2572
1735
self.address_family = socket.AF_INET6
2573
if socketfd is not None:
2574
# Save the file descriptor
2575
self.socketfd = socketfd
2576
# Save the original socket.socket() function
2577
self.socket_socket = socket.socket
2579
# To implement --socket, we monkey patch socket.socket.
2581
# (When socketserver.TCPServer is a new-style class, we
2582
# could make self.socket into a property instead of monkey
2583
# patching socket.socket.)
2585
# Create a one-time-only replacement for socket.socket()
2586
@functools.wraps(socket.socket)
2587
def socket_wrapper(*args, **kwargs):
2588
# Restore original function so subsequent calls are
2590
socket.socket = self.socket_socket
2591
del self.socket_socket
2592
# This time only, return a new socket object from the
2593
# saved file descriptor.
2594
return socket.fromfd(self.socketfd, *args, **kwargs)
2595
# Replace socket.socket() function with wrapper
2596
socket.socket = socket_wrapper
2597
# The socketserver.TCPServer.__init__ will call
2598
# socket.socket(), which might be our replacement,
2599
# socket_wrapper(), if socketfd was set.
2600
1736
socketserver.TCPServer.__init__(self, server_address,
2601
1737
RequestHandlerClass)
2603
1738
def server_bind(self):
2604
1739
"""This overrides the normal server_bind() function
2605
1740
to bind to an interface if one was specified, and also NOT to
2606
1741
bind to an address or port if they were not specified."""
2607
global SO_BINDTODEVICE
2608
1742
if self.interface is not None:
2609
1743
if SO_BINDTODEVICE is None:
2610
# Fall back to a hard-coded value which seems to be
2612
logger.warning("SO_BINDTODEVICE not found, trying 25")
2613
SO_BINDTODEVICE = 25
2615
self.socket.setsockopt(
2616
socket.SOL_SOCKET, SO_BINDTODEVICE,
2617
(self.interface + "\0").encode("utf-8"))
2618
except socket.error as error:
2619
if error.errno == errno.EPERM:
2620
logger.error("No permission to bind to"
2621
" interface %s", self.interface)
2622
elif error.errno == errno.ENOPROTOOPT:
2623
logger.error("SO_BINDTODEVICE not available;"
2624
" cannot bind to interface %s",
2626
elif error.errno == errno.ENODEV:
2627
logger.error("Interface %s does not exist,"
2628
" cannot bind", self.interface)
1744
logger.error("SO_BINDTODEVICE does not exist;"
1745
" cannot bind to interface %s",
1749
self.socket.setsockopt(socket.SOL_SOCKET,
1753
except socket.error as error:
1754
if error[0] == errno.EPERM:
1755
logger.error("No permission to"
1756
" bind to interface %s",
1758
elif error[0] == errno.ENOPROTOOPT:
1759
logger.error("SO_BINDTODEVICE not available;"
1760
" cannot bind to interface %s",
2631
1764
# Only bind(2) the socket if we really need to.
2632
1765
if self.server_address[0] or self.server_address[1]:
2633
if self.server_address[1]:
2634
self.allow_reuse_address = True
2635
1766
if not self.server_address[0]:
2636
1767
if self.address_family == socket.AF_INET6:
2637
any_address = "::" # in6addr_any
1768
any_address = "::" # in6addr_any
2639
any_address = "0.0.0.0" # INADDR_ANY
1770
any_address = socket.INADDR_ANY
2640
1771
self.server_address = (any_address,
2641
1772
self.server_address[1])
2642
1773
elif not self.server_address[1]:
2643
self.server_address = (self.server_address[0], 0)
1774
self.server_address = (self.server_address[0],
2644
1776
# if self.interface:
2645
1777
# self.server_address = (self.server_address[0],
2676
1803
self.gnutls_priority = gnutls_priority
2677
1804
IPv6_TCPServer.__init__(self, server_address,
2678
1805
RequestHandlerClass,
2679
interface=interface,
1806
interface = interface,
1807
use_ipv6 = use_ipv6)
2683
1808
def server_activate(self):
2684
1809
if self.enabled:
2685
1810
return socketserver.TCPServer.server_activate(self)
2687
1812
def enable(self):
2688
1813
self.enabled = True
2690
1815
def add_pipe(self, parent_pipe, proc):
2691
1816
# Call "handle_ipc" for both data and EOF events
2693
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2694
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2695
functools.partial(self.handle_ipc,
2696
parent_pipe=parent_pipe,
2699
def handle_ipc(self, source, condition,
2702
client_object=None):
1817
gobject.io_add_watch(parent_pipe.fileno(),
1818
gobject.IO_IN | gobject.IO_HUP,
1819
functools.partial(self.handle_ipc,
1824
def handle_ipc(self, source, condition, parent_pipe=None,
1825
proc = None, client_object=None):
1827
gobject.IO_IN: "IN", # There is data to read.
1828
gobject.IO_OUT: "OUT", # Data can be written (without
1830
gobject.IO_PRI: "PRI", # There is urgent data to read.
1831
gobject.IO_ERR: "ERR", # Error condition.
1832
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1833
# broken, usually for pipes and
1836
conditions_string = ' | '.join(name
1838
condition_names.iteritems()
1839
if cond & condition)
2703
1840
# error, or the other end of multiprocessing.Pipe has closed
2704
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1841
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2705
1842
# Wait for other process to exit
2709
1846
# Read a request from the child
2710
1847
request = parent_pipe.recv()
2711
1848
command = request[0]
2713
1850
if command == 'init':
2714
key_id = request[1].decode("ascii")
2715
fpr = request[2].decode("ascii")
2716
address = request[3]
2718
for c in self.clients.values():
2719
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2721
if key_id and c.key_id == key_id:
2724
if fpr and c.fingerprint == fpr:
1852
address = request[2]
1854
for c in self.clients.itervalues():
1855
if c.fingerprint == fpr:
2728
logger.info("Client not found for key ID: %s, address"
2729
": %s", key_id or fpr, address)
1859
logger.info("Client not found for fingerprint: %s, ad"
1860
"dress: %s", fpr, address)
2730
1861
if self.use_dbus:
2731
1862
# Emit D-Bus signal
2732
mandos_dbus_service.ClientNotFound(key_id or fpr,
1863
mandos_dbus_service.ClientNotFound(fpr,
2734
1865
parent_pipe.send(False)
2738
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2739
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2740
functools.partial(self.handle_ipc,
2741
parent_pipe=parent_pipe,
2743
client_object=client))
1868
gobject.io_add_watch(parent_pipe.fileno(),
1869
gobject.IO_IN | gobject.IO_HUP,
1870
functools.partial(self.handle_ipc,
2744
1876
parent_pipe.send(True)
2745
1877
# remove the old hook in favor of the new above hook on
2749
1881
funcname = request[1]
2750
1882
args = request[2]
2751
1883
kwargs = request[3]
2753
1885
parent_pipe.send(('data', getattr(client_object,
2754
1886
funcname)(*args,
2757
1889
if command == 'getattr':
2758
1890
attrname = request[1]
2759
if isinstance(client_object.__getattribute__(attrname),
2760
collections.abc.Callable):
2761
parent_pipe.send(('function', ))
1891
if callable(client_object.__getattribute__(attrname)):
1892
parent_pipe.send(('function',))
2764
'data', client_object.__getattribute__(attrname)))
1894
parent_pipe.send(('data', client_object
1895
.__getattribute__(attrname)))
2766
1897
if command == 'setattr':
2767
1898
attrname = request[1]
2768
1899
value = request[2]
2769
1900
setattr(client_object, attrname, value)
2774
def rfc3339_duration_to_delta(duration):
2775
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2777
>>> rfc3339_duration_to_delta("P7D") == datetime.timedelta(7)
2779
>>> rfc3339_duration_to_delta("PT60S") == datetime.timedelta(0, 60)
2781
>>> rfc3339_duration_to_delta("PT60M") == datetime.timedelta(0, 3600)
2783
>>> rfc3339_duration_to_delta("PT24H") == datetime.timedelta(1)
2785
>>> rfc3339_duration_to_delta("P1W") == datetime.timedelta(7)
2787
>>> rfc3339_duration_to_delta("PT5M30S") == datetime.timedelta(0, 330)
2789
>>> rfc3339_duration_to_delta("P1DT3M20S") == datetime.timedelta(1, 200)
2793
# Parsing an RFC 3339 duration with regular expressions is not
2794
# possible - there would have to be multiple places for the same
2795
# values, like seconds. The current code, while more esoteric, is
2796
# cleaner without depending on a parsing library. If Python had a
2797
# built-in library for parsing we would use it, but we'd like to
2798
# avoid excessive use of external libraries.
2800
# New type for defining tokens, syntax, and semantics all-in-one
2801
Token = collections.namedtuple("Token", (
2802
"regexp", # To match token; if "value" is not None, must have
2803
# a "group" containing digits
2804
"value", # datetime.timedelta or None
2805
"followers")) # Tokens valid after this token
2806
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2807
# the "duration" ABNF definition in RFC 3339, Appendix A.
2808
token_end = Token(re.compile(r"$"), None, frozenset())
2809
token_second = Token(re.compile(r"(\d+)S"),
2810
datetime.timedelta(seconds=1),
2811
frozenset((token_end, )))
2812
token_minute = Token(re.compile(r"(\d+)M"),
2813
datetime.timedelta(minutes=1),
2814
frozenset((token_second, token_end)))
2815
token_hour = Token(re.compile(r"(\d+)H"),
2816
datetime.timedelta(hours=1),
2817
frozenset((token_minute, token_end)))
2818
token_time = Token(re.compile(r"T"),
2820
frozenset((token_hour, token_minute,
2822
token_day = Token(re.compile(r"(\d+)D"),
2823
datetime.timedelta(days=1),
2824
frozenset((token_time, token_end)))
2825
token_month = Token(re.compile(r"(\d+)M"),
2826
datetime.timedelta(weeks=4),
2827
frozenset((token_day, token_end)))
2828
token_year = Token(re.compile(r"(\d+)Y"),
2829
datetime.timedelta(weeks=52),
2830
frozenset((token_month, token_end)))
2831
token_week = Token(re.compile(r"(\d+)W"),
2832
datetime.timedelta(weeks=1),
2833
frozenset((token_end, )))
2834
token_duration = Token(re.compile(r"P"), None,
2835
frozenset((token_year, token_month,
2836
token_day, token_time,
2838
# Define starting values:
2840
value = datetime.timedelta()
2842
# Following valid tokens
2843
followers = frozenset((token_duration, ))
2844
# String left to parse
2846
# Loop until end token is found
2847
while found_token is not token_end:
2848
# Search for any currently valid tokens
2849
for token in followers:
2850
match = token.regexp.match(s)
2851
if match is not None:
2853
if token.value is not None:
2854
# Value found, parse digits
2855
factor = int(match.group(1), 10)
2856
# Add to value so far
2857
value += factor * token.value
2858
# Strip token from string
2859
s = token.regexp.sub("", s, 1)
2862
# Set valid next tokens
2863
followers = found_token.followers
2866
# No currently valid tokens were found
2867
raise ValueError("Invalid RFC 3339 duration: {!r}"
2873
1905
def string_to_delta(interval):
2874
1906
"""Parse a string and return a datetime.timedelta
2876
>>> string_to_delta('7d') == datetime.timedelta(7)
2878
>>> string_to_delta('60s') == datetime.timedelta(0, 60)
2880
>>> string_to_delta('60m') == datetime.timedelta(0, 3600)
2882
>>> string_to_delta('24h') == datetime.timedelta(1)
2884
>>> string_to_delta('1w') == datetime.timedelta(7)
2886
>>> string_to_delta('5m 30s') == datetime.timedelta(0, 330)
1908
>>> string_to_delta('7d')
1909
datetime.timedelta(7)
1910
>>> string_to_delta('60s')
1911
datetime.timedelta(0, 60)
1912
>>> string_to_delta('60m')
1913
datetime.timedelta(0, 3600)
1914
>>> string_to_delta('24h')
1915
datetime.timedelta(1)
1916
>>> string_to_delta('1w')
1917
datetime.timedelta(7)
1918
>>> string_to_delta('5m 30s')
1919
datetime.timedelta(0, 330)
2891
return rfc3339_duration_to_delta(interval)
2895
1921
timevalue = datetime.timedelta(0)
2896
1922
for s in interval.split():
1924
suffix = unicode(s[-1])
2899
1925
value = int(s[:-1])
2900
1926
if suffix == "d":
2901
1927
delta = datetime.timedelta(value)
2973
1999
parser.add_argument("--no-dbus", action="store_false",
2974
2000
dest="use_dbus", help="Do not provide D-Bus"
2975
" system bus interface", default=None)
2001
" system bus interface")
2976
2002
parser.add_argument("--no-ipv6", action="store_false",
2977
dest="use_ipv6", help="Do not use IPv6",
2003
dest="use_ipv6", help="Do not use IPv6")
2979
2004
parser.add_argument("--no-restore", action="store_false",
2980
2005
dest="restore", help="Do not restore stored"
2981
" state", default=None)
2982
parser.add_argument("--socket", type=int,
2983
help="Specify a file descriptor to a network"
2984
" socket to use instead of creating one")
2985
2007
parser.add_argument("--statedir", metavar="DIR",
2986
2008
help="Directory to save/restore state in")
2987
parser.add_argument("--foreground", action="store_true",
2988
help="Run in foreground", default=None)
2989
parser.add_argument("--no-zeroconf", action="store_false",
2990
dest="zeroconf", help="Do not use Zeroconf",
2993
2010
options = parser.parse_args()
2995
2017
# Default values for config file for server-global settings
2996
if gnutls.has_rawpk:
2997
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2998
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3000
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3001
":+SIGN-DSA-SHA256")
3002
server_defaults = {"interface": "",
3006
"priority": priority,
3007
"servicename": "Mandos",
3013
"statedir": "/var/lib/mandos",
3014
"foreground": "False",
2018
server_defaults = { "interface": "",
2023
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2024
"servicename": "Mandos",
2029
"statedir": "/var/lib/mandos"
3019
2032
# Parse config file for server-global settings
3020
server_config = configparser.ConfigParser(server_defaults)
2033
server_config = configparser.SafeConfigParser(server_defaults)
3021
2034
del server_defaults
3022
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3023
# Convert the ConfigParser object to a dict
2035
server_config.read(os.path.join(options.configdir,
2037
# Convert the SafeConfigParser object to a dict
3024
2038
server_settings = server_config.defaults()
3025
2039
# Use the appropriate methods on the non-string config options
3026
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3027
"foreground", "zeroconf"):
2040
for option in ("debug", "use_dbus", "use_ipv6"):
3028
2041
server_settings[option] = server_config.getboolean("DEFAULT",
3030
2043
if server_settings["port"]:
3031
2044
server_settings["port"] = server_config.getint("DEFAULT",
3033
if server_settings["socket"]:
3034
server_settings["socket"] = server_config.getint("DEFAULT",
3036
# Later, stdin will, and stdout and stderr might, be dup'ed
3037
# over with an opened os.devnull. But we don't want this to
3038
# happen with a supplied network socket.
3039
if 0 <= server_settings["socket"] <= 2:
3040
server_settings["socket"] = os.dup(server_settings
3042
2046
del server_config
3044
2048
# Override the settings from the config file with command line
3045
2049
# options, if set.
3046
2050
for option in ("interface", "address", "port", "debug",
3047
"priority", "servicename", "configdir", "use_dbus",
3048
"use_ipv6", "debuglevel", "restore", "statedir",
3049
"socket", "foreground", "zeroconf"):
2051
"priority", "servicename", "configdir",
2052
"use_dbus", "use_ipv6", "debuglevel", "restore",
3050
2054
value = getattr(options, option)
3051
2055
if value is not None:
3052
2056
server_settings[option] = value
3054
2058
# Force all strings to be unicode
3055
2059
for option in server_settings.keys():
3056
if isinstance(server_settings[option], bytes):
3057
server_settings[option] = (server_settings[option]
3059
# Force all boolean options to be boolean
3060
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3061
"foreground", "zeroconf"):
3062
server_settings[option] = bool(server_settings[option])
3063
# Debug implies foreground
3064
if server_settings["debug"]:
3065
server_settings["foreground"] = True
2060
if type(server_settings[option]) is str:
2061
server_settings[option] = unicode(server_settings[option])
3066
2062
# Now we have our good server settings in "server_settings"
3068
2064
##################################################################
3070
if (not server_settings["zeroconf"]
3071
and not (server_settings["port"]
3072
or server_settings["socket"] != "")):
3073
parser.error("Needs port or socket to work without Zeroconf")
3075
2066
# For convenience
3076
2067
debug = server_settings["debug"]
3077
2068
debuglevel = server_settings["debuglevel"]
3091
2080
level = getattr(logging, debuglevel.upper())
3092
2081
initlogger(debug, level)
3094
2083
if server_settings["servicename"] != "Mandos":
3095
syslogger.setFormatter(
3096
logging.Formatter('Mandos ({}) [%(process)d]:'
3097
' %(levelname)s: %(message)s'.format(
3098
server_settings["servicename"])))
2084
syslogger.setFormatter(logging.Formatter
2085
('Mandos (%s) [%%(process)d]:'
2086
' %%(levelname)s: %%(message)s'
2087
% server_settings["servicename"]))
3100
2089
# Parse config file with clients
3101
client_config = configparser.ConfigParser(Client.client_defaults)
2090
client_config = configparser.SafeConfigParser(Client
3102
2092
client_config.read(os.path.join(server_settings["configdir"],
3103
2093
"clients.conf"))
3105
2095
global mandos_dbus_service
3106
2096
mandos_dbus_service = None
3109
if server_settings["socket"] != "":
3110
socketfd = server_settings["socket"]
3111
tcp_server = MandosServer(
3112
(server_settings["address"], server_settings["port"]),
3114
interface=(server_settings["interface"] or None),
3116
gnutls_priority=server_settings["priority"],
3120
pidfilename = "/run/mandos.pid"
3121
if not os.path.isdir("/run/."):
3122
pidfilename = "/var/run/mandos.pid"
3125
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3126
except IOError as e:
3127
logger.error("Could not open file %r", pidfilename,
3130
for name, group in (("_mandos", "_mandos"),
3131
("mandos", "mandos"),
3132
("nobody", "nogroup")):
3134
uid = pwd.getpwnam(name).pw_uid
3135
gid = pwd.getpwnam(group).pw_gid
2098
tcp_server = MandosServer((server_settings["address"],
2099
server_settings["port"]),
2101
interface=(server_settings["interface"]
2105
server_settings["priority"],
2108
pidfilename = "/var/run/mandos.pid"
2110
pidfile = open(pidfilename, "w")
2112
logger.error("Could not open file %r", pidfilename)
2115
uid = pwd.getpwnam("_mandos").pw_uid
2116
gid = pwd.getpwnam("_mandos").pw_gid
2119
uid = pwd.getpwnam("mandos").pw_uid
2120
gid = pwd.getpwnam("mandos").pw_gid
3137
2121
except KeyError:
2123
uid = pwd.getpwnam("nobody").pw_uid
2124
gid = pwd.getpwnam("nobody").pw_gid
3146
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3148
2131
except OSError as error:
3149
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3150
.format(uid, gid, os.strerror(error.errno)))
3151
if error.errno != errno.EPERM:
2132
if error[0] != errno.EPERM:
3155
2136
# Enable all possible GnuTLS debugging
3157
2138
# "Use a log level over 10 to enable all debugging options."
3158
2139
# - GnuTLS manual
3159
gnutls.global_set_log_level(11)
2140
gnutls.library.functions.gnutls_global_set_log_level(11)
2142
@gnutls.library.types.gnutls_log_func
3162
2143
def debug_gnutls(level, string):
3163
2144
logger.debug("GnuTLS: %s", string[:-1])
3165
gnutls.global_set_log_function(debug_gnutls)
2146
(gnutls.library.functions
2147
.gnutls_global_set_log_function(debug_gnutls))
3167
2149
# Redirect stdin so all checkers get /dev/null
3168
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2150
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3169
2151
os.dup2(null, sys.stdin.fileno())
3173
2155
# Need to fork before connecting to D-Bus
3175
2157
# Close all input and output, do double fork, etc.
3178
if gi.version_info < (3, 10, 2):
3179
# multiprocessing will use threads, so before we use GLib we
3180
# need to inform GLib that threads will be used.
2160
gobject.threads_init()
3183
2162
global main_loop
3184
2163
# From the Avahi example code
3185
DBusGMainLoop(set_as_default=True)
3186
main_loop = GLib.MainLoop()
2164
DBusGMainLoop(set_as_default=True )
2165
main_loop = gobject.MainLoop()
3187
2166
bus = dbus.SystemBus()
3188
2167
# End of Avahi example code
3191
2170
bus_name = dbus.service.BusName("se.recompile.Mandos",
3194
old_bus_name = dbus.service.BusName(
3195
"se.bsnet.fukt.Mandos", bus,
3197
except dbus.exceptions.DBusException as e:
3198
logger.error("Disabling D-Bus:", exc_info=e)
2171
bus, do_not_queue=True)
2172
old_bus_name = (dbus.service.BusName
2173
("se.bsnet.fukt.Mandos", bus,
2175
except dbus.exceptions.NameExistsException as e:
2176
logger.error(unicode(e) + ", disabling D-Bus")
3199
2177
use_dbus = False
3200
2178
server_settings["use_dbus"] = False
3201
2179
tcp_server.use_dbus = False
3203
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3204
service = AvahiServiceToSyslog(
3205
name=server_settings["servicename"],
3206
servicetype="_mandos._tcp",
3209
if server_settings["interface"]:
3210
service.interface = if_nametoindex(
3211
server_settings["interface"].encode("utf-8"))
2180
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2181
service = AvahiServiceToSyslog(name =
2182
server_settings["servicename"],
2183
servicetype = "_mandos._tcp",
2184
protocol = protocol, bus = bus)
2185
if server_settings["interface"]:
2186
service.interface = (if_nametoindex
2187
(str(server_settings["interface"])))
3213
2189
global multiprocessing_manager
3214
2190
multiprocessing_manager = multiprocessing.Manager()
3216
2192
client_class = Client
3218
client_class = functools.partial(ClientDBus, bus=bus)
2194
client_class = functools.partial(ClientDBusTransitional,
3220
2197
client_settings = Client.config_parser(client_config)
3221
2198
old_client_settings = {}
3222
2199
clients_data = {}
3224
# This is used to redirect stdout and stderr for checker processes
3226
wnull = open(os.devnull, "w") # A writable /dev/null
3227
# Only used if server is running in foreground but not in debug
3229
if debug or not foreground:
3232
2201
# Get client data and settings from last running state.
3233
2202
if server_settings["restore"]:
3235
2204
with open(stored_state_path, "rb") as stored_state:
3236
if sys.version_info.major == 2:
3237
clients_data, old_client_settings = pickle.load(
3240
bytes_clients_data, bytes_old_client_settings = (
3241
pickle.load(stored_state, encoding="bytes"))
3242
# Fix bytes to strings
3245
clients_data = {(key.decode("utf-8")
3246
if isinstance(key, bytes)
3249
bytes_clients_data.items()}
3250
del bytes_clients_data
3251
for key in clients_data:
3252
value = {(k.decode("utf-8")
3253
if isinstance(k, bytes) else k): v
3255
clients_data[key].items()}
3256
clients_data[key] = value
3258
value["client_structure"] = [
3260
if isinstance(s, bytes)
3262
value["client_structure"]]
3263
# .name, .host, and .checker_command
3264
for k in ("name", "host", "checker_command"):
3265
if isinstance(value[k], bytes):
3266
value[k] = value[k].decode("utf-8")
3267
if "key_id" not in value:
3268
value["key_id"] = ""
3269
elif "fingerprint" not in value:
3270
value["fingerprint"] = ""
3271
# old_client_settings
3273
old_client_settings = {
3274
(key.decode("utf-8")
3275
if isinstance(key, bytes)
3278
bytes_old_client_settings.items()}
3279
del bytes_old_client_settings
3280
# .host and .checker_command
3281
for value in old_client_settings.values():
3282
for attribute in ("host", "checker_command"):
3283
if isinstance(value[attribute], bytes):
3284
value[attribute] = (value[attribute]
2205
clients_data, old_client_settings = (pickle.load
3286
2207
os.remove(stored_state_path)
3287
2208
except IOError as e:
3288
if e.errno == errno.ENOENT:
3289
logger.warning("Could not load persistent state:"
3290
" {}".format(os.strerror(e.errno)))
3292
logger.critical("Could not load persistent state:",
2209
logger.warning("Could not load persistent state: {0}"
2211
if e.errno != errno.ENOENT:
3295
2213
except EOFError as e:
3296
2214
logger.warning("Could not load persistent state: "
2215
"EOFError: {0}".format(e))
3300
2217
with PGPEngine() as pgp:
3301
for client_name, client in clients_data.items():
3302
# Skip removed clients
3303
if client_name not in client_settings:
2218
for client_name, client in clients_data.iteritems():
3306
2219
# Decide which value to use after restoring saved state.
3307
2220
# We have three different values: Old config file,
3308
2221
# new config file, and saved state.
3368
2282
clients_data[client_name] = client_settings[client_name]
3370
2284
# Create all client objects
3371
for client_name, client in clients_data.items():
2285
for client_name, client in clients_data.iteritems():
3372
2286
tcp_server.clients[client_name] = client_class(
3375
server_settings=server_settings)
2287
name = client_name, settings = client)
3377
2289
if not tcp_server.clients:
3378
2290
logger.warning("No clients defined")
3381
if pidfile is not None:
3385
print(pid, file=pidfile)
3387
logger.error("Could not write to file %r with PID %d",
2296
pidfile.write(str(pid) + "\n".encode("utf-8"))
2299
logger.error("Could not write to file %r with PID %d",
2302
# "pidfile" was never created
3390
2304
del pidfilename
3392
for termsig in (signal.SIGHUP, signal.SIGTERM):
3393
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3394
lambda: main_loop.quit() and False)
2305
signal.signal(signal.SIGINT, signal.SIG_IGN)
2307
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2308
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3398
@alternate_dbus_interfaces(
3399
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3400
class MandosDBusService(DBusObjectWithObjectManager):
2311
class MandosDBusService(dbus.service.Object):
3401
2312
"""A D-Bus proxy object"""
3403
2313
def __init__(self):
3404
2314
dbus.service.Object.__init__(self, bus, "/")
3406
2315
_interface = "se.recompile.Mandos"
3408
2317
@dbus.service.signal(_interface, signature="o")
3409
2318
def ClientAdded(self, objpath):
3413
2322
@dbus.service.signal(_interface, signature="ss")
3414
def ClientNotFound(self, key_id, address):
2323
def ClientNotFound(self, fingerprint, address):
3418
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3420
2327
@dbus.service.signal(_interface, signature="os")
3421
2328
def ClientRemoved(self, objpath, name):
3425
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3427
2332
@dbus.service.method(_interface, out_signature="ao")
3428
2333
def GetAllClients(self):
3430
return dbus.Array(c.dbus_object_path for c in
3431
tcp_server.clients.values())
3433
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2335
return dbus.Array(c.dbus_object_path
2337
tcp_server.clients.itervalues())
3435
2339
@dbus.service.method(_interface,
3436
2340
out_signature="a{oa{sv}}")
3437
2341
def GetAllClientsWithProperties(self):
3439
2343
return dbus.Dictionary(
3440
{c.dbus_object_path: c.GetAll(
3441
"se.recompile.Mandos.Client")
3442
for c in tcp_server.clients.values()},
2344
((c.dbus_object_path, c.GetAll(""))
2345
for c in tcp_server.clients.itervalues()),
3443
2346
signature="oa{sv}")
3445
2348
@dbus.service.method(_interface, in_signature="o")
3446
2349
def RemoveClient(self, object_path):
3448
for c in tcp_server.clients.values():
2351
for c in tcp_server.clients.itervalues():
3449
2352
if c.dbus_object_path == object_path:
3450
2353
del tcp_server.clients[c.name]
3451
2354
c.remove_from_connection()
3452
# Don't signal the disabling
2355
# Don't signal anything except ClientRemoved
3453
2356
c.disable(quiet=True)
3454
# Emit D-Bus signal for removal
3455
self.client_removed_signal(c)
2358
self.ClientRemoved(object_path, c.name)
3457
2360
raise KeyError(object_path)
3461
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3462
out_signature="a{oa{sa{sv}}}")
3463
def GetManagedObjects(self):
3465
return dbus.Dictionary(
3466
{client.dbus_object_path:
3468
{interface: client.GetAll(interface)
3470
client._get_all_interface_names()})
3471
for client in tcp_server.clients.values()})
3473
def client_added_signal(self, client):
3474
"""Send the new standard signal and the old signal"""
3476
# New standard signal
3477
self.InterfacesAdded(
3478
client.dbus_object_path,
3480
{interface: client.GetAll(interface)
3482
client._get_all_interface_names()}))
3484
self.ClientAdded(client.dbus_object_path)
3486
def client_removed_signal(self, client):
3487
"""Send the new standard signal and the old signal"""
3489
# New standard signal
3490
self.InterfacesRemoved(
3491
client.dbus_object_path,
3492
client._get_all_interface_names())
3494
self.ClientRemoved(client.dbus_object_path,
3497
mandos_dbus_service = MandosDBusService()
3499
# Save modules to variables to exempt the modules from being
3500
# unloaded before the function registered with atexit() is run.
3501
mp = multiprocessing
2364
class MandosDBusServiceTransitional(MandosDBusService):
2365
__metaclass__ = AlternateDBusNamesMetaclass
2366
mandos_dbus_service = MandosDBusServiceTransitional()
3505
2369
"Cleanup function; run on exit"
3509
mp.active_children()
2372
multiprocessing.active_children()
3511
2373
if not (tcp_server.clients or client_settings):
3514
2376
# Store client before exiting. Secrets are encrypted with key
3515
2377
# based on what config file has. If config file is
3516
2378
# removed/edited, old secret will thus be unrecovable.
3518
2380
with PGPEngine() as pgp:
3519
for client in tcp_server.clients.values():
2381
for client in tcp_server.clients.itervalues():
3520
2382
key = client_settings[client.name]["secret"]
3521
2383
client.encrypted_secret = pgp.encrypt(client.secret,
3523
2385
client_dict = {}
3525
2387
# A list of attributes that can not be pickled
3527
exclude = {"bus", "changedstate", "secret",
3528
"checker", "server_settings"}
3529
for name, typ in inspect.getmembers(dbus.service
2389
exclude = set(("bus", "changedstate", "secret",
2391
for name, typ in (inspect.getmembers
2392
(dbus.service.Object)):
3531
2393
exclude.add(name)
3533
2395
client_dict["encrypted_secret"] = (client
3534
2396
.encrypted_secret)
3535
2397
for attr in client.client_structure:
3536
2398
if attr not in exclude:
3537
2399
client_dict[attr] = getattr(client, attr)
3539
2401
clients[client.name] = client_dict
3540
2402
del client_settings[client.name]["secret"]
3543
with tempfile.NamedTemporaryFile(
3547
dir=os.path.dirname(stored_state_path),
3548
delete=False) as stored_state:
3549
pickle.dump((clients, client_settings), stored_state,
3551
tempname = stored_state.name
2405
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2408
(stored_state_path))
2409
with os.fdopen(tempfd, "wb") as stored_state:
2410
pickle.dump((clients, client_settings), stored_state)
3552
2411
os.rename(tempname, stored_state_path)
3553
2412
except (IOError, OSError) as e:
2413
logger.warning("Could not save persistent state: {0}"
3556
2417
os.remove(tempname)
3557
2418
except NameError:
3559
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3560
logger.warning("Could not save persistent state: {}"
3561
.format(os.strerror(e.errno)))
3563
logger.warning("Could not save persistent state:",
2420
if e.errno not in set((errno.ENOENT, errno.EACCES,
3567
2424
# Delete all clients, and settings from config
3568
2425
while tcp_server.clients:
3569
2426
name, client = tcp_server.clients.popitem()
3571
2428
client.remove_from_connection()
3572
# Don't signal the disabling
2429
# Don't signal anything except ClientRemoved
3573
2430
client.disable(quiet=True)
3574
# Emit D-Bus signal for removal
3576
mandos_dbus_service.client_removed_signal(client)
2433
mandos_dbus_service.ClientRemoved(client
3577
2436
client_settings.clear()
3579
2438
atexit.register(cleanup)
3581
for client in tcp_server.clients.values():
2440
for client in tcp_server.clients.itervalues():
3583
# Emit D-Bus signal for adding
3584
mandos_dbus_service.client_added_signal(client)
2443
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3585
2444
# Need to initiate checking of clients
3586
2445
if client.enabled:
3587
2446
client.init_checker()
3589
2448
tcp_server.enable()
3590
2449
tcp_server.server_activate()
3592
2451
# Find out what port we got
3594
service.port = tcp_server.socket.getsockname()[1]
2452
service.port = tcp_server.socket.getsockname()[1]
3596
2454
logger.info("Now listening on address %r, port %d,"
3597
" flowinfo %d, scope_id %d",
3598
*tcp_server.socket.getsockname())
2455
" flowinfo %d, scope_id %d"
2456
% tcp_server.socket.getsockname())
3600
logger.info("Now listening on address %r, port %d",
3601
*tcp_server.socket.getsockname())
3603
# service.interface = tcp_server.socket.getsockname()[3]
2458
logger.info("Now listening on address %r, port %d"
2459
% tcp_server.socket.getsockname())
2461
#service.interface = tcp_server.socket.getsockname()[3]
3607
# From the Avahi example code
3610
except dbus.exceptions.DBusException as error:
3611
logger.critical("D-Bus Exception", exc_info=error)
3614
# End of Avahi example code
3617
GLib.IOChannel.unix_new(tcp_server.fileno()),
3618
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3619
lambda *args, **kwargs: (tcp_server.handle_request
3620
(*args[2:], **kwargs) or True))
2464
# From the Avahi example code
2467
except dbus.exceptions.DBusException as error:
2468
logger.critical("DBusException: %s", error)
2471
# End of Avahi example code
2473
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2474
lambda *args, **kwargs:
2475
(tcp_server.handle_request
2476
(*args[2:], **kwargs) or True))
3622
2478
logger.debug("Starting main loop")
3623
2479
main_loop.run()
3624
2480
except AvahiError as error:
3625
logger.critical("Avahi Error", exc_info=error)
2481
logger.critical("AvahiError: %s", error)
3628
2484
except KeyboardInterrupt: