2
2
# -*- mode: python; coding: utf-8 -*-
4
4
# Mandos server - give out binary blobs to connecting clients.
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
9
# methods "add", "remove", "server_state_changed",
10
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 Björn Påhlsson
17
# This file is part of Mandos.
19
# Mandos is free software: you can redistribute it and/or modify it
20
# under the terms of the GNU General Public License as published by
14
# Copyright © 2008-2016 Teddy Hogeborn
15
# Copyright © 2008-2016 Björn Påhlsson
17
# This program is free software: you can redistribute it and/or modify
18
# it under the terms of the GNU General Public License as published by
21
19
# the Free Software Foundation, either version 3 of the License, or
22
20
# (at your option) any later version.
24
# Mandos is distributed in the hope that it will be useful, but
25
# WITHOUT ANY WARRANTY; without even the implied warranty of
22
# This program is distributed in the hope that it will be useful,
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
26
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27
25
# GNU General Public License for more details.
29
27
# You should have received a copy of the GNU General Public License
30
# along with Mandos. If not, see <http://www.gnu.org/licenses/>.
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
32
31
# Contact the authors at <mandos@recompile.se>.
35
34
from __future__ import (division, absolute_import, print_function,
247
246
'--passphrase-file',
249
248
+ self.gnupgargs,
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
249
stdin = subprocess.PIPE,
250
stdout = subprocess.PIPE,
251
stderr = subprocess.PIPE)
252
ciphertext, err = proc.communicate(input = data)
254
253
if proc.returncode != 0:
255
254
raise PGPError(err)
256
255
return ciphertext
258
257
def decrypt(self, data, password):
259
258
passphrase = self.password_encode(password)
260
259
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
260
dir = self.tempdir) as passfile:
262
261
passfile.write(passphrase)
264
263
proc = subprocess.Popen([self.gpg, '--decrypt',
265
264
'--passphrase-file',
267
266
+ self.gnupgargs,
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
267
stdin = subprocess.PIPE,
268
stdout = subprocess.PIPE,
269
stderr = subprocess.PIPE)
270
decrypted_plaintext, err = proc.communicate(input = data)
272
271
if proc.returncode != 0:
273
272
raise PGPError(err)
274
273
return decrypted_plaintext
277
275
# Pretend that we have an Avahi module
279
"""This isn't so much a class as it is a module-like namespace."""
280
IF_UNSPEC = -1 # avahi-common/address.h
281
PROTO_UNSPEC = -1 # avahi-common/address.h
282
PROTO_INET = 0 # avahi-common/address.h
283
PROTO_INET6 = 1 # avahi-common/address.h
277
"""This isn't so much a class as it is a module-like namespace.
278
It is instantiated once, and simulates having an Avahi module."""
279
IF_UNSPEC = -1 # avahi-common/address.h
280
PROTO_UNSPEC = -1 # avahi-common/address.h
281
PROTO_INET = 0 # avahi-common/address.h
282
PROTO_INET6 = 1 # avahi-common/address.h
284
283
DBUS_NAME = "org.freedesktop.Avahi"
285
284
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
286
285
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
286
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(t):
287
def string_array_to_txt_array(self, t):
291
288
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
289
for s in t), signature="ay")
293
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
294
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
295
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
296
SERVER_INVALID = 0 # avahi-common/defs.h
297
SERVER_REGISTERING = 1 # avahi-common/defs.h
298
SERVER_RUNNING = 2 # avahi-common/defs.h
299
SERVER_COLLISION = 3 # avahi-common/defs.h
300
SERVER_FAILURE = 4 # avahi-common/defs.h
290
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
291
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
292
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
293
SERVER_INVALID = 0 # avahi-common/defs.h
294
SERVER_REGISTERING = 1 # avahi-common/defs.h
295
SERVER_RUNNING = 2 # avahi-common/defs.h
296
SERVER_COLLISION = 3 # avahi-common/defs.h
297
SERVER_FAILURE = 4 # avahi-common/defs.h
303
300
class AvahiError(Exception):
304
301
def __init__(self, value, *args, **kwargs):
495
492
class AvahiServiceToSyslog(AvahiService):
496
493
def rename(self, *args, **kwargs):
497
494
"""Add the new name to the syslog messages"""
498
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
495
ret = AvahiService.rename(self, *args, **kwargs)
499
496
syslogger.setFormatter(logging.Formatter(
500
497
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
501
498
.format(self.name)))
505
501
# Pretend that we have a GnuTLS module
506
class gnutls(object):
507
"""This isn't so much a class as it is a module-like namespace."""
509
library = ctypes.util.find_library("gnutls")
511
library = ctypes.util.find_library("gnutls-deb0")
512
_library = ctypes.cdll.LoadLibrary(library)
502
class GnuTLS(object):
503
"""This isn't so much a class as it is a module-like namespace.
504
It is instantiated once, and simulates having a GnuTLS module."""
506
_library = ctypes.cdll.LoadLibrary(
507
ctypes.util.find_library("gnutls"))
508
_need_version = b"3.3.0"
510
# Need to use class name "GnuTLS" here, since this method is
511
# called before the assignment to the "gnutls" global variable
513
if GnuTLS.check_version(self._need_version) is None:
514
raise GnuTLS.Error("Needs GnuTLS {} or later"
515
.format(self._need_version))
515
517
# Unless otherwise indicated, the constants and types below are
516
518
# all from the gnutls/gnutls.h C header file.
520
522
E_INTERRUPTED = -52
526
527
CRD_CERTIFICATE = 1
527
528
E_NO_CERTIFICATE_FOUND = -49
532
KEYID_USE_SHA256 = 1 # gnutls/x509.h
533
529
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
536
532
class session_int(ctypes.Structure):
538
534
session_t = ctypes.POINTER(session_int)
540
535
class certificate_credentials_st(ctypes.Structure):
542
537
certificate_credentials_t = ctypes.POINTER(
543
538
certificate_credentials_st)
544
539
certificate_type_t = ctypes.c_int
546
540
class datum_t(ctypes.Structure):
547
541
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
548
542
('size', ctypes.c_uint)]
550
543
class openpgp_crt_int(ctypes.Structure):
552
545
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
553
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
546
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
554
547
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
555
548
credentials_type_t = ctypes.c_int
556
549
transport_ptr_t = ctypes.c_void_p
557
550
close_request_t = ctypes.c_int
560
553
class Error(Exception):
561
def __init__(self, message=None, code=None, args=()):
554
# We need to use the class name "GnuTLS" here, since this
555
# exception might be raised from within GnuTLS.__init__,
556
# which is called before the assignment to the "gnutls"
557
# global variable has happened.
558
def __init__(self, message = None, code = None, args=()):
562
559
# Default usage is by a message string, but if a return
563
560
# code is passed, convert it to a string with
564
561
# gnutls.strerror()
566
563
if message is None and code is not None:
567
message = gnutls.strerror(code)
568
return super(gnutls.Error, self).__init__(
564
message = GnuTLS.strerror(code)
565
return super(GnuTLS.Error, self).__init__(
571
568
class CertificateSecurityError(Error):
575
572
class Credentials(object):
576
573
def __init__(self):
639
630
return _error_code(result)
640
631
result = func(*arguments)
643
634
# Unless otherwise indicated, the function declarations below are
644
635
# all from the gnutls/gnutls.h C header file.
647
638
priority_set_direct = _library.gnutls_priority_set_direct
648
639
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
649
640
ctypes.POINTER(ctypes.c_char_p)]
650
641
priority_set_direct.restype = _error_code
652
643
init = _library.gnutls_init
653
644
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
654
645
init.restype = _error_code
656
647
set_default_priority = _library.gnutls_set_default_priority
657
648
set_default_priority.argtypes = [session_t]
658
649
set_default_priority.restype = _error_code
660
651
record_send = _library.gnutls_record_send
661
652
record_send.argtypes = [session_t, ctypes.c_void_p,
663
654
record_send.restype = ctypes.c_ssize_t
664
655
record_send.errcheck = _retry_on_error
666
657
certificate_allocate_credentials = (
667
658
_library.gnutls_certificate_allocate_credentials)
668
659
certificate_allocate_credentials.argtypes = [
669
660
ctypes.POINTER(certificate_credentials_t)]
670
661
certificate_allocate_credentials.restype = _error_code
672
663
certificate_free_credentials = (
673
664
_library.gnutls_certificate_free_credentials)
674
certificate_free_credentials.argtypes = [
675
certificate_credentials_t]
665
certificate_free_credentials.argtypes = [certificate_credentials_t]
676
666
certificate_free_credentials.restype = None
678
668
handshake_set_private_extensions = (
679
669
_library.gnutls_handshake_set_private_extensions)
680
670
handshake_set_private_extensions.argtypes = [session_t,
682
672
handshake_set_private_extensions.restype = None
684
674
credentials_set = _library.gnutls_credentials_set
685
675
credentials_set.argtypes = [session_t, credentials_type_t,
687
677
credentials_set.restype = _error_code
689
679
strerror = _library.gnutls_strerror
690
680
strerror.argtypes = [ctypes.c_int]
691
681
strerror.restype = ctypes.c_char_p
693
683
certificate_type_get = _library.gnutls_certificate_type_get
694
684
certificate_type_get.argtypes = [session_t]
695
685
certificate_type_get.restype = _error_code
697
687
certificate_get_peers = _library.gnutls_certificate_get_peers
698
688
certificate_get_peers.argtypes = [session_t,
699
689
ctypes.POINTER(ctypes.c_uint)]
700
690
certificate_get_peers.restype = ctypes.POINTER(datum_t)
702
692
global_set_log_level = _library.gnutls_global_set_log_level
703
693
global_set_log_level.argtypes = [ctypes.c_int]
704
694
global_set_log_level.restype = None
706
696
global_set_log_function = _library.gnutls_global_set_log_function
707
697
global_set_log_function.argtypes = [log_func]
708
698
global_set_log_function.restype = None
710
700
deinit = _library.gnutls_deinit
711
701
deinit.argtypes = [session_t]
712
702
deinit.restype = None
714
704
handshake = _library.gnutls_handshake
715
705
handshake.argtypes = [session_t]
716
706
handshake.restype = _error_code
717
707
handshake.errcheck = _retry_on_error
719
709
transport_set_ptr = _library.gnutls_transport_set_ptr
720
710
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
721
711
transport_set_ptr.restype = None
723
713
bye = _library.gnutls_bye
724
714
bye.argtypes = [session_t, close_request_t]
725
715
bye.restype = _error_code
726
716
bye.errcheck = _retry_on_error
728
718
check_version = _library.gnutls_check_version
729
719
check_version.argtypes = [ctypes.c_char_p]
730
720
check_version.restype = ctypes.c_char_p
732
_need_version = b"3.3.0"
733
if check_version(_need_version) is None:
734
raise self.Error("Needs GnuTLS {} or later"
735
.format(_need_version))
737
_tls_rawpk_version = b"3.6.6"
738
has_rawpk = bool(check_version(_tls_rawpk_version))
742
class pubkey_st(ctypes.Structure):
744
pubkey_t = ctypes.POINTER(pubkey_st)
746
x509_crt_fmt_t = ctypes.c_int
748
# All the function declarations below are from gnutls/abstract.h
749
pubkey_init = _library.gnutls_pubkey_init
750
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
751
pubkey_init.restype = _error_code
753
pubkey_import = _library.gnutls_pubkey_import
754
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
756
pubkey_import.restype = _error_code
758
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
759
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
760
ctypes.POINTER(ctypes.c_ubyte),
761
ctypes.POINTER(ctypes.c_size_t)]
762
pubkey_get_key_id.restype = _error_code
764
pubkey_deinit = _library.gnutls_pubkey_deinit
765
pubkey_deinit.argtypes = [pubkey_t]
766
pubkey_deinit.restype = None
768
# All the function declarations below are from gnutls/openpgp.h
770
openpgp_crt_init = _library.gnutls_openpgp_crt_init
771
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
772
openpgp_crt_init.restype = _error_code
774
openpgp_crt_import = _library.gnutls_openpgp_crt_import
775
openpgp_crt_import.argtypes = [openpgp_crt_t,
776
ctypes.POINTER(datum_t),
778
openpgp_crt_import.restype = _error_code
780
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
781
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
782
ctypes.POINTER(ctypes.c_uint)]
783
openpgp_crt_verify_self.restype = _error_code
785
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
786
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
787
openpgp_crt_deinit.restype = None
789
openpgp_crt_get_fingerprint = (
790
_library.gnutls_openpgp_crt_get_fingerprint)
791
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
795
openpgp_crt_get_fingerprint.restype = _error_code
797
if check_version(b"3.6.4"):
798
certificate_type_get2 = _library.gnutls_certificate_type_get2
799
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
800
certificate_type_get2.restype = _error_code
722
# All the function declarations below are from gnutls/openpgp.h
724
openpgp_crt_init = _library.gnutls_openpgp_crt_init
725
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
726
openpgp_crt_init.restype = _error_code
728
openpgp_crt_import = _library.gnutls_openpgp_crt_import
729
openpgp_crt_import.argtypes = [openpgp_crt_t,
730
ctypes.POINTER(datum_t),
732
openpgp_crt_import.restype = _error_code
734
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
735
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
736
ctypes.POINTER(ctypes.c_uint)]
737
openpgp_crt_verify_self.restype = _error_code
739
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
740
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
741
openpgp_crt_deinit.restype = None
743
openpgp_crt_get_fingerprint = (
744
_library.gnutls_openpgp_crt_get_fingerprint)
745
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
749
openpgp_crt_get_fingerprint.restype = _error_code
802
751
# Remove non-public functions
803
752
del _error_code, _retry_on_error
753
# Create the global "gnutls" object, simulating a module
806
756
def call_pipe(connection, # : multiprocessing.Connection
807
757
func, *args, **kwargs):
808
758
"""This function is meant to be called by multiprocessing.Process
810
760
This function runs func(*args, **kwargs), and writes the resulting
811
761
return value on the provided multiprocessing.Connection.
813
763
connection.send(func(*args, **kwargs))
814
764
connection.close()
817
766
class Client(object):
818
767
"""A representation of a client host served by this server.
821
770
approved: bool(); 'None' if not yet approved/disapproved
822
771
approval_delay: datetime.timedelta(); Time to wait for approval
823
772
approval_duration: datetime.timedelta(); Duration of one approval
824
checker: multiprocessing.Process(); a running checker process used
825
to see if the client lives. 'None' if no process is
773
checker: subprocess.Popen(); a running checker process used
774
to see if the client lives.
775
'None' if no process is running.
827
776
checker_callback_tag: a GLib event source tag, or None
828
777
checker_command: string; External command which is run to check
829
778
if client lives. %() expansions are done at
1504
1447
exc_info=error)
1505
1448
return xmlstring
1509
1451
dbus.OBJECT_MANAGER_IFACE
1510
1452
except AttributeError:
1511
1453
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1514
1455
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1515
1456
"""A D-Bus object with an ObjectManager.
1517
1458
Classes inheriting from this exposes the standard
1518
1459
GetManagedObjects call and the InterfacesAdded and
1519
1460
InterfacesRemoved signals on the standard
1520
1461
"org.freedesktop.DBus.ObjectManager" interface.
1522
1463
Note: No signals are sent automatically; they must be sent
1525
1466
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1526
out_signature="a{oa{sa{sv}}}")
1467
out_signature = "a{oa{sa{sv}}}")
1527
1468
def GetManagedObjects(self):
1528
1469
"""This function must be overridden"""
1529
1470
raise NotImplementedError()
1531
1472
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1532
signature="oa{sa{sv}}")
1473
signature = "oa{sa{sv}}")
1533
1474
def InterfacesAdded(self, object_path, interfaces_and_properties):
1536
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1477
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1537
1478
def InterfacesRemoved(self, object_path, interfaces):
1540
1481
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1542
path_keyword='object_path',
1543
connection_keyword='connection')
1482
out_signature = "s",
1483
path_keyword = 'object_path',
1484
connection_keyword = 'connection')
1544
1485
def Introspect(self, object_path, connection):
1545
1486
"""Overloading of standard D-Bus method.
1547
1488
Override return argument name of GetManagedObjects to be
1548
1489
"objpath_interfaces_and_properties"
2491
2365
class MultiprocessingMixIn(object):
2492
2366
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2494
2368
def sub_process_main(self, request, address):
2496
2370
self.finish_request(request, address)
2497
2371
except Exception:
2498
2372
self.handle_error(request, address)
2499
2373
self.close_request(request)
2501
2375
def process_request(self, request, address):
2502
2376
"""Start a new process to process the request."""
2503
proc = multiprocessing.Process(target=self.sub_process_main,
2504
args=(request, address))
2377
proc = multiprocessing.Process(target = self.sub_process_main,
2378
args = (request, address))
2509
2383
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2510
2384
""" adds a pipe to the MixIn """
2512
2386
def process_request(self, request, client_address):
2513
2387
"""Overrides and wraps the original process_request().
2515
2389
This function creates a new pipe in self.pipe
2517
2391
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2519
2393
proc = MultiprocessingMixIn.process_request(self, request,
2520
2394
client_address)
2521
2395
self.child_pipe.close()
2522
2396
self.add_pipe(parent_pipe, proc)
2524
2398
def add_pipe(self, parent_pipe, proc):
2525
2399
"""Dummy function; override as necessary"""
2526
2400
raise NotImplementedError()
2652
2523
self.gnutls_priority = gnutls_priority
2653
2524
IPv6_TCPServer.__init__(self, server_address,
2654
2525
RequestHandlerClass,
2655
interface=interface,
2526
interface = interface,
2527
use_ipv6 = use_ipv6,
2528
socketfd = socketfd)
2659
2530
def server_activate(self):
2660
2531
if self.enabled:
2661
2532
return socketserver.TCPServer.server_activate(self)
2663
2534
def enable(self):
2664
2535
self.enabled = True
2666
2537
def add_pipe(self, parent_pipe, proc):
2667
2538
# Call "handle_ipc" for both data and EOF events
2668
2539
GLib.io_add_watch(
2669
2540
parent_pipe.fileno(),
2670
2541
GLib.IO_IN | GLib.IO_HUP,
2671
2542
functools.partial(self.handle_ipc,
2672
parent_pipe=parent_pipe,
2543
parent_pipe = parent_pipe,
2675
2546
def handle_ipc(self, source, condition,
2676
2547
parent_pipe=None,
2678
2549
client_object=None):
2679
2550
# error, or the other end of multiprocessing.Pipe has closed
2680
2551
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2681
2552
# Wait for other process to exit
2685
2556
# Read a request from the child
2686
2557
request = parent_pipe.recv()
2687
2558
command = request[0]
2689
2560
if command == 'init':
2690
key_id = request[1].decode("ascii")
2691
fpr = request[2].decode("ascii")
2692
address = request[3]
2562
address = request[2]
2694
2564
for c in self.clients.values():
2695
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2697
if key_id and c.key_id == key_id:
2700
if fpr and c.fingerprint == fpr:
2565
if c.fingerprint == fpr:
2704
logger.info("Client not found for key ID: %s, address"
2705
": %s", key_id or fpr, address)
2569
logger.info("Client not found for fingerprint: %s, ad"
2570
"dress: %s", fpr, address)
2706
2571
if self.use_dbus:
2707
2572
# Emit D-Bus signal
2708
mandos_dbus_service.ClientNotFound(key_id or fpr,
2573
mandos_dbus_service.ClientNotFound(fpr,
2710
2575
parent_pipe.send(False)
2713
2578
GLib.io_add_watch(
2714
2579
parent_pipe.fileno(),
2715
2580
GLib.IO_IN | GLib.IO_HUP,
2716
2581
functools.partial(self.handle_ipc,
2717
parent_pipe=parent_pipe,
2719
client_object=client))
2582
parent_pipe = parent_pipe,
2584
client_object = client))
2720
2585
parent_pipe.send(True)
2721
2586
# remove the old hook in favor of the new above hook on
3184
3040
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3185
3041
service = AvahiServiceToSyslog(
3186
name=server_settings["servicename"],
3187
servicetype="_mandos._tcp",
3042
name = server_settings["servicename"],
3043
servicetype = "_mandos._tcp",
3044
protocol = protocol,
3190
3046
if server_settings["interface"]:
3191
3047
service.interface = if_nametoindex(
3192
3048
server_settings["interface"].encode("utf-8"))
3194
3050
global multiprocessing_manager
3195
3051
multiprocessing_manager = multiprocessing.Manager()
3197
3053
client_class = Client
3199
client_class = functools.partial(ClientDBus, bus=bus)
3055
client_class = functools.partial(ClientDBus, bus = bus)
3201
3057
client_settings = Client.config_parser(client_config)
3202
3058
old_client_settings = {}
3203
3059
clients_data = {}
3205
3061
# This is used to redirect stdout and stderr for checker processes
3207
wnull = open(os.devnull, "w") # A writable /dev/null
3063
wnull = open(os.devnull, "w") # A writable /dev/null
3208
3064
# Only used if server is running in foreground but not in debug
3210
3066
if debug or not foreground:
3213
3069
# Get client data and settings from last running state.
3214
3070
if server_settings["restore"]:
3216
3072
with open(stored_state_path, "rb") as stored_state:
3217
if sys.version_info.major == 2:
3073
if sys.version_info.major == 2:
3218
3074
clients_data, old_client_settings = pickle.load(
3221
3077
bytes_clients_data, bytes_old_client_settings = (
3222
pickle.load(stored_state, encoding="bytes"))
3223
# Fix bytes to strings
3078
pickle.load(stored_state, encoding = "bytes"))
3079
### Fix bytes to strings
3226
clients_data = {(key.decode("utf-8")
3227
if isinstance(key, bytes)
3230
bytes_clients_data.items()}
3082
clients_data = { (key.decode("utf-8")
3083
if isinstance(key, bytes)
3086
bytes_clients_data.items() }
3231
3087
del bytes_clients_data
3232
3088
for key in clients_data:
3233
value = {(k.decode("utf-8")
3234
if isinstance(k, bytes) else k): v
3236
clients_data[key].items()}
3089
value = { (k.decode("utf-8")
3090
if isinstance(k, bytes) else k): v
3092
clients_data[key].items() }
3237
3093
clients_data[key] = value
3238
3094
# .client_structure
3239
3095
value["client_structure"] = [
3240
3096
(s.decode("utf-8")
3241
3097
if isinstance(s, bytes)
3242
3098
else s) for s in
3243
value["client_structure"]]
3099
value["client_structure"] ]
3244
3100
# .name & .host
3245
3101
for k in ("name", "host"):
3246
3102
if isinstance(value[k], bytes):
3247
3103
value[k] = value[k].decode("utf-8")
3248
if "key_id" not in value:
3249
value["key_id"] = ""
3250
elif "fingerprint" not in value:
3251
value["fingerprint"] = ""
3252
# old_client_settings
3104
## old_client_settings
3254
3106
old_client_settings = {
3255
3107
(key.decode("utf-8")
3256
3108
if isinstance(key, bytes)
3257
3109
else key): value
3258
3110
for key, value in
3259
bytes_old_client_settings.items()}
3111
bytes_old_client_settings.items() }
3260
3112
del bytes_old_client_settings
3262
3114
for value in old_client_settings.values():