240
183
.replace(b"\n", b"\\n")
241
184
.replace(b"\0", b"\\x00"))
244
187
def encrypt(self, data, password):
245
188
passphrase = self.password_encode(password)
246
with tempfile.NamedTemporaryFile(
247
dir=self.tempdir) as passfile:
189
with tempfile.NamedTemporaryFile(dir=self.tempdir
248
191
passfile.write(passphrase)
250
proc = subprocess.Popen([self.gpg, '--symmetric',
193
proc = subprocess.Popen(['gpg', '--symmetric',
251
194
'--passphrase-file',
253
196
+ self.gnupgargs,
254
stdin=subprocess.PIPE,
255
stdout=subprocess.PIPE,
256
stderr=subprocess.PIPE)
257
ciphertext, err = proc.communicate(input=data)
197
stdin = subprocess.PIPE,
198
stdout = subprocess.PIPE,
199
stderr = subprocess.PIPE)
200
ciphertext, err = proc.communicate(input = data)
258
201
if proc.returncode != 0:
259
202
raise PGPError(err)
260
203
return ciphertext
262
205
def decrypt(self, data, password):
263
206
passphrase = self.password_encode(password)
264
with tempfile.NamedTemporaryFile(
265
dir=self.tempdir) as passfile:
207
with tempfile.NamedTemporaryFile(dir = self.tempdir
266
209
passfile.write(passphrase)
268
proc = subprocess.Popen([self.gpg, '--decrypt',
211
proc = subprocess.Popen(['gpg', '--decrypt',
269
212
'--passphrase-file',
271
214
+ self.gnupgargs,
272
stdin=subprocess.PIPE,
273
stdout=subprocess.PIPE,
274
stderr=subprocess.PIPE)
275
decrypted_plaintext, err = proc.communicate(input=data)
215
stdin = subprocess.PIPE,
216
stdout = subprocess.PIPE,
217
stderr = subprocess.PIPE)
218
decrypted_plaintext, err = proc.communicate(input
276
220
if proc.returncode != 0:
277
221
raise PGPError(err)
278
222
return decrypted_plaintext
281
# Pretend that we have an Avahi module
283
"""This isn't so much a class as it is a module-like namespace."""
284
IF_UNSPEC = -1 # avahi-common/address.h
285
PROTO_UNSPEC = -1 # avahi-common/address.h
286
PROTO_INET = 0 # avahi-common/address.h
287
PROTO_INET6 = 1 # avahi-common/address.h
288
DBUS_NAME = "org.freedesktop.Avahi"
289
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
290
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
291
DBUS_PATH_SERVER = "/"
294
def string_array_to_txt_array(t):
295
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
296
for s in t), signature="ay")
297
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
298
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
299
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
300
SERVER_INVALID = 0 # avahi-common/defs.h
301
SERVER_REGISTERING = 1 # avahi-common/defs.h
302
SERVER_RUNNING = 2 # avahi-common/defs.h
303
SERVER_COLLISION = 3 # avahi-common/defs.h
304
SERVER_FAILURE = 4 # avahi-common/defs.h
307
225
class AvahiError(Exception):
308
226
def __init__(self, value, *args, **kwargs):
309
227
self.value = value
310
228
return super(AvahiError, self).__init__(value, *args,
314
231
class AvahiServiceError(AvahiError):
318
234
class AvahiGroupError(AvahiError):
322
238
class AvahiService(object):
323
239
"""An Avahi (Zeroconf) service.
326
242
interface: integer; avahi.IF_UNSPEC or an interface index.
327
243
Used to optionally bind to the specified interface.
492
392
follow_name_owner_changes=True),
493
393
avahi.DBUS_INTERFACE_SERVER)
494
394
self.server.connect_to_signal("StateChanged",
495
self.server_state_changed)
395
self.server_state_changed)
496
396
self.server_state_changed(self.server.GetState())
499
399
class AvahiServiceToSyslog(AvahiService):
500
400
def rename(self, *args, **kwargs):
501
401
"""Add the new name to the syslog messages"""
502
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
503
syslogger.setFormatter(logging.Formatter(
504
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
402
ret = AvahiService.rename(self, *args, **kwargs)
403
syslogger.setFormatter(logging.Formatter
404
('Mandos ({}) [%(process)d]:'
405
' %(levelname)s: %(message)s'
509
# Pretend that we have a GnuTLS module
510
class gnutls(object):
511
"""This isn't so much a class as it is a module-like namespace."""
513
library = ctypes.util.find_library("gnutls")
515
library = ctypes.util.find_library("gnutls-deb0")
516
_library = ctypes.cdll.LoadLibrary(library)
519
# Unless otherwise indicated, the constants and types below are
520
# all from the gnutls/gnutls.h C header file.
531
E_NO_CERTIFICATE_FOUND = -49
536
KEYID_USE_SHA256 = 1 # gnutls/x509.h
537
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
540
class session_int(ctypes.Structure):
542
session_t = ctypes.POINTER(session_int)
544
class certificate_credentials_st(ctypes.Structure):
546
certificate_credentials_t = ctypes.POINTER(
547
certificate_credentials_st)
548
certificate_type_t = ctypes.c_int
550
class datum_t(ctypes.Structure):
551
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
('size', ctypes.c_uint)]
554
class openpgp_crt_int(ctypes.Structure):
556
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
credentials_type_t = ctypes.c_int
560
transport_ptr_t = ctypes.c_void_p
561
close_request_t = ctypes.c_int
564
class Error(Exception):
565
def __init__(self, message=None, code=None, args=()):
566
# Default usage is by a message string, but if a return
567
# code is passed, convert it to a string with
570
if message is None and code is not None:
571
message = gnutls.strerror(code)
572
return super(gnutls.Error, self).__init__(
575
class CertificateSecurityError(Error):
579
class Credentials(object):
581
self._c_object = gnutls.certificate_credentials_t()
582
gnutls.certificate_allocate_credentials(
583
ctypes.byref(self._c_object))
584
self.type = gnutls.CRD_CERTIFICATE
587
gnutls.certificate_free_credentials(self._c_object)
589
class ClientSession(object):
590
def __init__(self, socket, credentials=None):
591
self._c_object = gnutls.session_t()
592
gnutls_flags = gnutls.CLIENT
593
if gnutls.check_version(b"3.5.6"):
594
gnutls_flags |= gnutls.NO_TICKETS
596
gnutls_flags |= gnutls.ENABLE_RAWPK
597
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
599
gnutls.set_default_priority(self._c_object)
600
gnutls.transport_set_ptr(self._c_object, socket.fileno())
601
gnutls.handshake_set_private_extensions(self._c_object,
604
if credentials is None:
605
credentials = gnutls.Credentials()
606
gnutls.credentials_set(self._c_object, credentials.type,
607
ctypes.cast(credentials._c_object,
609
self.credentials = credentials
612
gnutls.deinit(self._c_object)
615
return gnutls.handshake(self._c_object)
617
def send(self, data):
621
data_len -= gnutls.record_send(self._c_object,
626
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
628
# Error handling functions
629
def _error_code(result):
630
"""A function to raise exceptions on errors, suitable
631
for the 'restype' attribute on ctypes functions"""
634
if result == gnutls.E_NO_CERTIFICATE_FOUND:
635
raise gnutls.CertificateSecurityError(code=result)
636
raise gnutls.Error(code=result)
638
def _retry_on_error(result, func, arguments):
639
"""A function to retry on some errors, suitable
640
for the 'errcheck' attribute on ctypes functions"""
642
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
643
return _error_code(result)
644
result = func(*arguments)
647
# Unless otherwise indicated, the function declarations below are
648
# all from the gnutls/gnutls.h C header file.
651
priority_set_direct = _library.gnutls_priority_set_direct
652
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
653
ctypes.POINTER(ctypes.c_char_p)]
654
priority_set_direct.restype = _error_code
656
init = _library.gnutls_init
657
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
658
init.restype = _error_code
660
set_default_priority = _library.gnutls_set_default_priority
661
set_default_priority.argtypes = [session_t]
662
set_default_priority.restype = _error_code
664
record_send = _library.gnutls_record_send
665
record_send.argtypes = [session_t, ctypes.c_void_p,
667
record_send.restype = ctypes.c_ssize_t
668
record_send.errcheck = _retry_on_error
670
certificate_allocate_credentials = (
671
_library.gnutls_certificate_allocate_credentials)
672
certificate_allocate_credentials.argtypes = [
673
ctypes.POINTER(certificate_credentials_t)]
674
certificate_allocate_credentials.restype = _error_code
676
certificate_free_credentials = (
677
_library.gnutls_certificate_free_credentials)
678
certificate_free_credentials.argtypes = [
679
certificate_credentials_t]
680
certificate_free_credentials.restype = None
682
handshake_set_private_extensions = (
683
_library.gnutls_handshake_set_private_extensions)
684
handshake_set_private_extensions.argtypes = [session_t,
686
handshake_set_private_extensions.restype = None
688
credentials_set = _library.gnutls_credentials_set
689
credentials_set.argtypes = [session_t, credentials_type_t,
691
credentials_set.restype = _error_code
693
strerror = _library.gnutls_strerror
694
strerror.argtypes = [ctypes.c_int]
695
strerror.restype = ctypes.c_char_p
697
certificate_type_get = _library.gnutls_certificate_type_get
698
certificate_type_get.argtypes = [session_t]
699
certificate_type_get.restype = _error_code
701
certificate_get_peers = _library.gnutls_certificate_get_peers
702
certificate_get_peers.argtypes = [session_t,
703
ctypes.POINTER(ctypes.c_uint)]
704
certificate_get_peers.restype = ctypes.POINTER(datum_t)
706
global_set_log_level = _library.gnutls_global_set_log_level
707
global_set_log_level.argtypes = [ctypes.c_int]
708
global_set_log_level.restype = None
710
global_set_log_function = _library.gnutls_global_set_log_function
711
global_set_log_function.argtypes = [log_func]
712
global_set_log_function.restype = None
714
deinit = _library.gnutls_deinit
715
deinit.argtypes = [session_t]
716
deinit.restype = None
718
handshake = _library.gnutls_handshake
719
handshake.argtypes = [session_t]
720
handshake.restype = _error_code
721
handshake.errcheck = _retry_on_error
723
transport_set_ptr = _library.gnutls_transport_set_ptr
724
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
725
transport_set_ptr.restype = None
727
bye = _library.gnutls_bye
728
bye.argtypes = [session_t, close_request_t]
729
bye.restype = _error_code
730
bye.errcheck = _retry_on_error
732
check_version = _library.gnutls_check_version
733
check_version.argtypes = [ctypes.c_char_p]
734
check_version.restype = ctypes.c_char_p
736
_need_version = b"3.3.0"
737
if check_version(_need_version) is None:
738
raise self.Error("Needs GnuTLS {} or later"
739
.format(_need_version))
741
_tls_rawpk_version = b"3.6.6"
742
has_rawpk = bool(check_version(_tls_rawpk_version))
746
class pubkey_st(ctypes.Structure):
748
pubkey_t = ctypes.POINTER(pubkey_st)
750
x509_crt_fmt_t = ctypes.c_int
752
# All the function declarations below are from gnutls/abstract.h
753
pubkey_init = _library.gnutls_pubkey_init
754
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
755
pubkey_init.restype = _error_code
757
pubkey_import = _library.gnutls_pubkey_import
758
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
760
pubkey_import.restype = _error_code
762
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
763
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
764
ctypes.POINTER(ctypes.c_ubyte),
765
ctypes.POINTER(ctypes.c_size_t)]
766
pubkey_get_key_id.restype = _error_code
768
pubkey_deinit = _library.gnutls_pubkey_deinit
769
pubkey_deinit.argtypes = [pubkey_t]
770
pubkey_deinit.restype = None
772
# All the function declarations below are from gnutls/openpgp.h
774
openpgp_crt_init = _library.gnutls_openpgp_crt_init
775
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
776
openpgp_crt_init.restype = _error_code
778
openpgp_crt_import = _library.gnutls_openpgp_crt_import
779
openpgp_crt_import.argtypes = [openpgp_crt_t,
780
ctypes.POINTER(datum_t),
782
openpgp_crt_import.restype = _error_code
784
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
785
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
786
ctypes.POINTER(ctypes.c_uint)]
787
openpgp_crt_verify_self.restype = _error_code
789
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
790
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
791
openpgp_crt_deinit.restype = None
793
openpgp_crt_get_fingerprint = (
794
_library.gnutls_openpgp_crt_get_fingerprint)
795
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
799
openpgp_crt_get_fingerprint.restype = _error_code
801
if check_version(b"3.6.4"):
802
certificate_type_get2 = _library.gnutls_certificate_type_get2
803
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
804
certificate_type_get2.restype = _error_code
806
# Remove non-public functions
807
del _error_code, _retry_on_error
810
def call_pipe(connection, # : multiprocessing.Connection
811
func, *args, **kwargs):
812
"""This function is meant to be called by multiprocessing.Process
814
This function runs func(*args, **kwargs), and writes the resulting
815
return value on the provided multiprocessing.Connection.
817
connection.send(func(*args, **kwargs))
821
410
class Client(object):
822
411
"""A representation of a client host served by this server.
825
414
approved: bool(); 'None' if not yet approved/disapproved
826
415
approval_delay: datetime.timedelta(); Time to wait for approval
827
416
approval_duration: datetime.timedelta(); Duration of one approval
828
checker: multiprocessing.Process(); a running checker process used
829
to see if the client lives. 'None' if no process is
831
checker_callback_tag: a GLib event source tag, or None
417
checker: subprocess.Popen(); a running checker process used
418
to see if the client lives.
419
'None' if no process is running.
420
checker_callback_tag: a gobject event source tag, or None
832
421
checker_command: string; External command which is run to check
833
422
if client lives. %() expansions are done at
834
423
runtime with vars(self) as dict, so that for
835
424
instance %(name)s can be used in the command.
836
checker_initiator_tag: a GLib event source tag, or None
425
checker_initiator_tag: a gobject event source tag, or None
837
426
created: datetime.datetime(); (UTC) object creation
838
427
client_structure: Object describing what attributes a client has
839
428
and is used for storing the client at exit
840
429
current_checker_command: string; current running checker_command
841
disable_initiator_tag: a GLib event source tag, or None
430
disable_initiator_tag: a gobject event source tag, or None
843
432
fingerprint: string (40 or 32 hexadecimal digits); used to
844
uniquely identify an OpenPGP client
845
key_id: string (64 hexadecimal digits); used to uniquely identify
846
a client using raw public keys
433
uniquely identify the client
847
434
host: string; available for use by the checker command
848
435
interval: datetime.timedelta(); How often to start a new checker
849
436
last_approval_request: datetime.datetime(); (UTC) or None
1006
588
logger.info("Disabling client %s", self.name)
1007
589
if getattr(self, "disable_initiator_tag", None) is not None:
1008
GLib.source_remove(self.disable_initiator_tag)
590
gobject.source_remove(self.disable_initiator_tag)
1009
591
self.disable_initiator_tag = None
1010
592
self.expires = None
1011
593
if getattr(self, "checker_initiator_tag", None) is not None:
1012
GLib.source_remove(self.checker_initiator_tag)
594
gobject.source_remove(self.checker_initiator_tag)
1013
595
self.checker_initiator_tag = None
1014
596
self.stop_checker()
1015
597
self.enabled = False
1017
599
self.send_changedstate()
1018
# Do not run this again if called by a GLib.timeout_add
600
# Do not run this again if called by a gobject.timeout_add
1021
603
def __del__(self):
1024
606
def init_checker(self):
1025
607
# Schedule a new checker to be started an 'interval' from now,
1026
608
# and every interval from then on.
1027
609
if self.checker_initiator_tag is not None:
1028
GLib.source_remove(self.checker_initiator_tag)
1029
self.checker_initiator_tag = GLib.timeout_add(
1030
int(self.interval.total_seconds() * 1000),
610
gobject.source_remove(self.checker_initiator_tag)
611
self.checker_initiator_tag = (gobject.timeout_add
613
.total_seconds() * 1000),
1032
615
# Schedule a disable() when 'timeout' has passed
1033
616
if self.disable_initiator_tag is not None:
1034
GLib.source_remove(self.disable_initiator_tag)
1035
self.disable_initiator_tag = GLib.timeout_add(
1036
int(self.timeout.total_seconds() * 1000), self.disable)
617
gobject.source_remove(self.disable_initiator_tag)
618
self.disable_initiator_tag = (gobject.timeout_add
620
.total_seconds() * 1000),
1037
622
# Also start a new checker *right now*.
1038
623
self.start_checker()
1040
def checker_callback(self, source, condition, connection,
625
def checker_callback(self, pid, condition, command):
1042
626
"""The checker has completed, so take appropriate actions."""
1043
# Read return code from connection (see call_pipe)
1044
returncode = connection.recv()
1047
627
self.checker_callback_tag = None
1048
628
self.checker = None
1051
self.last_checker_status = returncode
1052
self.last_checker_signal = None
629
if os.WIFEXITED(condition):
630
self.last_checker_status = os.WEXITSTATUS(condition)
1053
631
if self.last_checker_status == 0:
1054
632
logger.info("Checker for %(name)s succeeded",
1056
634
self.checked_ok()
1058
logger.info("Checker for %(name)s failed", vars(self))
636
logger.info("Checker for %(name)s failed",
1060
639
self.last_checker_status = -1
1061
self.last_checker_signal = -returncode
1062
640
logger.warning("Checker for %(name)s crashed?",
1066
643
def checked_ok(self):
1067
644
"""Assert that the client has been seen, alive and well."""
1068
645
self.last_checked_ok = datetime.datetime.utcnow()
1069
646
self.last_checker_status = 0
1070
self.last_checker_signal = None
1071
647
self.bump_timeout()
1073
649
def bump_timeout(self, timeout=None):
1074
650
"""Bump up the timeout for this client."""
1075
651
if timeout is None:
1076
652
timeout = self.timeout
1077
653
if self.disable_initiator_tag is not None:
1078
GLib.source_remove(self.disable_initiator_tag)
654
gobject.source_remove(self.disable_initiator_tag)
1079
655
self.disable_initiator_tag = None
1080
656
if getattr(self, "enabled", False):
1081
self.disable_initiator_tag = GLib.timeout_add(
1082
int(timeout.total_seconds() * 1000), self.disable)
657
self.disable_initiator_tag = (gobject.timeout_add
658
(int(timeout.total_seconds()
659
* 1000), self.disable))
1083
660
self.expires = datetime.datetime.utcnow() + timeout
1085
662
def need_approval(self):
1086
663
self.last_approval_request = datetime.datetime.utcnow()
1088
665
def start_checker(self):
1089
666
"""Start a new checker subprocess if one is not running.
1091
668
If a checker already exists, leave it running and do
1093
670
# The reason for not killing a running checker is that if we
1098
675
# checkers alone, the checker would have to take more time
1099
676
# than 'timeout' for the client to be disabled, which is as it
1102
if self.checker is not None and not self.checker.is_alive():
1103
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:
684
except OSError as error:
685
if 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)
1106
693
# Start a new checker if needed
1107
694
if self.checker is None:
1108
695
# Escape attributes for the shell
1110
attr: re.escape(str(getattr(self, attr)))
1111
for attr in self.runtime_expansions}
696
escaped_attrs = { attr:
697
re.escape(str(getattr(self, attr)))
698
for attr in self.runtime_expansions }
1113
700
command = self.checker_command % escaped_attrs
1114
701
except TypeError as error:
1115
702
logger.error('Could not format string "%s"',
1116
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
# The exception is when not debugging but nevertheless
714
# running in the foreground; use the previously
717
if (not self.server_settings["debug"]
718
and self.server_settings["foreground"]):
719
popen_args.update({"stdout": wnull,
721
self.checker = subprocess.Popen(command,
725
except OSError as error:
726
logger.error("Failed to start subprocess",
1118
return True # Try again later
1119
self.current_checker_command = command
1120
logger.info("Starting checker %r for %s", command,
1122
# We don't need to redirect stdout and stderr, since
1123
# in normal mode, that is already done by daemon(),
1124
# and in debug mode we don't want to. (Stdin is
1125
# always replaced by /dev/null.)
1126
# The exception is when not debugging but nevertheless
1127
# running in the foreground; use the previously
1129
popen_args = {"close_fds": True,
1132
if (not self.server_settings["debug"]
1133
and self.server_settings["foreground"]):
1134
popen_args.update({"stdout": wnull,
1136
pipe = multiprocessing.Pipe(duplex=False)
1137
self.checker = multiprocessing.Process(
1139
args=(pipe[1], subprocess.call, command),
1141
self.checker.start()
1142
self.checker_callback_tag = GLib.io_add_watch(
1143
pipe[0].fileno(), GLib.IO_IN,
1144
self.checker_callback, pipe[0], command)
1145
# Re-run this periodically if run by GLib.timeout_add
729
self.checker_callback_tag = (gobject.child_watch_add
731
self.checker_callback,
733
# The checker may have completed before the gobject
734
# watch was added. Check for this.
736
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
737
except OSError as error:
738
if error.errno == errno.ECHILD:
739
# This should never happen
740
logger.error("Child process vanished",
745
gobject.source_remove(self.checker_callback_tag)
746
self.checker_callback(pid, status, command)
747
# Re-run this periodically if run by gobject.timeout_add
1148
750
def stop_checker(self):
1149
751
"""Force the checker process, if any, to stop."""
1150
752
if self.checker_callback_tag:
1151
GLib.source_remove(self.checker_callback_tag)
753
gobject.source_remove(self.checker_callback_tag)
1152
754
self.checker_callback_tag = None
1153
755
if getattr(self, "checker", None) is None:
1155
757
logger.debug("Stopping checker for %(name)s", vars(self))
1156
self.checker.terminate()
759
self.checker.terminate()
761
#if self.checker.poll() is None:
762
# self.checker.kill()
763
except OSError as error:
764
if error.errno != errno.ESRCH: # No such process
1157
766
self.checker = None
1160
def dbus_service_property(dbus_interface,
769
def dbus_service_property(dbus_interface, signature="v",
770
access="readwrite", byte_arrays=False):
1164
771
"""Decorators for marking methods of a DBusObjectWithProperties to
1165
772
become properties on the D-Bus.
1167
774
The decorated method will be called with no arguments by "Get"
1168
775
and with one argument by "Set".
1170
777
The parameters, where they are supported, are the same as
1171
778
dbus.service.method, except there is only "signature", since the
1172
779
type from Get() and the type sent to Set() is the same.
1255
class DBusObjectWithAnnotations(dbus.service.Object):
1256
"""A D-Bus object with annotations.
1258
Classes inheriting from this can use the dbus_annotations
1259
decorator to add annotations to methods or signals.
853
class DBusObjectWithProperties(dbus.service.Object):
854
"""A D-Bus object with properties.
856
Classes inheriting from this can use the dbus_service_property
857
decorator to expose methods as D-Bus properties. It exposes the
858
standard Get(), Set(), and GetAll() methods on the D-Bus.
1263
862
def _is_dbus_thing(thing):
1264
863
"""Returns a function testing if an attribute is a D-Bus thing
1266
865
If called like _is_dbus_thing("method") it returns a function
1267
866
suitable for use as predicate to inspect.getmembers().
1269
868
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1272
871
def _get_all_dbus_things(self, thing):
1273
872
"""Returns a generator of (name, attribute) pairs
1275
return ((getattr(athing.__get__(self), "_dbus_name", name),
874
return ((getattr(athing.__get__(self), "_dbus_name",
1276
876
athing.__get__(self))
1277
877
for cls in self.__class__.__mro__
1278
878
for name, athing in
1279
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1281
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1283
path_keyword='object_path',
1284
connection_keyword='connection')
1285
def Introspect(self, object_path, connection):
1286
"""Overloading of standard D-Bus method.
1288
Inserts annotation tags on methods and signals.
1290
xmlstring = dbus.service.Object.Introspect(self, object_path,
1293
document = xml.dom.minidom.parseString(xmlstring)
1295
for if_tag in document.getElementsByTagName("interface"):
1296
# Add annotation tags
1297
for typ in ("method", "signal"):
1298
for tag in if_tag.getElementsByTagName(typ):
1300
for name, prop in (self.
1301
_get_all_dbus_things(typ)):
1302
if (name == tag.getAttribute("name")
1303
and prop._dbus_interface
1304
== if_tag.getAttribute("name")):
1305
annots.update(getattr(
1306
prop, "_dbus_annotations", {}))
1307
for name, value in annots.items():
1308
ann_tag = document.createElement(
1310
ann_tag.setAttribute("name", name)
1311
ann_tag.setAttribute("value", value)
1312
tag.appendChild(ann_tag)
1313
# Add interface annotation tags
1314
for annotation, value in dict(
1315
itertools.chain.from_iterable(
1316
annotations().items()
1317
for name, annotations
1318
in self._get_all_dbus_things("interface")
1319
if name == if_tag.getAttribute("name")
1321
ann_tag = document.createElement("annotation")
1322
ann_tag.setAttribute("name", annotation)
1323
ann_tag.setAttribute("value", value)
1324
if_tag.appendChild(ann_tag)
1325
# Fix argument name for the Introspect method itself
1326
if (if_tag.getAttribute("name")
1327
== dbus.INTROSPECTABLE_IFACE):
1328
for cn in if_tag.getElementsByTagName("method"):
1329
if cn.getAttribute("name") == "Introspect":
1330
for arg in cn.getElementsByTagName("arg"):
1331
if (arg.getAttribute("direction")
1333
arg.setAttribute("name",
1335
xmlstring = document.toxml("utf-8")
1337
except (AttributeError, xml.dom.DOMException,
1338
xml.parsers.expat.ExpatError) as error:
1339
logger.error("Failed to override Introspection method",
1344
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1345
"""A D-Bus object with properties.
1347
Classes inheriting from this can use the dbus_service_property
1348
decorator to expose methods as D-Bus properties. It exposes the
1349
standard Get(), Set(), and GetAll() methods on the D-Bus.
879
inspect.getmembers(cls,
880
self._is_dbus_thing(thing)))
1352
882
def _get_dbus_property(self, interface_name, property_name):
1353
883
"""Returns a bound method if one exists which is a D-Bus
1354
884
property with the specified name and interface.
1356
for cls in self.__class__.__mro__:
1357
for name, value in inspect.getmembers(
1358
cls, self._is_dbus_thing("property")):
886
for cls in self.__class__.__mro__:
887
for name, value in (inspect.getmembers
889
self._is_dbus_thing("property"))):
1359
890
if (value._dbus_name == property_name
1360
891
and value._dbus_interface == interface_name):
1361
892
return value.__get__(self)
1363
894
# No such property
1364
raise DBusPropertyNotFound("{}:{}.{}".format(
1365
self.dbus_object_path, interface_name, property_name))
1368
def _get_all_interface_names(cls):
1369
"""Get a sequence of all interfaces supported by an object"""
1370
return (name for name in set(getattr(getattr(x, attr),
1371
"_dbus_interface", None)
1372
for x in (inspect.getmro(cls))
1374
if name is not None)
1376
@dbus.service.method(dbus.PROPERTIES_IFACE,
895
raise DBusPropertyNotFound(self.dbus_object_path + ":"
896
+ interface_name + "."
899
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1378
900
out_signature="v")
1379
901
def Get(self, interface_name, property_name):
1380
902
"""Standard D-Bus property Get() method, see D-Bus standard.
1509
1042
return xmlstring
1513
dbus.OBJECT_MANAGER_IFACE
1514
except AttributeError:
1515
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1518
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1519
"""A D-Bus object with an ObjectManager.
1521
Classes inheriting from this exposes the standard
1522
GetManagedObjects call and the InterfacesAdded and
1523
InterfacesRemoved signals on the standard
1524
"org.freedesktop.DBus.ObjectManager" interface.
1526
Note: No signals are sent automatically; they must be sent
1529
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1530
out_signature="a{oa{sa{sv}}}")
1531
def GetManagedObjects(self):
1532
"""This function must be overridden"""
1533
raise NotImplementedError()
1535
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1536
signature="oa{sa{sv}}")
1537
def InterfacesAdded(self, object_path, interfaces_and_properties):
1540
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1541
def InterfacesRemoved(self, object_path, interfaces):
1544
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1546
path_keyword='object_path',
1547
connection_keyword='connection')
1548
def Introspect(self, object_path, connection):
1549
"""Overloading of standard D-Bus method.
1551
Override return argument name of GetManagedObjects to be
1552
"objpath_interfaces_and_properties"
1554
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1558
document = xml.dom.minidom.parseString(xmlstring)
1560
for if_tag in document.getElementsByTagName("interface"):
1561
# Fix argument name for the GetManagedObjects method
1562
if (if_tag.getAttribute("name")
1563
== dbus.OBJECT_MANAGER_IFACE):
1564
for cn in if_tag.getElementsByTagName("method"):
1565
if (cn.getAttribute("name")
1566
== "GetManagedObjects"):
1567
for arg in cn.getElementsByTagName("arg"):
1568
if (arg.getAttribute("direction")
1572
"objpath_interfaces"
1574
xmlstring = document.toxml("utf-8")
1576
except (AttributeError, xml.dom.DOMException,
1577
xml.parsers.expat.ExpatError) as error:
1578
logger.error("Failed to override Introspection method",
1583
1045
def datetime_to_dbus(dt, variant_level=0):
1584
1046
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1586
return dbus.String("", variant_level=variant_level)
1587
return dbus.String(dt.isoformat(), variant_level=variant_level)
1048
return dbus.String("", variant_level = variant_level)
1049
return dbus.String(dt.isoformat(),
1050
variant_level=variant_level)
1590
1053
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1951
1413
server to mandos-client
1955
1417
# Rejected - signal
1956
1418
@dbus.service.signal(_interface, signature="s")
1957
1419
def Rejected(self, reason):
1961
1423
# NeedApproval - signal
1962
1424
@dbus.service.signal(_interface, signature="tb")
1963
1425
def NeedApproval(self, timeout, default):
1965
1427
return self.need_approval()
1969
1431
# Approve - method
1970
1432
@dbus.service.method(_interface, in_signature="b")
1971
1433
def Approve(self, value):
1972
1434
self.approve(value)
1974
1436
# CheckedOK - method
1975
1437
@dbus.service.method(_interface)
1976
1438
def CheckedOK(self):
1977
1439
self.checked_ok()
1979
1441
# Enable - method
1980
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1981
1442
@dbus.service.method(_interface)
1982
1443
def Enable(self):
1986
1447
# StartChecker - method
1987
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1988
1448
@dbus.service.method(_interface)
1989
1449
def StartChecker(self):
1991
1451
self.start_checker()
1993
1453
# Disable - method
1994
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1995
1454
@dbus.service.method(_interface)
1996
1455
def Disable(self):
2000
1459
# StopChecker - method
2001
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
2002
1460
@dbus.service.method(_interface)
2003
1461
def StopChecker(self):
2004
1462
self.stop_checker()
2008
1466
# ApprovalPending - property
2009
1467
@dbus_service_property(_interface, signature="b", access="read")
2010
1468
def ApprovalPending_dbus_property(self):
2011
1469
return dbus.Boolean(bool(self.approvals_pending))
2013
1471
# ApprovedByDefault - property
2014
@dbus_service_property(_interface,
1472
@dbus_service_property(_interface, signature="b",
2016
1473
access="readwrite")
2017
1474
def ApprovedByDefault_dbus_property(self, value=None):
2018
1475
if value is None: # get
2019
1476
return dbus.Boolean(self.approved_by_default)
2020
1477
self.approved_by_default = bool(value)
2022
1479
# ApprovalDelay - property
2023
@dbus_service_property(_interface,
1480
@dbus_service_property(_interface, signature="t",
2025
1481
access="readwrite")
2026
1482
def ApprovalDelay_dbus_property(self, value=None):
2027
1483
if value is None: # get
2028
1484
return dbus.UInt64(self.approval_delay.total_seconds()
2030
1486
self.approval_delay = datetime.timedelta(0, 0, 0, value)
2032
1488
# ApprovalDuration - property
2033
@dbus_service_property(_interface,
1489
@dbus_service_property(_interface, signature="t",
2035
1490
access="readwrite")
2036
1491
def ApprovalDuration_dbus_property(self, value=None):
2037
1492
if value is None: # get
2038
1493
return dbus.UInt64(self.approval_duration.total_seconds()
2040
1495
self.approval_duration = datetime.timedelta(0, 0, 0, value)
2042
1497
# Name - property
2044
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2045
1498
@dbus_service_property(_interface, signature="s", access="read")
2046
1499
def Name_dbus_property(self):
2047
1500
return dbus.String(self.name)
2051
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2052
@dbus_service_property(_interface, signature="s", access="read")
2053
def KeyID_dbus_property(self):
2054
return dbus.String(self.key_id)
2056
1502
# Fingerprint - property
2058
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2059
1503
@dbus_service_property(_interface, signature="s", access="read")
2060
1504
def Fingerprint_dbus_property(self):
2061
1505
return dbus.String(self.fingerprint)
2063
1507
# Host - property
2064
@dbus_service_property(_interface,
1508
@dbus_service_property(_interface, signature="s",
2066
1509
access="readwrite")
2067
1510
def Host_dbus_property(self, value=None):
2068
1511
if value is None: # get
2069
1512
return dbus.String(self.host)
2070
1513
self.host = str(value)
2072
1515
# Created - property
2074
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2075
1516
@dbus_service_property(_interface, signature="s", access="read")
2076
1517
def Created_dbus_property(self):
2077
1518
return datetime_to_dbus(self.created)
2079
1520
# LastEnabled - property
2080
1521
@dbus_service_property(_interface, signature="s", access="read")
2081
1522
def LastEnabled_dbus_property(self):
2082
1523
return datetime_to_dbus(self.last_enabled)
2084
1525
# Enabled - property
2085
@dbus_service_property(_interface,
1526
@dbus_service_property(_interface, signature="b",
2087
1527
access="readwrite")
2088
1528
def Enabled_dbus_property(self, value=None):
2089
1529
if value is None: # get
2371
1794
delay -= time2 - time
2374
session.send(client.secret)
2375
except gnutls.Error as error:
2376
logger.warning("gnutls send failed",
1797
while sent_size < len(client.secret):
1799
sent = session.send(client.secret[sent_size:])
1800
except gnutls.errors.GNUTLSError as error:
1801
logger.warning("gnutls send failed",
1804
logger.debug("Sent: %d, remaining: %d",
1805
sent, len(client.secret)
1806
- (sent_size + sent))
2380
1809
logger.info("Sending secret to %s", client.name)
2381
1810
# bump the timeout using extended_timeout
2382
1811
client.bump_timeout(client.extended_timeout)
2383
1812
if self.server.use_dbus:
2384
1813
# Emit D-Bus signal
2385
1814
client.GotSecret()
2388
1817
if approval_required:
2389
1818
client.approvals_pending -= 1
2392
except gnutls.Error as error:
1821
except gnutls.errors.GNUTLSError as error:
2393
1822
logger.warning("GnuTLS bye failed",
2394
1823
exc_info=error)
2397
1826
def peer_certificate(session):
2398
"Return the peer's certificate as a bytestring"
2400
cert_type = gnutls.certificate_type_get2(session._c_object,
2402
except AttributeError:
2403
cert_type = gnutls.certificate_type_get(session._c_object)
2404
if gnutls.has_rawpk:
2405
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2407
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2408
# If not a valid certificate type...
2409
if cert_type not in valid_cert_types:
2410
logger.info("Cert type %r not in %r", cert_type,
2412
# ...return invalid data
1827
"Return the peer's OpenPGP certificate as a bytestring"
1828
# If not an OpenPGP certificate...
1829
if (gnutls.library.functions
1830
.gnutls_certificate_type_get(session._c_object)
1831
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1832
# ...do the normal thing
1833
return session.peer_certificate
2414
1834
list_size = ctypes.c_uint(1)
2415
cert_list = (gnutls.certificate_get_peers
1835
cert_list = (gnutls.library.functions
1836
.gnutls_certificate_get_peers
2416
1837
(session._c_object, ctypes.byref(list_size)))
2417
1838
if not bool(cert_list) and list_size.value != 0:
2418
raise gnutls.Error("error getting peer certificate")
1839
raise gnutls.errors.GNUTLSError("error getting peer"
2419
1841
if list_size.value == 0:
2421
1843
cert = cert_list[0]
2422
1844
return ctypes.string_at(cert.data, cert.size)
2425
def key_id(certificate):
2426
"Convert a certificate bytestring to a hexdigit key ID"
2427
# New GnuTLS "datum" with the public key
2428
datum = gnutls.datum_t(
2429
ctypes.cast(ctypes.c_char_p(certificate),
2430
ctypes.POINTER(ctypes.c_ubyte)),
2431
ctypes.c_uint(len(certificate)))
2432
# XXX all these need to be created in the gnutls "module"
2433
# New empty GnuTLS certificate
2434
pubkey = gnutls.pubkey_t()
2435
gnutls.pubkey_init(ctypes.byref(pubkey))
2436
# Import the raw public key into the certificate
2437
gnutls.pubkey_import(pubkey,
2438
ctypes.byref(datum),
2439
gnutls.X509_FMT_DER)
2440
# New buffer for the key ID
2441
buf = ctypes.create_string_buffer(32)
2442
buf_len = ctypes.c_size_t(len(buf))
2443
# Get the key ID from the raw public key into the buffer
2444
gnutls.pubkey_get_key_id(pubkey,
2445
gnutls.KEYID_USE_SHA256,
2446
ctypes.cast(ctypes.byref(buf),
2447
ctypes.POINTER(ctypes.c_ubyte)),
2448
ctypes.byref(buf_len))
2449
# Deinit the certificate
2450
gnutls.pubkey_deinit(pubkey)
2452
# Convert the buffer to a Python bytestring
2453
key_id = ctypes.string_at(buf, buf_len.value)
2454
# Convert the bytestring to hexadecimal notation
2455
hex_key_id = binascii.hexlify(key_id).upper()
2459
1847
def fingerprint(openpgp):
2460
1848
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2461
1849
# New GnuTLS "datum" with the OpenPGP public key
2462
datum = gnutls.datum_t(
2463
ctypes.cast(ctypes.c_char_p(openpgp),
2464
ctypes.POINTER(ctypes.c_ubyte)),
2465
ctypes.c_uint(len(openpgp)))
1850
datum = (gnutls.library.types
1851
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1854
ctypes.c_uint(len(openpgp))))
2466
1855
# New empty GnuTLS certificate
2467
crt = gnutls.openpgp_crt_t()
2468
gnutls.openpgp_crt_init(ctypes.byref(crt))
1856
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1857
(gnutls.library.functions
1858
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2469
1859
# Import the OpenPGP public key into the certificate
2470
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2471
gnutls.OPENPGP_FMT_RAW)
1860
(gnutls.library.functions
1861
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1862
gnutls.library.constants
1863
.GNUTLS_OPENPGP_FMT_RAW))
2472
1864
# Verify the self signature in the key
2473
1865
crtverify = ctypes.c_uint()
2474
gnutls.openpgp_crt_verify_self(crt, 0,
2475
ctypes.byref(crtverify))
1866
(gnutls.library.functions
1867
.gnutls_openpgp_crt_verify_self(crt, 0,
1868
ctypes.byref(crtverify)))
2476
1869
if crtverify.value != 0:
2477
gnutls.openpgp_crt_deinit(crt)
2478
raise gnutls.CertificateSecurityError(code
1870
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1871
raise (gnutls.errors.CertificateSecurityError
2480
1873
# New buffer for the fingerprint
2481
1874
buf = ctypes.create_string_buffer(20)
2482
1875
buf_len = ctypes.c_size_t()
2483
1876
# Get the fingerprint from the certificate into the buffer
2484
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2485
ctypes.byref(buf_len))
1877
(gnutls.library.functions
1878
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1879
ctypes.byref(buf_len)))
2486
1880
# Deinit the certificate
2487
gnutls.openpgp_crt_deinit(crt)
1881
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2488
1882
# Convert the buffer to a Python bytestring
2489
1883
fpr = ctypes.string_at(buf, buf_len.value)
2490
1884
# Convert the bytestring to hexadecimal notation
2579
1967
# socket_wrapper(), if socketfd was set.
2580
1968
socketserver.TCPServer.__init__(self, server_address,
2581
1969
RequestHandlerClass)
2583
1971
def server_bind(self):
2584
1972
"""This overrides the normal server_bind() function
2585
1973
to bind to an interface if one was specified, and also NOT to
2586
1974
bind to an address or port if they were not specified."""
2587
global SO_BINDTODEVICE
2588
1975
if self.interface is not None:
2589
1976
if SO_BINDTODEVICE is None:
2590
# Fall back to a hard-coded value which seems to be
2592
logger.warning("SO_BINDTODEVICE not found, trying 25")
2593
SO_BINDTODEVICE = 25
2595
self.socket.setsockopt(
2596
socket.SOL_SOCKET, SO_BINDTODEVICE,
2597
(self.interface + "\0").encode("utf-8"))
2598
except socket.error as error:
2599
if error.errno == errno.EPERM:
2600
logger.error("No permission to bind to"
2601
" interface %s", self.interface)
2602
elif error.errno == errno.ENOPROTOOPT:
2603
logger.error("SO_BINDTODEVICE not available;"
2604
" cannot bind to interface %s",
2606
elif error.errno == errno.ENODEV:
2607
logger.error("Interface %s does not exist,"
2608
" cannot bind", self.interface)
1977
logger.error("SO_BINDTODEVICE does not exist;"
1978
" cannot bind to interface %s",
1982
self.socket.setsockopt(socket.SOL_SOCKET,
1984
(self.interface + "\0")
1986
except socket.error as error:
1987
if error.errno == errno.EPERM:
1988
logger.error("No permission to bind to"
1989
" interface %s", self.interface)
1990
elif error.errno == errno.ENOPROTOOPT:
1991
logger.error("SO_BINDTODEVICE not available;"
1992
" cannot bind to interface %s",
1994
elif error.errno == errno.ENODEV:
1995
logger.error("Interface %s does not exist,"
1996
" cannot bind", self.interface)
2611
1999
# Only bind(2) the socket if we really need to.
2612
2000
if self.server_address[0] or self.server_address[1]:
2613
if self.server_address[1]:
2614
self.allow_reuse_address = True
2615
2001
if not self.server_address[0]:
2616
2002
if self.address_family == socket.AF_INET6:
2617
any_address = "::" # in6addr_any
2003
any_address = "::" # in6addr_any
2619
any_address = "0.0.0.0" # INADDR_ANY
2005
any_address = "0.0.0.0" # INADDR_ANY
2620
2006
self.server_address = (any_address,
2621
2007
self.server_address[1])
2622
2008
elif not self.server_address[1]:
2623
self.server_address = (self.server_address[0], 0)
2009
self.server_address = (self.server_address[0],
2624
2011
# if self.interface:
2625
2012
# self.server_address = (self.server_address[0],
2656
2038
self.gnutls_priority = gnutls_priority
2657
2039
IPv6_TCPServer.__init__(self, server_address,
2658
2040
RequestHandlerClass,
2659
interface=interface,
2041
interface = interface,
2042
use_ipv6 = use_ipv6,
2043
socketfd = socketfd)
2663
2044
def server_activate(self):
2664
2045
if self.enabled:
2665
2046
return socketserver.TCPServer.server_activate(self)
2667
2048
def enable(self):
2668
2049
self.enabled = True
2670
2051
def add_pipe(self, parent_pipe, proc):
2671
2052
# Call "handle_ipc" for both data and EOF events
2673
parent_pipe.fileno(),
2674
GLib.IO_IN | GLib.IO_HUP,
2675
functools.partial(self.handle_ipc,
2676
parent_pipe=parent_pipe,
2679
def handle_ipc(self, source, condition,
2682
client_object=None):
2053
gobject.io_add_watch(parent_pipe.fileno(),
2054
gobject.IO_IN | gobject.IO_HUP,
2055
functools.partial(self.handle_ipc,
2060
def handle_ipc(self, source, condition, parent_pipe=None,
2061
proc = None, client_object=None):
2683
2062
# error, or the other end of multiprocessing.Pipe has closed
2684
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2063
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2685
2064
# Wait for other process to exit
2689
2068
# Read a request from the child
2690
2069
request = parent_pipe.recv()
2691
2070
command = request[0]
2693
2072
if command == 'init':
2694
key_id = request[1].decode("ascii")
2695
fpr = request[2].decode("ascii")
2696
address = request[3]
2698
for c in self.clients.values():
2699
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2701
if key_id and c.key_id == key_id:
2704
if fpr and c.fingerprint == fpr:
2074
address = request[2]
2076
for c in self.clients.itervalues():
2077
if c.fingerprint == fpr:
2708
logger.info("Client not found for key ID: %s, address"
2709
": %s", key_id or fpr, address)
2081
logger.info("Client not found for fingerprint: %s, ad"
2082
"dress: %s", fpr, address)
2710
2083
if self.use_dbus:
2711
2084
# Emit D-Bus signal
2712
mandos_dbus_service.ClientNotFound(key_id or fpr,
2085
mandos_dbus_service.ClientNotFound(fpr,
2714
2087
parent_pipe.send(False)
2718
parent_pipe.fileno(),
2719
GLib.IO_IN | GLib.IO_HUP,
2720
functools.partial(self.handle_ipc,
2721
parent_pipe=parent_pipe,
2723
client_object=client))
2090
gobject.io_add_watch(parent_pipe.fileno(),
2091
gobject.IO_IN | gobject.IO_HUP,
2092
functools.partial(self.handle_ipc,
2724
2098
parent_pipe.send(True)
2725
2099
# remove the old hook in favor of the new above hook on
3131
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3133
2500
except OSError as error:
3134
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3135
.format(uid, gid, os.strerror(error.errno)))
3136
2501
if error.errno != errno.EPERM:
3140
2505
# Enable all possible GnuTLS debugging
3142
2507
# "Use a log level over 10 to enable all debugging options."
3143
2508
# - GnuTLS manual
3144
gnutls.global_set_log_level(11)
2509
gnutls.library.functions.gnutls_global_set_log_level(11)
2511
@gnutls.library.types.gnutls_log_func
3147
2512
def debug_gnutls(level, string):
3148
2513
logger.debug("GnuTLS: %s", string[:-1])
3150
gnutls.global_set_log_function(debug_gnutls)
2515
(gnutls.library.functions
2516
.gnutls_global_set_log_function(debug_gnutls))
3152
2518
# Redirect stdin so all checkers get /dev/null
3153
2519
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3154
2520
os.dup2(null, sys.stdin.fileno())
3158
2524
# Need to fork before connecting to D-Bus
3159
2525
if not foreground:
3160
2526
# Close all input and output, do double fork, etc.
3163
if gi.version_info < (3, 10, 2):
3164
# multiprocessing will use threads, so before we use GLib we
3165
# need to inform GLib that threads will be used.
2529
# multiprocessing will use threads, so before we use gobject we
2530
# need to inform gobject that threads will be used.
2531
gobject.threads_init()
3168
2533
global main_loop
3169
2534
# From the Avahi example code
3170
2535
DBusGMainLoop(set_as_default=True)
3171
main_loop = GLib.MainLoop()
2536
main_loop = gobject.MainLoop()
3172
2537
bus = dbus.SystemBus()
3173
2538
# End of Avahi example code
3176
2541
bus_name = dbus.service.BusName("se.recompile.Mandos",
3179
old_bus_name = dbus.service.BusName(
3180
"se.bsnet.fukt.Mandos", bus,
3182
except dbus.exceptions.DBusException as e:
2542
bus, do_not_queue=True)
2543
old_bus_name = (dbus.service.BusName
2544
("se.bsnet.fukt.Mandos", bus,
2546
except dbus.exceptions.NameExistsException as e:
3183
2547
logger.error("Disabling D-Bus:", exc_info=e)
3184
2548
use_dbus = False
3185
2549
server_settings["use_dbus"] = False
3186
2550
tcp_server.use_dbus = False
3188
2552
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3189
service = AvahiServiceToSyslog(
3190
name=server_settings["servicename"],
3191
servicetype="_mandos._tcp",
2553
service = AvahiServiceToSyslog(name =
2554
server_settings["servicename"],
2555
servicetype = "_mandos._tcp",
2556
protocol = protocol, bus = bus)
3194
2557
if server_settings["interface"]:
3195
service.interface = if_nametoindex(
3196
server_settings["interface"].encode("utf-8"))
2558
service.interface = (if_nametoindex
2559
(server_settings["interface"]
3198
2562
global multiprocessing_manager
3199
2563
multiprocessing_manager = multiprocessing.Manager()
3201
2565
client_class = Client
3203
client_class = functools.partial(ClientDBus, bus=bus)
2567
client_class = functools.partial(ClientDBus, bus = bus)
3205
2569
client_settings = Client.config_parser(client_config)
3206
2570
old_client_settings = {}
3207
2571
clients_data = {}
3209
2573
# This is used to redirect stdout and stderr for checker processes
3211
wnull = open(os.devnull, "w") # A writable /dev/null
2575
wnull = open(os.devnull, "w") # A writable /dev/null
3212
2576
# Only used if server is running in foreground but not in debug
3214
2578
if debug or not foreground:
3217
2581
# Get client data and settings from last running state.
3218
2582
if server_settings["restore"]:
3220
2584
with open(stored_state_path, "rb") as stored_state:
3221
if sys.version_info.major == 2:
3222
clients_data, old_client_settings = pickle.load(
3225
bytes_clients_data, bytes_old_client_settings = (
3226
pickle.load(stored_state, encoding="bytes"))
3227
# Fix bytes to strings
3230
clients_data = {(key.decode("utf-8")
3231
if isinstance(key, bytes)
3234
bytes_clients_data.items()}
3235
del bytes_clients_data
3236
for key in clients_data:
3237
value = {(k.decode("utf-8")
3238
if isinstance(k, bytes) else k): v
3240
clients_data[key].items()}
3241
clients_data[key] = value
3243
value["client_structure"] = [
3245
if isinstance(s, bytes)
3247
value["client_structure"]]
3249
for k in ("name", "host"):
3250
if isinstance(value[k], bytes):
3251
value[k] = value[k].decode("utf-8")
3252
if "key_id" not in value:
3253
value["key_id"] = ""
3254
elif "fingerprint" not in value:
3255
value["fingerprint"] = ""
3256
# old_client_settings
3258
old_client_settings = {
3259
(key.decode("utf-8")
3260
if isinstance(key, bytes)
3263
bytes_old_client_settings.items()}
3264
del bytes_old_client_settings
3266
for value in old_client_settings.values():
3267
if isinstance(value["host"], bytes):
3268
value["host"] = (value["host"]
2585
clients_data, old_client_settings = (pickle.load
3270
2587
os.remove(stored_state_path)
3271
2588
except IOError as e:
3272
2589
if e.errno == errno.ENOENT:
3273
logger.warning("Could not load persistent state:"
3274
" {}".format(os.strerror(e.errno)))
2590
logger.warning("Could not load persistent state: {}"
2591
.format(os.strerror(e.errno)))
3276
2593
logger.critical("Could not load persistent state:",
3279
2596
except EOFError as e:
3280
2597
logger.warning("Could not load persistent state: "
2598
"EOFError:", exc_info=e)
3284
2600
with PGPEngine() as pgp:
3285
2601
for client_name, client in clients_data.items():
3286
2602
# Skip removed clients
3287
2603
if client_name not in client_settings:
3290
2606
# Decide which value to use after restoring saved state.
3291
2607
# We have three different values: Old config file,
3292
2608
# new config file, and saved state.
3350
2666
for client_name in (set(client_settings)
3351
2667
- set(old_client_settings)):
3352
2668
clients_data[client_name] = client_settings[client_name]
3354
2670
# Create all client objects
3355
2671
for client_name, client in clients_data.items():
3356
2672
tcp_server.clients[client_name] = client_class(
3359
server_settings=server_settings)
2673
name = client_name, settings = client,
2674
server_settings = server_settings)
3361
2676
if not tcp_server.clients:
3362
2677
logger.warning("No clients defined")
3364
2679
if not foreground:
3365
2680
if pidfile is not None:
3369
print(pid, file=pidfile)
2684
pidfile.write("{}\n".format(pid).encode("utf-8"))
3370
2685
except IOError:
3371
2686
logger.error("Could not write to file %r with PID %d",
3372
2687
pidfilename, pid)
3374
2689
del pidfilename
3376
for termsig in (signal.SIGHUP, signal.SIGTERM):
3377
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3378
lambda: main_loop.quit() and False)
2691
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2692
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3382
@alternate_dbus_interfaces(
3383
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3384
class MandosDBusService(DBusObjectWithObjectManager):
2695
@alternate_dbus_interfaces({"se.recompile.Mandos":
2696
"se.bsnet.fukt.Mandos"})
2697
class MandosDBusService(DBusObjectWithProperties):
3385
2698
"""A D-Bus proxy object"""
3387
2699
def __init__(self):
3388
2700
dbus.service.Object.__init__(self, bus, "/")
3390
2701
_interface = "se.recompile.Mandos"
2703
@dbus_interface_annotations(_interface)
2705
return { "org.freedesktop.DBus.Property"
2706
".EmitsChangedSignal":
3392
2709
@dbus.service.signal(_interface, signature="o")
3393
2710
def ClientAdded(self, objpath):
3397
2714
@dbus.service.signal(_interface, signature="ss")
3398
def ClientNotFound(self, key_id, address):
2715
def ClientNotFound(self, fingerprint, address):
3402
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3404
2719
@dbus.service.signal(_interface, signature="os")
3405
2720
def ClientRemoved(self, objpath, name):
3409
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3411
2724
@dbus.service.method(_interface, out_signature="ao")
3412
2725
def GetAllClients(self):
3414
return dbus.Array(c.dbus_object_path for c in
3415
tcp_server.clients.values())
3417
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2727
return dbus.Array(c.dbus_object_path
2729
tcp_server.clients.itervalues())
3419
2731
@dbus.service.method(_interface,
3420
2732
out_signature="a{oa{sv}}")
3421
2733
def GetAllClientsWithProperties(self):
3423
2735
return dbus.Dictionary(
3424
{c.dbus_object_path: c.GetAll(
3425
"se.recompile.Mandos.Client")
3426
for c in tcp_server.clients.values()},
2736
{ c.dbus_object_path: c.GetAll("")
2737
for c in tcp_server.clients.itervalues() },
3427
2738
signature="oa{sv}")
3429
2740
@dbus.service.method(_interface, in_signature="o")
3430
2741
def RemoveClient(self, object_path):
3432
for c in tcp_server.clients.values():
2743
for c in tcp_server.clients.itervalues():
3433
2744
if c.dbus_object_path == object_path:
3434
2745
del tcp_server.clients[c.name]
3435
2746
c.remove_from_connection()
3436
# Don't signal the disabling
2747
# Don't signal anything except ClientRemoved
3437
2748
c.disable(quiet=True)
3438
# Emit D-Bus signal for removal
3439
self.client_removed_signal(c)
2750
self.ClientRemoved(object_path, c.name)
3441
2752
raise KeyError(object_path)
3445
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3446
out_signature="a{oa{sa{sv}}}")
3447
def GetManagedObjects(self):
3449
return dbus.Dictionary(
3450
{client.dbus_object_path:
3452
{interface: client.GetAll(interface)
3454
client._get_all_interface_names()})
3455
for client in tcp_server.clients.values()})
3457
def client_added_signal(self, client):
3458
"""Send the new standard signal and the old signal"""
3460
# New standard signal
3461
self.InterfacesAdded(
3462
client.dbus_object_path,
3464
{interface: client.GetAll(interface)
3466
client._get_all_interface_names()}))
3468
self.ClientAdded(client.dbus_object_path)
3470
def client_removed_signal(self, client):
3471
"""Send the new standard signal and the old signal"""
3473
# New standard signal
3474
self.InterfacesRemoved(
3475
client.dbus_object_path,
3476
client._get_all_interface_names())
3478
self.ClientRemoved(client.dbus_object_path,
3481
2756
mandos_dbus_service = MandosDBusService()
3483
# Save modules to variables to exempt the modules from being
3484
# unloaded before the function registered with atexit() is run.
3485
mp = multiprocessing
3489
2759
"Cleanup function; run on exit"
3491
2761
service.cleanup()
3493
mp.active_children()
2763
multiprocessing.active_children()
3495
2765
if not (tcp_server.clients or client_settings):
3498
2768
# Store client before exiting. Secrets are encrypted with key
3499
2769
# based on what config file has. If config file is
3500
2770
# removed/edited, old secret will thus be unrecovable.
3502
2772
with PGPEngine() as pgp:
3503
for client in tcp_server.clients.values():
2773
for client in tcp_server.clients.itervalues():
3504
2774
key = client_settings[client.name]["secret"]
3505
2775
client.encrypted_secret = pgp.encrypt(client.secret,
3507
2777
client_dict = {}
3509
2779
# A list of attributes that can not be pickled
3511
exclude = {"bus", "changedstate", "secret",
3512
"checker", "server_settings"}
3513
for name, typ in inspect.getmembers(dbus.service
2781
exclude = { "bus", "changedstate", "secret",
2782
"checker", "server_settings" }
2783
for name, typ in (inspect.getmembers
2784
(dbus.service.Object)):
3515
2785
exclude.add(name)
3517
2787
client_dict["encrypted_secret"] = (client
3518
2788
.encrypted_secret)
3519
2789
for attr in client.client_structure:
3520
2790
if attr not in exclude:
3521
2791
client_dict[attr] = getattr(client, attr)
3523
2793
clients[client.name] = client_dict
3524
2794
del client_settings[client.name]["secret"]
3527
with tempfile.NamedTemporaryFile(
3531
dir=os.path.dirname(stored_state_path),
3532
delete=False) as stored_state:
3533
pickle.dump((clients, client_settings), stored_state,
3535
tempname = stored_state.name
2797
with (tempfile.NamedTemporaryFile
2798
(mode='wb', suffix=".pickle", prefix='clients-',
2799
dir=os.path.dirname(stored_state_path),
2800
delete=False)) as stored_state:
2801
pickle.dump((clients, client_settings), stored_state)
2802
tempname=stored_state.name
3536
2803
os.rename(tempname, stored_state_path)
3537
2804
except (IOError, OSError) as e: