70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
85
74
import dbus.service
87
from gi.repository import GLib
88
77
from dbus.mainloop.glib import DBusGMainLoop
91
80
import xml.dom.minidom
94
if sys.version_info.major == 2:
98
# Add collections.abc.Callable if it does not exist
100
collections.abc.Callable
101
except AttributeError:
103
Callable = collections.Callable
104
collections.abc = abc
107
# Add shlex.quote if it does not exist
110
except AttributeError:
111
shlex.quote = re.escape
113
# Show warnings by default
114
if not sys.warnoptions:
116
warnings.simplefilter("default")
118
# Try to find the value of SO_BINDTODEVICE:
120
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
121
# newer, and it is also the most natural place for it:
122
85
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
123
86
except AttributeError:
125
# This is where SO_BINDTODEVICE was up to and including Python
127
88
from IN import SO_BINDTODEVICE
128
89
except ImportError:
129
# In Python 2.7 it seems to have been removed entirely.
130
# Try running the C preprocessor:
132
cc = subprocess.Popen(["cc", "--language=c", "-E",
134
stdin=subprocess.PIPE,
135
stdout=subprocess.PIPE)
136
stdout = cc.communicate(
137
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
138
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
139
except (OSError, ValueError, IndexError):
141
SO_BINDTODEVICE = None
143
if sys.version_info < (3, 2):
144
configparser.Configparser = configparser.SafeConfigParser
90
SO_BINDTODEVICE = None
147
93
stored_state_file = "clients.pickle"
149
95
logger = logging.getLogger()
150
logging.captureWarnings(True) # Show warnings via the logging system
96
syslogger = (logging.handlers.SysLogHandler
97
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
98
address = str("/dev/log")))
154
if_nametoindex = ctypes.cdll.LoadLibrary(
155
ctypes.util.find_library("c")).if_nametoindex
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
156
104
except (OSError, AttributeError):
158
105
def if_nametoindex(interface):
159
106
"Get an interface index the hard way, i.e. using fcntl()"
160
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
161
108
with contextlib.closing(socket.socket()) as s:
162
109
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
163
struct.pack(b"16s16x", interface))
164
interface_index = struct.unpack("I", ifreq[16:20])[0]
110
struct.pack(str("16s16x"),
112
interface_index = struct.unpack(str("I"),
165
114
return interface_index
168
def copy_function(func):
169
"""Make a copy of a function"""
170
if sys.version_info.major == 2:
171
return types.FunctionType(func.func_code,
177
return types.FunctionType(func.__code__,
184
117
def initlogger(debug, level=logging.WARNING):
185
118
"""init logger and add loglevel"""
188
syslogger = (logging.handlers.SysLogHandler(
189
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
191
120
syslogger.setFormatter(logging.Formatter
192
("Mandos [%(process)d]: %(levelname)s:"
121
('Mandos [%(process)d]: %(levelname)s:'
194
123
logger.addHandler(syslogger)
197
126
console = logging.StreamHandler()
198
console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
127
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
202
131
logger.addHandler(console)
203
132
logger.setLevel(level)
255
172
os.rmdir(self.tempdir)
256
173
self.tempdir = None
258
175
def password_encode(self, password):
259
176
# Passphrase can not be empty and can not contain newlines or
260
177
# NUL bytes. So we prefix it and hex encode it.
261
encoded = b"mandos" + binascii.hexlify(password)
262
if len(encoded) > 2048:
263
# GnuPG can't handle long passwords, so encode differently
264
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
265
.replace(b"\n", b"\\n")
266
.replace(b"\0", b"\\x00"))
178
return b"mandos" + binascii.hexlify(password)
269
180
def encrypt(self, data, password):
270
passphrase = self.password_encode(password)
271
with tempfile.NamedTemporaryFile(
272
dir=self.tempdir) as passfile:
273
passfile.write(passphrase)
275
proc = subprocess.Popen([self.gpg, "--symmetric",
279
stdin=subprocess.PIPE,
280
stdout=subprocess.PIPE,
281
stderr=subprocess.PIPE)
282
ciphertext, err = proc.communicate(input=data)
283
if proc.returncode != 0:
181
self.gnupg.passphrase = self.password_encode(password)
182
with open(os.devnull, "w") as devnull:
184
proc = self.gnupg.run(['--symmetric'],
185
create_fhs=['stdin', 'stdout'],
186
attach_fhs={'stderr': devnull})
187
with contextlib.closing(proc.handles['stdin']) as f:
189
with contextlib.closing(proc.handles['stdout']) as f:
190
ciphertext = f.read()
194
self.gnupg.passphrase = None
285
195
return ciphertext
287
197
def decrypt(self, data, password):
288
passphrase = self.password_encode(password)
289
with tempfile.NamedTemporaryFile(
290
dir=self.tempdir) as passfile:
291
passfile.write(passphrase)
293
proc = subprocess.Popen([self.gpg, "--decrypt",
297
stdin=subprocess.PIPE,
298
stdout=subprocess.PIPE,
299
stderr=subprocess.PIPE)
300
decrypted_plaintext, err = proc.communicate(input=data)
301
if proc.returncode != 0:
198
self.gnupg.passphrase = self.password_encode(password)
199
with open(os.devnull, "w") as devnull:
201
proc = self.gnupg.run(['--decrypt'],
202
create_fhs=['stdin', 'stdout'],
203
attach_fhs={'stderr': devnull})
204
with contextlib.closing(proc.handles['stdin']) as f:
206
with contextlib.closing(proc.handles['stdout']) as f:
207
decrypted_plaintext = f.read()
211
self.gnupg.passphrase = None
303
212
return decrypted_plaintext
306
# Pretend that we have an Avahi module
308
"""This isn't so much a class as it is a module-like namespace."""
309
IF_UNSPEC = -1 # avahi-common/address.h
310
PROTO_UNSPEC = -1 # avahi-common/address.h
311
PROTO_INET = 0 # avahi-common/address.h
312
PROTO_INET6 = 1 # avahi-common/address.h
313
DBUS_NAME = "org.freedesktop.Avahi"
314
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
315
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
316
DBUS_PATH_SERVER = "/"
319
def string_array_to_txt_array(t):
320
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
321
for s in t), signature="ay")
322
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
323
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
324
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
325
SERVER_INVALID = 0 # avahi-common/defs.h
326
SERVER_REGISTERING = 1 # avahi-common/defs.h
327
SERVER_RUNNING = 2 # avahi-common/defs.h
328
SERVER_COLLISION = 3 # avahi-common/defs.h
329
SERVER_FAILURE = 4 # avahi-common/defs.h
332
215
class AvahiError(Exception):
333
216
def __init__(self, value, *args, **kwargs):
334
217
self.value = value
335
return super(AvahiError, self).__init__(value, *args,
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
339
222
class AvahiServiceError(AvahiError):
343
225
class AvahiGroupError(AvahiError):
229
class AvahiService(object):
348
230
"""An Avahi (Zeroconf) service.
351
233
interface: integer; avahi.IF_UNSPEC or an interface index.
352
234
Used to optionally bind to the specified interface.
353
name: string; Example: "Mandos"
354
type: string; Example: "_mandos._tcp".
355
See <https://www.iana.org/assignments/service-names-port-numbers>
235
name: string; Example: 'Mandos'
236
type: string; Example: '_mandos._tcp'.
237
See <http://www.dns-sd.org/ServiceTypes.html>
356
238
port: integer; what port to announce
357
239
TXT: list of strings; TXT record for the service
358
240
domain: string; Domain to publish on, default to .local if empty.
517
377
follow_name_owner_changes=True),
518
378
avahi.DBUS_INTERFACE_SERVER)
519
379
self.server.connect_to_signal("StateChanged",
520
self.server_state_changed)
380
self.server_state_changed)
521
381
self.server_state_changed(self.server.GetState())
524
384
class AvahiServiceToSyslog(AvahiService):
525
def rename(self, *args, **kwargs):
526
386
"""Add the new name to the syslog messages"""
527
ret = super(AvahiServiceToSyslog, self).rename(*args,
529
syslogger.setFormatter(logging.Formatter(
530
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
535
# Pretend that we have a GnuTLS module
537
"""This isn't so much a class as it is a module-like namespace."""
539
library = ctypes.util.find_library("gnutls")
541
library = ctypes.util.find_library("gnutls-deb0")
542
_library = ctypes.cdll.LoadLibrary(library)
545
# Unless otherwise indicated, the constants and types below are
546
# all from the gnutls/gnutls.h C header file.
557
E_NO_CERTIFICATE_FOUND = -49
562
KEYID_USE_SHA256 = 1 # gnutls/x509.h
563
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
566
class _session_int(ctypes.Structure):
568
session_t = ctypes.POINTER(_session_int)
570
class certificate_credentials_st(ctypes.Structure):
572
certificate_credentials_t = ctypes.POINTER(
573
certificate_credentials_st)
574
certificate_type_t = ctypes.c_int
576
class datum_t(ctypes.Structure):
577
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
578
("size", ctypes.c_uint)]
580
class _openpgp_crt_int(ctypes.Structure):
582
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
583
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
584
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
585
credentials_type_t = ctypes.c_int
586
transport_ptr_t = ctypes.c_void_p
587
close_request_t = ctypes.c_int
590
class Error(Exception):
591
def __init__(self, message=None, code=None, args=()):
592
# Default usage is by a message string, but if a return
593
# code is passed, convert it to a string with
596
if message is None and code is not None:
597
message = gnutls.strerror(code).decode(
598
"utf-8", errors="replace")
599
return super(gnutls.Error, self).__init__(
602
class CertificateSecurityError(Error):
606
def __init__(self, cls):
609
def from_param(self, obj):
610
if not isinstance(obj, self.cls):
611
raise TypeError("Not of type {}: {!r}"
612
.format(self.cls.__name__, obj))
613
return ctypes.byref(obj.from_param(obj))
615
class CastToVoidPointer:
616
def __init__(self, cls):
619
def from_param(self, obj):
620
if not isinstance(obj, self.cls):
621
raise TypeError("Not of type {}: {!r}"
622
.format(self.cls.__name__, obj))
623
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
625
class With_from_param:
627
def from_param(cls, obj):
628
return obj._as_parameter_
631
class Credentials(With_from_param):
633
self._as_parameter_ = gnutls.certificate_credentials_t()
634
gnutls.certificate_allocate_credentials(self)
635
self.type = gnutls.CRD_CERTIFICATE
638
gnutls.certificate_free_credentials(self)
640
class ClientSession(With_from_param):
641
def __init__(self, socket, credentials=None):
642
self._as_parameter_ = gnutls.session_t()
643
gnutls_flags = gnutls.CLIENT
644
if gnutls.check_version(b"3.5.6"):
645
gnutls_flags |= gnutls.NO_TICKETS
647
gnutls_flags |= gnutls.ENABLE_RAWPK
648
gnutls.init(self, gnutls_flags)
650
gnutls.set_default_priority(self)
651
gnutls.transport_set_ptr(self, socket.fileno())
652
gnutls.handshake_set_private_extensions(self, True)
654
if credentials is None:
655
credentials = gnutls.Credentials()
656
gnutls.credentials_set(self, credentials.type,
658
self.credentials = credentials
664
return gnutls.handshake(self)
666
def send(self, data):
670
data_len -= gnutls.record_send(self, data[-data_len:],
674
return gnutls.bye(self, gnutls.SHUT_RDWR)
676
# Error handling functions
677
def _error_code(result):
678
"""A function to raise exceptions on errors, suitable
679
for the "restype" attribute on ctypes functions"""
680
if result >= gnutls.E_SUCCESS:
682
if result == gnutls.E_NO_CERTIFICATE_FOUND:
683
raise gnutls.CertificateSecurityError(code=result)
684
raise gnutls.Error(code=result)
686
def _retry_on_error(result, func, arguments,
687
_error_code=_error_code):
688
"""A function to retry on some errors, suitable
689
for the "errcheck" attribute on ctypes functions"""
690
while result < gnutls.E_SUCCESS:
691
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
692
return _error_code(result)
693
result = func(*arguments)
696
# Unless otherwise indicated, the function declarations below are
697
# all from the gnutls/gnutls.h C header file.
700
priority_set_direct = _library.gnutls_priority_set_direct
701
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
702
ctypes.POINTER(ctypes.c_char_p)]
703
priority_set_direct.restype = _error_code
705
init = _library.gnutls_init
706
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
707
init.restype = _error_code
709
set_default_priority = _library.gnutls_set_default_priority
710
set_default_priority.argtypes = [ClientSession]
711
set_default_priority.restype = _error_code
713
record_send = _library.gnutls_record_send
714
record_send.argtypes = [ClientSession, ctypes.c_void_p,
716
record_send.restype = ctypes.c_ssize_t
717
record_send.errcheck = _retry_on_error
719
certificate_allocate_credentials = (
720
_library.gnutls_certificate_allocate_credentials)
721
certificate_allocate_credentials.argtypes = [
722
PointerTo(Credentials)]
723
certificate_allocate_credentials.restype = _error_code
725
certificate_free_credentials = (
726
_library.gnutls_certificate_free_credentials)
727
certificate_free_credentials.argtypes = [Credentials]
728
certificate_free_credentials.restype = None
730
handshake_set_private_extensions = (
731
_library.gnutls_handshake_set_private_extensions)
732
handshake_set_private_extensions.argtypes = [ClientSession,
734
handshake_set_private_extensions.restype = None
736
credentials_set = _library.gnutls_credentials_set
737
credentials_set.argtypes = [ClientSession, credentials_type_t,
738
CastToVoidPointer(Credentials)]
739
credentials_set.restype = _error_code
741
strerror = _library.gnutls_strerror
742
strerror.argtypes = [ctypes.c_int]
743
strerror.restype = ctypes.c_char_p
745
certificate_type_get = _library.gnutls_certificate_type_get
746
certificate_type_get.argtypes = [ClientSession]
747
certificate_type_get.restype = _error_code
749
certificate_get_peers = _library.gnutls_certificate_get_peers
750
certificate_get_peers.argtypes = [ClientSession,
751
ctypes.POINTER(ctypes.c_uint)]
752
certificate_get_peers.restype = ctypes.POINTER(datum_t)
754
global_set_log_level = _library.gnutls_global_set_log_level
755
global_set_log_level.argtypes = [ctypes.c_int]
756
global_set_log_level.restype = None
758
global_set_log_function = _library.gnutls_global_set_log_function
759
global_set_log_function.argtypes = [log_func]
760
global_set_log_function.restype = None
762
deinit = _library.gnutls_deinit
763
deinit.argtypes = [ClientSession]
764
deinit.restype = None
766
handshake = _library.gnutls_handshake
767
handshake.argtypes = [ClientSession]
768
handshake.restype = ctypes.c_int
769
handshake.errcheck = _retry_on_error
771
transport_set_ptr = _library.gnutls_transport_set_ptr
772
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
773
transport_set_ptr.restype = None
775
bye = _library.gnutls_bye
776
bye.argtypes = [ClientSession, close_request_t]
777
bye.restype = ctypes.c_int
778
bye.errcheck = _retry_on_error
780
check_version = _library.gnutls_check_version
781
check_version.argtypes = [ctypes.c_char_p]
782
check_version.restype = ctypes.c_char_p
784
_need_version = b"3.3.0"
785
if check_version(_need_version) is None:
786
raise self.Error("Needs GnuTLS {} or later"
787
.format(_need_version))
789
_tls_rawpk_version = b"3.6.6"
790
has_rawpk = bool(check_version(_tls_rawpk_version))
794
class pubkey_st(ctypes.Structure):
796
pubkey_t = ctypes.POINTER(pubkey_st)
798
x509_crt_fmt_t = ctypes.c_int
800
# All the function declarations below are from
802
pubkey_init = _library.gnutls_pubkey_init
803
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
804
pubkey_init.restype = _error_code
806
pubkey_import = _library.gnutls_pubkey_import
807
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
809
pubkey_import.restype = _error_code
811
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
812
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
813
ctypes.POINTER(ctypes.c_ubyte),
814
ctypes.POINTER(ctypes.c_size_t)]
815
pubkey_get_key_id.restype = _error_code
817
pubkey_deinit = _library.gnutls_pubkey_deinit
818
pubkey_deinit.argtypes = [pubkey_t]
819
pubkey_deinit.restype = None
821
# All the function declarations below are from
824
openpgp_crt_init = _library.gnutls_openpgp_crt_init
825
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
826
openpgp_crt_init.restype = _error_code
828
openpgp_crt_import = _library.gnutls_openpgp_crt_import
829
openpgp_crt_import.argtypes = [openpgp_crt_t,
830
ctypes.POINTER(datum_t),
832
openpgp_crt_import.restype = _error_code
834
openpgp_crt_verify_self = \
835
_library.gnutls_openpgp_crt_verify_self
836
openpgp_crt_verify_self.argtypes = [
839
ctypes.POINTER(ctypes.c_uint),
841
openpgp_crt_verify_self.restype = _error_code
843
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
844
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
845
openpgp_crt_deinit.restype = None
847
openpgp_crt_get_fingerprint = (
848
_library.gnutls_openpgp_crt_get_fingerprint)
849
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
853
openpgp_crt_get_fingerprint.restype = _error_code
855
if check_version(b"3.6.4"):
856
certificate_type_get2 = _library.gnutls_certificate_type_get2
857
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
858
certificate_type_get2.restype = _error_code
860
# Remove non-public functions
861
del _error_code, _retry_on_error
864
def call_pipe(connection, # : multiprocessing.Connection
865
func, *args, **kwargs):
866
"""This function is meant to be called by multiprocessing.Process
868
This function runs func(*args, **kwargs), and writes the resulting
869
return value on the provided multiprocessing.Connection.
871
connection.send(func(*args, **kwargs))
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
402
class Client(object):
876
403
"""A representation of a client host served by this server.
879
approved: bool(); None if not yet approved/disapproved
406
approved: bool(); 'None' if not yet approved/disapproved
880
407
approval_delay: datetime.timedelta(); Time to wait for approval
881
408
approval_duration: datetime.timedelta(); Duration of one approval
882
checker: multiprocessing.Process(); a running checker process used
883
to see if the client lives. None if no process is
885
checker_callback_tag: a GLib event source tag, or None
409
checker: subprocess.Popen(); a running checker process used
410
to see if the client lives.
411
'None' if no process is running.
412
checker_callback_tag: a gobject event source tag, or None
886
413
checker_command: string; External command which is run to check
887
414
if client lives. %() expansions are done at
888
415
runtime with vars(self) as dict, so that for
889
416
instance %(name)s can be used in the command.
890
checker_initiator_tag: a GLib event source tag, or None
417
checker_initiator_tag: a gobject event source tag, or None
891
418
created: datetime.datetime(); (UTC) object creation
892
419
client_structure: Object describing what attributes a client has
893
420
and is used for storing the client at exit
894
421
current_checker_command: string; current running checker_command
895
disable_initiator_tag: a GLib event source tag, or None
422
disable_initiator_tag: a gobject event source tag, or None
897
424
fingerprint: string (40 or 32 hexadecimal digits); used to
898
uniquely identify an OpenPGP client
899
key_id: string (64 hexadecimal digits); used to uniquely identify
900
a client using raw public keys
425
uniquely identify the client
901
426
host: string; available for use by the checker command
902
427
interval: datetime.timedelta(); How often to start a new checker
903
428
last_approval_request: datetime.datetime(); (UTC) or None
1060
591
logger.info("Disabling client %s", self.name)
1061
592
if getattr(self, "disable_initiator_tag", None) is not None:
1062
GLib.source_remove(self.disable_initiator_tag)
593
gobject.source_remove(self.disable_initiator_tag)
1063
594
self.disable_initiator_tag = None
1064
595
self.expires = None
1065
596
if getattr(self, "checker_initiator_tag", None) is not None:
1066
GLib.source_remove(self.checker_initiator_tag)
597
gobject.source_remove(self.checker_initiator_tag)
1067
598
self.checker_initiator_tag = None
1068
599
self.stop_checker()
1069
600
self.enabled = False
1071
602
self.send_changedstate()
1072
# Do not run this again if called by a GLib.timeout_add
603
# Do not run this again if called by a gobject.timeout_add
1075
606
def __del__(self):
1078
609
def init_checker(self):
1079
610
# Schedule a new checker to be started an 'interval' from now,
1080
611
# and every interval from then on.
1081
612
if self.checker_initiator_tag is not None:
1082
GLib.source_remove(self.checker_initiator_tag)
1083
self.checker_initiator_tag = GLib.timeout_add(
1084
random.randrange(int(self.interval.total_seconds() * 1000
613
gobject.source_remove(self.checker_initiator_tag)
614
self.checker_initiator_tag = (gobject.timeout_add
615
(self.interval_milliseconds(),
1087
617
# Schedule a disable() when 'timeout' has passed
1088
618
if self.disable_initiator_tag is not None:
1089
GLib.source_remove(self.disable_initiator_tag)
1090
self.disable_initiator_tag = GLib.timeout_add(
1091
int(self.timeout.total_seconds() * 1000), self.disable)
619
gobject.source_remove(self.disable_initiator_tag)
620
self.disable_initiator_tag = (gobject.timeout_add
621
(self.timeout_milliseconds(),
1092
623
# Also start a new checker *right now*.
1093
624
self.start_checker()
1095
def checker_callback(self, source, condition, connection,
626
def checker_callback(self, pid, condition, command):
1097
627
"""The checker has completed, so take appropriate actions."""
1098
# Read return code from connection (see call_pipe)
1099
returncode = connection.recv()
1101
if self.checker is not None:
1103
628
self.checker_callback_tag = None
1104
629
self.checker = None
1107
self.last_checker_status = returncode
1108
self.last_checker_signal = None
630
if os.WIFEXITED(condition):
631
self.last_checker_status = os.WEXITSTATUS(condition)
1109
632
if self.last_checker_status == 0:
1110
633
logger.info("Checker for %(name)s succeeded",
1112
635
self.checked_ok()
1114
logger.info("Checker for %(name)s failed", vars(self))
637
logger.info("Checker for %(name)s failed",
1116
640
self.last_checker_status = -1
1117
self.last_checker_signal = -returncode
1118
641
logger.warning("Checker for %(name)s crashed?",
1122
644
def checked_ok(self):
1123
645
"""Assert that the client has been seen, alive and well."""
1124
646
self.last_checked_ok = datetime.datetime.utcnow()
1125
647
self.last_checker_status = 0
1126
self.last_checker_signal = None
1127
648
self.bump_timeout()
1129
650
def bump_timeout(self, timeout=None):
1130
651
"""Bump up the timeout for this client."""
1131
652
if timeout is None:
1132
653
timeout = self.timeout
1133
654
if self.disable_initiator_tag is not None:
1134
GLib.source_remove(self.disable_initiator_tag)
655
gobject.source_remove(self.disable_initiator_tag)
1135
656
self.disable_initiator_tag = None
1136
657
if getattr(self, "enabled", False):
1137
self.disable_initiator_tag = GLib.timeout_add(
1138
int(timeout.total_seconds() * 1000), self.disable)
658
self.disable_initiator_tag = (gobject.timeout_add
659
(timedelta_to_milliseconds
660
(timeout), self.disable))
1139
661
self.expires = datetime.datetime.utcnow() + timeout
1141
663
def need_approval(self):
1142
664
self.last_approval_request = datetime.datetime.utcnow()
1144
666
def start_checker(self):
1145
667
"""Start a new checker subprocess if one is not running.
1147
669
If a checker already exists, leave it running and do
1149
671
# The reason for not killing a running checker is that if we
1154
676
# checkers alone, the checker would have to take more time
1155
677
# than 'timeout' for the client to be disabled, which is as it
1158
if self.checker is not None and not self.checker.is_alive():
1159
logger.warning("Checker was not alive; joining")
680
# If a checker exists, make sure it is not a zombie
682
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
683
except (AttributeError, OSError) as error:
684
if (isinstance(error, OSError)
685
and error.errno != errno.ECHILD):
689
logger.warning("Checker was a zombie")
690
gobject.source_remove(self.checker_callback_tag)
691
self.checker_callback(pid, status,
692
self.current_checker_command)
1162
693
# Start a new checker if needed
1163
694
if self.checker is None:
1164
695
# Escape attributes for the shell
1166
attr: shlex.quote(str(getattr(self, attr)))
1167
for attr in self.runtime_expansions}
696
escaped_attrs = dict(
697
(attr, re.escape(unicode(getattr(self, attr))))
699
self.runtime_expansions)
1169
701
command = self.checker_command % escaped_attrs
1170
702
except TypeError as error:
1171
703
logger.error('Could not format string "%s"',
1172
self.checker_command,
704
self.checker_command, exc_info=error)
705
return True # Try again later
706
self.current_checker_command = command
708
logger.info("Starting checker %r for %s",
710
# We don't need to redirect stdout and stderr, since
711
# in normal mode, that is already done by daemon(),
712
# and in debug mode we don't want to. (Stdin is
713
# always replaced by /dev/null.)
714
self.checker = subprocess.Popen(command,
717
except OSError as error:
718
logger.error("Failed to start subprocess",
1174
return True # Try again later
1175
self.current_checker_command = command
1176
logger.info("Starting checker %r for %s", command,
1178
# We don't need to redirect stdout and stderr, since
1179
# in normal mode, that is already done by daemon(),
1180
# and in debug mode we don't want to. (Stdin is
1181
# always replaced by /dev/null.)
1182
# The exception is when not debugging but nevertheless
1183
# running in the foreground; use the previously
1185
popen_args = {"close_fds": True,
1188
if (not self.server_settings["debug"]
1189
and self.server_settings["foreground"]):
1190
popen_args.update({"stdout": wnull,
1192
pipe = multiprocessing.Pipe(duplex=False)
1193
self.checker = multiprocessing.Process(
1195
args=(pipe[1], subprocess.call, command),
1197
self.checker.start()
1198
self.checker_callback_tag = GLib.io_add_watch(
1199
GLib.IOChannel.unix_new(pipe[0].fileno()),
1200
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1201
self.checker_callback, pipe[0], command)
1202
# Re-run this periodically if run by GLib.timeout_add
721
self.checker_callback_tag = (gobject.child_watch_add
723
self.checker_callback,
725
# The checker may have completed before the gobject
726
# watch was added. Check for this.
728
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
729
except OSError as error:
730
if error.errno == errno.ECHILD:
731
# This should never happen
732
logger.error("Child process vanished",
737
gobject.source_remove(self.checker_callback_tag)
738
self.checker_callback(pid, status, command)
739
# Re-run this periodically if run by gobject.timeout_add
1205
742
def stop_checker(self):
1206
743
"""Force the checker process, if any, to stop."""
1207
744
if self.checker_callback_tag:
1208
GLib.source_remove(self.checker_callback_tag)
745
gobject.source_remove(self.checker_callback_tag)
1209
746
self.checker_callback_tag = None
1210
747
if getattr(self, "checker", None) is None:
1212
749
logger.debug("Stopping checker for %(name)s", vars(self))
1213
self.checker.terminate()
751
self.checker.terminate()
753
#if self.checker.poll() is None:
754
# self.checker.kill()
755
except OSError as error:
756
if error.errno != errno.ESRCH: # No such process
1214
758
self.checker = None
1217
def dbus_service_property(dbus_interface,
761
def dbus_service_property(dbus_interface, signature="v",
762
access="readwrite", byte_arrays=False):
1221
763
"""Decorators for marking methods of a DBusObjectWithProperties to
1222
764
become properties on the D-Bus.
1224
766
The decorated method will be called with no arguments by "Get"
1225
767
and with one argument by "Set".
1227
769
The parameters, where they are supported, are the same as
1228
770
dbus.service.method, except there is only "signature", since the
1229
771
type from Get() and the type sent to Set() is the same.
1312
class DBusObjectWithAnnotations(dbus.service.Object):
1313
"""A D-Bus object with annotations.
1315
Classes inheriting from this can use the dbus_annotations
1316
decorator to add annotations to methods or signals.
847
class DBusObjectWithProperties(dbus.service.Object):
848
"""A D-Bus object with properties.
850
Classes inheriting from this can use the dbus_service_property
851
decorator to expose methods as D-Bus properties. It exposes the
852
standard Get(), Set(), and GetAll() methods on the D-Bus.
1320
856
def _is_dbus_thing(thing):
1321
857
"""Returns a function testing if an attribute is a D-Bus thing
1323
859
If called like _is_dbus_thing("method") it returns a function
1324
860
suitable for use as predicate to inspect.getmembers().
1326
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
862
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1329
865
def _get_all_dbus_things(self, thing):
1330
866
"""Returns a generator of (name, attribute) pairs
1332
return ((getattr(athing.__get__(self), "_dbus_name", name),
868
return ((getattr(athing.__get__(self), "_dbus_name",
1333
870
athing.__get__(self))
1334
871
for cls in self.__class__.__mro__
1335
872
for name, athing in
1336
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1338
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1340
path_keyword="object_path",
1341
connection_keyword="connection")
1342
def Introspect(self, object_path, connection):
1343
"""Overloading of standard D-Bus method.
1345
Inserts annotation tags on methods and signals.
1347
xmlstring = dbus.service.Object.Introspect(self, object_path,
1350
document = xml.dom.minidom.parseString(xmlstring)
1352
for if_tag in document.getElementsByTagName("interface"):
1353
# Add annotation tags
1354
for typ in ("method", "signal"):
1355
for tag in if_tag.getElementsByTagName(typ):
1357
for name, prop in (self.
1358
_get_all_dbus_things(typ)):
1359
if (name == tag.getAttribute("name")
1360
and prop._dbus_interface
1361
== if_tag.getAttribute("name")):
1362
annots.update(getattr(
1363
prop, "_dbus_annotations", {}))
1364
for name, value in annots.items():
1365
ann_tag = document.createElement(
1367
ann_tag.setAttribute("name", name)
1368
ann_tag.setAttribute("value", value)
1369
tag.appendChild(ann_tag)
1370
# Add interface annotation tags
1371
for annotation, value in dict(
1372
itertools.chain.from_iterable(
1373
annotations().items()
1374
for name, annotations
1375
in self._get_all_dbus_things("interface")
1376
if name == if_tag.getAttribute("name")
1378
ann_tag = document.createElement("annotation")
1379
ann_tag.setAttribute("name", annotation)
1380
ann_tag.setAttribute("value", value)
1381
if_tag.appendChild(ann_tag)
1382
# Fix argument name for the Introspect method itself
1383
if (if_tag.getAttribute("name")
1384
== dbus.INTROSPECTABLE_IFACE):
1385
for cn in if_tag.getElementsByTagName("method"):
1386
if cn.getAttribute("name") == "Introspect":
1387
for arg in cn.getElementsByTagName("arg"):
1388
if (arg.getAttribute("direction")
1390
arg.setAttribute("name",
1392
xmlstring = document.toxml("utf-8")
1394
except (AttributeError, xml.dom.DOMException,
1395
xml.parsers.expat.ExpatError) as error:
1396
logger.error("Failed to override Introspection method",
1401
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1402
"""A D-Bus object with properties.
1404
Classes inheriting from this can use the dbus_service_property
1405
decorator to expose methods as D-Bus properties. It exposes the
1406
standard Get(), Set(), and GetAll() methods on the D-Bus.
873
inspect.getmembers(cls,
874
self._is_dbus_thing(thing)))
1409
876
def _get_dbus_property(self, interface_name, property_name):
1410
877
"""Returns a bound method if one exists which is a D-Bus
1411
878
property with the specified name and interface.
1413
for cls in self.__class__.__mro__:
1414
for name, value in inspect.getmembers(
1415
cls, self._is_dbus_thing("property")):
880
for cls in self.__class__.__mro__:
881
for name, value in (inspect.getmembers
883
self._is_dbus_thing("property"))):
1416
884
if (value._dbus_name == property_name
1417
885
and value._dbus_interface == interface_name):
1418
886
return value.__get__(self)
1420
888
# No such property
1421
raise DBusPropertyNotFound("{}:{}.{}".format(
1422
self.dbus_object_path, interface_name, property_name))
1425
def _get_all_interface_names(cls):
1426
"""Get a sequence of all interfaces supported by an object"""
1427
return (name for name in set(getattr(getattr(x, attr),
1428
"_dbus_interface", None)
1429
for x in (inspect.getmro(cls))
1431
if name is not None)
1433
@dbus.service.method(dbus.PROPERTIES_IFACE,
889
raise DBusPropertyNotFound(self.dbus_object_path + ":"
890
+ interface_name + "."
893
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1435
894
out_signature="v")
1436
895
def Get(self, interface_name, property_name):
1437
896
"""Standard D-Bus property Get() method, see D-Bus standard.
1565
1026
return xmlstring
1569
dbus.OBJECT_MANAGER_IFACE
1570
except AttributeError:
1571
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1574
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1575
"""A D-Bus object with an ObjectManager.
1577
Classes inheriting from this exposes the standard
1578
GetManagedObjects call and the InterfacesAdded and
1579
InterfacesRemoved signals on the standard
1580
"org.freedesktop.DBus.ObjectManager" interface.
1582
Note: No signals are sent automatically; they must be sent
1585
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1586
out_signature="a{oa{sa{sv}}}")
1587
def GetManagedObjects(self):
1588
"""This function must be overridden"""
1589
raise NotImplementedError()
1591
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1592
signature="oa{sa{sv}}")
1593
def InterfacesAdded(self, object_path, interfaces_and_properties):
1596
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1597
def InterfacesRemoved(self, object_path, interfaces):
1600
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1602
path_keyword="object_path",
1603
connection_keyword="connection")
1604
def Introspect(self, object_path, connection):
1605
"""Overloading of standard D-Bus method.
1607
Override return argument name of GetManagedObjects to be
1608
"objpath_interfaces_and_properties"
1610
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1614
document = xml.dom.minidom.parseString(xmlstring)
1616
for if_tag in document.getElementsByTagName("interface"):
1617
# Fix argument name for the GetManagedObjects method
1618
if (if_tag.getAttribute("name")
1619
== dbus.OBJECT_MANAGER_IFACE):
1620
for cn in if_tag.getElementsByTagName("method"):
1621
if (cn.getAttribute("name")
1622
== "GetManagedObjects"):
1623
for arg in cn.getElementsByTagName("arg"):
1624
if (arg.getAttribute("direction")
1628
"objpath_interfaces"
1630
xmlstring = document.toxml("utf-8")
1632
except (AttributeError, xml.dom.DOMException,
1633
xml.parsers.expat.ExpatError) as error:
1634
logger.error("Failed to override Introspection method",
1639
1029
def datetime_to_dbus(dt, variant_level=0):
1640
1030
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1642
return dbus.String("", variant_level=variant_level)
1643
return dbus.String(dt.isoformat(), variant_level=variant_level)
1032
return dbus.String("", variant_level = variant_level)
1033
return dbus.String(dt.isoformat(),
1034
variant_level=variant_level)
1646
1037
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
2007
1390
server to mandos-client
2011
1394
# Rejected - signal
2012
1395
@dbus.service.signal(_interface, signature="s")
2013
1396
def Rejected(self, reason):
2017
1400
# NeedApproval - signal
2018
1401
@dbus.service.signal(_interface, signature="tb")
2019
1402
def NeedApproval(self, timeout, default):
2021
1404
return self.need_approval()
2025
1408
# Approve - method
2026
1409
@dbus.service.method(_interface, in_signature="b")
2027
1410
def Approve(self, value):
2028
1411
self.approve(value)
2030
1413
# CheckedOK - method
2031
1414
@dbus.service.method(_interface)
2032
1415
def CheckedOK(self):
2033
1416
self.checked_ok()
2035
1418
# Enable - method
2036
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2037
1419
@dbus.service.method(_interface)
2038
1420
def Enable(self):
2042
1424
# StartChecker - method
2043
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2044
1425
@dbus.service.method(_interface)
2045
1426
def StartChecker(self):
2047
1428
self.start_checker()
2049
1430
# Disable - method
2050
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2051
1431
@dbus.service.method(_interface)
2052
1432
def Disable(self):
2056
1436
# StopChecker - method
2057
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2058
1437
@dbus.service.method(_interface)
2059
1438
def StopChecker(self):
2060
1439
self.stop_checker()
2064
1443
# ApprovalPending - property
2065
1444
@dbus_service_property(_interface, signature="b", access="read")
2066
1445
def ApprovalPending_dbus_property(self):
2067
1446
return dbus.Boolean(bool(self.approvals_pending))
2069
1448
# ApprovedByDefault - property
2070
@dbus_service_property(_interface,
1449
@dbus_service_property(_interface, signature="b",
2072
1450
access="readwrite")
2073
1451
def ApprovedByDefault_dbus_property(self, value=None):
2074
1452
if value is None: # get
2075
1453
return dbus.Boolean(self.approved_by_default)
2076
1454
self.approved_by_default = bool(value)
2078
1456
# ApprovalDelay - property
2079
@dbus_service_property(_interface,
1457
@dbus_service_property(_interface, signature="t",
2081
1458
access="readwrite")
2082
1459
def ApprovalDelay_dbus_property(self, value=None):
2083
1460
if value is None: # get
2084
return dbus.UInt64(self.approval_delay.total_seconds()
1461
return dbus.UInt64(self.approval_delay_milliseconds())
2086
1462
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2088
1464
# ApprovalDuration - property
2089
@dbus_service_property(_interface,
1465
@dbus_service_property(_interface, signature="t",
2091
1466
access="readwrite")
2092
1467
def ApprovalDuration_dbus_property(self, value=None):
2093
1468
if value is None: # get
2094
return dbus.UInt64(self.approval_duration.total_seconds()
1469
return dbus.UInt64(timedelta_to_milliseconds(
1470
self.approval_duration))
2096
1471
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2098
1473
# Name - property
2100
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2101
1474
@dbus_service_property(_interface, signature="s", access="read")
2102
1475
def Name_dbus_property(self):
2103
1476
return dbus.String(self.name)
2107
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2108
@dbus_service_property(_interface, signature="s", access="read")
2109
def KeyID_dbus_property(self):
2110
return dbus.String(self.key_id)
2112
1478
# Fingerprint - property
2114
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2115
1479
@dbus_service_property(_interface, signature="s", access="read")
2116
1480
def Fingerprint_dbus_property(self):
2117
1481
return dbus.String(self.fingerprint)
2119
1483
# Host - property
2120
@dbus_service_property(_interface,
1484
@dbus_service_property(_interface, signature="s",
2122
1485
access="readwrite")
2123
1486
def Host_dbus_property(self, value=None):
2124
1487
if value is None: # get
2125
1488
return dbus.String(self.host)
2126
self.host = str(value)
1489
self.host = unicode(value)
2128
1491
# Created - property
2130
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2131
1492
@dbus_service_property(_interface, signature="s", access="read")
2132
1493
def Created_dbus_property(self):
2133
1494
return datetime_to_dbus(self.created)
2135
1496
# LastEnabled - property
2136
1497
@dbus_service_property(_interface, signature="s", access="read")
2137
1498
def LastEnabled_dbus_property(self):
2138
1499
return datetime_to_dbus(self.last_enabled)
2140
1501
# Enabled - property
2141
@dbus_service_property(_interface,
1502
@dbus_service_property(_interface, signature="b",
2143
1503
access="readwrite")
2144
1504
def Enabled_dbus_property(self, value=None):
2145
1505
if value is None: # get
2246
1601
self.start_checker()
2248
1603
self.stop_checker()
2250
1605
# ObjectPath - property
2252
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2253
"org.freedesktop.DBus.Deprecated": "true"})
2254
1606
@dbus_service_property(_interface, signature="o", access="read")
2255
1607
def ObjectPath_dbus_property(self):
2256
return self.dbus_object_path # is already a dbus.ObjectPath
1608
return self.dbus_object_path # is already a dbus.ObjectPath
2258
1610
# Secret = property
2260
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2262
@dbus_service_property(_interface,
1611
@dbus_service_property(_interface, signature="ay",
1612
access="write", byte_arrays=True)
2266
1613
def Secret_dbus_property(self, value):
2267
self.secret = bytes(value)
1614
self.secret = str(value)
2273
def __init__(self, child_pipe, key_id, fpr, address):
1619
class ProxyClient(object):
1620
def __init__(self, child_pipe, fpr, address):
2274
1621
self._pipe = child_pipe
2275
self._pipe.send(("init", key_id, fpr, address))
1622
self._pipe.send(('init', fpr, address))
2276
1623
if not self._pipe.recv():
2277
raise KeyError(key_id or fpr)
2279
1626
def __getattribute__(self, name):
2281
1628
return super(ProxyClient, self).__getattribute__(name)
2282
self._pipe.send(("getattr", name))
1629
self._pipe.send(('getattr', name))
2283
1630
data = self._pipe.recv()
2284
if data[0] == "data":
1631
if data[0] == 'data':
2286
if data[0] == "function":
1633
if data[0] == 'function':
2288
1634
def func(*args, **kwargs):
2289
self._pipe.send(("funcall", name, args, kwargs))
1635
self._pipe.send(('funcall', name, args, kwargs))
2290
1636
return self._pipe.recv()[1]
2294
1639
def __setattr__(self, name, value):
2296
1641
return super(ProxyClient, self).__setattr__(name, value)
2297
self._pipe.send(("setattr", name, value))
1642
self._pipe.send(('setattr', name, value))
2300
1645
class ClientHandler(socketserver.BaseRequestHandler, object):
2301
1646
"""A class to handle client connections.
2303
1648
Instantiated once for each connection to handle it.
2304
1649
Note: This will run in its own forked process."""
2306
1651
def handle(self):
2307
1652
with contextlib.closing(self.server.child_pipe) as child_pipe:
2308
1653
logger.info("TCP connection from: %s",
2309
str(self.client_address))
1654
unicode(self.client_address))
2310
1655
logger.debug("Pipe FD: %d",
2311
1656
self.server.child_pipe.fileno())
2313
session = gnutls.ClientSession(self.request)
2315
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2316
# "+AES-256-CBC", "+SHA1",
2317
# "+COMP-NULL", "+CTYPE-OPENPGP",
1658
session = (gnutls.connection
1659
.ClientSession(self.request,
1661
.X509Credentials()))
1663
# Note: gnutls.connection.X509Credentials is really a
1664
# generic GnuTLS certificate credentials object so long as
1665
# no X.509 keys are added to it. Therefore, we can use it
1666
# here despite using OpenPGP certificates.
1668
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1669
# "+AES-256-CBC", "+SHA1",
1670
# "+COMP-NULL", "+CTYPE-OPENPGP",
2319
1672
# Use a fallback default, since this MUST be set.
2320
1673
priority = self.server.gnutls_priority
2321
1674
if priority is None:
2322
1675
priority = "NORMAL"
2323
gnutls.priority_set_direct(session,
2324
priority.encode("utf-8"), None)
1676
(gnutls.library.functions
1677
.gnutls_priority_set_direct(session._c_object,
2326
1680
# Start communication using the Mandos protocol
2327
1681
# Get protocol number
2328
1682
line = self.request.makefile().readline()
2329
1683
logger.debug("Protocol version: %r", line)
2331
1685
if int(line.strip().split()[0]) > 1:
2332
raise RuntimeError(line)
2333
1687
except (ValueError, IndexError, RuntimeError) as error:
2334
1688
logger.error("Unknown protocol version: %s", error)
2337
1691
# Start GnuTLS connection
2339
1693
session.handshake()
2340
except gnutls.Error as error:
1694
except gnutls.errors.GNUTLSError as error:
2341
1695
logger.warning("Handshake failed: %s", error)
2342
1696
# Do not run session.bye() here: the session is not
2343
1697
# established. Just abandon the request.
2345
1699
logger.debug("Handshake succeeded")
2347
1701
approval_required = False
2349
if gnutls.has_rawpk:
2352
key_id = self.key_id(
2353
self.peer_certificate(session))
2354
except (TypeError, gnutls.Error) as error:
2355
logger.warning("Bad certificate: %s", error)
2357
logger.debug("Key ID: %s",
2358
key_id.decode("utf-8",
2364
fpr = self.fingerprint(
2365
self.peer_certificate(session))
2366
except (TypeError, gnutls.Error) as error:
2367
logger.warning("Bad certificate: %s", error)
2369
logger.debug("Fingerprint: %s", fpr)
2372
client = ProxyClient(child_pipe, key_id, fpr,
1704
fpr = self.fingerprint(self.peer_certificate
1707
gnutls.errors.GNUTLSError) as error:
1708
logger.warning("Bad certificate: %s", error)
1710
logger.debug("Fingerprint: %s", fpr)
1713
client = ProxyClient(child_pipe, fpr,
2373
1714
self.client_address)
2374
1715
except KeyError:
2377
1718
if client.approval_delay:
2378
1719
delay = client.approval_delay
2379
1720
client.approvals_pending += 1
2380
1721
approval_required = True
2383
1724
if not client.enabled:
2384
1725
logger.info("Client %s is disabled",
2386
1727
if self.server.use_dbus:
2387
1728
# Emit D-Bus signal
2388
1729
client.Rejected("Disabled")
2391
1732
if client.approved or not client.approval_delay:
2392
# We are approved or approval is disabled
1733
#We are approved or approval is disabled
2394
1735
elif client.approved is None:
2395
1736
logger.info("Client %s needs approval",
2428
1771
delay -= time2 - time
2431
session.send(client.secret)
2432
except gnutls.Error as error:
2433
logger.warning("gnutls send failed",
1774
while sent_size < len(client.secret):
1776
sent = session.send(client.secret[sent_size:])
1777
except gnutls.errors.GNUTLSError as error:
1778
logger.warning("gnutls send failed",
1781
logger.debug("Sent: %d, remaining: %d",
1782
sent, len(client.secret)
1783
- (sent_size + sent))
2437
1786
logger.info("Sending secret to %s", client.name)
2438
1787
# bump the timeout using extended_timeout
2439
1788
client.bump_timeout(client.extended_timeout)
2440
1789
if self.server.use_dbus:
2441
1790
# Emit D-Bus signal
2442
1791
client.GotSecret()
2445
1794
if approval_required:
2446
1795
client.approvals_pending -= 1
2449
except gnutls.Error as error:
1798
except gnutls.errors.GNUTLSError as error:
2450
1799
logger.warning("GnuTLS bye failed",
2451
1800
exc_info=error)
2454
1803
def peer_certificate(session):
2455
"Return the peer's certificate as a bytestring"
2457
cert_type = gnutls.certificate_type_get2(
2458
session, gnutls.CTYPE_PEERS)
2459
except AttributeError:
2460
cert_type = gnutls.certificate_type_get(session)
2461
if gnutls.has_rawpk:
2462
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2464
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2465
# If not a valid certificate type...
2466
if cert_type not in valid_cert_types:
2467
logger.info("Cert type %r not in %r", cert_type,
2469
# ...return invalid data
1804
"Return the peer's OpenPGP certificate as a bytestring"
1805
# If not an OpenPGP certificate...
1806
if (gnutls.library.functions
1807
.gnutls_certificate_type_get(session._c_object)
1808
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1809
# ...do the normal thing
1810
return session.peer_certificate
2471
1811
list_size = ctypes.c_uint(1)
2472
cert_list = (gnutls.certificate_get_peers
2473
(session, ctypes.byref(list_size)))
1812
cert_list = (gnutls.library.functions
1813
.gnutls_certificate_get_peers
1814
(session._c_object, ctypes.byref(list_size)))
2474
1815
if not bool(cert_list) and list_size.value != 0:
2475
raise gnutls.Error("error getting peer certificate")
1816
raise gnutls.errors.GNUTLSError("error getting peer"
2476
1818
if list_size.value == 0:
2478
1820
cert = cert_list[0]
2479
1821
return ctypes.string_at(cert.data, cert.size)
2482
def key_id(certificate):
2483
"Convert a certificate bytestring to a hexdigit key ID"
2484
# New GnuTLS "datum" with the public key
2485
datum = gnutls.datum_t(
2486
ctypes.cast(ctypes.c_char_p(certificate),
2487
ctypes.POINTER(ctypes.c_ubyte)),
2488
ctypes.c_uint(len(certificate)))
2489
# XXX all these need to be created in the gnutls "module"
2490
# New empty GnuTLS certificate
2491
pubkey = gnutls.pubkey_t()
2492
gnutls.pubkey_init(ctypes.byref(pubkey))
2493
# Import the raw public key into the certificate
2494
gnutls.pubkey_import(pubkey,
2495
ctypes.byref(datum),
2496
gnutls.X509_FMT_DER)
2497
# New buffer for the key ID
2498
buf = ctypes.create_string_buffer(32)
2499
buf_len = ctypes.c_size_t(len(buf))
2500
# Get the key ID from the raw public key into the buffer
2501
gnutls.pubkey_get_key_id(
2503
gnutls.KEYID_USE_SHA256,
2504
ctypes.cast(ctypes.byref(buf),
2505
ctypes.POINTER(ctypes.c_ubyte)),
2506
ctypes.byref(buf_len))
2507
# Deinit the certificate
2508
gnutls.pubkey_deinit(pubkey)
2510
# Convert the buffer to a Python bytestring
2511
key_id = ctypes.string_at(buf, buf_len.value)
2512
# Convert the bytestring to hexadecimal notation
2513
hex_key_id = binascii.hexlify(key_id).upper()
2517
1824
def fingerprint(openpgp):
2518
1825
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2519
1826
# New GnuTLS "datum" with the OpenPGP public key
2520
datum = gnutls.datum_t(
2521
ctypes.cast(ctypes.c_char_p(openpgp),
2522
ctypes.POINTER(ctypes.c_ubyte)),
2523
ctypes.c_uint(len(openpgp)))
1827
datum = (gnutls.library.types
1828
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1831
ctypes.c_uint(len(openpgp))))
2524
1832
# New empty GnuTLS certificate
2525
crt = gnutls.openpgp_crt_t()
2526
gnutls.openpgp_crt_init(ctypes.byref(crt))
1833
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1834
(gnutls.library.functions
1835
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2527
1836
# Import the OpenPGP public key into the certificate
2528
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2529
gnutls.OPENPGP_FMT_RAW)
1837
(gnutls.library.functions
1838
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1839
gnutls.library.constants
1840
.GNUTLS_OPENPGP_FMT_RAW))
2530
1841
# Verify the self signature in the key
2531
1842
crtverify = ctypes.c_uint()
2532
gnutls.openpgp_crt_verify_self(crt, 0,
2533
ctypes.byref(crtverify))
1843
(gnutls.library.functions
1844
.gnutls_openpgp_crt_verify_self(crt, 0,
1845
ctypes.byref(crtverify)))
2534
1846
if crtverify.value != 0:
2535
gnutls.openpgp_crt_deinit(crt)
2536
raise gnutls.CertificateSecurityError(code
1847
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1848
raise (gnutls.errors.CertificateSecurityError
2538
1850
# New buffer for the fingerprint
2539
1851
buf = ctypes.create_string_buffer(20)
2540
1852
buf_len = ctypes.c_size_t()
2541
1853
# Get the fingerprint from the certificate into the buffer
2542
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2543
ctypes.byref(buf_len))
1854
(gnutls.library.functions
1855
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1856
ctypes.byref(buf_len)))
2544
1857
# Deinit the certificate
2545
gnutls.openpgp_crt_deinit(crt)
1858
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2546
1859
# Convert the buffer to a Python bytestring
2547
1860
fpr = ctypes.string_at(buf, buf_len.value)
2548
1861
# Convert the bytestring to hexadecimal notation
2637
1944
# socket_wrapper(), if socketfd was set.
2638
1945
socketserver.TCPServer.__init__(self, server_address,
2639
1946
RequestHandlerClass)
2641
1948
def server_bind(self):
2642
1949
"""This overrides the normal server_bind() function
2643
1950
to bind to an interface if one was specified, and also NOT to
2644
1951
bind to an address or port if they were not specified."""
2645
global SO_BINDTODEVICE
2646
1952
if self.interface is not None:
2647
1953
if SO_BINDTODEVICE is None:
2648
# Fall back to a hard-coded value which seems to be
2650
logger.warning("SO_BINDTODEVICE not found, trying 25")
2651
SO_BINDTODEVICE = 25
2653
self.socket.setsockopt(
2654
socket.SOL_SOCKET, SO_BINDTODEVICE,
2655
(self.interface + "\0").encode("utf-8"))
2656
except socket.error as error:
2657
if error.errno == errno.EPERM:
2658
logger.error("No permission to bind to"
2659
" interface %s", self.interface)
2660
elif error.errno == errno.ENOPROTOOPT:
2661
logger.error("SO_BINDTODEVICE not available;"
2662
" cannot bind to interface %s",
2664
elif error.errno == errno.ENODEV:
2665
logger.error("Interface %s does not exist,"
2666
" cannot bind", self.interface)
1954
logger.error("SO_BINDTODEVICE does not exist;"
1955
" cannot bind to interface %s",
1959
self.socket.setsockopt(socket.SOL_SOCKET,
1961
str(self.interface + '\0'))
1962
except socket.error as error:
1963
if error.errno == errno.EPERM:
1964
logger.error("No permission to bind to"
1965
" interface %s", self.interface)
1966
elif error.errno == errno.ENOPROTOOPT:
1967
logger.error("SO_BINDTODEVICE not available;"
1968
" cannot bind to interface %s",
1970
elif error.errno == errno.ENODEV:
1971
logger.error("Interface %s does not exist,"
1972
" cannot bind", self.interface)
2669
1975
# Only bind(2) the socket if we really need to.
2670
1976
if self.server_address[0] or self.server_address[1]:
2671
if self.server_address[1]:
2672
self.allow_reuse_address = True
2673
1977
if not self.server_address[0]:
2674
1978
if self.address_family == socket.AF_INET6:
2675
any_address = "::" # in6addr_any
1979
any_address = "::" # in6addr_any
2677
any_address = "0.0.0.0" # INADDR_ANY
1981
any_address = socket.INADDR_ANY
2678
1982
self.server_address = (any_address,
2679
1983
self.server_address[1])
2680
1984
elif not self.server_address[1]:
2681
self.server_address = (self.server_address[0], 0)
1985
self.server_address = (self.server_address[0],
2682
1987
# if self.interface:
2683
1988
# self.server_address = (self.server_address[0],
2714
2014
self.gnutls_priority = gnutls_priority
2715
2015
IPv6_TCPServer.__init__(self, server_address,
2716
2016
RequestHandlerClass,
2717
interface=interface,
2017
interface = interface,
2018
use_ipv6 = use_ipv6,
2019
socketfd = socketfd)
2721
2020
def server_activate(self):
2722
2021
if self.enabled:
2723
2022
return socketserver.TCPServer.server_activate(self)
2725
2024
def enable(self):
2726
2025
self.enabled = True
2728
2027
def add_pipe(self, parent_pipe, proc):
2729
2028
# Call "handle_ipc" for both data and EOF events
2731
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2732
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2733
functools.partial(self.handle_ipc,
2734
parent_pipe=parent_pipe,
2737
def handle_ipc(self, source, condition,
2740
client_object=None):
2029
gobject.io_add_watch(parent_pipe.fileno(),
2030
gobject.IO_IN | gobject.IO_HUP,
2031
functools.partial(self.handle_ipc,
2036
def handle_ipc(self, source, condition, parent_pipe=None,
2037
proc = None, client_object=None):
2741
2038
# error, or the other end of multiprocessing.Pipe has closed
2742
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2039
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2743
2040
# Wait for other process to exit
2747
2044
# Read a request from the child
2748
2045
request = parent_pipe.recv()
2749
2046
command = request[0]
2751
if command == "init":
2752
key_id = request[1].decode("ascii")
2753
fpr = request[2].decode("ascii")
2754
address = request[3]
2756
for c in self.clients.values():
2757
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2758
"27AE41E4649B934CA495991B7852B855"):
2760
if key_id and c.key_id == key_id:
2763
if fpr and c.fingerprint == fpr:
2048
if command == 'init':
2050
address = request[2]
2052
for c in self.clients.itervalues():
2053
if c.fingerprint == fpr:
2767
logger.info("Client not found for key ID: %s, address"
2768
": %s", key_id or fpr, address)
2057
logger.info("Client not found for fingerprint: %s, ad"
2058
"dress: %s", fpr, address)
2769
2059
if self.use_dbus:
2770
2060
# Emit D-Bus signal
2771
mandos_dbus_service.ClientNotFound(key_id or fpr,
2061
mandos_dbus_service.ClientNotFound(fpr,
2773
2063
parent_pipe.send(False)
2777
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2778
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2779
functools.partial(self.handle_ipc,
2780
parent_pipe=parent_pipe,
2782
client_object=client))
2066
gobject.io_add_watch(parent_pipe.fileno(),
2067
gobject.IO_IN | gobject.IO_HUP,
2068
functools.partial(self.handle_ipc,
2783
2074
parent_pipe.send(True)
2784
2075
# remove the old hook in favor of the new above hook on
2787
if command == "funcall":
2078
if command == 'funcall':
2788
2079
funcname = request[1]
2789
2080
args = request[2]
2790
2081
kwargs = request[3]
2792
parent_pipe.send(("data", getattr(client_object,
2083
parent_pipe.send(('data', getattr(client_object,
2793
2084
funcname)(*args,
2796
if command == "getattr":
2087
if command == 'getattr':
2797
2088
attrname = request[1]
2798
if isinstance(client_object.__getattribute__(attrname),
2799
collections.abc.Callable):
2800
parent_pipe.send(("function", ))
2089
if callable(client_object.__getattribute__(attrname)):
2090
parent_pipe.send(('function',))
2803
"data", client_object.__getattribute__(attrname)))
2805
if command == "setattr":
2092
parent_pipe.send(('data', client_object
2093
.__getattribute__(attrname)))
2095
if command == 'setattr':
2806
2096
attrname = request[1]
2807
2097
value = request[2]
2808
2098
setattr(client_object, attrname, value)
2813
2103
def rfc3339_duration_to_delta(duration):
2814
2104
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2816
>>> timedelta = datetime.timedelta
2817
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2819
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2821
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2823
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2825
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2827
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2829
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2106
>>> rfc3339_duration_to_delta("P7D")
2107
datetime.timedelta(7)
2108
>>> rfc3339_duration_to_delta("PT60S")
2109
datetime.timedelta(0, 60)
2110
>>> rfc3339_duration_to_delta("PT60M")
2111
datetime.timedelta(0, 3600)
2112
>>> rfc3339_duration_to_delta("PT24H")
2113
datetime.timedelta(1)
2114
>>> rfc3339_duration_to_delta("P1W")
2115
datetime.timedelta(7)
2116
>>> rfc3339_duration_to_delta("PT5M30S")
2117
datetime.timedelta(0, 330)
2118
>>> rfc3339_duration_to_delta("P1DT3M20S")
2119
datetime.timedelta(1, 200)
2834
2122
# Parsing an RFC 3339 duration with regular expressions is not
2835
2123
# possible - there would have to be multiple places for the same
2836
2124
# values, like seconds. The current code, while more esoteric, is
2837
2125
# cleaner without depending on a parsing library. If Python had a
2838
2126
# built-in library for parsing we would use it, but we'd like to
2839
2127
# avoid excessive use of external libraries.
2841
2129
# New type for defining tokens, syntax, and semantics all-in-one
2842
Token = collections.namedtuple("Token", (
2843
"regexp", # To match token; if "value" is not None, must have
2844
# a "group" containing digits
2845
"value", # datetime.timedelta or None
2846
"followers")) # Tokens valid after this token
2130
Token = collections.namedtuple("Token",
2131
("regexp", # To match token; if
2132
# "value" is not None,
2133
# must have a "group"
2135
"value", # datetime.timedelta or
2137
"followers")) # Tokens valid after
2847
2139
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2848
2140
# the "duration" ABNF definition in RFC 3339, Appendix A.
2849
2141
token_end = Token(re.compile(r"$"), None, frozenset())
2850
2142
token_second = Token(re.compile(r"(\d+)S"),
2851
2143
datetime.timedelta(seconds=1),
2852
frozenset((token_end, )))
2144
frozenset((token_end,)))
2853
2145
token_minute = Token(re.compile(r"(\d+)M"),
2854
2146
datetime.timedelta(minutes=1),
2855
2147
frozenset((token_second, token_end)))
3014
2303
parser.add_argument("--no-dbus", action="store_false",
3015
2304
dest="use_dbus", help="Do not provide D-Bus"
3016
" system bus interface", default=None)
2305
" system bus interface")
3017
2306
parser.add_argument("--no-ipv6", action="store_false",
3018
dest="use_ipv6", help="Do not use IPv6",
2307
dest="use_ipv6", help="Do not use IPv6")
3020
2308
parser.add_argument("--no-restore", action="store_false",
3021
2309
dest="restore", help="Do not restore stored"
3022
" state", default=None)
3023
2311
parser.add_argument("--socket", type=int,
3024
2312
help="Specify a file descriptor to a network"
3025
2313
" socket to use instead of creating one")
3026
2314
parser.add_argument("--statedir", metavar="DIR",
3027
2315
help="Directory to save/restore state in")
3028
2316
parser.add_argument("--foreground", action="store_true",
3029
help="Run in foreground", default=None)
3030
parser.add_argument("--no-zeroconf", action="store_false",
3031
dest="zeroconf", help="Do not use Zeroconf",
2317
help="Run in foreground")
3034
2319
options = parser.parse_args()
3036
2326
# Default values for config file for server-global settings
3037
if gnutls.has_rawpk:
3038
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3039
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
3041
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
3042
":+SIGN-DSA-SHA256")
3043
server_defaults = {"interface": "",
3047
"priority": priority,
3048
"servicename": "Mandos",
3054
"statedir": "/var/lib/mandos",
3055
"foreground": "False",
2327
server_defaults = { "interface": "",
2332
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2333
"servicename": "Mandos",
2339
"statedir": "/var/lib/mandos",
2340
"foreground": "False",
3060
2343
# Parse config file for server-global settings
3061
server_config = configparser.ConfigParser(server_defaults)
2344
server_config = configparser.SafeConfigParser(server_defaults)
3062
2345
del server_defaults
3063
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3064
# Convert the ConfigParser object to a dict
2346
server_config.read(os.path.join(options.configdir,
2348
# Convert the SafeConfigParser object to a dict
3065
2349
server_settings = server_config.defaults()
3066
2350
# Use the appropriate methods on the non-string config options
3067
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3068
"foreground", "zeroconf"):
2351
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
3069
2352
server_settings[option] = server_config.getboolean("DEFAULT",
3071
2354
if server_settings["port"]:
3187
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3189
2456
except OSError as error:
3190
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3191
.format(uid, gid, os.strerror(error.errno)))
3192
2457
if error.errno != errno.EPERM:
3196
2461
# Enable all possible GnuTLS debugging
3198
2463
# "Use a log level over 10 to enable all debugging options."
3199
2464
# - GnuTLS manual
3200
gnutls.global_set_log_level(11)
2465
gnutls.library.functions.gnutls_global_set_log_level(11)
2467
@gnutls.library.types.gnutls_log_func
3203
2468
def debug_gnutls(level, string):
3204
logger.debug("GnuTLS: %s",
3205
string[:-1].decode("utf-8",
3208
gnutls.global_set_log_function(debug_gnutls)
2469
logger.debug("GnuTLS: %s", string[:-1])
2471
(gnutls.library.functions
2472
.gnutls_global_set_log_function(debug_gnutls))
3210
2474
# Redirect stdin so all checkers get /dev/null
3211
2475
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3212
2476
os.dup2(null, sys.stdin.fileno())
3216
2480
# Need to fork before connecting to D-Bus
3217
2481
if not foreground:
3218
2482
# Close all input and output, do double fork, etc.
3221
if gi.version_info < (3, 10, 2):
3222
# multiprocessing will use threads, so before we use GLib we
3223
# need to inform GLib that threads will be used.
2485
# multiprocessing will use threads, so before we use gobject we
2486
# need to inform gobject that threads will be used.
2487
gobject.threads_init()
3226
2489
global main_loop
3227
2490
# From the Avahi example code
3228
2491
DBusGMainLoop(set_as_default=True)
3229
main_loop = GLib.MainLoop()
2492
main_loop = gobject.MainLoop()
3230
2493
bus = dbus.SystemBus()
3231
2494
# End of Avahi example code
3234
2497
bus_name = dbus.service.BusName("se.recompile.Mandos",
3237
old_bus_name = dbus.service.BusName(
3238
"se.bsnet.fukt.Mandos", bus,
3240
except dbus.exceptions.DBusException as e:
2498
bus, do_not_queue=True)
2499
old_bus_name = (dbus.service.BusName
2500
("se.bsnet.fukt.Mandos", bus,
2502
except dbus.exceptions.NameExistsException as e:
3241
2503
logger.error("Disabling D-Bus:", exc_info=e)
3242
2504
use_dbus = False
3243
2505
server_settings["use_dbus"] = False
3244
2506
tcp_server.use_dbus = False
3246
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3247
service = AvahiServiceToSyslog(
3248
name=server_settings["servicename"],
3249
servicetype="_mandos._tcp",
3252
if server_settings["interface"]:
3253
service.interface = if_nametoindex(
3254
server_settings["interface"].encode("utf-8"))
2507
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2508
service = AvahiServiceToSyslog(name =
2509
server_settings["servicename"],
2510
servicetype = "_mandos._tcp",
2511
protocol = protocol, bus = bus)
2512
if server_settings["interface"]:
2513
service.interface = (if_nametoindex
2514
(str(server_settings["interface"])))
3256
2516
global multiprocessing_manager
3257
2517
multiprocessing_manager = multiprocessing.Manager()
3259
2519
client_class = Client
3261
client_class = functools.partial(ClientDBus, bus=bus)
2521
client_class = functools.partial(ClientDBus, bus = bus)
3263
2523
client_settings = Client.config_parser(client_config)
3264
2524
old_client_settings = {}
3265
2525
clients_data = {}
3267
# This is used to redirect stdout and stderr for checker processes
3269
wnull = open(os.devnull, "w") # A writable /dev/null
3270
# Only used if server is running in foreground but not in debug
3272
if debug or not foreground:
3275
2527
# Get client data and settings from last running state.
3276
2528
if server_settings["restore"]:
3278
2530
with open(stored_state_path, "rb") as stored_state:
3279
if sys.version_info.major == 2:
3280
clients_data, old_client_settings = pickle.load(
3283
bytes_clients_data, bytes_old_client_settings = (
3284
pickle.load(stored_state, encoding="bytes"))
3285
# Fix bytes to strings
3288
clients_data = {(key.decode("utf-8")
3289
if isinstance(key, bytes)
3292
bytes_clients_data.items()}
3293
del bytes_clients_data
3294
for key in clients_data:
3295
value = {(k.decode("utf-8")
3296
if isinstance(k, bytes) else k): v
3298
clients_data[key].items()}
3299
clients_data[key] = value
3301
value["client_structure"] = [
3303
if isinstance(s, bytes)
3305
value["client_structure"]]
3306
# .name, .host, and .checker_command
3307
for k in ("name", "host", "checker_command"):
3308
if isinstance(value[k], bytes):
3309
value[k] = value[k].decode("utf-8")
3310
if "key_id" not in value:
3311
value["key_id"] = ""
3312
elif "fingerprint" not in value:
3313
value["fingerprint"] = ""
3314
# old_client_settings
3316
old_client_settings = {
3317
(key.decode("utf-8")
3318
if isinstance(key, bytes)
3321
bytes_old_client_settings.items()}
3322
del bytes_old_client_settings
3323
# .host and .checker_command
3324
for value in old_client_settings.values():
3325
for attribute in ("host", "checker_command"):
3326
if isinstance(value[attribute], bytes):
3327
value[attribute] = (value[attribute]
2531
clients_data, old_client_settings = (pickle.load
3329
2533
os.remove(stored_state_path)
3330
2534
except IOError as e:
3331
2535
if e.errno == errno.ENOENT:
3332
logger.warning("Could not load persistent state:"
3333
" {}".format(os.strerror(e.errno)))
2536
logger.warning("Could not load persistent state: {0}"
2537
.format(os.strerror(e.errno)))
3335
2539
logger.critical("Could not load persistent state:",
3338
2542
except EOFError as e:
3339
2543
logger.warning("Could not load persistent state: "
2544
"EOFError:", exc_info=e)
3343
2546
with PGPEngine() as pgp:
3344
for client_name, client in clients_data.items():
3345
# Skip removed clients
3346
if client_name not in client_settings:
2547
for client_name, client in clients_data.iteritems():
3349
2548
# Decide which value to use after restoring saved state.
3350
2549
# We have three different values: Old config file,
3351
2550
# new config file, and saved state.
3409
2608
for client_name in (set(client_settings)
3410
2609
- set(old_client_settings)):
3411
2610
clients_data[client_name] = client_settings[client_name]
3413
2612
# Create all client objects
3414
for client_name, client in clients_data.items():
2613
for client_name, client in clients_data.iteritems():
3415
2614
tcp_server.clients[client_name] = client_class(
3418
server_settings=server_settings)
2615
name = client_name, settings = client)
3420
2617
if not tcp_server.clients:
3421
2618
logger.warning("No clients defined")
3423
2620
if not foreground:
3424
2621
if pidfile is not None:
3428
print(pid, file=pidfile)
2625
pidfile.write(str(pid) + "\n".encode("utf-8"))
3429
2626
except IOError:
3430
2627
logger.error("Could not write to file %r with PID %d",
3431
2628
pidfilename, pid)
3433
2630
del pidfilename
3435
for termsig in (signal.SIGHUP, signal.SIGTERM):
3436
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3437
lambda: main_loop.quit() and False)
2632
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2633
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3441
@alternate_dbus_interfaces(
3442
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3443
class MandosDBusService(DBusObjectWithObjectManager):
2636
@alternate_dbus_interfaces({"se.recompile.Mandos":
2637
"se.bsnet.fukt.Mandos"})
2638
class MandosDBusService(DBusObjectWithProperties):
3444
2639
"""A D-Bus proxy object"""
3446
2640
def __init__(self):
3447
2641
dbus.service.Object.__init__(self, bus, "/")
3449
2642
_interface = "se.recompile.Mandos"
2644
@dbus_interface_annotations(_interface)
2646
return { "org.freedesktop.DBus.Property"
2647
".EmitsChangedSignal":
3451
2650
@dbus.service.signal(_interface, signature="o")
3452
2651
def ClientAdded(self, objpath):
3456
2655
@dbus.service.signal(_interface, signature="ss")
3457
def ClientNotFound(self, key_id, address):
2656
def ClientNotFound(self, fingerprint, address):
3461
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3463
2660
@dbus.service.signal(_interface, signature="os")
3464
2661
def ClientRemoved(self, objpath, name):
3468
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3470
2665
@dbus.service.method(_interface, out_signature="ao")
3471
2666
def GetAllClients(self):
3473
return dbus.Array(c.dbus_object_path for c in
3474
tcp_server.clients.values())
3476
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2668
return dbus.Array(c.dbus_object_path
2670
tcp_server.clients.itervalues())
3478
2672
@dbus.service.method(_interface,
3479
2673
out_signature="a{oa{sv}}")
3480
2674
def GetAllClientsWithProperties(self):
3482
2676
return dbus.Dictionary(
3483
{c.dbus_object_path: c.GetAll(
3484
"se.recompile.Mandos.Client")
3485
for c in tcp_server.clients.values()},
2677
((c.dbus_object_path, c.GetAll(""))
2678
for c in tcp_server.clients.itervalues()),
3486
2679
signature="oa{sv}")
3488
2681
@dbus.service.method(_interface, in_signature="o")
3489
2682
def RemoveClient(self, object_path):
3491
for c in tcp_server.clients.values():
2684
for c in tcp_server.clients.itervalues():
3492
2685
if c.dbus_object_path == object_path:
3493
2686
del tcp_server.clients[c.name]
3494
2687
c.remove_from_connection()
3495
# Don't signal the disabling
2688
# Don't signal anything except ClientRemoved
3496
2689
c.disable(quiet=True)
3497
# Emit D-Bus signal for removal
3498
self.client_removed_signal(c)
2691
self.ClientRemoved(object_path, c.name)
3500
2693
raise KeyError(object_path)
3504
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3505
out_signature="a{oa{sa{sv}}}")
3506
def GetManagedObjects(self):
3508
return dbus.Dictionary(
3509
{client.dbus_object_path:
3511
{interface: client.GetAll(interface)
3513
client._get_all_interface_names()})
3514
for client in tcp_server.clients.values()})
3516
def client_added_signal(self, client):
3517
"""Send the new standard signal and the old signal"""
3519
# New standard signal
3520
self.InterfacesAdded(
3521
client.dbus_object_path,
3523
{interface: client.GetAll(interface)
3525
client._get_all_interface_names()}))
3527
self.ClientAdded(client.dbus_object_path)
3529
def client_removed_signal(self, client):
3530
"""Send the new standard signal and the old signal"""
3532
# New standard signal
3533
self.InterfacesRemoved(
3534
client.dbus_object_path,
3535
client._get_all_interface_names())
3537
self.ClientRemoved(client.dbus_object_path,
3540
2697
mandos_dbus_service = MandosDBusService()
3542
# Save modules to variables to exempt the modules from being
3543
# unloaded before the function registered with atexit() is run.
3544
mp = multiprocessing
3548
2700
"Cleanup function; run on exit"
3552
mp.active_children()
2703
multiprocessing.active_children()
3554
2704
if not (tcp_server.clients or client_settings):
3557
2707
# Store client before exiting. Secrets are encrypted with key
3558
2708
# based on what config file has. If config file is
3559
2709
# removed/edited, old secret will thus be unrecovable.
3561
2711
with PGPEngine() as pgp:
3562
for client in tcp_server.clients.values():
2712
for client in tcp_server.clients.itervalues():
3563
2713
key = client_settings[client.name]["secret"]
3564
2714
client.encrypted_secret = pgp.encrypt(client.secret,
3566
2716
client_dict = {}
3568
2718
# A list of attributes that can not be pickled
3570
exclude = {"bus", "changedstate", "secret",
3571
"checker", "server_settings"}
3572
for name, typ in inspect.getmembers(dbus.service
2720
exclude = set(("bus", "changedstate", "secret",
2722
for name, typ in (inspect.getmembers
2723
(dbus.service.Object)):
3574
2724
exclude.add(name)
3576
2726
client_dict["encrypted_secret"] = (client
3577
2727
.encrypted_secret)
3578
2728
for attr in client.client_structure:
3579
2729
if attr not in exclude:
3580
2730
client_dict[attr] = getattr(client, attr)
3582
2732
clients[client.name] = client_dict
3583
2733
del client_settings[client.name]["secret"]
3586
with tempfile.NamedTemporaryFile(
3590
dir=os.path.dirname(stored_state_path),
3591
delete=False) as stored_state:
3592
pickle.dump((clients, client_settings), stored_state,
3594
tempname = stored_state.name
2736
with (tempfile.NamedTemporaryFile
2737
(mode='wb', suffix=".pickle", prefix='clients-',
2738
dir=os.path.dirname(stored_state_path),
2739
delete=False)) as stored_state:
2740
pickle.dump((clients, client_settings), stored_state)
2741
tempname=stored_state.name
3595
2742
os.rename(tempname, stored_state_path)
3596
2743
except (IOError, OSError) as e: