168
233
os.rmdir(self.tempdir)
169
234
self.tempdir = None
171
236
def password_encode(self, password):
172
237
# Passphrase can not be empty and can not contain newlines or
173
238
# NUL bytes. So we prefix it and hex encode it.
174
return b"mandos" + binascii.hexlify(password)
239
encoded = b"mandos" + binascii.hexlify(password)
240
if len(encoded) > 2048:
241
# GnuPG can't handle long passwords, so encode differently
242
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
243
.replace(b"\n", b"\\n")
244
.replace(b"\0", b"\\x00"))
176
247
def encrypt(self, data, password):
177
self.gnupg.passphrase = self.password_encode(password)
178
with open(os.devnull) as devnull:
180
proc = self.gnupg.run(['--symmetric'],
181
create_fhs=['stdin', 'stdout'],
182
attach_fhs={'stderr': devnull})
183
with contextlib.closing(proc.handles['stdin']) as f:
185
with contextlib.closing(proc.handles['stdout']) as f:
186
ciphertext = f.read()
190
self.gnupg.passphrase = None
248
passphrase = self.password_encode(password)
249
with tempfile.NamedTemporaryFile(
250
dir=self.tempdir) as passfile:
251
passfile.write(passphrase)
253
proc = subprocess.Popen([self.gpg, '--symmetric',
257
stdin=subprocess.PIPE,
258
stdout=subprocess.PIPE,
259
stderr=subprocess.PIPE)
260
ciphertext, err = proc.communicate(input=data)
261
if proc.returncode != 0:
191
263
return ciphertext
193
265
def decrypt(self, data, password):
194
self.gnupg.passphrase = self.password_encode(password)
195
with open(os.devnull) as devnull:
197
proc = self.gnupg.run(['--decrypt'],
198
create_fhs=['stdin', 'stdout'],
199
attach_fhs={'stderr': devnull})
200
with contextlib.closing(proc.handles['stdin'] ) as f:
202
with contextlib.closing(proc.handles['stdout']) as f:
203
decrypted_plaintext = f.read()
207
self.gnupg.passphrase = None
266
passphrase = self.password_encode(password)
267
with tempfile.NamedTemporaryFile(
268
dir=self.tempdir) as passfile:
269
passfile.write(passphrase)
271
proc = subprocess.Popen([self.gpg, '--decrypt',
275
stdin=subprocess.PIPE,
276
stdout=subprocess.PIPE,
277
stderr=subprocess.PIPE)
278
decrypted_plaintext, err = proc.communicate(input=data)
279
if proc.returncode != 0:
208
281
return decrypted_plaintext
284
# Pretend that we have an Avahi module
286
"""This isn't so much a class as it is a module-like namespace."""
287
IF_UNSPEC = -1 # avahi-common/address.h
288
PROTO_UNSPEC = -1 # avahi-common/address.h
289
PROTO_INET = 0 # avahi-common/address.h
290
PROTO_INET6 = 1 # avahi-common/address.h
291
DBUS_NAME = "org.freedesktop.Avahi"
292
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
293
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
294
DBUS_PATH_SERVER = "/"
297
def string_array_to_txt_array(t):
298
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
299
for s in t), signature="ay")
300
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
301
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
302
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
303
SERVER_INVALID = 0 # avahi-common/defs.h
304
SERVER_REGISTERING = 1 # avahi-common/defs.h
305
SERVER_RUNNING = 2 # avahi-common/defs.h
306
SERVER_COLLISION = 3 # avahi-common/defs.h
307
SERVER_FAILURE = 4 # avahi-common/defs.h
212
310
class AvahiError(Exception):
213
311
def __init__(self, value, *args, **kwargs):
214
312
self.value = value
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
313
return super(AvahiError, self).__init__(value, *args,
219
317
class AvahiServiceError(AvahiError):
222
321
class AvahiGroupError(AvahiError):
226
class AvahiService(object):
227
326
"""An Avahi (Zeroconf) service.
230
329
interface: integer; avahi.IF_UNSPEC or an interface index.
231
330
Used to optionally bind to the specified interface.
232
331
name: string; Example: 'Mandos'
233
332
type: string; Example: '_mandos._tcp'.
234
See <http://www.dns-sd.org/ServiceTypes.html>
333
See <https://www.iana.org/assignments/service-names-port-numbers>
235
334
port: integer; what port to announce
236
335
TXT: list of strings; TXT record for the service
237
336
domain: string; Domain to publish on, default to .local if empty.
366
495
follow_name_owner_changes=True),
367
496
avahi.DBUS_INTERFACE_SERVER)
368
497
self.server.connect_to_signal("StateChanged",
369
self.server_state_changed)
498
self.server_state_changed)
370
499
self.server_state_changed(self.server.GetState())
372
502
class AvahiServiceToSyslog(AvahiService):
503
def rename(self, *args, **kwargs):
374
504
"""Add the new name to the syslog messages"""
375
ret = AvahiService.rename(self)
376
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
505
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
506
syslogger.setFormatter(logging.Formatter(
507
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
382
def timedelta_to_milliseconds(td):
383
"Convert a datetime.timedelta() to milliseconds"
384
return ((td.days * 24 * 60 * 60 * 1000)
385
+ (td.seconds * 1000)
386
+ (td.microseconds // 1000))
388
class Client(object):
512
# Pretend that we have a GnuTLS module
514
"""This isn't so much a class as it is a module-like namespace."""
516
library = ctypes.util.find_library("gnutls")
518
library = ctypes.util.find_library("gnutls-deb0")
519
_library = ctypes.cdll.LoadLibrary(library)
522
# Unless otherwise indicated, the constants and types below are
523
# all from the gnutls/gnutls.h C header file.
534
E_NO_CERTIFICATE_FOUND = -49
539
KEYID_USE_SHA256 = 1 # gnutls/x509.h
540
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
543
class session_int(ctypes.Structure):
545
session_t = ctypes.POINTER(session_int)
547
class certificate_credentials_st(ctypes.Structure):
549
certificate_credentials_t = ctypes.POINTER(
550
certificate_credentials_st)
551
certificate_type_t = ctypes.c_int
553
class datum_t(ctypes.Structure):
554
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
555
('size', ctypes.c_uint)]
557
class openpgp_crt_int(ctypes.Structure):
559
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
560
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
561
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
562
credentials_type_t = ctypes.c_int
563
transport_ptr_t = ctypes.c_void_p
564
close_request_t = ctypes.c_int
567
class Error(Exception):
568
def __init__(self, message=None, code=None, args=()):
569
# Default usage is by a message string, but if a return
570
# code is passed, convert it to a string with
573
if message is None and code is not None:
574
message = gnutls.strerror(code)
575
return super(gnutls.Error, self).__init__(
578
class CertificateSecurityError(Error):
584
self._c_object = gnutls.certificate_credentials_t()
585
gnutls.certificate_allocate_credentials(
586
ctypes.byref(self._c_object))
587
self.type = gnutls.CRD_CERTIFICATE
590
gnutls.certificate_free_credentials(self._c_object)
593
def __init__(self, socket, credentials=None):
594
self._c_object = gnutls.session_t()
595
gnutls_flags = gnutls.CLIENT
596
if gnutls.check_version(b"3.5.6"):
597
gnutls_flags |= gnutls.NO_TICKETS
599
gnutls_flags |= gnutls.ENABLE_RAWPK
600
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
602
gnutls.set_default_priority(self._c_object)
603
gnutls.transport_set_ptr(self._c_object, socket.fileno())
604
gnutls.handshake_set_private_extensions(self._c_object,
607
if credentials is None:
608
credentials = gnutls.Credentials()
609
gnutls.credentials_set(self._c_object, credentials.type,
610
ctypes.cast(credentials._c_object,
612
self.credentials = credentials
615
gnutls.deinit(self._c_object)
618
return gnutls.handshake(self._c_object)
620
def send(self, data):
624
data_len -= gnutls.record_send(self._c_object,
629
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
631
# Error handling functions
632
def _error_code(result):
633
"""A function to raise exceptions on errors, suitable
634
for the 'restype' attribute on ctypes functions"""
637
if result == gnutls.E_NO_CERTIFICATE_FOUND:
638
raise gnutls.CertificateSecurityError(code=result)
639
raise gnutls.Error(code=result)
641
def _retry_on_error(result, func, arguments):
642
"""A function to retry on some errors, suitable
643
for the 'errcheck' attribute on ctypes functions"""
645
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
646
return _error_code(result)
647
result = func(*arguments)
650
# Unless otherwise indicated, the function declarations below are
651
# all from the gnutls/gnutls.h C header file.
654
priority_set_direct = _library.gnutls_priority_set_direct
655
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
656
ctypes.POINTER(ctypes.c_char_p)]
657
priority_set_direct.restype = _error_code
659
init = _library.gnutls_init
660
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
661
init.restype = _error_code
663
set_default_priority = _library.gnutls_set_default_priority
664
set_default_priority.argtypes = [session_t]
665
set_default_priority.restype = _error_code
667
record_send = _library.gnutls_record_send
668
record_send.argtypes = [session_t, ctypes.c_void_p,
670
record_send.restype = ctypes.c_ssize_t
671
record_send.errcheck = _retry_on_error
673
certificate_allocate_credentials = (
674
_library.gnutls_certificate_allocate_credentials)
675
certificate_allocate_credentials.argtypes = [
676
ctypes.POINTER(certificate_credentials_t)]
677
certificate_allocate_credentials.restype = _error_code
679
certificate_free_credentials = (
680
_library.gnutls_certificate_free_credentials)
681
certificate_free_credentials.argtypes = [
682
certificate_credentials_t]
683
certificate_free_credentials.restype = None
685
handshake_set_private_extensions = (
686
_library.gnutls_handshake_set_private_extensions)
687
handshake_set_private_extensions.argtypes = [session_t,
689
handshake_set_private_extensions.restype = None
691
credentials_set = _library.gnutls_credentials_set
692
credentials_set.argtypes = [session_t, credentials_type_t,
694
credentials_set.restype = _error_code
696
strerror = _library.gnutls_strerror
697
strerror.argtypes = [ctypes.c_int]
698
strerror.restype = ctypes.c_char_p
700
certificate_type_get = _library.gnutls_certificate_type_get
701
certificate_type_get.argtypes = [session_t]
702
certificate_type_get.restype = _error_code
704
certificate_get_peers = _library.gnutls_certificate_get_peers
705
certificate_get_peers.argtypes = [session_t,
706
ctypes.POINTER(ctypes.c_uint)]
707
certificate_get_peers.restype = ctypes.POINTER(datum_t)
709
global_set_log_level = _library.gnutls_global_set_log_level
710
global_set_log_level.argtypes = [ctypes.c_int]
711
global_set_log_level.restype = None
713
global_set_log_function = _library.gnutls_global_set_log_function
714
global_set_log_function.argtypes = [log_func]
715
global_set_log_function.restype = None
717
deinit = _library.gnutls_deinit
718
deinit.argtypes = [session_t]
719
deinit.restype = None
721
handshake = _library.gnutls_handshake
722
handshake.argtypes = [session_t]
723
handshake.restype = _error_code
724
handshake.errcheck = _retry_on_error
726
transport_set_ptr = _library.gnutls_transport_set_ptr
727
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
728
transport_set_ptr.restype = None
730
bye = _library.gnutls_bye
731
bye.argtypes = [session_t, close_request_t]
732
bye.restype = _error_code
733
bye.errcheck = _retry_on_error
735
check_version = _library.gnutls_check_version
736
check_version.argtypes = [ctypes.c_char_p]
737
check_version.restype = ctypes.c_char_p
739
_need_version = b"3.3.0"
740
if check_version(_need_version) is None:
741
raise self.Error("Needs GnuTLS {} or later"
742
.format(_need_version))
744
_tls_rawpk_version = b"3.6.6"
745
has_rawpk = bool(check_version(_tls_rawpk_version))
749
class pubkey_st(ctypes.Structure):
751
pubkey_t = ctypes.POINTER(pubkey_st)
753
x509_crt_fmt_t = ctypes.c_int
755
# All the function declarations below are from gnutls/abstract.h
756
pubkey_init = _library.gnutls_pubkey_init
757
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
758
pubkey_init.restype = _error_code
760
pubkey_import = _library.gnutls_pubkey_import
761
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
763
pubkey_import.restype = _error_code
765
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
766
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
767
ctypes.POINTER(ctypes.c_ubyte),
768
ctypes.POINTER(ctypes.c_size_t)]
769
pubkey_get_key_id.restype = _error_code
771
pubkey_deinit = _library.gnutls_pubkey_deinit
772
pubkey_deinit.argtypes = [pubkey_t]
773
pubkey_deinit.restype = None
775
# All the function declarations below are from gnutls/openpgp.h
777
openpgp_crt_init = _library.gnutls_openpgp_crt_init
778
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
779
openpgp_crt_init.restype = _error_code
781
openpgp_crt_import = _library.gnutls_openpgp_crt_import
782
openpgp_crt_import.argtypes = [openpgp_crt_t,
783
ctypes.POINTER(datum_t),
785
openpgp_crt_import.restype = _error_code
787
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
788
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
789
ctypes.POINTER(ctypes.c_uint)]
790
openpgp_crt_verify_self.restype = _error_code
792
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
793
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
794
openpgp_crt_deinit.restype = None
796
openpgp_crt_get_fingerprint = (
797
_library.gnutls_openpgp_crt_get_fingerprint)
798
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
802
openpgp_crt_get_fingerprint.restype = _error_code
804
if check_version(b"3.6.4"):
805
certificate_type_get2 = _library.gnutls_certificate_type_get2
806
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
807
certificate_type_get2.restype = _error_code
809
# Remove non-public functions
810
del _error_code, _retry_on_error
813
def call_pipe(connection, # : multiprocessing.Connection
814
func, *args, **kwargs):
815
"""This function is meant to be called by multiprocessing.Process
817
This function runs func(*args, **kwargs), and writes the resulting
818
return value on the provided multiprocessing.Connection.
820
connection.send(func(*args, **kwargs))
389
825
"""A representation of a client host served by this server.
392
828
approved: bool(); 'None' if not yet approved/disapproved
393
829
approval_delay: datetime.timedelta(); Time to wait for approval
394
830
approval_duration: datetime.timedelta(); Duration of one approval
395
checker: subprocess.Popen(); a running checker process used
396
to see if the client lives.
397
'None' if no process is running.
398
checker_callback_tag: a gobject event source tag, or None
831
checker: multiprocessing.Process(); a running checker process used
832
to see if the client lives. 'None' if no process is
834
checker_callback_tag: a GLib event source tag, or None
399
835
checker_command: string; External command which is run to check
400
836
if client lives. %() expansions are done at
401
837
runtime with vars(self) as dict, so that for
402
838
instance %(name)s can be used in the command.
403
checker_initiator_tag: a gobject event source tag, or None
839
checker_initiator_tag: a GLib event source tag, or None
404
840
created: datetime.datetime(); (UTC) object creation
405
841
client_structure: Object describing what attributes a client has
406
842
and is used for storing the client at exit
407
843
current_checker_command: string; current running checker_command
408
disable_initiator_tag: a gobject event source tag, or None
844
disable_initiator_tag: a GLib event source tag, or None
410
846
fingerprint: string (40 or 32 hexadecimal digits); used to
411
uniquely identify the client
847
uniquely identify an OpenPGP client
848
key_id: string (64 hexadecimal digits); used to uniquely identify
849
a client using raw public keys
412
850
host: string; available for use by the checker command
413
851
interval: datetime.timedelta(); How often to start a new checker
414
852
last_approval_request: datetime.datetime(); (UTC) or None
415
853
last_checked_ok: datetime.datetime(); (UTC) or None
416
854
last_checker_status: integer between 0 and 255 reflecting exit
417
855
status of last checker. -1 reflects crashed
856
checker, -2 means no checker completed yet.
857
last_checker_signal: The signal which killed the last checker, if
858
last_checker_status is -1
419
859
last_enabled: datetime.datetime(); (UTC) or None
420
860
name: string; from the config file, used in log messages and
421
861
D-Bus identifiers
422
862
secret: bytestring; sent verbatim (over TLS) to client
423
863
timeout: datetime.timedelta(); How long from last_checked_ok
424
864
until this client is disabled
425
extended_timeout: extra long timeout when password has been sent
865
extended_timeout: extra long timeout when secret has been sent
426
866
runtime_expansions: Allowed attributes for runtime expansion.
427
867
expires: datetime.datetime(); time (UTC) when a client will be
428
868
disabled, or None
869
server_settings: The server_settings dict from main()
431
872
runtime_expansions = ("approval_delay", "approval_duration",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
873
"created", "enabled", "expires", "key_id",
874
"fingerprint", "host", "interval",
875
"last_approval_request", "last_checked_ok",
434
876
"last_enabled", "name", "timeout")
435
client_defaults = { "timeout": "5m",
436
"extended_timeout": "15m",
438
"checker": "fping -q -- %%(host)s",
440
"approval_delay": "0s",
441
"approval_duration": "1s",
442
"approved_by_default": "True",
446
def timeout_milliseconds(self):
447
"Return the 'timeout' attribute in milliseconds"
448
return timedelta_to_milliseconds(self.timeout)
450
def extended_timeout_milliseconds(self):
451
"Return the 'extended_timeout' attribute in milliseconds"
452
return timedelta_to_milliseconds(self.extended_timeout)
454
def interval_milliseconds(self):
455
"Return the 'interval' attribute in milliseconds"
456
return timedelta_to_milliseconds(self.interval)
458
def approval_delay_milliseconds(self):
459
return timedelta_to_milliseconds(self.approval_delay)
879
"extended_timeout": "PT15M",
881
"checker": "fping -q -- %%(host)s",
883
"approval_delay": "PT0S",
884
"approval_duration": "PT1S",
885
"approved_by_default": "True",
462
890
def config_parser(config):
463
""" Construct a new dict of client settings of this form:
891
"""Construct a new dict of client settings of this form:
464
892
{ client_name: {setting_name: value, ...}, ...}
465
with exceptions for any special settings as defined above"""
893
with exceptions for any special settings as defined above.
894
NOTE: Must be a pure function. Must return the same result
895
value given the same arguments.
467
898
for client_name in config.sections():
468
899
section = dict(config.items(client_name))
469
900
client = settings[client_name] = {}
471
902
client["host"] = section["host"]
472
903
# Reformat values from string types to Python types
473
904
client["approved_by_default"] = config.getboolean(
474
905
client_name, "approved_by_default")
475
client["enabled"] = config.getboolean(client_name, "enabled")
906
client["enabled"] = config.getboolean(client_name,
909
# Uppercase and remove spaces from key_id and fingerprint
910
# for later comparison purposes with return value from the
911
# key_id() and fingerprint() functions
912
client["key_id"] = (section.get("key_id", "").upper()
477
914
client["fingerprint"] = (section["fingerprint"].upper()
478
915
.replace(" ", ""))
479
916
if "secret" in section:
480
client["secret"] = section["secret"].decode("base64")
917
client["secret"] = codecs.decode(section["secret"]
481
920
elif "secfile" in section:
482
921
with open(os.path.expanduser(os.path.expandvars
483
922
(section["secfile"])),
484
923
"rb") as secfile:
485
924
client["secret"] = secfile.read()
487
raise TypeError("No secret or secfile for section %s"
926
raise TypeError("No secret or secfile for section {}"
489
928
client["timeout"] = string_to_delta(section["timeout"])
490
929
client["extended_timeout"] = string_to_delta(
491
930
section["extended_timeout"])
533
973
self.current_checker_command = None
534
974
self.approved = None
535
975
self.approvals_pending = 0
536
self.changedstate = (multiprocessing_manager
537
.Condition(multiprocessing_manager
539
self.client_structure = [attr for attr in
540
self.__dict__.iterkeys()
976
self.changedstate = multiprocessing_manager.Condition(
977
multiprocessing_manager.Lock())
978
self.client_structure = [attr
979
for attr in self.__dict__.keys()
541
980
if not attr.startswith("_")]
542
981
self.client_structure.append("client_structure")
544
for name, t in inspect.getmembers(type(self),
983
for name, t in inspect.getmembers(
984
type(self), lambda obj: isinstance(obj, property)):
548
985
if not name.startswith("_"):
549
986
self.client_structure.append(name)
551
988
# Send notice to process children that client state has changed
552
989
def send_changedstate(self):
553
990
with self.changedstate:
554
991
self.changedstate.notify_all()
556
993
def enable(self):
557
994
"""Start this client's checker and timeout hooks"""
558
995
if getattr(self, "enabled", False):
559
996
# Already enabled
561
self.send_changedstate()
562
998
self.expires = datetime.datetime.utcnow() + self.timeout
563
999
self.enabled = True
564
1000
self.last_enabled = datetime.datetime.utcnow()
565
1001
self.init_checker()
1002
self.send_changedstate()
567
1004
def disable(self, quiet=True):
568
1005
"""Disable this client."""
569
1006
if not getattr(self, "enabled", False):
572
self.send_changedstate()
574
1009
logger.info("Disabling client %s", self.name)
575
if getattr(self, "disable_initiator_tag", False):
576
gobject.source_remove(self.disable_initiator_tag)
1010
if getattr(self, "disable_initiator_tag", None) is not None:
1011
GLib.source_remove(self.disable_initiator_tag)
577
1012
self.disable_initiator_tag = None
578
1013
self.expires = None
579
if getattr(self, "checker_initiator_tag", False):
580
gobject.source_remove(self.checker_initiator_tag)
1014
if getattr(self, "checker_initiator_tag", None) is not None:
1015
GLib.source_remove(self.checker_initiator_tag)
581
1016
self.checker_initiator_tag = None
582
1017
self.stop_checker()
583
1018
self.enabled = False
584
# Do not run this again if called by a gobject.timeout_add
1020
self.send_changedstate()
1021
# Do not run this again if called by a GLib.timeout_add
587
1024
def __del__(self):
590
1027
def init_checker(self):
591
1028
# Schedule a new checker to be started an 'interval' from now,
592
1029
# and every interval from then on.
593
self.checker_initiator_tag = (gobject.timeout_add
594
(self.interval_milliseconds(),
1030
if self.checker_initiator_tag is not None:
1031
GLib.source_remove(self.checker_initiator_tag)
1032
self.checker_initiator_tag = GLib.timeout_add(
1033
int(self.interval.total_seconds() * 1000),
596
1035
# Schedule a disable() when 'timeout' has passed
597
self.disable_initiator_tag = (gobject.timeout_add
598
(self.timeout_milliseconds(),
1036
if self.disable_initiator_tag is not None:
1037
GLib.source_remove(self.disable_initiator_tag)
1038
self.disable_initiator_tag = GLib.timeout_add(
1039
int(self.timeout.total_seconds() * 1000), self.disable)
600
1040
# Also start a new checker *right now*.
601
1041
self.start_checker()
603
def checker_callback(self, pid, condition, command):
1043
def checker_callback(self, source, condition, connection,
604
1045
"""The checker has completed, so take appropriate actions."""
1046
# Read return code from connection (see call_pipe)
1047
returncode = connection.recv()
605
1050
self.checker_callback_tag = None
606
1051
self.checker = None
607
if os.WIFEXITED(condition):
608
self.last_checker_status = os.WEXITSTATUS(condition)
1054
self.last_checker_status = returncode
1055
self.last_checker_signal = None
609
1056
if self.last_checker_status == 0:
610
1057
logger.info("Checker for %(name)s succeeded",
612
1059
self.checked_ok()
614
logger.info("Checker for %(name)s failed",
1061
logger.info("Checker for %(name)s failed", vars(self))
617
1063
self.last_checker_status = -1
1064
self.last_checker_signal = -returncode
618
1065
logger.warning("Checker for %(name)s crashed?",
621
def checked_ok(self, timeout=None):
622
"""Bump up the timeout for this client.
624
This should only be called when the client has been seen,
1069
def checked_ok(self):
1070
"""Assert that the client has been seen, alive and well."""
1071
self.last_checked_ok = datetime.datetime.utcnow()
1072
self.last_checker_status = 0
1073
self.last_checker_signal = None
1076
def bump_timeout(self, timeout=None):
1077
"""Bump up the timeout for this client."""
627
1078
if timeout is None:
628
1079
timeout = self.timeout
629
self.last_checked_ok = datetime.datetime.utcnow()
630
1080
if self.disable_initiator_tag is not None:
631
gobject.source_remove(self.disable_initiator_tag)
1081
GLib.source_remove(self.disable_initiator_tag)
1082
self.disable_initiator_tag = None
632
1083
if getattr(self, "enabled", False):
633
self.disable_initiator_tag = (gobject.timeout_add
634
(timedelta_to_milliseconds
635
(timeout), self.disable))
1084
self.disable_initiator_tag = GLib.timeout_add(
1085
int(timeout.total_seconds() * 1000), self.disable)
636
1086
self.expires = datetime.datetime.utcnow() + timeout
638
1088
def need_approval(self):
639
1089
self.last_approval_request = datetime.datetime.utcnow()
641
1091
def start_checker(self):
642
1092
"""Start a new checker subprocess if one is not running.
644
1094
If a checker already exists, leave it running and do
646
1096
# The reason for not killing a running checker is that if we
647
# did that, then if a checker (for some reason) started
648
# running slowly and taking more than 'interval' time, the
649
# client would inevitably timeout, since no checker would get
650
# a chance to run to completion. If we instead leave running
1097
# did that, and if a checker (for some reason) started running
1098
# slowly and taking more than 'interval' time, then the client
1099
# would inevitably timeout, since no checker would get a
1100
# chance to run to completion. If we instead leave running
651
1101
# checkers alone, the checker would have to take more time
652
1102
# than 'timeout' for the client to be disabled, which is as it
655
# If a checker exists, make sure it is not a zombie
657
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
658
except (AttributeError, OSError) as error:
659
if (isinstance(error, OSError)
660
and error.errno != errno.ECHILD):
664
logger.warning("Checker was a zombie")
665
gobject.source_remove(self.checker_callback_tag)
666
self.checker_callback(pid, status,
667
self.current_checker_command)
1105
if self.checker is not None and not self.checker.is_alive():
1106
logger.warning("Checker was not alive; joining")
668
1109
# Start a new checker if needed
669
1110
if self.checker is None:
1111
# Escape attributes for the shell
1113
attr: re.escape(str(getattr(self, attr)))
1114
for attr in self.runtime_expansions}
671
# In case checker_command has exactly one % operator
672
command = self.checker_command % self.host
674
# Escape attributes for the shell
675
escaped_attrs = dict(
677
re.escape(unicode(str(getattr(self, attr, "")),
681
self.runtime_expansions)
684
command = self.checker_command % escaped_attrs
685
except TypeError as error:
686
logger.error('Could not format string "%s":'
687
' %s', self.checker_command, error)
688
return True # Try again later
1116
command = self.checker_command % escaped_attrs
1117
except TypeError as error:
1118
logger.error('Could not format string "%s"',
1119
self.checker_command,
1121
return True # Try again later
689
1122
self.current_checker_command = command
691
logger.info("Starting checker %r for %s",
693
# We don't need to redirect stdout and stderr, since
694
# in normal mode, that is already done by daemon(),
695
# and in debug mode we don't want to. (Stdin is
696
# always replaced by /dev/null.)
697
self.checker = subprocess.Popen(command,
700
self.checker_callback_tag = (gobject.child_watch_add
702
self.checker_callback,
704
# The checker may have completed before the gobject
705
# watch was added. Check for this.
706
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
708
gobject.source_remove(self.checker_callback_tag)
709
self.checker_callback(pid, status, command)
710
except OSError as error:
711
logger.error("Failed to start subprocess: %s",
713
# Re-run this periodically if run by gobject.timeout_add
1123
logger.info("Starting checker %r for %s", command,
1125
# We don't need to redirect stdout and stderr, since
1126
# in normal mode, that is already done by daemon(),
1127
# and in debug mode we don't want to. (Stdin is
1128
# always replaced by /dev/null.)
1129
# The exception is when not debugging but nevertheless
1130
# running in the foreground; use the previously
1132
popen_args = {"close_fds": True,
1135
if (not self.server_settings["debug"]
1136
and self.server_settings["foreground"]):
1137
popen_args.update({"stdout": wnull,
1139
pipe = multiprocessing.Pipe(duplex=False)
1140
self.checker = multiprocessing.Process(
1142
args=(pipe[1], subprocess.call, command),
1144
self.checker.start()
1145
self.checker_callback_tag = GLib.io_add_watch(
1146
pipe[0].fileno(), GLib.IO_IN,
1147
self.checker_callback, pipe[0], command)
1148
# Re-run this periodically if run by GLib.timeout_add
716
1151
def stop_checker(self):
717
1152
"""Force the checker process, if any, to stop."""
718
1153
if self.checker_callback_tag:
719
gobject.source_remove(self.checker_callback_tag)
1154
GLib.source_remove(self.checker_callback_tag)
720
1155
self.checker_callback_tag = None
721
1156
if getattr(self, "checker", None) is None:
723
1158
logger.debug("Stopping checker for %(name)s", vars(self))
725
os.kill(self.checker.pid, signal.SIGTERM)
727
#if self.checker.poll() is None:
728
# os.kill(self.checker.pid, signal.SIGKILL)
729
except OSError as error:
730
if error.errno != errno.ESRCH: # No such process
1159
self.checker.terminate()
732
1160
self.checker = None
735
def dbus_service_property(dbus_interface, signature="v",
736
access="readwrite", byte_arrays=False):
1163
def dbus_service_property(dbus_interface,
737
1167
"""Decorators for marking methods of a DBusObjectWithProperties to
738
1168
become properties on the D-Bus.
740
1170
The decorated method will be called with no arguments by "Get"
741
1171
and with one argument by "Set".
743
1173
The parameters, where they are supported, are the same as
744
1174
dbus.service.method, except there is only "signature", since the
745
1175
type from Get() and the type sent to Set() is the same.
784
class DBusObjectWithProperties(dbus.service.Object):
1258
class DBusObjectWithAnnotations(dbus.service.Object):
1259
"""A D-Bus object with annotations.
1261
Classes inheriting from this can use the dbus_annotations
1262
decorator to add annotations to methods or signals.
1266
def _is_dbus_thing(thing):
1267
"""Returns a function testing if an attribute is a D-Bus thing
1269
If called like _is_dbus_thing("method") it returns a function
1270
suitable for use as predicate to inspect.getmembers().
1272
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1275
def _get_all_dbus_things(self, thing):
1276
"""Returns a generator of (name, attribute) pairs
1278
return ((getattr(athing.__get__(self), "_dbus_name", name),
1279
athing.__get__(self))
1280
for cls in self.__class__.__mro__
1282
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1284
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1286
path_keyword='object_path',
1287
connection_keyword='connection')
1288
def Introspect(self, object_path, connection):
1289
"""Overloading of standard D-Bus method.
1291
Inserts annotation tags on methods and signals.
1293
xmlstring = dbus.service.Object.Introspect(self, object_path,
1296
document = xml.dom.minidom.parseString(xmlstring)
1298
for if_tag in document.getElementsByTagName("interface"):
1299
# Add annotation tags
1300
for typ in ("method", "signal"):
1301
for tag in if_tag.getElementsByTagName(typ):
1303
for name, prop in (self.
1304
_get_all_dbus_things(typ)):
1305
if (name == tag.getAttribute("name")
1306
and prop._dbus_interface
1307
== if_tag.getAttribute("name")):
1308
annots.update(getattr(
1309
prop, "_dbus_annotations", {}))
1310
for name, value in annots.items():
1311
ann_tag = document.createElement(
1313
ann_tag.setAttribute("name", name)
1314
ann_tag.setAttribute("value", value)
1315
tag.appendChild(ann_tag)
1316
# Add interface annotation tags
1317
for annotation, value in dict(
1318
itertools.chain.from_iterable(
1319
annotations().items()
1320
for name, annotations
1321
in self._get_all_dbus_things("interface")
1322
if name == if_tag.getAttribute("name")
1324
ann_tag = document.createElement("annotation")
1325
ann_tag.setAttribute("name", annotation)
1326
ann_tag.setAttribute("value", value)
1327
if_tag.appendChild(ann_tag)
1328
# Fix argument name for the Introspect method itself
1329
if (if_tag.getAttribute("name")
1330
== dbus.INTROSPECTABLE_IFACE):
1331
for cn in if_tag.getElementsByTagName("method"):
1332
if cn.getAttribute("name") == "Introspect":
1333
for arg in cn.getElementsByTagName("arg"):
1334
if (arg.getAttribute("direction")
1336
arg.setAttribute("name",
1338
xmlstring = document.toxml("utf-8")
1340
except (AttributeError, xml.dom.DOMException,
1341
xml.parsers.expat.ExpatError) as error:
1342
logger.error("Failed to override Introspection method",
1347
class DBusObjectWithProperties(DBusObjectWithAnnotations):
785
1348
"""A D-Bus object with properties.
787
1350
Classes inheriting from this can use the dbus_service_property
788
1351
decorator to expose methods as D-Bus properties. It exposes the
789
1352
standard Get(), Set(), and GetAll() methods on the D-Bus.
793
def _is_dbus_property(obj):
794
return getattr(obj, "_dbus_is_property", False)
796
def _get_all_dbus_properties(self):
797
"""Returns a generator of (name, attribute) pairs
799
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
800
for cls in self.__class__.__mro__
802
inspect.getmembers(cls, self._is_dbus_property))
804
1355
def _get_dbus_property(self, interface_name, property_name):
805
1356
"""Returns a bound method if one exists which is a D-Bus
806
1357
property with the specified name and interface.
808
for cls in self.__class__.__mro__:
809
for name, value in (inspect.getmembers
810
(cls, self._is_dbus_property)):
1359
for cls in self.__class__.__mro__:
1360
for name, value in inspect.getmembers(
1361
cls, self._is_dbus_thing("property")):
811
1362
if (value._dbus_name == property_name
812
1363
and value._dbus_interface == interface_name):
813
1364
return value.__get__(self)
815
1366
# No such property
816
raise DBusPropertyNotFound(self.dbus_object_path + ":"
817
+ interface_name + "."
820
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1367
raise DBusPropertyNotFound("{}:{}.{}".format(
1368
self.dbus_object_path, interface_name, property_name))
1371
def _get_all_interface_names(cls):
1372
"""Get a sequence of all interfaces supported by an object"""
1373
return (name for name in set(getattr(getattr(x, attr),
1374
"_dbus_interface", None)
1375
for x in (inspect.getmro(cls))
1377
if name is not None)
1379
@dbus.service.method(dbus.PROPERTIES_IFACE,
821
1381
out_signature="v")
822
1382
def Get(self, interface_name, property_name):
823
1383
"""Standard D-Bus property Get() method, see D-Bus standard.
915
1508
except (AttributeError, xml.dom.DOMException,
916
1509
xml.parsers.expat.ExpatError) as error:
917
1510
logger.error("Failed to override Introspection method",
922
def datetime_to_dbus (dt, variant_level=0):
1516
dbus.OBJECT_MANAGER_IFACE
1517
except AttributeError:
1518
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1521
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1522
"""A D-Bus object with an ObjectManager.
1524
Classes inheriting from this exposes the standard
1525
GetManagedObjects call and the InterfacesAdded and
1526
InterfacesRemoved signals on the standard
1527
"org.freedesktop.DBus.ObjectManager" interface.
1529
Note: No signals are sent automatically; they must be sent
1532
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1533
out_signature="a{oa{sa{sv}}}")
1534
def GetManagedObjects(self):
1535
"""This function must be overridden"""
1536
raise NotImplementedError()
1538
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1539
signature="oa{sa{sv}}")
1540
def InterfacesAdded(self, object_path, interfaces_and_properties):
1543
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1544
def InterfacesRemoved(self, object_path, interfaces):
1547
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1549
path_keyword='object_path',
1550
connection_keyword='connection')
1551
def Introspect(self, object_path, connection):
1552
"""Overloading of standard D-Bus method.
1554
Override return argument name of GetManagedObjects to be
1555
"objpath_interfaces_and_properties"
1557
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1561
document = xml.dom.minidom.parseString(xmlstring)
1563
for if_tag in document.getElementsByTagName("interface"):
1564
# Fix argument name for the GetManagedObjects method
1565
if (if_tag.getAttribute("name")
1566
== dbus.OBJECT_MANAGER_IFACE):
1567
for cn in if_tag.getElementsByTagName("method"):
1568
if (cn.getAttribute("name")
1569
== "GetManagedObjects"):
1570
for arg in cn.getElementsByTagName("arg"):
1571
if (arg.getAttribute("direction")
1575
"objpath_interfaces"
1577
xmlstring = document.toxml("utf-8")
1579
except (AttributeError, xml.dom.DOMException,
1580
xml.parsers.expat.ExpatError) as error:
1581
logger.error("Failed to override Introspection method",
1586
def datetime_to_dbus(dt, variant_level=0):
923
1587
"""Convert a UTC datetime.datetime() to a D-Bus type."""
925
return dbus.String("", variant_level = variant_level)
926
return dbus.String(dt.isoformat(),
927
variant_level=variant_level)
930
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
932
"""Applied to an empty subclass of a D-Bus object, this metaclass
933
will add additional D-Bus attributes matching a certain pattern.
1589
return dbus.String("", variant_level=variant_level)
1590
return dbus.String(dt.isoformat(), variant_level=variant_level)
1593
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1594
"""A class decorator; applied to a subclass of
1595
dbus.service.Object, it will add alternate D-Bus attributes with
1596
interface names according to the "alt_interface_names" mapping.
1599
@alternate_dbus_interfaces({"org.example.Interface":
1600
"net.example.AlternateInterface"})
1601
class SampleDBusObject(dbus.service.Object):
1602
@dbus.service.method("org.example.Interface")
1603
def SampleDBusMethod():
1606
The above "SampleDBusMethod" on "SampleDBusObject" will be
1607
reachable via two interfaces: "org.example.Interface" and
1608
"net.example.AlternateInterface", the latter of which will have
1609
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1610
"true", unless "deprecate" is passed with a False value.
1612
This works for methods and signals, and also for D-Bus properties
1613
(from DBusObjectWithProperties) and interfaces (from the
1614
dbus_interface_annotations decorator).
935
def __new__(mcs, name, bases, attr):
936
# Go through all the base classes which could have D-Bus
937
# methods, signals, or properties in them
938
for base in (b for b in bases
939
if issubclass(b, dbus.service.Object)):
940
# Go though all attributes of the base class
941
for attrname, attribute in inspect.getmembers(base):
1618
for orig_interface_name, alt_interface_name in (
1619
alt_interface_names.items()):
1621
interface_names = set()
1622
# Go though all attributes of the class
1623
for attrname, attribute in inspect.getmembers(cls):
942
1624
# Ignore non-D-Bus attributes, and D-Bus attributes
943
1625
# with the wrong interface name
944
1626
if (not hasattr(attribute, "_dbus_interface")
945
or not attribute._dbus_interface
946
.startswith("se.recompile.Mandos")):
1627
or not attribute._dbus_interface.startswith(
1628
orig_interface_name)):
948
1630
# Create an alternate D-Bus interface name based on
949
1631
# the current name
950
alt_interface = (attribute._dbus_interface
951
.replace("se.recompile.Mandos",
952
"se.bsnet.fukt.Mandos"))
1632
alt_interface = attribute._dbus_interface.replace(
1633
orig_interface_name, alt_interface_name)
1634
interface_names.add(alt_interface)
953
1635
# Is this a D-Bus signal?
954
1636
if getattr(attribute, "_dbus_is_signal", False):
955
# Extract the original non-method function by
957
nonmethod_func = (dict(
1637
# Extract the original non-method undecorated
1638
# function by black magic
1639
if sys.version_info.major == 2:
1640
nonmethod_func = (dict(
958
1641
zip(attribute.func_code.co_freevars,
959
attribute.__closure__))["func"]
1642
attribute.__closure__))
1643
["func"].cell_contents)
1645
nonmethod_func = (dict(
1646
zip(attribute.__code__.co_freevars,
1647
attribute.__closure__))
1648
["func"].cell_contents)
961
1649
# Create a new, but exactly alike, function
962
1650
# object, and decorate it to be a new D-Bus signal
963
1651
# with the alternate D-Bus interface name
964
new_function = (dbus.service.signal
966
attribute._dbus_signature)
968
nonmethod_func.func_code,
969
nonmethod_func.func_globals,
970
nonmethod_func.func_name,
971
nonmethod_func.func_defaults,
972
nonmethod_func.func_closure)))
1652
new_function = copy_function(nonmethod_func)
1653
new_function = (dbus.service.signal(
1655
attribute._dbus_signature)(new_function))
1656
# Copy annotations, if any
1658
new_function._dbus_annotations = dict(
1659
attribute._dbus_annotations)
1660
except AttributeError:
973
1663
# Define a creator of a function to call both the
974
# old and new functions, so both the old and new
975
# signals gets sent when the function is called
1664
# original and alternate functions, so both the
1665
# original and alternate signals gets sent when
1666
# the function is called
976
1667
def fixscope(func1, func2):
977
1668
"""This function is a scope container to pass
978
1669
func1 and func2 to the "call_both" function
979
1670
outside of its arguments"""
1672
@functools.wraps(func2)
980
1673
def call_both(*args, **kwargs):
981
1674
"""This function will emit two D-Bus
982
1675
signals by calling func1 and func2"""
983
1676
func1(*args, **kwargs)
984
1677
func2(*args, **kwargs)
1678
# Make wrapper function look like a D-Bus
1680
for name, attr in inspect.getmembers(func2):
1681
if name.startswith("_dbus_"):
1682
setattr(call_both, name, attr)
985
1684
return call_both
986
1685
# Create the "call_both" function and add it to
988
attr[attrname] = fixscope(attribute,
1687
attr[attrname] = fixscope(attribute, new_function)
990
1688
# Is this a D-Bus method?
991
1689
elif getattr(attribute, "_dbus_is_method", False):
992
1690
# Create a new, but exactly alike, function
993
1691
# object. Decorate it to be a new D-Bus method
994
1692
# with the alternate D-Bus interface name. Add it
996
attr[attrname] = (dbus.service.method
998
attribute._dbus_in_signature,
999
attribute._dbus_out_signature)
1001
(attribute.func_code,
1002
attribute.func_globals,
1003
attribute.func_name,
1004
attribute.func_defaults,
1005
attribute.func_closure)))
1695
dbus.service.method(
1697
attribute._dbus_in_signature,
1698
attribute._dbus_out_signature)
1699
(copy_function(attribute)))
1700
# Copy annotations, if any
1702
attr[attrname]._dbus_annotations = dict(
1703
attribute._dbus_annotations)
1704
except AttributeError:
1006
1706
# Is this a D-Bus property?
1007
1707
elif getattr(attribute, "_dbus_is_property", False):
1008
1708
# Create a new, but exactly alike, function
1009
1709
# object, and decorate it to be a new D-Bus
1010
1710
# property with the alternate D-Bus interface
1011
1711
# name. Add it to the class.
1012
attr[attrname] = (dbus_service_property
1014
attribute._dbus_signature,
1015
attribute._dbus_access,
1017
._dbus_get_args_options
1020
(attribute.func_code,
1021
attribute.func_globals,
1022
attribute.func_name,
1023
attribute.func_defaults,
1024
attribute.func_closure)))
1025
return type.__new__(mcs, name, bases, attr)
1712
attr[attrname] = (dbus_service_property(
1713
alt_interface, attribute._dbus_signature,
1714
attribute._dbus_access,
1715
attribute._dbus_get_args_options
1717
(copy_function(attribute)))
1718
# Copy annotations, if any
1720
attr[attrname]._dbus_annotations = dict(
1721
attribute._dbus_annotations)
1722
except AttributeError:
1724
# Is this a D-Bus interface?
1725
elif getattr(attribute, "_dbus_is_interface", False):
1726
# Create a new, but exactly alike, function
1727
# object. Decorate it to be a new D-Bus interface
1728
# with the alternate D-Bus interface name. Add it
1731
dbus_interface_annotations(alt_interface)
1732
(copy_function(attribute)))
1734
# Deprecate all alternate interfaces
1735
iname = "_AlternateDBusNames_interface_annotation{}"
1736
for interface_name in interface_names:
1738
@dbus_interface_annotations(interface_name)
1740
return {"org.freedesktop.DBus.Deprecated":
1742
# Find an unused name
1743
for aname in (iname.format(i)
1744
for i in itertools.count()):
1745
if aname not in attr:
1749
# Replace the class with a new subclass of it with
1750
# methods, signals, etc. as created above.
1751
if sys.version_info.major == 2:
1752
cls = type(b"{}Alternate".format(cls.__name__),
1755
cls = type("{}Alternate".format(cls.__name__),
1762
@alternate_dbus_interfaces({"se.recompile.Mandos":
1763
"se.bsnet.fukt.Mandos"})
1028
1764
class ClientDBus(Client, DBusObjectWithProperties):
1029
1765
"""A Client class using D-Bus
1032
1768
dbus_object_path: dbus.ObjectPath
1033
1769
bus: dbus.SystemBus()
1036
1772
runtime_expansions = (Client.runtime_expansions
1037
+ ("dbus_object_path",))
1773
+ ("dbus_object_path", ))
1775
_interface = "se.recompile.Mandos.Client"
1039
1777
# dbus.service.Object doesn't use super(), so we can't either.
1041
def __init__(self, bus = None, *args, **kwargs):
1779
def __init__(self, bus=None, *args, **kwargs):
1043
1781
Client.__init__(self, *args, **kwargs)
1044
self._approvals_pending = 0
1046
self._approvals_pending = 0
1047
1782
# Only now, when this client is initialized, can it show up on
1049
client_object_name = unicode(self.name).translate(
1784
client_object_name = str(self.name).translate(
1050
1785
{ord("."): ord("_"),
1051
1786
ord("-"): ord("_")})
1052
self.dbus_object_path = (dbus.ObjectPath
1053
("/clients/" + client_object_name))
1787
self.dbus_object_path = dbus.ObjectPath(
1788
"/clients/" + client_object_name)
1054
1789
DBusObjectWithProperties.__init__(self, self.bus,
1055
1790
self.dbus_object_path)
1057
def notifychangeproperty(transform_func,
1058
dbus_name, type_func=lambda x: x,
1792
def notifychangeproperty(transform_func, dbus_name,
1793
type_func=lambda x: x,
1795
invalidate_only=False,
1796
_interface=_interface):
1060
1797
""" Modify a variable so that it's a property which announces
1061
1798
its changes to DBus.
1063
1800
transform_fun: Function that takes a value and a variant_level
1064
1801
and transforms it to a D-Bus type.
1065
1802
dbus_name: D-Bus name of the variable
1067
1804
to the D-Bus. Default: no transform
1068
1805
variant_level: D-Bus variant level. Default: 1
1070
attrname = "_{0}".format(dbus_name)
1807
attrname = "_{}".format(dbus_name)
1071
1809
def setter(self, value):
1072
1810
if hasattr(self, "dbus_object_path"):
1073
1811
if (not hasattr(self, attrname) or
1074
1812
type_func(getattr(self, attrname, None))
1075
1813
!= type_func(value)):
1076
dbus_value = transform_func(type_func(value),
1079
self.PropertyChanged(dbus.String(dbus_name),
1815
self.PropertiesChanged(
1816
_interface, dbus.Dictionary(),
1817
dbus.Array((dbus_name, )))
1819
dbus_value = transform_func(
1821
variant_level=variant_level)
1822
self.PropertyChanged(dbus.String(dbus_name),
1824
self.PropertiesChanged(
1826
dbus.Dictionary({dbus.String(dbus_name):
1081
1829
setattr(self, attrname, value)
1083
1831
return property(lambda self: getattr(self, attrname), setter)
1086
1833
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1087
1834
approvals_pending = notifychangeproperty(dbus.Boolean,
1088
1835
"ApprovalPending",
1090
1837
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1091
1838
last_enabled = notifychangeproperty(datetime_to_dbus,
1093
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1094
type_func = lambda checker:
1095
checker is not None)
1840
checker = notifychangeproperty(
1841
dbus.Boolean, "CheckerRunning",
1842
type_func=lambda checker: checker is not None)
1096
1843
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1097
1844
"LastCheckedOK")
1845
last_checker_status = notifychangeproperty(dbus.Int16,
1846
"LastCheckerStatus")
1098
1847
last_approval_request = notifychangeproperty(
1099
1848
datetime_to_dbus, "LastApprovalRequest")
1100
1849
approved_by_default = notifychangeproperty(dbus.Boolean,
1101
1850
"ApprovedByDefault")
1102
approval_delay = notifychangeproperty(dbus.UInt64,
1105
timedelta_to_milliseconds)
1851
approval_delay = notifychangeproperty(
1852
dbus.UInt64, "ApprovalDelay",
1853
type_func=lambda td: td.total_seconds() * 1000)
1106
1854
approval_duration = notifychangeproperty(
1107
1855
dbus.UInt64, "ApprovalDuration",
1108
type_func = timedelta_to_milliseconds)
1856
type_func=lambda td: td.total_seconds() * 1000)
1109
1857
host = notifychangeproperty(dbus.String, "Host")
1110
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1112
timedelta_to_milliseconds)
1858
timeout = notifychangeproperty(
1859
dbus.UInt64, "Timeout",
1860
type_func=lambda td: td.total_seconds() * 1000)
1113
1861
extended_timeout = notifychangeproperty(
1114
1862
dbus.UInt64, "ExtendedTimeout",
1115
type_func = timedelta_to_milliseconds)
1116
interval = notifychangeproperty(dbus.UInt64,
1119
timedelta_to_milliseconds)
1863
type_func=lambda td: td.total_seconds() * 1000)
1864
interval = notifychangeproperty(
1865
dbus.UInt64, "Interval",
1866
type_func=lambda td: td.total_seconds() * 1000)
1120
1867
checker_command = notifychangeproperty(dbus.String, "Checker")
1868
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1869
invalidate_only=True)
1122
1871
del notifychangeproperty
1124
1873
def __del__(self, *args, **kwargs):
1126
1875
self.remove_from_connection()
1206
1954
server to mandos-client
1210
1958
# Rejected - signal
1211
1959
@dbus.service.signal(_interface, signature="s")
1212
1960
def Rejected(self, reason):
1216
1964
# NeedApproval - signal
1217
1965
@dbus.service.signal(_interface, signature="tb")
1218
1966
def NeedApproval(self, timeout, default):
1220
1968
return self.need_approval()
1222
# NeRwequest - signal
1223
@dbus.service.signal(_interface, signature="s")
1224
def NewRequest(self, ip):
1226
Is sent after a client request a password.
1232
1972
# Approve - method
1233
1973
@dbus.service.method(_interface, in_signature="b")
1234
1974
def Approve(self, value):
1235
1975
self.approve(value)
1237
1977
# CheckedOK - method
1238
1978
@dbus.service.method(_interface)
1239
1979
def CheckedOK(self):
1240
1980
self.checked_ok()
1242
1982
# Enable - method
1983
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1243
1984
@dbus.service.method(_interface)
1244
1985
def Enable(self):
1248
1989
# StartChecker - method
1990
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1249
1991
@dbus.service.method(_interface)
1250
1992
def StartChecker(self):
1252
1994
self.start_checker()
1254
1996
# Disable - method
1997
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1255
1998
@dbus.service.method(_interface)
1256
1999
def Disable(self):
1260
2003
# StopChecker - method
2004
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1261
2005
@dbus.service.method(_interface)
1262
2006
def StopChecker(self):
1263
2007
self.stop_checker()
1267
2011
# ApprovalPending - property
1268
2012
@dbus_service_property(_interface, signature="b", access="read")
1269
2013
def ApprovalPending_dbus_property(self):
1270
2014
return dbus.Boolean(bool(self.approvals_pending))
1272
2016
# ApprovedByDefault - property
1273
@dbus_service_property(_interface, signature="b",
2017
@dbus_service_property(_interface,
1274
2019
access="readwrite")
1275
2020
def ApprovedByDefault_dbus_property(self, value=None):
1276
2021
if value is None: # get
1277
2022
return dbus.Boolean(self.approved_by_default)
1278
2023
self.approved_by_default = bool(value)
1280
2025
# ApprovalDelay - property
1281
@dbus_service_property(_interface, signature="t",
2026
@dbus_service_property(_interface,
1282
2028
access="readwrite")
1283
2029
def ApprovalDelay_dbus_property(self, value=None):
1284
2030
if value is None: # get
1285
return dbus.UInt64(self.approval_delay_milliseconds())
2031
return dbus.UInt64(self.approval_delay.total_seconds()
1286
2033
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1288
2035
# ApprovalDuration - property
1289
@dbus_service_property(_interface, signature="t",
2036
@dbus_service_property(_interface,
1290
2038
access="readwrite")
1291
2039
def ApprovalDuration_dbus_property(self, value=None):
1292
2040
if value is None: # get
1293
return dbus.UInt64(timedelta_to_milliseconds(
1294
self.approval_duration))
2041
return dbus.UInt64(self.approval_duration.total_seconds()
1295
2043
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1297
2045
# Name - property
2047
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1298
2048
@dbus_service_property(_interface, signature="s", access="read")
1299
2049
def Name_dbus_property(self):
1300
2050
return dbus.String(self.name)
2054
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2055
@dbus_service_property(_interface, signature="s", access="read")
2056
def KeyID_dbus_property(self):
2057
return dbus.String(self.key_id)
1302
2059
# Fingerprint - property
2061
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1303
2062
@dbus_service_property(_interface, signature="s", access="read")
1304
2063
def Fingerprint_dbus_property(self):
1305
2064
return dbus.String(self.fingerprint)
1307
2066
# Host - property
1308
@dbus_service_property(_interface, signature="s",
2067
@dbus_service_property(_interface,
1309
2069
access="readwrite")
1310
2070
def Host_dbus_property(self, value=None):
1311
2071
if value is None: # get
1312
2072
return dbus.String(self.host)
1313
self.host = unicode(value)
2073
self.host = str(value)
1315
2075
# Created - property
2077
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1316
2078
@dbus_service_property(_interface, signature="s", access="read")
1317
2079
def Created_dbus_property(self):
1318
2080
return datetime_to_dbus(self.created)
1320
2082
# LastEnabled - property
1321
2083
@dbus_service_property(_interface, signature="s", access="read")
1322
2084
def LastEnabled_dbus_property(self):
1323
2085
return datetime_to_dbus(self.last_enabled)
1325
2087
# Enabled - property
1326
@dbus_service_property(_interface, signature="b",
2088
@dbus_service_property(_interface,
1327
2090
access="readwrite")
1328
2091
def Enabled_dbus_property(self, value=None):
1329
2092
if value is None: # get
1336
2099
# LastCheckedOK - property
1337
@dbus_service_property(_interface, signature="s",
2100
@dbus_service_property(_interface,
1338
2102
access="readwrite")
1339
2103
def LastCheckedOK_dbus_property(self, value=None):
1340
2104
if value is not None:
1341
2105
self.checked_ok()
1343
2107
return datetime_to_dbus(self.last_checked_ok)
2109
# LastCheckerStatus - property
2110
@dbus_service_property(_interface, signature="n", access="read")
2111
def LastCheckerStatus_dbus_property(self):
2112
return dbus.Int16(self.last_checker_status)
1345
2114
# Expires - property
1346
2115
@dbus_service_property(_interface, signature="s", access="read")
1347
2116
def Expires_dbus_property(self):
1348
2117
return datetime_to_dbus(self.expires)
1350
2119
# LastApprovalRequest - property
1351
2120
@dbus_service_property(_interface, signature="s", access="read")
1352
2121
def LastApprovalRequest_dbus_property(self):
1353
2122
return datetime_to_dbus(self.last_approval_request)
1355
2124
# Timeout - property
1356
@dbus_service_property(_interface, signature="t",
2125
@dbus_service_property(_interface,
1357
2127
access="readwrite")
1358
2128
def Timeout_dbus_property(self, value=None):
1359
2129
if value is None: # get
1360
return dbus.UInt64(self.timeout_milliseconds())
2130
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2131
old_timeout = self.timeout
1361
2132
self.timeout = datetime.timedelta(0, 0, 0, value)
1362
if getattr(self, "disable_initiator_tag", None) is None:
1364
# Reschedule timeout
1365
gobject.source_remove(self.disable_initiator_tag)
1366
self.disable_initiator_tag = None
1368
time_to_die = timedelta_to_milliseconds((self
1373
if time_to_die <= 0:
1374
# The timeout has passed
1377
self.expires = (datetime.datetime.utcnow()
1378
+ datetime.timedelta(milliseconds =
1380
self.disable_initiator_tag = (gobject.timeout_add
1381
(time_to_die, self.disable))
2133
# Reschedule disabling
2135
now = datetime.datetime.utcnow()
2136
self.expires += self.timeout - old_timeout
2137
if self.expires <= now:
2138
# The timeout has passed
2141
if (getattr(self, "disable_initiator_tag", None)
2144
GLib.source_remove(self.disable_initiator_tag)
2145
self.disable_initiator_tag = GLib.timeout_add(
2146
int((self.expires - now).total_seconds() * 1000),
1383
2149
# ExtendedTimeout - property
1384
@dbus_service_property(_interface, signature="t",
2150
@dbus_service_property(_interface,
1385
2152
access="readwrite")
1386
2153
def ExtendedTimeout_dbus_property(self, value=None):
1387
2154
if value is None: # get
1388
return dbus.UInt64(self.extended_timeout_milliseconds())
2155
return dbus.UInt64(self.extended_timeout.total_seconds()
1389
2157
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1391
2159
# Interval - property
1392
@dbus_service_property(_interface, signature="t",
2160
@dbus_service_property(_interface,
1393
2162
access="readwrite")
1394
2163
def Interval_dbus_property(self, value=None):
1395
2164
if value is None: # get
1396
return dbus.UInt64(self.interval_milliseconds())
2165
return dbus.UInt64(self.interval.total_seconds() * 1000)
1397
2166
self.interval = datetime.timedelta(0, 0, 0, value)
1398
2167
if getattr(self, "checker_initiator_tag", None) is None:
1400
2169
if self.enabled:
1401
2170
# Reschedule checker run
1402
gobject.source_remove(self.checker_initiator_tag)
1403
self.checker_initiator_tag = (gobject.timeout_add
1404
(value, self.start_checker))
1405
self.start_checker() # Start one now, too
2171
GLib.source_remove(self.checker_initiator_tag)
2172
self.checker_initiator_tag = GLib.timeout_add(
2173
value, self.start_checker)
2174
self.start_checker() # Start one now, too
1407
2176
# Checker - property
1408
@dbus_service_property(_interface, signature="s",
2177
@dbus_service_property(_interface,
1409
2179
access="readwrite")
1410
2180
def Checker_dbus_property(self, value=None):
1411
2181
if value is None: # get
1412
2182
return dbus.String(self.checker_command)
1413
self.checker_command = unicode(value)
2183
self.checker_command = str(value)
1415
2185
# CheckerRunning - property
1416
@dbus_service_property(_interface, signature="b",
2186
@dbus_service_property(_interface,
1417
2188
access="readwrite")
1418
2189
def CheckerRunning_dbus_property(self, value=None):
1419
2190
if value is None: # get
1452
2231
if data[0] == 'data':
1454
2233
if data[0] == 'function':
1455
2235
def func(*args, **kwargs):
1456
2236
self._pipe.send(('funcall', name, args, kwargs))
1457
2237
return self._pipe.recv()[1]
1460
2241
def __setattr__(self, name, value):
1461
2242
if name == '_pipe':
1462
2243
return super(ProxyClient, self).__setattr__(name, value)
1463
2244
self._pipe.send(('setattr', name, value))
1466
class ClientDBusTransitional(ClientDBus):
1467
__metaclass__ = AlternateDBusNamesMetaclass
1470
2247
class ClientHandler(socketserver.BaseRequestHandler, object):
1471
2248
"""A class to handle client connections.
1473
2250
Instantiated once for each connection to handle it.
1474
2251
Note: This will run in its own forked process."""
1476
2253
def handle(self):
1477
2254
with contextlib.closing(self.server.child_pipe) as child_pipe:
1478
2255
logger.info("TCP connection from: %s",
1479
unicode(self.client_address))
2256
str(self.client_address))
1480
2257
logger.debug("Pipe FD: %d",
1481
2258
self.server.child_pipe.fileno())
1483
session = (gnutls.connection
1484
.ClientSession(self.request,
1486
.X509Credentials()))
1488
# Note: gnutls.connection.X509Credentials is really a
1489
# generic GnuTLS certificate credentials object so long as
1490
# no X.509 keys are added to it. Therefore, we can use it
1491
# here despite using OpenPGP certificates.
1493
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1494
# "+AES-256-CBC", "+SHA1",
1495
# "+COMP-NULL", "+CTYPE-OPENPGP",
2260
session = gnutls.ClientSession(self.request)
2262
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2263
# "+AES-256-CBC", "+SHA1",
2264
# "+COMP-NULL", "+CTYPE-OPENPGP",
1497
2266
# Use a fallback default, since this MUST be set.
1498
2267
priority = self.server.gnutls_priority
1499
2268
if priority is None:
1500
2269
priority = "NORMAL"
1501
(gnutls.library.functions
1502
.gnutls_priority_set_direct(session._c_object,
2270
gnutls.priority_set_direct(session._c_object,
2271
priority.encode("utf-8"),
1505
2274
# Start communication using the Mandos protocol
1506
2275
# Get protocol number
1507
2276
line = self.request.makefile().readline()
1508
2277
logger.debug("Protocol version: %r", line)
1510
2279
if int(line.strip().split()[0]) > 1:
2280
raise RuntimeError(line)
1512
2281
except (ValueError, IndexError, RuntimeError) as error:
1513
2282
logger.error("Unknown protocol version: %s", error)
1516
2285
# Start GnuTLS connection
1518
2287
session.handshake()
1519
except gnutls.errors.GNUTLSError as error:
2288
except gnutls.Error as error:
1520
2289
logger.warning("Handshake failed: %s", error)
1521
2290
# Do not run session.bye() here: the session is not
1522
2291
# established. Just abandon the request.
1524
2293
logger.debug("Handshake succeeded")
1526
2295
approval_required = False
1529
fpr = self.fingerprint(self.peer_certificate
1532
gnutls.errors.GNUTLSError) as error:
1533
logger.warning("Bad certificate: %s", error)
1535
logger.debug("Fingerprint: %s", fpr)
1538
client = ProxyClient(child_pipe, fpr,
2297
if gnutls.has_rawpk:
2300
key_id = self.key_id(
2301
self.peer_certificate(session))
2302
except (TypeError, gnutls.Error) as error:
2303
logger.warning("Bad certificate: %s", error)
2305
logger.debug("Key ID: %s", key_id)
2310
fpr = self.fingerprint(
2311
self.peer_certificate(session))
2312
except (TypeError, gnutls.Error) as error:
2313
logger.warning("Bad certificate: %s", error)
2315
logger.debug("Fingerprint: %s", fpr)
2318
client = ProxyClient(child_pipe, key_id, fpr,
1539
2319
self.client_address)
1540
2320
except KeyError:
1543
if self.server.use_dbus:
1545
client.NewRequest(str(self.client_address))
1547
2323
if client.approval_delay:
1548
2324
delay = client.approval_delay
1549
2325
client.approvals_pending += 1
1550
2326
approval_required = True
1553
2329
if not client.enabled:
1554
2330
logger.info("Client %s is disabled",
1556
2332
if self.server.use_dbus:
1557
2333
# Emit D-Bus signal
1558
2334
client.Rejected("Disabled")
1561
2337
if client.approved or not client.approval_delay:
1562
#We are approved or approval is disabled
2338
# We are approved or approval is disabled
1564
2340
elif client.approved is None:
1565
2341
logger.info("Client %s needs approval",
1600
2374
delay -= time2 - time
1603
while sent_size < len(client.secret):
1605
sent = session.send(client.secret[sent_size:])
1606
except gnutls.errors.GNUTLSError as error:
1607
logger.warning("gnutls send failed")
1609
logger.debug("Sent: %d, remaining: %d",
1610
sent, len(client.secret)
1611
- (sent_size + sent))
2377
session.send(client.secret)
2378
except gnutls.Error as error:
2379
logger.warning("gnutls send failed",
1614
2383
logger.info("Sending secret to %s", client.name)
1615
2384
# bump the timeout using extended_timeout
1616
client.checked_ok(client.extended_timeout)
2385
client.bump_timeout(client.extended_timeout)
1617
2386
if self.server.use_dbus:
1618
2387
# Emit D-Bus signal
1619
2388
client.GotSecret()
1622
2391
if approval_required:
1623
2392
client.approvals_pending -= 1
1626
except gnutls.errors.GNUTLSError as error:
1627
logger.warning("GnuTLS bye failed")
2395
except gnutls.Error as error:
2396
logger.warning("GnuTLS bye failed",
1630
2400
def peer_certificate(session):
1631
"Return the peer's OpenPGP certificate as a bytestring"
1632
# If not an OpenPGP certificate...
1633
if (gnutls.library.functions
1634
.gnutls_certificate_type_get(session._c_object)
1635
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1636
# ...do the normal thing
1637
return session.peer_certificate
2401
"Return the peer's certificate as a bytestring"
2403
cert_type = gnutls.certificate_type_get2(session._c_object,
2405
except AttributeError:
2406
cert_type = gnutls.certificate_type_get(session._c_object)
2407
if gnutls.has_rawpk:
2408
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2410
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2411
# If not a valid certificate type...
2412
if cert_type not in valid_cert_types:
2413
logger.info("Cert type %r not in %r", cert_type,
2415
# ...return invalid data
1638
2417
list_size = ctypes.c_uint(1)
1639
cert_list = (gnutls.library.functions
1640
.gnutls_certificate_get_peers
2418
cert_list = (gnutls.certificate_get_peers
1641
2419
(session._c_object, ctypes.byref(list_size)))
1642
2420
if not bool(cert_list) and list_size.value != 0:
1643
raise gnutls.errors.GNUTLSError("error getting peer"
2421
raise gnutls.Error("error getting peer certificate")
1645
2422
if list_size.value == 0:
1647
2424
cert = cert_list[0]
1648
2425
return ctypes.string_at(cert.data, cert.size)
2428
def key_id(certificate):
2429
"Convert a certificate bytestring to a hexdigit key ID"
2430
# New GnuTLS "datum" with the public key
2431
datum = gnutls.datum_t(
2432
ctypes.cast(ctypes.c_char_p(certificate),
2433
ctypes.POINTER(ctypes.c_ubyte)),
2434
ctypes.c_uint(len(certificate)))
2435
# XXX all these need to be created in the gnutls "module"
2436
# New empty GnuTLS certificate
2437
pubkey = gnutls.pubkey_t()
2438
gnutls.pubkey_init(ctypes.byref(pubkey))
2439
# Import the raw public key into the certificate
2440
gnutls.pubkey_import(pubkey,
2441
ctypes.byref(datum),
2442
gnutls.X509_FMT_DER)
2443
# New buffer for the key ID
2444
buf = ctypes.create_string_buffer(32)
2445
buf_len = ctypes.c_size_t(len(buf))
2446
# Get the key ID from the raw public key into the buffer
2447
gnutls.pubkey_get_key_id(pubkey,
2448
gnutls.KEYID_USE_SHA256,
2449
ctypes.cast(ctypes.byref(buf),
2450
ctypes.POINTER(ctypes.c_ubyte)),
2451
ctypes.byref(buf_len))
2452
# Deinit the certificate
2453
gnutls.pubkey_deinit(pubkey)
2455
# Convert the buffer to a Python bytestring
2456
key_id = ctypes.string_at(buf, buf_len.value)
2457
# Convert the bytestring to hexadecimal notation
2458
hex_key_id = binascii.hexlify(key_id).upper()
1651
2462
def fingerprint(openpgp):
1652
2463
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1653
2464
# New GnuTLS "datum" with the OpenPGP public key
1654
datum = (gnutls.library.types
1655
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1658
ctypes.c_uint(len(openpgp))))
2465
datum = gnutls.datum_t(
2466
ctypes.cast(ctypes.c_char_p(openpgp),
2467
ctypes.POINTER(ctypes.c_ubyte)),
2468
ctypes.c_uint(len(openpgp)))
1659
2469
# New empty GnuTLS certificate
1660
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1661
(gnutls.library.functions
1662
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2470
crt = gnutls.openpgp_crt_t()
2471
gnutls.openpgp_crt_init(ctypes.byref(crt))
1663
2472
# Import the OpenPGP public key into the certificate
1664
(gnutls.library.functions
1665
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1666
gnutls.library.constants
1667
.GNUTLS_OPENPGP_FMT_RAW))
2473
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2474
gnutls.OPENPGP_FMT_RAW)
1668
2475
# Verify the self signature in the key
1669
2476
crtverify = ctypes.c_uint()
1670
(gnutls.library.functions
1671
.gnutls_openpgp_crt_verify_self(crt, 0,
1672
ctypes.byref(crtverify)))
2477
gnutls.openpgp_crt_verify_self(crt, 0,
2478
ctypes.byref(crtverify))
1673
2479
if crtverify.value != 0:
1674
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1675
raise (gnutls.errors.CertificateSecurityError
2480
gnutls.openpgp_crt_deinit(crt)
2481
raise gnutls.CertificateSecurityError(code
1677
2483
# New buffer for the fingerprint
1678
2484
buf = ctypes.create_string_buffer(20)
1679
2485
buf_len = ctypes.c_size_t()
1680
2486
# Get the fingerprint from the certificate into the buffer
1681
(gnutls.library.functions
1682
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1683
ctypes.byref(buf_len)))
2487
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2488
ctypes.byref(buf_len))
1684
2489
# Deinit the certificate
1685
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2490
gnutls.openpgp_crt_deinit(crt)
1686
2491
# Convert the buffer to a Python bytestring
1687
2492
fpr = ctypes.string_at(buf, buf_len.value)
1688
2493
# Convert the bytestring to hexadecimal notation
1693
class MultiprocessingMixIn(object):
2498
class MultiprocessingMixIn:
1694
2499
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1695
2501
def sub_process_main(self, request, address):
1697
2503
self.finish_request(request, address)
1698
2504
except Exception:
1699
2505
self.handle_error(request, address)
1700
2506
self.close_request(request)
1702
2508
def process_request(self, request, address):
1703
2509
"""Start a new process to process the request."""
1704
proc = multiprocessing.Process(target = self.sub_process_main,
2510
proc = multiprocessing.Process(target=self.sub_process_main,
2511
args=(request, address))
1711
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2516
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
1712
2517
""" adds a pipe to the MixIn """
1713
2519
def process_request(self, request, client_address):
1714
2520
"""Overrides and wraps the original process_request().
1716
2522
This function creates a new pipe in self.pipe
1718
2524
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1720
2526
proc = MultiprocessingMixIn.process_request(self, request,
1721
2527
client_address)
1722
2528
self.child_pipe.close()
1723
2529
self.add_pipe(parent_pipe, proc)
1725
2531
def add_pipe(self, parent_pipe, proc):
1726
2532
"""Dummy function; override as necessary"""
1727
raise NotImplementedError
2533
raise NotImplementedError()
1730
2536
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1731
socketserver.TCPServer, object):
2537
socketserver.TCPServer):
1732
2538
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1735
2541
enabled: Boolean; whether this server is activated yet
1736
2542
interface: None or a network interface name (string)
1737
2543
use_ipv6: Boolean; to use IPv6 or not
1739
2546
def __init__(self, server_address, RequestHandlerClass,
1740
interface=None, use_ipv6=True):
2550
"""If socketfd is set, use that file descriptor instead of
2551
creating a new one with socket.socket().
1741
2553
self.interface = interface
1743
2555
self.address_family = socket.AF_INET6
2556
if socketfd is not None:
2557
# Save the file descriptor
2558
self.socketfd = socketfd
2559
# Save the original socket.socket() function
2560
self.socket_socket = socket.socket
2562
# To implement --socket, we monkey patch socket.socket.
2564
# (When socketserver.TCPServer is a new-style class, we
2565
# could make self.socket into a property instead of monkey
2566
# patching socket.socket.)
2568
# Create a one-time-only replacement for socket.socket()
2569
@functools.wraps(socket.socket)
2570
def socket_wrapper(*args, **kwargs):
2571
# Restore original function so subsequent calls are
2573
socket.socket = self.socket_socket
2574
del self.socket_socket
2575
# This time only, return a new socket object from the
2576
# saved file descriptor.
2577
return socket.fromfd(self.socketfd, *args, **kwargs)
2578
# Replace socket.socket() function with wrapper
2579
socket.socket = socket_wrapper
2580
# The socketserver.TCPServer.__init__ will call
2581
# socket.socket(), which might be our replacement,
2582
# socket_wrapper(), if socketfd was set.
1744
2583
socketserver.TCPServer.__init__(self, server_address,
1745
2584
RequestHandlerClass)
1746
2586
def server_bind(self):
1747
2587
"""This overrides the normal server_bind() function
1748
2588
to bind to an interface if one was specified, and also NOT to
1749
2589
bind to an address or port if they were not specified."""
2590
global SO_BINDTODEVICE
1750
2591
if self.interface is not None:
1751
2592
if SO_BINDTODEVICE is None:
1752
logger.error("SO_BINDTODEVICE does not exist;"
1753
" cannot bind to interface %s",
1757
self.socket.setsockopt(socket.SOL_SOCKET,
1761
except socket.error as error:
1762
if error[0] == errno.EPERM:
1763
logger.error("No permission to"
1764
" bind to interface %s",
1766
elif error[0] == errno.ENOPROTOOPT:
1767
logger.error("SO_BINDTODEVICE not available;"
1768
" cannot bind to interface %s",
2593
# Fall back to a hard-coded value which seems to be
2595
logger.warning("SO_BINDTODEVICE not found, trying 25")
2596
SO_BINDTODEVICE = 25
2598
self.socket.setsockopt(
2599
socket.SOL_SOCKET, SO_BINDTODEVICE,
2600
(self.interface + "\0").encode("utf-8"))
2601
except socket.error as error:
2602
if error.errno == errno.EPERM:
2603
logger.error("No permission to bind to"
2604
" interface %s", self.interface)
2605
elif error.errno == errno.ENOPROTOOPT:
2606
logger.error("SO_BINDTODEVICE not available;"
2607
" cannot bind to interface %s",
2609
elif error.errno == errno.ENODEV:
2610
logger.error("Interface %s does not exist,"
2611
" cannot bind", self.interface)
1772
2614
# Only bind(2) the socket if we really need to.
1773
2615
if self.server_address[0] or self.server_address[1]:
2616
if self.server_address[1]:
2617
self.allow_reuse_address = True
1774
2618
if not self.server_address[0]:
1775
2619
if self.address_family == socket.AF_INET6:
1776
any_address = "::" # in6addr_any
2620
any_address = "::" # in6addr_any
1778
any_address = socket.INADDR_ANY
2622
any_address = "0.0.0.0" # INADDR_ANY
1779
2623
self.server_address = (any_address,
1780
2624
self.server_address[1])
1781
2625
elif not self.server_address[1]:
1782
self.server_address = (self.server_address[0],
2626
self.server_address = (self.server_address[0], 0)
1784
2627
# if self.interface:
1785
2628
# self.server_address = (self.server_address[0],
1889
2732
funcname = request[1]
1890
2733
args = request[2]
1891
2734
kwargs = request[3]
1893
2736
parent_pipe.send(('data', getattr(client_object,
1894
2737
funcname)(*args,
1897
2740
if command == 'getattr':
1898
2741
attrname = request[1]
1899
if callable(client_object.__getattribute__(attrname)):
1900
parent_pipe.send(('function',))
2742
if isinstance(client_object.__getattribute__(attrname),
2743
collections.Callable):
2744
parent_pipe.send(('function', ))
1902
parent_pipe.send(('data', client_object
1903
.__getattribute__(attrname)))
2747
'data', client_object.__getattribute__(attrname)))
1905
2749
if command == 'setattr':
1906
2750
attrname = request[1]
1907
2751
value = request[2]
1908
2752
setattr(client_object, attrname, value)
2757
def rfc3339_duration_to_delta(duration):
2758
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2760
>>> rfc3339_duration_to_delta("P7D")
2761
datetime.timedelta(7)
2762
>>> rfc3339_duration_to_delta("PT60S")
2763
datetime.timedelta(0, 60)
2764
>>> rfc3339_duration_to_delta("PT60M")
2765
datetime.timedelta(0, 3600)
2766
>>> rfc3339_duration_to_delta("PT24H")
2767
datetime.timedelta(1)
2768
>>> rfc3339_duration_to_delta("P1W")
2769
datetime.timedelta(7)
2770
>>> rfc3339_duration_to_delta("PT5M30S")
2771
datetime.timedelta(0, 330)
2772
>>> rfc3339_duration_to_delta("P1DT3M20S")
2773
datetime.timedelta(1, 200)
2776
# Parsing an RFC 3339 duration with regular expressions is not
2777
# possible - there would have to be multiple places for the same
2778
# values, like seconds. The current code, while more esoteric, is
2779
# cleaner without depending on a parsing library. If Python had a
2780
# built-in library for parsing we would use it, but we'd like to
2781
# avoid excessive use of external libraries.
2783
# New type for defining tokens, syntax, and semantics all-in-one
2784
Token = collections.namedtuple("Token", (
2785
"regexp", # To match token; if "value" is not None, must have
2786
# a "group" containing digits
2787
"value", # datetime.timedelta or None
2788
"followers")) # Tokens valid after this token
2789
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2790
# the "duration" ABNF definition in RFC 3339, Appendix A.
2791
token_end = Token(re.compile(r"$"), None, frozenset())
2792
token_second = Token(re.compile(r"(\d+)S"),
2793
datetime.timedelta(seconds=1),
2794
frozenset((token_end, )))
2795
token_minute = Token(re.compile(r"(\d+)M"),
2796
datetime.timedelta(minutes=1),
2797
frozenset((token_second, token_end)))
2798
token_hour = Token(re.compile(r"(\d+)H"),
2799
datetime.timedelta(hours=1),
2800
frozenset((token_minute, token_end)))
2801
token_time = Token(re.compile(r"T"),
2803
frozenset((token_hour, token_minute,
2805
token_day = Token(re.compile(r"(\d+)D"),
2806
datetime.timedelta(days=1),
2807
frozenset((token_time, token_end)))
2808
token_month = Token(re.compile(r"(\d+)M"),
2809
datetime.timedelta(weeks=4),
2810
frozenset((token_day, token_end)))
2811
token_year = Token(re.compile(r"(\d+)Y"),
2812
datetime.timedelta(weeks=52),
2813
frozenset((token_month, token_end)))
2814
token_week = Token(re.compile(r"(\d+)W"),
2815
datetime.timedelta(weeks=1),
2816
frozenset((token_end, )))
2817
token_duration = Token(re.compile(r"P"), None,
2818
frozenset((token_year, token_month,
2819
token_day, token_time,
2821
# Define starting values:
2823
value = datetime.timedelta()
2825
# Following valid tokens
2826
followers = frozenset((token_duration, ))
2827
# String left to parse
2829
# Loop until end token is found
2830
while found_token is not token_end:
2831
# Search for any currently valid tokens
2832
for token in followers:
2833
match = token.regexp.match(s)
2834
if match is not None:
2836
if token.value is not None:
2837
# Value found, parse digits
2838
factor = int(match.group(1), 10)
2839
# Add to value so far
2840
value += factor * token.value
2841
# Strip token from string
2842
s = token.regexp.sub("", s, 1)
2845
# Set valid next tokens
2846
followers = found_token.followers
2849
# No currently valid tokens were found
2850
raise ValueError("Invalid RFC 3339 duration: {!r}"
1913
2856
def string_to_delta(interval):
1914
2857
"""Parse a string and return a datetime.timedelta
1916
2859
>>> string_to_delta('7d')
1917
2860
datetime.timedelta(7)
1918
2861
>>> string_to_delta('60s')
2007
2956
parser.add_argument("--no-dbus", action="store_false",
2008
2957
dest="use_dbus", help="Do not provide D-Bus"
2009
" system bus interface")
2958
" system bus interface", default=None)
2010
2959
parser.add_argument("--no-ipv6", action="store_false",
2011
dest="use_ipv6", help="Do not use IPv6")
2960
dest="use_ipv6", help="Do not use IPv6",
2012
2962
parser.add_argument("--no-restore", action="store_false",
2013
2963
dest="restore", help="Do not restore stored"
2964
" state", default=None)
2965
parser.add_argument("--socket", type=int,
2966
help="Specify a file descriptor to a network"
2967
" socket to use instead of creating one")
2015
2968
parser.add_argument("--statedir", metavar="DIR",
2016
2969
help="Directory to save/restore state in")
2970
parser.add_argument("--foreground", action="store_true",
2971
help="Run in foreground", default=None)
2972
parser.add_argument("--no-zeroconf", action="store_false",
2973
dest="zeroconf", help="Do not use Zeroconf",
2018
2976
options = parser.parse_args()
2020
2978
if options.check:
2980
fail_count, test_count = doctest.testmod()
2981
sys.exit(os.EX_OK if fail_count == 0 else 1)
2025
2983
# Default values for config file for server-global settings
2026
server_defaults = { "interface": "",
2031
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2032
"servicename": "Mandos",
2037
"statedir": "/var/lib/mandos"
2984
if gnutls.has_rawpk:
2985
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2986
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2988
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2989
":+SIGN-DSA-SHA256")
2990
server_defaults = {"interface": "",
2994
"priority": priority,
2995
"servicename": "Mandos",
3001
"statedir": "/var/lib/mandos",
3002
"foreground": "False",
2040
3007
# Parse config file for server-global settings
2041
server_config = configparser.SafeConfigParser(server_defaults)
3008
server_config = configparser.ConfigParser(server_defaults)
2042
3009
del server_defaults
2043
server_config.read(os.path.join(options.configdir,
2045
# Convert the SafeConfigParser object to a dict
3010
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3011
# Convert the ConfigParser object to a dict
2046
3012
server_settings = server_config.defaults()
2047
3013
# Use the appropriate methods on the non-string config options
2048
for option in ("debug", "use_dbus", "use_ipv6"):
3014
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3015
"foreground", "zeroconf"):
2049
3016
server_settings[option] = server_config.getboolean("DEFAULT",
2051
3018
if server_settings["port"]:
2052
3019
server_settings["port"] = server_config.getint("DEFAULT",
3021
if server_settings["socket"]:
3022
server_settings["socket"] = server_config.getint("DEFAULT",
3024
# Later, stdin will, and stdout and stderr might, be dup'ed
3025
# over with an opened os.devnull. But we don't want this to
3026
# happen with a supplied network socket.
3027
if 0 <= server_settings["socket"] <= 2:
3028
server_settings["socket"] = os.dup(server_settings
2054
3030
del server_config
2056
3032
# Override the settings from the config file with command line
2057
3033
# options, if set.
2058
3034
for option in ("interface", "address", "port", "debug",
2059
"priority", "servicename", "configdir",
2060
"use_dbus", "use_ipv6", "debuglevel", "restore",
3035
"priority", "servicename", "configdir", "use_dbus",
3036
"use_ipv6", "debuglevel", "restore", "statedir",
3037
"socket", "foreground", "zeroconf"):
2062
3038
value = getattr(options, option)
2063
3039
if value is not None:
2064
3040
server_settings[option] = value
2066
3042
# Force all strings to be unicode
2067
3043
for option in server_settings.keys():
2068
if type(server_settings[option]) is str:
2069
server_settings[option] = unicode(server_settings[option])
3044
if isinstance(server_settings[option], bytes):
3045
server_settings[option] = (server_settings[option]
3047
# Force all boolean options to be boolean
3048
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3049
"foreground", "zeroconf"):
3050
server_settings[option] = bool(server_settings[option])
3051
# Debug implies foreground
3052
if server_settings["debug"]:
3053
server_settings["foreground"] = True
2070
3054
# Now we have our good server settings in "server_settings"
2072
3056
##################################################################
3058
if (not server_settings["zeroconf"]
3059
and not (server_settings["port"]
3060
or server_settings["socket"] != "")):
3061
parser.error("Needs port or socket to work without Zeroconf")
2074
3063
# For convenience
2075
3064
debug = server_settings["debug"]
2076
3065
debuglevel = server_settings["debuglevel"]
2088
3079
level = getattr(logging, debuglevel.upper())
2089
3080
initlogger(debug, level)
2091
3082
if server_settings["servicename"] != "Mandos":
2092
syslogger.setFormatter(logging.Formatter
2093
('Mandos (%s) [%%(process)d]:'
2094
' %%(levelname)s: %%(message)s'
2095
% server_settings["servicename"]))
3083
syslogger.setFormatter(
3084
logging.Formatter('Mandos ({}) [%(process)d]:'
3085
' %(levelname)s: %(message)s'.format(
3086
server_settings["servicename"])))
2097
3088
# Parse config file with clients
2098
client_config = configparser.SafeConfigParser(Client.client_defaults)
3089
client_config = configparser.ConfigParser(Client.client_defaults)
2099
3090
client_config.read(os.path.join(server_settings["configdir"],
2100
3091
"clients.conf"))
2102
3093
global mandos_dbus_service
2103
3094
mandos_dbus_service = None
2105
tcp_server = MandosServer((server_settings["address"],
2106
server_settings["port"]),
2108
interface=(server_settings["interface"]
2112
server_settings["priority"],
2115
pidfilename = "/var/run/mandos.pid"
2117
pidfile = open(pidfilename, "w")
2119
logger.error("Could not open file %r", pidfilename)
2122
uid = pwd.getpwnam("_mandos").pw_uid
2123
gid = pwd.getpwnam("_mandos").pw_gid
2126
uid = pwd.getpwnam("mandos").pw_uid
2127
gid = pwd.getpwnam("mandos").pw_gid
3097
if server_settings["socket"] != "":
3098
socketfd = server_settings["socket"]
3099
tcp_server = MandosServer(
3100
(server_settings["address"], server_settings["port"]),
3102
interface=(server_settings["interface"] or None),
3104
gnutls_priority=server_settings["priority"],
3108
pidfilename = "/run/mandos.pid"
3109
if not os.path.isdir("/run/."):
3110
pidfilename = "/var/run/mandos.pid"
3113
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3114
except IOError as e:
3115
logger.error("Could not open file %r", pidfilename,
3118
for name, group in (("_mandos", "_mandos"),
3119
("mandos", "mandos"),
3120
("nobody", "nogroup")):
3122
uid = pwd.getpwnam(name).pw_uid
3123
gid = pwd.getpwnam(group).pw_gid
2128
3125
except KeyError:
2130
uid = pwd.getpwnam("nobody").pw_uid
2131
gid = pwd.getpwnam("nobody").pw_gid
3134
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2138
3136
except OSError as error:
2139
if error[0] != errno.EPERM:
3137
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3138
.format(uid, gid, os.strerror(error.errno)))
3139
if error.errno != errno.EPERM:
2143
3143
# Enable all possible GnuTLS debugging
2145
3145
# "Use a log level over 10 to enable all debugging options."
2146
3146
# - GnuTLS manual
2147
gnutls.library.functions.gnutls_global_set_log_level(11)
2149
@gnutls.library.types.gnutls_log_func
3147
gnutls.global_set_log_level(11)
2150
3150
def debug_gnutls(level, string):
2151
3151
logger.debug("GnuTLS: %s", string[:-1])
2153
(gnutls.library.functions
2154
.gnutls_global_set_log_function(debug_gnutls))
3153
gnutls.global_set_log_function(debug_gnutls)
2156
3155
# Redirect stdin so all checkers get /dev/null
2157
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3156
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2158
3157
os.dup2(null, sys.stdin.fileno())
2162
3161
# Need to fork before connecting to D-Bus
2164
3163
# Close all input and output, do double fork, etc.
2167
gobject.threads_init()
3166
if gi.version_info < (3, 10, 2):
3167
# multiprocessing will use threads, so before we use GLib we
3168
# need to inform GLib that threads will be used.
2169
3171
global main_loop
2170
3172
# From the Avahi example code
2171
DBusGMainLoop(set_as_default=True )
2172
main_loop = gobject.MainLoop()
3173
DBusGMainLoop(set_as_default=True)
3174
main_loop = GLib.MainLoop()
2173
3175
bus = dbus.SystemBus()
2174
3176
# End of Avahi example code
2177
3179
bus_name = dbus.service.BusName("se.recompile.Mandos",
2178
bus, do_not_queue=True)
2179
old_bus_name = (dbus.service.BusName
2180
("se.bsnet.fukt.Mandos", bus,
2182
except dbus.exceptions.NameExistsException as e:
2183
logger.error(unicode(e) + ", disabling D-Bus")
3182
old_bus_name = dbus.service.BusName(
3183
"se.bsnet.fukt.Mandos", bus,
3185
except dbus.exceptions.DBusException as e:
3186
logger.error("Disabling D-Bus:", exc_info=e)
2184
3187
use_dbus = False
2185
3188
server_settings["use_dbus"] = False
2186
3189
tcp_server.use_dbus = False
2187
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2188
service = AvahiServiceToSyslog(name =
2189
server_settings["servicename"],
2190
servicetype = "_mandos._tcp",
2191
protocol = protocol, bus = bus)
2192
if server_settings["interface"]:
2193
service.interface = (if_nametoindex
2194
(str(server_settings["interface"])))
3191
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3192
service = AvahiServiceToSyslog(
3193
name=server_settings["servicename"],
3194
servicetype="_mandos._tcp",
3197
if server_settings["interface"]:
3198
service.interface = if_nametoindex(
3199
server_settings["interface"].encode("utf-8"))
2196
3201
global multiprocessing_manager
2197
3202
multiprocessing_manager = multiprocessing.Manager()
2199
3204
client_class = Client
2201
client_class = functools.partial(ClientDBusTransitional,
3206
client_class = functools.partial(ClientDBus, bus=bus)
2204
3208
client_settings = Client.config_parser(client_config)
2205
3209
old_client_settings = {}
2206
3210
clients_data = {}
3212
# This is used to redirect stdout and stderr for checker processes
3214
wnull = open(os.devnull, "w") # A writable /dev/null
3215
# Only used if server is running in foreground but not in debug
3217
if debug or not foreground:
2208
3220
# Get client data and settings from last running state.
2209
3221
if server_settings["restore"]:
2211
3223
with open(stored_state_path, "rb") as stored_state:
2212
clients_data, old_client_settings = (pickle.load
3224
if sys.version_info.major == 2:
3225
clients_data, old_client_settings = pickle.load(
3228
bytes_clients_data, bytes_old_client_settings = (
3229
pickle.load(stored_state, encoding="bytes"))
3230
# Fix bytes to strings
3233
clients_data = {(key.decode("utf-8")
3234
if isinstance(key, bytes)
3237
bytes_clients_data.items()}
3238
del bytes_clients_data
3239
for key in clients_data:
3240
value = {(k.decode("utf-8")
3241
if isinstance(k, bytes) else k): v
3243
clients_data[key].items()}
3244
clients_data[key] = value
3246
value["client_structure"] = [
3248
if isinstance(s, bytes)
3250
value["client_structure"]]
3252
for k in ("name", "host"):
3253
if isinstance(value[k], bytes):
3254
value[k] = value[k].decode("utf-8")
3255
if "key_id" not in value:
3256
value["key_id"] = ""
3257
elif "fingerprint" not in value:
3258
value["fingerprint"] = ""
3259
# old_client_settings
3261
old_client_settings = {
3262
(key.decode("utf-8")
3263
if isinstance(key, bytes)
3266
bytes_old_client_settings.items()}
3267
del bytes_old_client_settings
3269
for value in old_client_settings.values():
3270
if isinstance(value["host"], bytes):
3271
value["host"] = (value["host"]
2214
3273
os.remove(stored_state_path)
2215
3274
except IOError as e:
2216
logger.warning("Could not load persistent state: {0}"
2218
if e.errno != errno.ENOENT:
3275
if e.errno == errno.ENOENT:
3276
logger.warning("Could not load persistent state:"
3277
" {}".format(os.strerror(e.errno)))
3279
logger.critical("Could not load persistent state:",
2220
3282
except EOFError as e:
2221
3283
logger.warning("Could not load persistent state: "
2222
"EOFError: {0}".format(e))
2224
3287
with PGPEngine() as pgp:
2225
for client_name, client in clients_data.iteritems():
3288
for client_name, client in clients_data.items():
3289
# Skip removed clients
3290
if client_name not in client_settings:
2226
3293
# Decide which value to use after restoring saved state.
2227
3294
# We have three different values: Old config file,
2228
3295
# new config file, and saved state.
2233
3300
# For each value in new config, check if it
2234
3301
# differs from the old config value (Except for
2235
3302
# the "secret" attribute)
2236
if (name != "secret" and
2237
value != old_client_settings[client_name]
3303
if (name != "secret"
3305
old_client_settings[client_name][name])):
2239
3306
client[name] = value
2240
3307
except KeyError:
2243
3310
# Clients who has passed its expire date can still be
2244
# enabled if its last checker was successful. Clients
2245
# whose checker failed before we stored its state is
2246
# assumed to have failed all checkers during downtime.
3311
# enabled if its last checker was successful. A Client
3312
# whose checker succeeded before we stored its state is
3313
# assumed to have successfully run all checkers during
2247
3315
if client["enabled"]:
2248
3316
if datetime.datetime.utcnow() >= client["expires"]:
2249
3317
if not client["last_checked_ok"]:
2250
3318
logger.warning(
2251
"disabling client {0} - Client never "
2252
"performed a successfull checker"
2253
.format(client["name"]))
3319
"disabling client {} - Client never "
3320
"performed a successful checker".format(
2254
3322
client["enabled"] = False
2255
3323
elif client["last_checker_status"] != 0:
2256
3324
logger.warning(
2257
"disabling client {0} - Client "
2258
"last checker failed with error code {1}"
2259
.format(client["name"],
2260
client["last_checker_status"]))
3325
"disabling client {} - Client last"
3326
" checker failed with error code"
3329
client["last_checker_status"]))
2261
3330
client["enabled"] = False
2263
client["expires"] = (datetime.datetime
2265
+ client["timeout"])
3332
client["expires"] = (
3333
datetime.datetime.utcnow()
3334
+ client["timeout"])
3335
logger.debug("Last checker succeeded,"
3336
" keeping {} enabled".format(
2268
client["secret"] = (
2269
pgp.decrypt(client["encrypted_secret"],
2270
client_settings[client_name]
3339
client["secret"] = pgp.decrypt(
3340
client["encrypted_secret"],
3341
client_settings[client_name]["secret"])
2272
3342
except PGPError:
2273
3343
# If decryption fails, we use secret from new settings
2274
logger.debug("Failed to decrypt {0} old secret"
2275
.format(client_name))
2276
client["secret"] = (
2277
client_settings[client_name]["secret"])
3344
logger.debug("Failed to decrypt {} old secret".format(
3346
client["secret"] = (client_settings[client_name]
2280
3349
# Add/remove clients based on new changes made to config
2281
for client_name in set(old_client_settings) - set(client_settings):
3350
for client_name in (set(old_client_settings)
3351
- set(client_settings)):
2282
3352
del clients_data[client_name]
2283
for client_name in set(client_settings) - set(old_client_settings):
3353
for client_name in (set(client_settings)
3354
- set(old_client_settings)):
2284
3355
clients_data[client_name] = client_settings[client_name]
2286
# Create clients all clients
2287
for client_name, client in clients_data.iteritems():
3357
# Create all client objects
3358
for client_name, client in clients_data.items():
2288
3359
tcp_server.clients[client_name] = client_class(
2289
name = client_name, settings = client)
3362
server_settings=server_settings)
2291
3364
if not tcp_server.clients:
2292
3365
logger.warning("No clients defined")
2298
pidfile.write(str(pid) + "\n".encode("utf-8"))
2301
logger.error("Could not write to file %r with PID %d",
2304
# "pidfile" was never created
3368
if pidfile is not None:
3372
print(pid, file=pidfile)
3374
logger.error("Could not write to file %r with PID %d",
2306
3377
del pidfilename
2307
signal.signal(signal.SIGINT, signal.SIG_IGN)
2309
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2310
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3379
for termsig in (signal.SIGHUP, signal.SIGTERM):
3380
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3381
lambda: main_loop.quit() and False)
2313
class MandosDBusService(dbus.service.Object):
3385
@alternate_dbus_interfaces(
3386
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3387
class MandosDBusService(DBusObjectWithObjectManager):
2314
3388
"""A D-Bus proxy object"""
2315
3390
def __init__(self):
2316
3391
dbus.service.Object.__init__(self, bus, "/")
2317
3393
_interface = "se.recompile.Mandos"
2319
3395
@dbus.service.signal(_interface, signature="o")
2320
3396
def ClientAdded(self, objpath):
2324
3400
@dbus.service.signal(_interface, signature="ss")
2325
def ClientNotFound(self, fingerprint, address):
3401
def ClientNotFound(self, key_id, address):
3405
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2329
3407
@dbus.service.signal(_interface, signature="os")
2330
3408
def ClientRemoved(self, objpath, name):
3412
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2334
3414
@dbus.service.method(_interface, out_signature="ao")
2335
3415
def GetAllClients(self):
2337
return dbus.Array(c.dbus_object_path
2339
tcp_server.clients.itervalues())
3417
return dbus.Array(c.dbus_object_path for c in
3418
tcp_server.clients.values())
3420
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2341
3422
@dbus.service.method(_interface,
2342
3423
out_signature="a{oa{sv}}")
2343
3424
def GetAllClientsWithProperties(self):
2345
3426
return dbus.Dictionary(
2346
((c.dbus_object_path, c.GetAll(""))
2347
for c in tcp_server.clients.itervalues()),
3427
{c.dbus_object_path: c.GetAll(
3428
"se.recompile.Mandos.Client")
3429
for c in tcp_server.clients.values()},
2348
3430
signature="oa{sv}")
2350
3432
@dbus.service.method(_interface, in_signature="o")
2351
3433
def RemoveClient(self, object_path):
2353
for c in tcp_server.clients.itervalues():
3435
for c in tcp_server.clients.values():
2354
3436
if c.dbus_object_path == object_path:
2355
3437
del tcp_server.clients[c.name]
2356
3438
c.remove_from_connection()
2357
# Don't signal anything except ClientRemoved
3439
# Don't signal the disabling
2358
3440
c.disable(quiet=True)
2360
self.ClientRemoved(object_path, c.name)
3441
# Emit D-Bus signal for removal
3442
self.client_removed_signal(c)
2362
3444
raise KeyError(object_path)
2366
class MandosDBusServiceTransitional(MandosDBusService):
2367
__metaclass__ = AlternateDBusNamesMetaclass
2368
mandos_dbus_service = MandosDBusServiceTransitional()
3448
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3449
out_signature="a{oa{sa{sv}}}")
3450
def GetManagedObjects(self):
3452
return dbus.Dictionary(
3453
{client.dbus_object_path:
3455
{interface: client.GetAll(interface)
3457
client._get_all_interface_names()})
3458
for client in tcp_server.clients.values()})
3460
def client_added_signal(self, client):
3461
"""Send the new standard signal and the old signal"""
3463
# New standard signal
3464
self.InterfacesAdded(
3465
client.dbus_object_path,
3467
{interface: client.GetAll(interface)
3469
client._get_all_interface_names()}))
3471
self.ClientAdded(client.dbus_object_path)
3473
def client_removed_signal(self, client):
3474
"""Send the new standard signal and the old signal"""
3476
# New standard signal
3477
self.InterfacesRemoved(
3478
client.dbus_object_path,
3479
client._get_all_interface_names())
3481
self.ClientRemoved(client.dbus_object_path,
3484
mandos_dbus_service = MandosDBusService()
3486
# Save modules to variables to exempt the modules from being
3487
# unloaded before the function registered with atexit() is run.
3488
mp = multiprocessing
2371
3492
"Cleanup function; run on exit"
2374
multiprocessing.active_children()
3496
mp.active_children()
2375
3498
if not (tcp_server.clients or client_settings):
2378
3501
# Store client before exiting. Secrets are encrypted with key
2379
3502
# based on what config file has. If config file is
2380
3503
# removed/edited, old secret will thus be unrecovable.
2382
3505
with PGPEngine() as pgp:
2383
for client in tcp_server.clients.itervalues():
3506
for client in tcp_server.clients.values():
2384
3507
key = client_settings[client.name]["secret"]
2385
3508
client.encrypted_secret = pgp.encrypt(client.secret,
2387
3510
client_dict = {}
2389
3512
# A list of attributes that can not be pickled
2391
exclude = set(("bus", "changedstate", "secret",
2393
for name, typ in (inspect.getmembers
2394
(dbus.service.Object)):
3514
exclude = {"bus", "changedstate", "secret",
3515
"checker", "server_settings"}
3516
for name, typ in inspect.getmembers(dbus.service
2395
3518
exclude.add(name)
2397
3520
client_dict["encrypted_secret"] = (client
2398
3521
.encrypted_secret)
2399
3522
for attr in client.client_structure:
2400
3523
if attr not in exclude:
2401
3524
client_dict[attr] = getattr(client, attr)
2403
3526
clients[client.name] = client_dict
2404
3527
del client_settings[client.name]["secret"]
2407
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2410
(stored_state_path))
2411
with os.fdopen(tempfd, "wb") as stored_state:
2412
pickle.dump((clients, client_settings), stored_state)
3530
with tempfile.NamedTemporaryFile(
3534
dir=os.path.dirname(stored_state_path),
3535
delete=False) as stored_state:
3536
pickle.dump((clients, client_settings), stored_state,
3538
tempname = stored_state.name
2413
3539
os.rename(tempname, stored_state_path)
2414
3540
except (IOError, OSError) as e:
2415
logger.warning("Could not save persistent state: {0}"
2419
3543
os.remove(tempname)
2420
3544
except NameError:
2422
if e.errno not in set((errno.ENOENT, errno.EACCES,
3546
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3547
logger.warning("Could not save persistent state: {}"
3548
.format(os.strerror(e.errno)))
3550
logger.warning("Could not save persistent state:",
2426
3554
# Delete all clients, and settings from config
2427
3555
while tcp_server.clients:
2428
3556
name, client = tcp_server.clients.popitem()
2430
3558
client.remove_from_connection()
2431
# Don't signal anything except ClientRemoved
3559
# Don't signal the disabling
2432
3560
client.disable(quiet=True)
3561
# Emit D-Bus signal for removal
2435
mandos_dbus_service.ClientRemoved(client
3563
mandos_dbus_service.client_removed_signal(client)
2438
3564
client_settings.clear()
2440
3566
atexit.register(cleanup)
2442
for client in tcp_server.clients.itervalues():
3568
for client in tcp_server.clients.values():
2445
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3570
# Emit D-Bus signal for adding
3571
mandos_dbus_service.client_added_signal(client)
2446
3572
# Need to initiate checking of clients
2447
3573
if client.enabled:
2448
3574
client.init_checker()
2450
3576
tcp_server.enable()
2451
3577
tcp_server.server_activate()
2453
3579
# Find out what port we got
2454
service.port = tcp_server.socket.getsockname()[1]
3581
service.port = tcp_server.socket.getsockname()[1]
2456
3583
logger.info("Now listening on address %r, port %d,"
2457
" flowinfo %d, scope_id %d"
2458
% tcp_server.socket.getsockname())
3584
" flowinfo %d, scope_id %d",
3585
*tcp_server.socket.getsockname())
2460
logger.info("Now listening on address %r, port %d"
2461
% tcp_server.socket.getsockname())
2463
#service.interface = tcp_server.socket.getsockname()[3]
3587
logger.info("Now listening on address %r, port %d",
3588
*tcp_server.socket.getsockname())
3590
# service.interface = tcp_server.socket.getsockname()[3]
2466
# From the Avahi example code
2469
except dbus.exceptions.DBusException as error:
2470
logger.critical("DBusException: %s", error)
2473
# End of Avahi example code
2475
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2476
lambda *args, **kwargs:
2477
(tcp_server.handle_request
2478
(*args[2:], **kwargs) or True))
3594
# From the Avahi example code
3597
except dbus.exceptions.DBusException as error:
3598
logger.critical("D-Bus Exception", exc_info=error)
3601
# End of Avahi example code
3603
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3604
lambda *args, **kwargs:
3605
(tcp_server.handle_request
3606
(*args[2:], **kwargs) or True))
2480
3608
logger.debug("Starting main loop")
2481
3609
main_loop.run()
2482
3610
except AvahiError as error:
2483
logger.critical("AvahiError: %s", error)
3611
logger.critical("Avahi Error", exc_info=error)
2486
3614
except KeyboardInterrupt: