70
import cPickle as pickle
65
import cPickle as pickle
73
66
import multiprocessing
85
73
import dbus.service
87
from gi.repository import GLib
88
76
from dbus.mainloop.glib import DBusGMainLoop
91
79
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
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
123
85
except AttributeError:
125
# This is where SO_BINDTODEVICE was up to and including Python
127
87
from IN import SO_BINDTODEVICE
128
88
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
89
SO_BINDTODEVICE = None
147
92
stored_state_file = "clients.pickle"
149
94
logger = logging.getLogger()
150
logging.captureWarnings(True) # Show warnings via the logging system
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
154
if_nametoindex = ctypes.cdll.LoadLibrary(
155
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
156
103
except (OSError, AttributeError):
158
104
def if_nametoindex(interface):
159
105
"Get an interface index the hard way, i.e. using fcntl()"
160
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
161
107
with contextlib.closing(socket.socket()) as s:
162
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
163
struct.pack(b"16s16x", interface))
164
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
165
113
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
116
def initlogger(debug, level=logging.WARNING):
185
117
"""init logger and add loglevel"""
188
syslogger = (logging.handlers.SysLogHandler(
189
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
191
119
syslogger.setFormatter(logging.Formatter
192
("Mandos [%(process)d]: %(levelname)s:"
120
('Mandos [%(process)d]: %(levelname)s:'
194
122
logger.addHandler(syslogger)
197
125
console = logging.StreamHandler()
198
console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
202
130
logger.addHandler(console)
203
131
logger.setLevel(level)
255
171
os.rmdir(self.tempdir)
256
172
self.tempdir = None
258
174
def password_encode(self, password):
259
175
# Passphrase can not be empty and can not contain newlines or
260
176
# 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"))
177
return b"mandos" + binascii.hexlify(password)
269
179
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:
180
self.gnupg.passphrase = self.password_encode(password)
181
with open(os.devnull, "w") as devnull:
183
proc = self.gnupg.run(['--symmetric'],
184
create_fhs=['stdin', 'stdout'],
185
attach_fhs={'stderr': devnull})
186
with contextlib.closing(proc.handles['stdin']) as f:
188
with contextlib.closing(proc.handles['stdout']) as f:
189
ciphertext = f.read()
193
self.gnupg.passphrase = None
285
194
return ciphertext
287
196
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:
197
self.gnupg.passphrase = self.password_encode(password)
198
with open(os.devnull, "w") as devnull:
200
proc = self.gnupg.run(['--decrypt'],
201
create_fhs=['stdin', 'stdout'],
202
attach_fhs={'stderr': devnull})
203
with contextlib.closing(proc.handles['stdin']) as f:
205
with contextlib.closing(proc.handles['stdout']) as f:
206
decrypted_plaintext = f.read()
210
self.gnupg.passphrase = None
303
211
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
214
class AvahiError(Exception):
333
215
def __init__(self, value, *args, **kwargs):
334
216
self.value = value
335
return super(AvahiError, self).__init__(value, *args,
217
super(AvahiError, self).__init__(value, *args, **kwargs)
218
def __unicode__(self):
219
return unicode(repr(self.value))
339
221
class AvahiServiceError(AvahiError):
343
224
class AvahiGroupError(AvahiError):
228
class AvahiService(object):
348
229
"""An Avahi (Zeroconf) service.
351
232
interface: integer; avahi.IF_UNSPEC or an interface index.
352
233
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>
234
name: string; Example: 'Mandos'
235
type: string; Example: '_mandos._tcp'.
236
See <http://www.dns-sd.org/ServiceTypes.html>
356
237
port: integer; what port to announce
357
238
TXT: list of strings; TXT record for the service
358
239
domain: string; Domain to publish on, default to .local if empty.
517
376
follow_name_owner_changes=True),
518
377
avahi.DBUS_INTERFACE_SERVER)
519
378
self.server.connect_to_signal("StateChanged",
520
self.server_state_changed)
379
self.server_state_changed)
521
380
self.server_state_changed(self.server.GetState())
524
383
class AvahiServiceToSyslog(AvahiService):
525
def rename(self, *args, **kwargs):
526
385
"""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"
386
ret = AvahiService.rename(self)
387
syslogger.setFormatter(logging.Formatter
388
('Mandos ({0}) [%(process)d]:'
389
' %(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))
394
def timedelta_to_milliseconds(td):
395
"Convert a datetime.timedelta() to milliseconds"
396
return ((td.days * 24 * 60 * 60 * 1000)
397
+ (td.seconds * 1000)
398
+ (td.microseconds // 1000))
401
class Client(object):
876
402
"""A representation of a client host served by this server.
879
approved: bool(); None if not yet approved/disapproved
405
approved: bool(); 'None' if not yet approved/disapproved
880
406
approval_delay: datetime.timedelta(); Time to wait for approval
881
407
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
408
checker: subprocess.Popen(); a running checker process used
409
to see if the client lives.
410
'None' if no process is running.
411
checker_callback_tag: a gobject event source tag, or None
886
412
checker_command: string; External command which is run to check
887
413
if client lives. %() expansions are done at
888
414
runtime with vars(self) as dict, so that for
889
415
instance %(name)s can be used in the command.
890
checker_initiator_tag: a GLib event source tag, or None
416
checker_initiator_tag: a gobject event source tag, or None
891
417
created: datetime.datetime(); (UTC) object creation
892
418
client_structure: Object describing what attributes a client has
893
419
and is used for storing the client at exit
894
420
current_checker_command: string; current running checker_command
895
disable_initiator_tag: a GLib event source tag, or None
421
disable_initiator_tag: a gobject event source tag, or None
897
423
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
424
uniquely identify the client
901
425
host: string; available for use by the checker command
902
426
interval: datetime.timedelta(); How often to start a new checker
903
427
last_approval_request: datetime.datetime(); (UTC) or None
1060
590
logger.info("Disabling client %s", self.name)
1061
591
if getattr(self, "disable_initiator_tag", None) is not None:
1062
GLib.source_remove(self.disable_initiator_tag)
592
gobject.source_remove(self.disable_initiator_tag)
1063
593
self.disable_initiator_tag = None
1064
594
self.expires = None
1065
595
if getattr(self, "checker_initiator_tag", None) is not None:
1066
GLib.source_remove(self.checker_initiator_tag)
596
gobject.source_remove(self.checker_initiator_tag)
1067
597
self.checker_initiator_tag = None
1068
598
self.stop_checker()
1069
599
self.enabled = False
1071
601
self.send_changedstate()
1072
# Do not run this again if called by a GLib.timeout_add
602
# Do not run this again if called by a gobject.timeout_add
1075
605
def __del__(self):
1078
608
def init_checker(self):
1079
609
# Schedule a new checker to be started an 'interval' from now,
1080
610
# and every interval from then on.
1081
611
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
612
gobject.source_remove(self.checker_initiator_tag)
613
self.checker_initiator_tag = (gobject.timeout_add
614
(self.interval_milliseconds(),
1087
616
# Schedule a disable() when 'timeout' has passed
1088
617
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)
618
gobject.source_remove(self.disable_initiator_tag)
619
self.disable_initiator_tag = (gobject.timeout_add
620
(self.timeout_milliseconds(),
1092
622
# Also start a new checker *right now*.
1093
623
self.start_checker()
1095
def checker_callback(self, source, condition, connection,
625
def checker_callback(self, pid, condition, command):
1097
626
"""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
627
self.checker_callback_tag = None
1104
628
self.checker = None
1107
self.last_checker_status = returncode
1108
self.last_checker_signal = None
629
if os.WIFEXITED(condition):
630
self.last_checker_status = os.WEXITSTATUS(condition)
1109
631
if self.last_checker_status == 0:
1110
632
logger.info("Checker for %(name)s succeeded",
1112
634
self.checked_ok()
1114
logger.info("Checker for %(name)s failed", vars(self))
636
logger.info("Checker for %(name)s failed",
1116
639
self.last_checker_status = -1
1117
self.last_checker_signal = -returncode
1118
640
logger.warning("Checker for %(name)s crashed?",
1122
643
def checked_ok(self):
1123
644
"""Assert that the client has been seen, alive and well."""
1124
645
self.last_checked_ok = datetime.datetime.utcnow()
1125
646
self.last_checker_status = 0
1126
self.last_checker_signal = None
1127
647
self.bump_timeout()
1129
649
def bump_timeout(self, timeout=None):
1130
650
"""Bump up the timeout for this client."""
1131
651
if timeout is None:
1132
652
timeout = self.timeout
1133
653
if self.disable_initiator_tag is not None:
1134
GLib.source_remove(self.disable_initiator_tag)
654
gobject.source_remove(self.disable_initiator_tag)
1135
655
self.disable_initiator_tag = None
1136
656
if getattr(self, "enabled", False):
1137
self.disable_initiator_tag = GLib.timeout_add(
1138
int(timeout.total_seconds() * 1000), self.disable)
657
self.disable_initiator_tag = (gobject.timeout_add
658
(timedelta_to_milliseconds
659
(timeout), self.disable))
1139
660
self.expires = datetime.datetime.utcnow() + timeout
1141
662
def need_approval(self):
1142
663
self.last_approval_request = datetime.datetime.utcnow()
1144
665
def start_checker(self):
1145
666
"""Start a new checker subprocess if one is not running.
1147
668
If a checker already exists, leave it running and do
1149
670
# The reason for not killing a running checker is that if we
1154
675
# checkers alone, the checker would have to take more time
1155
676
# 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")
679
# If a checker exists, make sure it is not a zombie
681
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
682
except (AttributeError, OSError) as error:
683
if (isinstance(error, OSError)
684
and error.errno != errno.ECHILD):
688
logger.warning("Checker was a zombie")
689
gobject.source_remove(self.checker_callback_tag)
690
self.checker_callback(pid, status,
691
self.current_checker_command)
1162
692
# Start a new checker if needed
1163
693
if self.checker is None:
1164
694
# Escape attributes for the shell
1166
attr: shlex.quote(str(getattr(self, attr)))
1167
for attr in self.runtime_expansions}
695
escaped_attrs = dict(
696
(attr, re.escape(unicode(getattr(self, attr))))
698
self.runtime_expansions)
1169
700
command = self.checker_command % escaped_attrs
1170
701
except TypeError as error:
1171
702
logger.error('Could not format string "%s"',
1172
self.checker_command,
703
self.checker_command, exc_info=error)
704
return True # Try again later
705
self.current_checker_command = command
707
logger.info("Starting checker %r for %s",
709
# We don't need to redirect stdout and stderr, since
710
# in normal mode, that is already done by daemon(),
711
# and in debug mode we don't want to. (Stdin is
712
# always replaced by /dev/null.)
713
self.checker = subprocess.Popen(command,
716
except OSError as error:
717
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
719
self.checker_callback_tag = (gobject.child_watch_add
721
self.checker_callback,
723
# The checker may have completed before the gobject
724
# watch was added. Check for this.
725
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
727
gobject.source_remove(self.checker_callback_tag)
728
self.checker_callback(pid, status, command)
729
# Re-run this periodically if run by gobject.timeout_add
1205
732
def stop_checker(self):
1206
733
"""Force the checker process, if any, to stop."""
1207
734
if self.checker_callback_tag:
1208
GLib.source_remove(self.checker_callback_tag)
735
gobject.source_remove(self.checker_callback_tag)
1209
736
self.checker_callback_tag = None
1210
737
if getattr(self, "checker", None) is None:
1212
739
logger.debug("Stopping checker for %(name)s", vars(self))
1213
self.checker.terminate()
741
self.checker.terminate()
743
#if self.checker.poll() is None:
744
# self.checker.kill()
745
except OSError as error:
746
if error.errno != errno.ESRCH: # No such process
1214
748
self.checker = None
1217
def dbus_service_property(dbus_interface,
751
def dbus_service_property(dbus_interface, signature="v",
752
access="readwrite", byte_arrays=False):
1221
753
"""Decorators for marking methods of a DBusObjectWithProperties to
1222
754
become properties on the D-Bus.
1224
756
The decorated method will be called with no arguments by "Get"
1225
757
and with one argument by "Set".
1227
759
The parameters, where they are supported, are the same as
1228
760
dbus.service.method, except there is only "signature", since the
1229
761
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.
837
class DBusObjectWithProperties(dbus.service.Object):
838
"""A D-Bus object with properties.
840
Classes inheriting from this can use the dbus_service_property
841
decorator to expose methods as D-Bus properties. It exposes the
842
standard Get(), Set(), and GetAll() methods on the D-Bus.
1320
846
def _is_dbus_thing(thing):
1321
847
"""Returns a function testing if an attribute is a D-Bus thing
1323
849
If called like _is_dbus_thing("method") it returns a function
1324
850
suitable for use as predicate to inspect.getmembers().
1326
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
852
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1329
855
def _get_all_dbus_things(self, thing):
1330
856
"""Returns a generator of (name, attribute) pairs
1332
return ((getattr(athing.__get__(self), "_dbus_name", name),
858
return ((getattr(athing.__get__(self), "_dbus_name",
1333
860
athing.__get__(self))
1334
861
for cls in self.__class__.__mro__
1335
862
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.
863
inspect.getmembers(cls,
864
self._is_dbus_thing(thing)))
1409
866
def _get_dbus_property(self, interface_name, property_name):
1410
867
"""Returns a bound method if one exists which is a D-Bus
1411
868
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")):
870
for cls in self.__class__.__mro__:
871
for name, value in (inspect.getmembers
873
self._is_dbus_thing("property"))):
1416
874
if (value._dbus_name == property_name
1417
875
and value._dbus_interface == interface_name):
1418
876
return value.__get__(self)
1420
878
# 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,
879
raise DBusPropertyNotFound(self.dbus_object_path + ":"
880
+ interface_name + "."
883
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1435
884
out_signature="v")
1436
885
def Get(self, interface_name, property_name):
1437
886
"""Standard D-Bus property Get() method, see D-Bus standard.
1565
1016
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
1019
def datetime_to_dbus(dt, variant_level=0):
1640
1020
"""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)
1022
return dbus.String("", variant_level = variant_level)
1023
return dbus.String(dt.isoformat(),
1024
variant_level=variant_level)
1646
1027
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
2007
1380
server to mandos-client
2011
1384
# Rejected - signal
2012
1385
@dbus.service.signal(_interface, signature="s")
2013
1386
def Rejected(self, reason):
2017
1390
# NeedApproval - signal
2018
1391
@dbus.service.signal(_interface, signature="tb")
2019
1392
def NeedApproval(self, timeout, default):
2021
1394
return self.need_approval()
2025
1398
# Approve - method
2026
1399
@dbus.service.method(_interface, in_signature="b")
2027
1400
def Approve(self, value):
2028
1401
self.approve(value)
2030
1403
# CheckedOK - method
2031
1404
@dbus.service.method(_interface)
2032
1405
def CheckedOK(self):
2033
1406
self.checked_ok()
2035
1408
# Enable - method
2036
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2037
1409
@dbus.service.method(_interface)
2038
1410
def Enable(self):
2042
1414
# StartChecker - method
2043
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2044
1415
@dbus.service.method(_interface)
2045
1416
def StartChecker(self):
2047
1418
self.start_checker()
2049
1420
# Disable - method
2050
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2051
1421
@dbus.service.method(_interface)
2052
1422
def Disable(self):
2056
1426
# StopChecker - method
2057
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2058
1427
@dbus.service.method(_interface)
2059
1428
def StopChecker(self):
2060
1429
self.stop_checker()
2064
1433
# ApprovalPending - property
2065
1434
@dbus_service_property(_interface, signature="b", access="read")
2066
1435
def ApprovalPending_dbus_property(self):
2067
1436
return dbus.Boolean(bool(self.approvals_pending))
2069
1438
# ApprovedByDefault - property
2070
@dbus_service_property(_interface,
1439
@dbus_service_property(_interface, signature="b",
2072
1440
access="readwrite")
2073
1441
def ApprovedByDefault_dbus_property(self, value=None):
2074
1442
if value is None: # get
2075
1443
return dbus.Boolean(self.approved_by_default)
2076
1444
self.approved_by_default = bool(value)
2078
1446
# ApprovalDelay - property
2079
@dbus_service_property(_interface,
1447
@dbus_service_property(_interface, signature="t",
2081
1448
access="readwrite")
2082
1449
def ApprovalDelay_dbus_property(self, value=None):
2083
1450
if value is None: # get
2084
return dbus.UInt64(self.approval_delay.total_seconds()
1451
return dbus.UInt64(self.approval_delay_milliseconds())
2086
1452
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2088
1454
# ApprovalDuration - property
2089
@dbus_service_property(_interface,
1455
@dbus_service_property(_interface, signature="t",
2091
1456
access="readwrite")
2092
1457
def ApprovalDuration_dbus_property(self, value=None):
2093
1458
if value is None: # get
2094
return dbus.UInt64(self.approval_duration.total_seconds()
1459
return dbus.UInt64(timedelta_to_milliseconds(
1460
self.approval_duration))
2096
1461
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2098
1463
# Name - property
2100
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2101
1464
@dbus_service_property(_interface, signature="s", access="read")
2102
1465
def Name_dbus_property(self):
2103
1466
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
1468
# Fingerprint - property
2114
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2115
1469
@dbus_service_property(_interface, signature="s", access="read")
2116
1470
def Fingerprint_dbus_property(self):
2117
1471
return dbus.String(self.fingerprint)
2119
1473
# Host - property
2120
@dbus_service_property(_interface,
1474
@dbus_service_property(_interface, signature="s",
2122
1475
access="readwrite")
2123
1476
def Host_dbus_property(self, value=None):
2124
1477
if value is None: # get
2125
1478
return dbus.String(self.host)
2126
self.host = str(value)
1479
self.host = unicode(value)
2128
1481
# Created - property
2130
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2131
1482
@dbus_service_property(_interface, signature="s", access="read")
2132
1483
def Created_dbus_property(self):
2133
1484
return datetime_to_dbus(self.created)
2135
1486
# LastEnabled - property
2136
1487
@dbus_service_property(_interface, signature="s", access="read")
2137
1488
def LastEnabled_dbus_property(self):
2138
1489
return datetime_to_dbus(self.last_enabled)
2140
1491
# Enabled - property
2141
@dbus_service_property(_interface,
1492
@dbus_service_property(_interface, signature="b",
2143
1493
access="readwrite")
2144
1494
def Enabled_dbus_property(self, value=None):
2145
1495
if value is None: # get
2246
1591
self.start_checker()
2248
1593
self.stop_checker()
2250
1595
# ObjectPath - property
2252
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2253
"org.freedesktop.DBus.Deprecated": "true"})
2254
1596
@dbus_service_property(_interface, signature="o", access="read")
2255
1597
def ObjectPath_dbus_property(self):
2256
return self.dbus_object_path # is already a dbus.ObjectPath
1598
return self.dbus_object_path # is already a dbus.ObjectPath
2258
1600
# Secret = property
2260
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2262
@dbus_service_property(_interface,
1601
@dbus_service_property(_interface, signature="ay",
1602
access="write", byte_arrays=True)
2266
1603
def Secret_dbus_property(self, value):
2267
self.secret = bytes(value)
1604
self.secret = str(value)
2273
def __init__(self, child_pipe, key_id, fpr, address):
1609
class ProxyClient(object):
1610
def __init__(self, child_pipe, fpr, address):
2274
1611
self._pipe = child_pipe
2275
self._pipe.send(("init", key_id, fpr, address))
1612
self._pipe.send(('init', fpr, address))
2276
1613
if not self._pipe.recv():
2277
raise KeyError(key_id or fpr)
2279
1616
def __getattribute__(self, name):
2281
1618
return super(ProxyClient, self).__getattribute__(name)
2282
self._pipe.send(("getattr", name))
1619
self._pipe.send(('getattr', name))
2283
1620
data = self._pipe.recv()
2284
if data[0] == "data":
1621
if data[0] == 'data':
2286
if data[0] == "function":
1623
if data[0] == 'function':
2288
1624
def func(*args, **kwargs):
2289
self._pipe.send(("funcall", name, args, kwargs))
1625
self._pipe.send(('funcall', name, args, kwargs))
2290
1626
return self._pipe.recv()[1]
2294
1629
def __setattr__(self, name, value):
2296
1631
return super(ProxyClient, self).__setattr__(name, value)
2297
self._pipe.send(("setattr", name, value))
1632
self._pipe.send(('setattr', name, value))
2300
1635
class ClientHandler(socketserver.BaseRequestHandler, object):
2301
1636
"""A class to handle client connections.
2303
1638
Instantiated once for each connection to handle it.
2304
1639
Note: This will run in its own forked process."""
2306
1641
def handle(self):
2307
1642
with contextlib.closing(self.server.child_pipe) as child_pipe:
2308
1643
logger.info("TCP connection from: %s",
2309
str(self.client_address))
1644
unicode(self.client_address))
2310
1645
logger.debug("Pipe FD: %d",
2311
1646
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",
1648
session = (gnutls.connection
1649
.ClientSession(self.request,
1651
.X509Credentials()))
1653
# Note: gnutls.connection.X509Credentials is really a
1654
# generic GnuTLS certificate credentials object so long as
1655
# no X.509 keys are added to it. Therefore, we can use it
1656
# here despite using OpenPGP certificates.
1658
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1659
# "+AES-256-CBC", "+SHA1",
1660
# "+COMP-NULL", "+CTYPE-OPENPGP",
2319
1662
# Use a fallback default, since this MUST be set.
2320
1663
priority = self.server.gnutls_priority
2321
1664
if priority is None:
2322
1665
priority = "NORMAL"
2323
gnutls.priority_set_direct(session,
2324
priority.encode("utf-8"), None)
1666
(gnutls.library.functions
1667
.gnutls_priority_set_direct(session._c_object,
2326
1670
# Start communication using the Mandos protocol
2327
1671
# Get protocol number
2328
1672
line = self.request.makefile().readline()
2329
1673
logger.debug("Protocol version: %r", line)
2331
1675
if int(line.strip().split()[0]) > 1:
2332
raise RuntimeError(line)
2333
1677
except (ValueError, IndexError, RuntimeError) as error:
2334
1678
logger.error("Unknown protocol version: %s", error)
2337
1681
# Start GnuTLS connection
2339
1683
session.handshake()
2340
except gnutls.Error as error:
1684
except gnutls.errors.GNUTLSError as error:
2341
1685
logger.warning("Handshake failed: %s", error)
2342
1686
# Do not run session.bye() here: the session is not
2343
1687
# established. Just abandon the request.
2345
1689
logger.debug("Handshake succeeded")
2347
1691
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,
1694
fpr = self.fingerprint(self.peer_certificate
1697
gnutls.errors.GNUTLSError) as error:
1698
logger.warning("Bad certificate: %s", error)
1700
logger.debug("Fingerprint: %s", fpr)
1703
client = ProxyClient(child_pipe, fpr,
2373
1704
self.client_address)
2374
1705
except KeyError:
2377
1708
if client.approval_delay:
2378
1709
delay = client.approval_delay
2379
1710
client.approvals_pending += 1
2380
1711
approval_required = True
2383
1714
if not client.enabled:
2384
1715
logger.info("Client %s is disabled",
2386
1717
if self.server.use_dbus:
2387
1718
# Emit D-Bus signal
2388
1719
client.Rejected("Disabled")
2391
1722
if client.approved or not client.approval_delay:
2392
# We are approved or approval is disabled
1723
#We are approved or approval is disabled
2394
1725
elif client.approved is None:
2395
1726
logger.info("Client %s needs approval",
2428
1761
delay -= time2 - time
2431
session.send(client.secret)
2432
except gnutls.Error as error:
2433
logger.warning("gnutls send failed",
1764
while sent_size < len(client.secret):
1766
sent = session.send(client.secret[sent_size:])
1767
except gnutls.errors.GNUTLSError as error:
1768
logger.warning("gnutls send failed",
1771
logger.debug("Sent: %d, remaining: %d",
1772
sent, len(client.secret)
1773
- (sent_size + sent))
2437
1776
logger.info("Sending secret to %s", client.name)
2438
1777
# bump the timeout using extended_timeout
2439
1778
client.bump_timeout(client.extended_timeout)
2440
1779
if self.server.use_dbus:
2441
1780
# Emit D-Bus signal
2442
1781
client.GotSecret()
2445
1784
if approval_required:
2446
1785
client.approvals_pending -= 1
2449
except gnutls.Error as error:
1788
except gnutls.errors.GNUTLSError as error:
2450
1789
logger.warning("GnuTLS bye failed",
2451
1790
exc_info=error)
2454
1793
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
1794
"Return the peer's OpenPGP certificate as a bytestring"
1795
# If not an OpenPGP certificate...
1796
if (gnutls.library.functions
1797
.gnutls_certificate_type_get(session._c_object)
1798
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1799
# ...do the normal thing
1800
return session.peer_certificate
2471
1801
list_size = ctypes.c_uint(1)
2472
cert_list = (gnutls.certificate_get_peers
2473
(session, ctypes.byref(list_size)))
1802
cert_list = (gnutls.library.functions
1803
.gnutls_certificate_get_peers
1804
(session._c_object, ctypes.byref(list_size)))
2474
1805
if not bool(cert_list) and list_size.value != 0:
2475
raise gnutls.Error("error getting peer certificate")
1806
raise gnutls.errors.GNUTLSError("error getting peer"
2476
1808
if list_size.value == 0:
2478
1810
cert = cert_list[0]
2479
1811
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
1814
def fingerprint(openpgp):
2518
1815
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2519
1816
# 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)))
1817
datum = (gnutls.library.types
1818
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1821
ctypes.c_uint(len(openpgp))))
2524
1822
# New empty GnuTLS certificate
2525
crt = gnutls.openpgp_crt_t()
2526
gnutls.openpgp_crt_init(ctypes.byref(crt))
1823
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1824
(gnutls.library.functions
1825
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2527
1826
# Import the OpenPGP public key into the certificate
2528
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2529
gnutls.OPENPGP_FMT_RAW)
1827
(gnutls.library.functions
1828
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1829
gnutls.library.constants
1830
.GNUTLS_OPENPGP_FMT_RAW))
2530
1831
# Verify the self signature in the key
2531
1832
crtverify = ctypes.c_uint()
2532
gnutls.openpgp_crt_verify_self(crt, 0,
2533
ctypes.byref(crtverify))
1833
(gnutls.library.functions
1834
.gnutls_openpgp_crt_verify_self(crt, 0,
1835
ctypes.byref(crtverify)))
2534
1836
if crtverify.value != 0:
2535
gnutls.openpgp_crt_deinit(crt)
2536
raise gnutls.CertificateSecurityError(code
1837
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1838
raise (gnutls.errors.CertificateSecurityError
2538
1840
# New buffer for the fingerprint
2539
1841
buf = ctypes.create_string_buffer(20)
2540
1842
buf_len = ctypes.c_size_t()
2541
1843
# Get the fingerprint from the certificate into the buffer
2542
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2543
ctypes.byref(buf_len))
1844
(gnutls.library.functions
1845
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1846
ctypes.byref(buf_len)))
2544
1847
# Deinit the certificate
2545
gnutls.openpgp_crt_deinit(crt)
1848
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2546
1849
# Convert the buffer to a Python bytestring
2547
1850
fpr = ctypes.string_at(buf, buf_len.value)
2548
1851
# Convert the bytestring to hexadecimal notation
2637
1934
# socket_wrapper(), if socketfd was set.
2638
1935
socketserver.TCPServer.__init__(self, server_address,
2639
1936
RequestHandlerClass)
2641
1938
def server_bind(self):
2642
1939
"""This overrides the normal server_bind() function
2643
1940
to bind to an interface if one was specified, and also NOT to
2644
1941
bind to an address or port if they were not specified."""
2645
global SO_BINDTODEVICE
2646
1942
if self.interface is not None:
2647
1943
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)
1944
logger.error("SO_BINDTODEVICE does not exist;"
1945
" cannot bind to interface %s",
1949
self.socket.setsockopt(socket.SOL_SOCKET,
1951
str(self.interface + '\0'))
1952
except socket.error as error:
1953
if error.errno == errno.EPERM:
1954
logger.error("No permission to bind to"
1955
" interface %s", self.interface)
1956
elif error.errno == errno.ENOPROTOOPT:
1957
logger.error("SO_BINDTODEVICE not available;"
1958
" cannot bind to interface %s",
1960
elif error.errno == errno.ENODEV:
1961
logger.error("Interface %s does not exist,"
1962
" cannot bind", self.interface)
2669
1965
# Only bind(2) the socket if we really need to.
2670
1966
if self.server_address[0] or self.server_address[1]:
2671
if self.server_address[1]:
2672
self.allow_reuse_address = True
2673
1967
if not self.server_address[0]:
2674
1968
if self.address_family == socket.AF_INET6:
2675
any_address = "::" # in6addr_any
1969
any_address = "::" # in6addr_any
2677
any_address = "0.0.0.0" # INADDR_ANY
1971
any_address = socket.INADDR_ANY
2678
1972
self.server_address = (any_address,
2679
1973
self.server_address[1])
2680
1974
elif not self.server_address[1]:
2681
self.server_address = (self.server_address[0], 0)
1975
self.server_address = (self.server_address[0],
2682
1977
# if self.interface:
2683
1978
# self.server_address = (self.server_address[0],
2714
2004
self.gnutls_priority = gnutls_priority
2715
2005
IPv6_TCPServer.__init__(self, server_address,
2716
2006
RequestHandlerClass,
2717
interface=interface,
2007
interface = interface,
2008
use_ipv6 = use_ipv6,
2009
socketfd = socketfd)
2721
2010
def server_activate(self):
2722
2011
if self.enabled:
2723
2012
return socketserver.TCPServer.server_activate(self)
2725
2014
def enable(self):
2726
2015
self.enabled = True
2728
2017
def add_pipe(self, parent_pipe, proc):
2729
2018
# 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):
2019
gobject.io_add_watch(parent_pipe.fileno(),
2020
gobject.IO_IN | gobject.IO_HUP,
2021
functools.partial(self.handle_ipc,
2026
def handle_ipc(self, source, condition, parent_pipe=None,
2027
proc = None, client_object=None):
2741
2028
# error, or the other end of multiprocessing.Pipe has closed
2742
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2029
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2743
2030
# Wait for other process to exit
2747
2034
# Read a request from the child
2748
2035
request = parent_pipe.recv()
2749
2036
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:
2038
if command == 'init':
2040
address = request[2]
2042
for c in self.clients.itervalues():
2043
if c.fingerprint == fpr:
2767
logger.info("Client not found for key ID: %s, address"
2768
": %s", key_id or fpr, address)
2047
logger.info("Client not found for fingerprint: %s, ad"
2048
"dress: %s", fpr, address)
2769
2049
if self.use_dbus:
2770
2050
# Emit D-Bus signal
2771
mandos_dbus_service.ClientNotFound(key_id or fpr,
2051
mandos_dbus_service.ClientNotFound(fpr,
2773
2053
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))
2056
gobject.io_add_watch(parent_pipe.fileno(),
2057
gobject.IO_IN | gobject.IO_HUP,
2058
functools.partial(self.handle_ipc,
2783
2064
parent_pipe.send(True)
2784
2065
# remove the old hook in favor of the new above hook on
2787
if command == "funcall":
2068
if command == 'funcall':
2788
2069
funcname = request[1]
2789
2070
args = request[2]
2790
2071
kwargs = request[3]
2792
parent_pipe.send(("data", getattr(client_object,
2073
parent_pipe.send(('data', getattr(client_object,
2793
2074
funcname)(*args,
2796
if command == "getattr":
2077
if command == 'getattr':
2797
2078
attrname = request[1]
2798
if isinstance(client_object.__getattribute__(attrname),
2799
collections.abc.Callable):
2800
parent_pipe.send(("function", ))
2079
if callable(client_object.__getattribute__(attrname)):
2080
parent_pipe.send(('function',))
2803
"data", client_object.__getattribute__(attrname)))
2805
if command == "setattr":
2082
parent_pipe.send(('data', client_object
2083
.__getattribute__(attrname)))
2085
if command == 'setattr':
2806
2086
attrname = request[1]
2807
2087
value = request[2]
2808
2088
setattr(client_object, attrname, value)
2813
def rfc3339_duration_to_delta(duration):
2814
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2816
>>> timedelta = datetime.timedelta
2817
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2819
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2821
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2823
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2825
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2827
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2829
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2834
# Parsing an RFC 3339 duration with regular expressions is not
2835
# possible - there would have to be multiple places for the same
2836
# values, like seconds. The current code, while more esoteric, is
2837
# cleaner without depending on a parsing library. If Python had a
2838
# built-in library for parsing we would use it, but we'd like to
2839
# avoid excessive use of external libraries.
2841
# New type for defining tokens, syntax, and semantics all-in-one
2842
Token = collections.namedtuple("Token", (
2843
"regexp", # To match token; if "value" is not None, must have
2844
# a "group" containing digits
2845
"value", # datetime.timedelta or None
2846
"followers")) # Tokens valid after this token
2847
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2848
# the "duration" ABNF definition in RFC 3339, Appendix A.
2849
token_end = Token(re.compile(r"$"), None, frozenset())
2850
token_second = Token(re.compile(r"(\d+)S"),
2851
datetime.timedelta(seconds=1),
2852
frozenset((token_end, )))
2853
token_minute = Token(re.compile(r"(\d+)M"),
2854
datetime.timedelta(minutes=1),
2855
frozenset((token_second, token_end)))
2856
token_hour = Token(re.compile(r"(\d+)H"),
2857
datetime.timedelta(hours=1),
2858
frozenset((token_minute, token_end)))
2859
token_time = Token(re.compile(r"T"),
2861
frozenset((token_hour, token_minute,
2863
token_day = Token(re.compile(r"(\d+)D"),
2864
datetime.timedelta(days=1),
2865
frozenset((token_time, token_end)))
2866
token_month = Token(re.compile(r"(\d+)M"),
2867
datetime.timedelta(weeks=4),
2868
frozenset((token_day, token_end)))
2869
token_year = Token(re.compile(r"(\d+)Y"),
2870
datetime.timedelta(weeks=52),
2871
frozenset((token_month, token_end)))
2872
token_week = Token(re.compile(r"(\d+)W"),
2873
datetime.timedelta(weeks=1),
2874
frozenset((token_end, )))
2875
token_duration = Token(re.compile(r"P"), None,
2876
frozenset((token_year, token_month,
2877
token_day, token_time,
2879
# Define starting values:
2881
value = datetime.timedelta()
2883
# Following valid tokens
2884
followers = frozenset((token_duration, ))
2885
# String left to parse
2887
# Loop until end token is found
2888
while found_token is not token_end:
2889
# Search for any currently valid tokens
2890
for token in followers:
2891
match = token.regexp.match(s)
2892
if match is not None:
2894
if token.value is not None:
2895
# Value found, parse digits
2896
factor = int(match.group(1), 10)
2897
# Add to value so far
2898
value += factor * token.value
2899
# Strip token from string
2900
s = token.regexp.sub("", s, 1)
2903
# Set valid next tokens
2904
followers = found_token.followers
2907
# No currently valid tokens were found
2908
raise ValueError("Invalid RFC 3339 duration: {!r}"
2914
2093
def string_to_delta(interval):
2915
2094
"""Parse a string and return a datetime.timedelta
2917
>>> string_to_delta("7d") == datetime.timedelta(7)
2919
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2921
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2923
>>> string_to_delta("24h") == datetime.timedelta(1)
2925
>>> string_to_delta("1w") == datetime.timedelta(7)
2927
>>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2096
>>> string_to_delta('7d')
2097
datetime.timedelta(7)
2098
>>> string_to_delta('60s')
2099
datetime.timedelta(0, 60)
2100
>>> string_to_delta('60m')
2101
datetime.timedelta(0, 3600)
2102
>>> string_to_delta('24h')
2103
datetime.timedelta(1)
2104
>>> string_to_delta('1w')
2105
datetime.timedelta(7)
2106
>>> string_to_delta('5m 30s')
2107
datetime.timedelta(0, 330)
2932
return rfc3339_duration_to_delta(interval)
2936
2109
timevalue = datetime.timedelta(0)
2937
2110
for s in interval.split():
2112
suffix = unicode(s[-1])
2940
2113
value = int(s[:-1])
2941
2114
if suffix == "d":
2942
2115
delta = datetime.timedelta(value)
3014
2188
parser.add_argument("--no-dbus", action="store_false",
3015
2189
dest="use_dbus", help="Do not provide D-Bus"
3016
" system bus interface", default=None)
2190
" system bus interface")
3017
2191
parser.add_argument("--no-ipv6", action="store_false",
3018
dest="use_ipv6", help="Do not use IPv6",
2192
dest="use_ipv6", help="Do not use IPv6")
3020
2193
parser.add_argument("--no-restore", action="store_false",
3021
2194
dest="restore", help="Do not restore stored"
3022
" state", default=None)
3023
2196
parser.add_argument("--socket", type=int,
3024
2197
help="Specify a file descriptor to a network"
3025
2198
" socket to use instead of creating one")
3026
2199
parser.add_argument("--statedir", metavar="DIR",
3027
2200
help="Directory to save/restore state in")
3028
2201
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",
2202
help="Run in foreground")
3034
2204
options = parser.parse_args()
3036
2211
# 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",
2212
server_defaults = { "interface": "",
2217
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2218
"servicename": "Mandos",
2224
"statedir": "/var/lib/mandos",
2225
"foreground": "False",
3060
2228
# Parse config file for server-global settings
3061
server_config = configparser.ConfigParser(server_defaults)
2229
server_config = configparser.SafeConfigParser(server_defaults)
3062
2230
del server_defaults
3063
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3064
# Convert the ConfigParser object to a dict
2231
server_config.read(os.path.join(options.configdir,
2233
# Convert the SafeConfigParser object to a dict
3065
2234
server_settings = server_config.defaults()
3066
2235
# Use the appropriate methods on the non-string config options
3067
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3068
"foreground", "zeroconf"):
2236
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
3069
2237
server_settings[option] = server_config.getboolean("DEFAULT",
3071
2239
if server_settings["port"]:
3187
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3189
2341
except OSError as error:
3190
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3191
.format(uid, gid, os.strerror(error.errno)))
3192
2342
if error.errno != errno.EPERM:
3196
2346
# Enable all possible GnuTLS debugging
3198
2348
# "Use a log level over 10 to enable all debugging options."
3199
2349
# - GnuTLS manual
3200
gnutls.global_set_log_level(11)
2350
gnutls.library.functions.gnutls_global_set_log_level(11)
2352
@gnutls.library.types.gnutls_log_func
3203
2353
def debug_gnutls(level, string):
3204
logger.debug("GnuTLS: %s",
3205
string[:-1].decode("utf-8",
3208
gnutls.global_set_log_function(debug_gnutls)
2354
logger.debug("GnuTLS: %s", string[:-1])
2356
(gnutls.library.functions
2357
.gnutls_global_set_log_function(debug_gnutls))
3210
2359
# Redirect stdin so all checkers get /dev/null
3211
2360
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3212
2361
os.dup2(null, sys.stdin.fileno())
3216
2365
# Need to fork before connecting to D-Bus
3217
2366
if not foreground:
3218
2367
# 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.
2370
# multiprocessing will use threads, so before we use gobject we
2371
# need to inform gobject that threads will be used.
2372
gobject.threads_init()
3226
2374
global main_loop
3227
2375
# From the Avahi example code
3228
2376
DBusGMainLoop(set_as_default=True)
3229
main_loop = GLib.MainLoop()
2377
main_loop = gobject.MainLoop()
3230
2378
bus = dbus.SystemBus()
3231
2379
# End of Avahi example code
3234
2382
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:
2383
bus, do_not_queue=True)
2384
old_bus_name = (dbus.service.BusName
2385
("se.bsnet.fukt.Mandos", bus,
2387
except dbus.exceptions.NameExistsException as e:
3241
2388
logger.error("Disabling D-Bus:", exc_info=e)
3242
2389
use_dbus = False
3243
2390
server_settings["use_dbus"] = False
3244
2391
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"))
2392
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2393
service = AvahiServiceToSyslog(name =
2394
server_settings["servicename"],
2395
servicetype = "_mandos._tcp",
2396
protocol = protocol, bus = bus)
2397
if server_settings["interface"]:
2398
service.interface = (if_nametoindex
2399
(str(server_settings["interface"])))
3256
2401
global multiprocessing_manager
3257
2402
multiprocessing_manager = multiprocessing.Manager()
3259
2404
client_class = Client
3261
client_class = functools.partial(ClientDBus, bus=bus)
2406
client_class = functools.partial(ClientDBus, bus = bus)
3263
2408
client_settings = Client.config_parser(client_config)
3264
2409
old_client_settings = {}
3265
2410
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
2412
# Get client data and settings from last running state.
3276
2413
if server_settings["restore"]:
3278
2415
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]
2416
clients_data, old_client_settings = (pickle.load
3329
2418
os.remove(stored_state_path)
3330
2419
except IOError as e:
3331
2420
if e.errno == errno.ENOENT:
3332
logger.warning("Could not load persistent state:"
3333
" {}".format(os.strerror(e.errno)))
2421
logger.warning("Could not load persistent state: {0}"
2422
.format(os.strerror(e.errno)))
3335
2424
logger.critical("Could not load persistent state:",
3338
2427
except EOFError as e:
3339
2428
logger.warning("Could not load persistent state: "
2429
"EOFError:", exc_info=e)
3343
2431
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:
2432
for client_name, client in clients_data.iteritems():
3349
2433
# Decide which value to use after restoring saved state.
3350
2434
# We have three different values: Old config file,
3351
2435
# new config file, and saved state.
3409
2493
for client_name in (set(client_settings)
3410
2494
- set(old_client_settings)):
3411
2495
clients_data[client_name] = client_settings[client_name]
3413
2497
# Create all client objects
3414
for client_name, client in clients_data.items():
2498
for client_name, client in clients_data.iteritems():
3415
2499
tcp_server.clients[client_name] = client_class(
3418
server_settings=server_settings)
2500
name = client_name, settings = client)
3420
2502
if not tcp_server.clients:
3421
2503
logger.warning("No clients defined")
3423
2505
if not foreground:
3424
2506
if pidfile is not None:
3428
print(pid, file=pidfile)
2510
pidfile.write(str(pid) + "\n".encode("utf-8"))
3429
2511
except IOError:
3430
2512
logger.error("Could not write to file %r with PID %d",
3431
2513
pidfilename, pid)
3433
2515
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)
2517
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2518
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):
2521
@alternate_dbus_interfaces({"se.recompile.Mandos":
2522
"se.bsnet.fukt.Mandos"})
2523
class MandosDBusService(DBusObjectWithProperties):
3444
2524
"""A D-Bus proxy object"""
3446
2525
def __init__(self):
3447
2526
dbus.service.Object.__init__(self, bus, "/")
3449
2527
_interface = "se.recompile.Mandos"
2529
@dbus_interface_annotations(_interface)
2531
return { "org.freedesktop.DBus.Property"
2532
".EmitsChangedSignal":
3451
2535
@dbus.service.signal(_interface, signature="o")
3452
2536
def ClientAdded(self, objpath):
3456
2540
@dbus.service.signal(_interface, signature="ss")
3457
def ClientNotFound(self, key_id, address):
2541
def ClientNotFound(self, fingerprint, address):
3461
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3463
2545
@dbus.service.signal(_interface, signature="os")
3464
2546
def ClientRemoved(self, objpath, name):
3468
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3470
2550
@dbus.service.method(_interface, out_signature="ao")
3471
2551
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":
2553
return dbus.Array(c.dbus_object_path
2555
tcp_server.clients.itervalues())
3478
2557
@dbus.service.method(_interface,
3479
2558
out_signature="a{oa{sv}}")
3480
2559
def GetAllClientsWithProperties(self):
3482
2561
return dbus.Dictionary(
3483
{c.dbus_object_path: c.GetAll(
3484
"se.recompile.Mandos.Client")
3485
for c in tcp_server.clients.values()},
2562
((c.dbus_object_path, c.GetAll(""))
2563
for c in tcp_server.clients.itervalues()),
3486
2564
signature="oa{sv}")
3488
2566
@dbus.service.method(_interface, in_signature="o")
3489
2567
def RemoveClient(self, object_path):
3491
for c in tcp_server.clients.values():
2569
for c in tcp_server.clients.itervalues():
3492
2570
if c.dbus_object_path == object_path:
3493
2571
del tcp_server.clients[c.name]
3494
2572
c.remove_from_connection()
3495
# Don't signal the disabling
2573
# Don't signal anything except ClientRemoved
3496
2574
c.disable(quiet=True)
3497
# Emit D-Bus signal for removal
3498
self.client_removed_signal(c)
2576
self.ClientRemoved(object_path, c.name)
3500
2578
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
2582
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
2585
"Cleanup function; run on exit"
3552
mp.active_children()
2588
multiprocessing.active_children()
3554
2589
if not (tcp_server.clients or client_settings):
3557
2592
# Store client before exiting. Secrets are encrypted with key
3558
2593
# based on what config file has. If config file is
3559
2594
# removed/edited, old secret will thus be unrecovable.
3561
2596
with PGPEngine() as pgp:
3562
for client in tcp_server.clients.values():
2597
for client in tcp_server.clients.itervalues():
3563
2598
key = client_settings[client.name]["secret"]
3564
2599
client.encrypted_secret = pgp.encrypt(client.secret,
3566
2601
client_dict = {}
3568
2603
# 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
2605
exclude = set(("bus", "changedstate", "secret",
2607
for name, typ in (inspect.getmembers
2608
(dbus.service.Object)):
3574
2609
exclude.add(name)
3576
2611
client_dict["encrypted_secret"] = (client
3577
2612
.encrypted_secret)
3578
2613
for attr in client.client_structure:
3579
2614
if attr not in exclude:
3580
2615
client_dict[attr] = getattr(client, attr)
3582
2617
clients[client.name] = client_dict
3583
2618
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
2621
with (tempfile.NamedTemporaryFile
2622
(mode='wb', suffix=".pickle", prefix='clients-',
2623
dir=os.path.dirname(stored_state_path),
2624
delete=False)) as stored_state:
2625
pickle.dump((clients, client_settings), stored_state)
2626
tempname=stored_state.name
3595
2627
os.rename(tempname, stored_state_path)
3596
2628
except (IOError, OSError) as e: