63
import cPickle as pickle
70
import cPickle as pickle
64
73
import multiprocessing
70
82
import dbus.service
83
from gi.repository import GLib
73
84
from dbus.mainloop.glib import DBusGMainLoop
76
87
import xml.dom.minidom
90
# Try to find the value of SO_BINDTODEVICE:
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
93
# newer, and it is also the most natural place for it:
81
94
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
95
except AttributeError:
97
# This is where SO_BINDTODEVICE was up to and including Python
84
99
from IN import SO_BINDTODEVICE
85
100
except ImportError:
86
SO_BINDTODEVICE = None
101
# In Python 2.7 it seems to have been removed entirely.
102
# Try running the C preprocessor:
104
cc = subprocess.Popen(["cc", "--language=c", "-E",
106
stdin=subprocess.PIPE,
107
stdout=subprocess.PIPE)
108
stdout = cc.communicate(
109
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
110
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
111
except (OSError, ValueError, IndexError):
113
SO_BINDTODEVICE = None
115
if sys.version_info.major == 2:
89
119
stored_state_file = "clients.pickle"
91
121
logger = logging.getLogger()
92
syslogger = (logging.handlers.SysLogHandler
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
100
127
except (OSError, AttributeError):
101
129
def if_nametoindex(interface):
102
130
"Get an interface index the hard way, i.e. using fcntl()"
103
131
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
104
132
with contextlib.closing(socket.socket()) as s:
105
133
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
110
136
return interface_index
139
def copy_function(func):
140
"""Make a copy of a function"""
141
if sys.version_info.major == 2:
142
return types.FunctionType(func.func_code,
148
return types.FunctionType(func.__code__,
113
155
def initlogger(debug, level=logging.WARNING):
114
156
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
116
162
syslogger.setFormatter(logging.Formatter
117
163
('Mandos [%(process)d]: %(levelname)s:'
119
165
logger.addHandler(syslogger)
122
168
console = logging.StreamHandler()
123
169
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
168
226
os.rmdir(self.tempdir)
169
227
self.tempdir = None
171
229
def password_encode(self, password):
172
230
# Passphrase can not be empty and can not contain newlines or
173
231
# NUL bytes. So we prefix it and hex encode it.
174
return b"mandos" + binascii.hexlify(password)
232
encoded = b"mandos" + binascii.hexlify(password)
233
if len(encoded) > 2048:
234
# GnuPG can't handle long passwords, so encode differently
235
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
236
.replace(b"\n", b"\\n")
237
.replace(b"\0", b"\\x00"))
176
240
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
241
passphrase = self.password_encode(password)
242
with tempfile.NamedTemporaryFile(
243
dir=self.tempdir) as passfile:
244
passfile.write(passphrase)
246
proc = subprocess.Popen([self.gpg, '--symmetric',
250
stdin=subprocess.PIPE,
251
stdout=subprocess.PIPE,
252
stderr=subprocess.PIPE)
253
ciphertext, err = proc.communicate(input=data)
254
if proc.returncode != 0:
191
256
return ciphertext
193
258
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
259
passphrase = self.password_encode(password)
260
with tempfile.NamedTemporaryFile(
261
dir=self.tempdir) as passfile:
262
passfile.write(passphrase)
264
proc = subprocess.Popen([self.gpg, '--decrypt',
268
stdin=subprocess.PIPE,
269
stdout=subprocess.PIPE,
270
stderr=subprocess.PIPE)
271
decrypted_plaintext, err = proc.communicate(input=data)
272
if proc.returncode != 0:
208
274
return decrypted_plaintext
277
# Pretend that we have an Avahi module
279
"""This isn't so much a class as it is a module-like namespace.
280
It is instantiated once, and simulates having an Avahi module."""
281
IF_UNSPEC = -1 # avahi-common/address.h
282
PROTO_UNSPEC = -1 # avahi-common/address.h
283
PROTO_INET = 0 # avahi-common/address.h
284
PROTO_INET6 = 1 # avahi-common/address.h
285
DBUS_NAME = "org.freedesktop.Avahi"
286
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
287
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
288
DBUS_PATH_SERVER = "/"
290
def string_array_to_txt_array(self, t):
291
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
292
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
212
304
class AvahiError(Exception):
213
305
def __init__(self, value, *args, **kwargs):
214
306
self.value = value
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
307
return super(AvahiError, self).__init__(value, *args,
219
311
class AvahiServiceError(AvahiError):
222
315
class AvahiGroupError(AvahiError):
226
319
class AvahiService(object):
227
320
"""An Avahi (Zeroconf) service.
230
323
interface: integer; avahi.IF_UNSPEC or an interface index.
231
324
Used to optionally bind to the specified interface.
232
325
name: string; Example: 'Mandos'
233
326
type: string; Example: '_mandos._tcp'.
234
See <http://www.dns-sd.org/ServiceTypes.html>
327
See <https://www.iana.org/assignments/service-names-port-numbers>
235
328
port: integer; what port to announce
236
329
TXT: list of strings; TXT record for the service
237
330
domain: string; Domain to publish on, default to .local if empty.
366
489
follow_name_owner_changes=True),
367
490
avahi.DBUS_INTERFACE_SERVER)
368
491
self.server.connect_to_signal("StateChanged",
369
self.server_state_changed)
492
self.server_state_changed)
370
493
self.server_state_changed(self.server.GetState())
372
496
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
374
498
"""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'
499
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
500
syslogger.setFormatter(logging.Formatter(
501
'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))
506
# Pretend that we have a GnuTLS module
507
class GnuTLS(object):
508
"""This isn't so much a class as it is a module-like namespace.
509
It is instantiated once, and simulates having a GnuTLS module."""
511
library = ctypes.util.find_library("gnutls")
513
library = ctypes.util.find_library("gnutls-deb0")
514
_library = ctypes.cdll.LoadLibrary(library)
516
_need_version = b"3.3.0"
517
_tls_rawpk_version = b"3.6.6"
520
# Need to use "self" here, since this method is called before
521
# the assignment to the "gnutls" global variable happens.
522
if self.check_version(self._need_version) is None:
523
raise self.Error("Needs GnuTLS {} or later"
524
.format(self._need_version))
526
# Unless otherwise indicated, the constants and types below are
527
# all from the gnutls/gnutls.h C header file.
538
E_NO_CERTIFICATE_FOUND = -49
543
KEYID_USE_SHA256 = 1 # gnutls/x509.h
544
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
547
class session_int(ctypes.Structure):
549
session_t = ctypes.POINTER(session_int)
551
class certificate_credentials_st(ctypes.Structure):
553
certificate_credentials_t = ctypes.POINTER(
554
certificate_credentials_st)
555
certificate_type_t = ctypes.c_int
557
class datum_t(ctypes.Structure):
558
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
559
('size', ctypes.c_uint)]
561
class openpgp_crt_int(ctypes.Structure):
563
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
564
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
565
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
566
credentials_type_t = ctypes.c_int
567
transport_ptr_t = ctypes.c_void_p
568
close_request_t = ctypes.c_int
571
class Error(Exception):
572
# We need to use the class name "GnuTLS" here, since this
573
# exception might be raised from within GnuTLS.__init__,
574
# which is called before the assignment to the "gnutls"
575
# global variable has happened.
576
def __init__(self, message=None, code=None, args=()):
577
# Default usage is by a message string, but if a return
578
# code is passed, convert it to a string with
581
if message is None and code is not None:
582
message = GnuTLS.strerror(code)
583
return super(GnuTLS.Error, self).__init__(
586
class CertificateSecurityError(Error):
590
class Credentials(object):
592
self._c_object = gnutls.certificate_credentials_t()
593
gnutls.certificate_allocate_credentials(
594
ctypes.byref(self._c_object))
595
self.type = gnutls.CRD_CERTIFICATE
598
gnutls.certificate_free_credentials(self._c_object)
600
class ClientSession(object):
601
def __init__(self, socket, credentials=None):
602
self._c_object = gnutls.session_t()
603
gnutls_flags = gnutls.CLIENT
604
if gnutls.check_version("3.5.6"):
605
gnutls_flags |= gnutls.NO_TICKETS
607
gnutls_flags |= gnutls.ENABLE_RAWPK
608
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
610
gnutls.set_default_priority(self._c_object)
611
gnutls.transport_set_ptr(self._c_object, socket.fileno())
612
gnutls.handshake_set_private_extensions(self._c_object,
615
if credentials is None:
616
credentials = gnutls.Credentials()
617
gnutls.credentials_set(self._c_object, credentials.type,
618
ctypes.cast(credentials._c_object,
620
self.credentials = credentials
623
gnutls.deinit(self._c_object)
626
return gnutls.handshake(self._c_object)
628
def send(self, data):
632
data_len -= gnutls.record_send(self._c_object,
637
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
639
# Error handling functions
640
def _error_code(result):
641
"""A function to raise exceptions on errors, suitable
642
for the 'restype' attribute on ctypes functions"""
645
if result == gnutls.E_NO_CERTIFICATE_FOUND:
646
raise gnutls.CertificateSecurityError(code=result)
647
raise gnutls.Error(code=result)
649
def _retry_on_error(result, func, arguments):
650
"""A function to retry on some errors, suitable
651
for the 'errcheck' attribute on ctypes functions"""
653
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
654
return _error_code(result)
655
result = func(*arguments)
658
# Unless otherwise indicated, the function declarations below are
659
# all from the gnutls/gnutls.h C header file.
662
priority_set_direct = _library.gnutls_priority_set_direct
663
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
664
ctypes.POINTER(ctypes.c_char_p)]
665
priority_set_direct.restype = _error_code
667
init = _library.gnutls_init
668
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
669
init.restype = _error_code
671
set_default_priority = _library.gnutls_set_default_priority
672
set_default_priority.argtypes = [session_t]
673
set_default_priority.restype = _error_code
675
record_send = _library.gnutls_record_send
676
record_send.argtypes = [session_t, ctypes.c_void_p,
678
record_send.restype = ctypes.c_ssize_t
679
record_send.errcheck = _retry_on_error
681
certificate_allocate_credentials = (
682
_library.gnutls_certificate_allocate_credentials)
683
certificate_allocate_credentials.argtypes = [
684
ctypes.POINTER(certificate_credentials_t)]
685
certificate_allocate_credentials.restype = _error_code
687
certificate_free_credentials = (
688
_library.gnutls_certificate_free_credentials)
689
certificate_free_credentials.argtypes = [
690
certificate_credentials_t]
691
certificate_free_credentials.restype = None
693
handshake_set_private_extensions = (
694
_library.gnutls_handshake_set_private_extensions)
695
handshake_set_private_extensions.argtypes = [session_t,
697
handshake_set_private_extensions.restype = None
699
credentials_set = _library.gnutls_credentials_set
700
credentials_set.argtypes = [session_t, credentials_type_t,
702
credentials_set.restype = _error_code
704
strerror = _library.gnutls_strerror
705
strerror.argtypes = [ctypes.c_int]
706
strerror.restype = ctypes.c_char_p
708
certificate_type_get = _library.gnutls_certificate_type_get
709
certificate_type_get.argtypes = [session_t]
710
certificate_type_get.restype = _error_code
712
certificate_get_peers = _library.gnutls_certificate_get_peers
713
certificate_get_peers.argtypes = [session_t,
714
ctypes.POINTER(ctypes.c_uint)]
715
certificate_get_peers.restype = ctypes.POINTER(datum_t)
717
global_set_log_level = _library.gnutls_global_set_log_level
718
global_set_log_level.argtypes = [ctypes.c_int]
719
global_set_log_level.restype = None
721
global_set_log_function = _library.gnutls_global_set_log_function
722
global_set_log_function.argtypes = [log_func]
723
global_set_log_function.restype = None
725
deinit = _library.gnutls_deinit
726
deinit.argtypes = [session_t]
727
deinit.restype = None
729
handshake = _library.gnutls_handshake
730
handshake.argtypes = [session_t]
731
handshake.restype = _error_code
732
handshake.errcheck = _retry_on_error
734
transport_set_ptr = _library.gnutls_transport_set_ptr
735
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
736
transport_set_ptr.restype = None
738
bye = _library.gnutls_bye
739
bye.argtypes = [session_t, close_request_t]
740
bye.restype = _error_code
741
bye.errcheck = _retry_on_error
743
check_version = _library.gnutls_check_version
744
check_version.argtypes = [ctypes.c_char_p]
745
check_version.restype = ctypes.c_char_p
747
has_rawpk = bool(check_version(_tls_rawpk_version))
751
class pubkey_st(ctypes.Structure):
753
pubkey_t = ctypes.POINTER(pubkey_st)
755
x509_crt_fmt_t = ctypes.c_int
757
# All the function declarations below are from gnutls/abstract.h
758
pubkey_init = _library.gnutls_pubkey_init
759
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
760
pubkey_init.restype = _error_code
762
pubkey_import = _library.gnutls_pubkey_import
763
pubkey_import.argtypes = [pubkey_t, ctypes.POINTER(datum_t),
765
pubkey_import.restype = _error_code
767
pubkey_get_key_id = _library.gnutls_pubkey_get_key_id
768
pubkey_get_key_id.argtypes = [pubkey_t, ctypes.c_int,
769
ctypes.POINTER(ctypes.c_ubyte),
770
ctypes.POINTER(ctypes.c_size_t)]
771
pubkey_get_key_id.restype = _error_code
773
pubkey_deinit = _library.gnutls_pubkey_deinit
774
pubkey_deinit.argtypes = [pubkey_t]
775
pubkey_deinit.restype = None
777
# All the function declarations below are from gnutls/openpgp.h
779
openpgp_crt_init = _library.gnutls_openpgp_crt_init
780
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
781
openpgp_crt_init.restype = _error_code
783
openpgp_crt_import = _library.gnutls_openpgp_crt_import
784
openpgp_crt_import.argtypes = [openpgp_crt_t,
785
ctypes.POINTER(datum_t),
787
openpgp_crt_import.restype = _error_code
789
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
790
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
791
ctypes.POINTER(ctypes.c_uint)]
792
openpgp_crt_verify_self.restype = _error_code
794
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
795
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
796
openpgp_crt_deinit.restype = None
798
openpgp_crt_get_fingerprint = (
799
_library.gnutls_openpgp_crt_get_fingerprint)
800
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
804
openpgp_crt_get_fingerprint.restype = _error_code
806
if check_version("3.6.4"):
807
certificate_type_get2 = _library.gnutls_certificate_type_get2
808
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
809
certificate_type_get2.restype = _error_code
811
# Remove non-public functions
812
del _error_code, _retry_on_error
813
# Create the global "gnutls" object, simulating a module
817
def call_pipe(connection, # : multiprocessing.Connection
818
func, *args, **kwargs):
819
"""This function is meant to be called by multiprocessing.Process
821
This function runs func(*args, **kwargs), and writes the resulting
822
return value on the provided multiprocessing.Connection.
824
connection.send(func(*args, **kwargs))
388
828
class Client(object):
389
829
"""A representation of a client host served by this server.
392
832
approved: bool(); 'None' if not yet approved/disapproved
393
833
approval_delay: datetime.timedelta(); Time to wait for approval
395
835
checker: subprocess.Popen(); a running checker process used
396
836
to see if the client lives.
397
837
'None' if no process is running.
398
checker_callback_tag: a gobject event source tag, or None
838
checker_callback_tag: a GLib event source tag, or None
399
839
checker_command: string; External command which is run to check
400
840
if client lives. %() expansions are done at
401
841
runtime with vars(self) as dict, so that for
402
842
instance %(name)s can be used in the command.
403
checker_initiator_tag: a gobject event source tag, or None
843
checker_initiator_tag: a GLib event source tag, or None
404
844
created: datetime.datetime(); (UTC) object creation
405
845
client_structure: Object describing what attributes a client has
406
846
and is used for storing the client at exit
407
847
current_checker_command: string; current running checker_command
408
disable_initiator_tag: a gobject event source tag, or None
848
disable_initiator_tag: a GLib event source tag, or None
410
850
fingerprint: string (40 or 32 hexadecimal digits); used to
411
uniquely identify the client
851
uniquely identify an OpenPGP client
852
key_id: string (64 hexadecimal digits); used to uniquely identify
853
a client using raw public keys
412
854
host: string; available for use by the checker command
413
855
interval: datetime.timedelta(); How often to start a new checker
414
856
last_approval_request: datetime.datetime(); (UTC) or None
415
857
last_checked_ok: datetime.datetime(); (UTC) or None
416
858
last_checker_status: integer between 0 and 255 reflecting exit
417
859
status of last checker. -1 reflects crashed
860
checker, -2 means no checker completed yet.
861
last_checker_signal: The signal which killed the last checker, if
862
last_checker_status is -1
419
863
last_enabled: datetime.datetime(); (UTC) or None
420
864
name: string; from the config file, used in log messages and
421
865
D-Bus identifiers
422
866
secret: bytestring; sent verbatim (over TLS) to client
423
867
timeout: datetime.timedelta(); How long from last_checked_ok
424
868
until this client is disabled
425
extended_timeout: extra long timeout when password has been sent
869
extended_timeout: extra long timeout when secret has been sent
426
870
runtime_expansions: Allowed attributes for runtime expansion.
427
871
expires: datetime.datetime(); time (UTC) when a client will be
428
872
disabled, or None
873
server_settings: The server_settings dict from main()
431
876
runtime_expansions = ("approval_delay", "approval_duration",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
877
"created", "enabled", "expires", "key_id",
878
"fingerprint", "host", "interval",
879
"last_approval_request", "last_checked_ok",
434
880
"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)
883
"extended_timeout": "PT15M",
885
"checker": "fping -q -- %%(host)s",
887
"approval_delay": "PT0S",
888
"approval_duration": "PT1S",
889
"approved_by_default": "True",
462
894
def config_parser(config):
463
""" Construct a new dict of client settings of this form:
895
"""Construct a new dict of client settings of this form:
464
896
{ client_name: {setting_name: value, ...}, ...}
465
with exceptions for any special settings as defined above"""
897
with exceptions for any special settings as defined above.
898
NOTE: Must be a pure function. Must return the same result
899
value given the same arguments.
467
902
for client_name in config.sections():
468
903
section = dict(config.items(client_name))
469
904
client = settings[client_name] = {}
471
906
client["host"] = section["host"]
472
907
# Reformat values from string types to Python types
473
908
client["approved_by_default"] = config.getboolean(
474
909
client_name, "approved_by_default")
475
client["enabled"] = config.getboolean(client_name, "enabled")
910
client["enabled"] = config.getboolean(client_name,
913
# Uppercase and remove spaces from key_id and fingerprint
914
# for later comparison purposes with return value from the
915
# key_id() and fingerprint() functions
916
client["key_id"] = (section.get("key_id", "").upper()
477
918
client["fingerprint"] = (section["fingerprint"].upper()
478
919
.replace(" ", ""))
479
920
if "secret" in section:
480
client["secret"] = section["secret"].decode("base64")
921
client["secret"] = codecs.decode(section["secret"]
481
924
elif "secfile" in section:
482
925
with open(os.path.expanduser(os.path.expandvars
483
926
(section["secfile"])),
484
927
"rb") as secfile:
485
928
client["secret"] = secfile.read()
487
raise TypeError("No secret or secfile for section %s"
930
raise TypeError("No secret or secfile for section {}"
489
932
client["timeout"] = string_to_delta(section["timeout"])
490
933
client["extended_timeout"] = string_to_delta(
491
934
section["extended_timeout"])
533
977
self.current_checker_command = None
534
978
self.approved = None
535
979
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()
980
self.changedstate = multiprocessing_manager.Condition(
981
multiprocessing_manager.Lock())
982
self.client_structure = [attr
983
for attr in self.__dict__.keys()
541
984
if not attr.startswith("_")]
542
985
self.client_structure.append("client_structure")
544
for name, t in inspect.getmembers(type(self),
987
for name, t in inspect.getmembers(
988
type(self), lambda obj: isinstance(obj, property)):
548
989
if not name.startswith("_"):
549
990
self.client_structure.append(name)
551
992
# Send notice to process children that client state has changed
552
993
def send_changedstate(self):
553
994
with self.changedstate:
554
995
self.changedstate.notify_all()
556
997
def enable(self):
557
998
"""Start this client's checker and timeout hooks"""
558
999
if getattr(self, "enabled", False):
559
1000
# Already enabled
561
self.send_changedstate()
562
1002
self.expires = datetime.datetime.utcnow() + self.timeout
563
1003
self.enabled = True
564
1004
self.last_enabled = datetime.datetime.utcnow()
565
1005
self.init_checker()
1006
self.send_changedstate()
567
1008
def disable(self, quiet=True):
568
1009
"""Disable this client."""
569
1010
if not getattr(self, "enabled", False):
572
self.send_changedstate()
574
1013
logger.info("Disabling client %s", self.name)
575
if getattr(self, "disable_initiator_tag", False):
576
gobject.source_remove(self.disable_initiator_tag)
1014
if getattr(self, "disable_initiator_tag", None) is not None:
1015
GLib.source_remove(self.disable_initiator_tag)
577
1016
self.disable_initiator_tag = None
578
1017
self.expires = None
579
if getattr(self, "checker_initiator_tag", False):
580
gobject.source_remove(self.checker_initiator_tag)
1018
if getattr(self, "checker_initiator_tag", None) is not None:
1019
GLib.source_remove(self.checker_initiator_tag)
581
1020
self.checker_initiator_tag = None
582
1021
self.stop_checker()
583
1022
self.enabled = False
584
# Do not run this again if called by a gobject.timeout_add
1024
self.send_changedstate()
1025
# Do not run this again if called by a GLib.timeout_add
587
1028
def __del__(self):
590
1031
def init_checker(self):
591
1032
# Schedule a new checker to be started an 'interval' from now,
592
1033
# and every interval from then on.
593
self.checker_initiator_tag = (gobject.timeout_add
594
(self.interval_milliseconds(),
1034
if self.checker_initiator_tag is not None:
1035
GLib.source_remove(self.checker_initiator_tag)
1036
self.checker_initiator_tag = GLib.timeout_add(
1037
int(self.interval.total_seconds() * 1000),
596
1039
# Schedule a disable() when 'timeout' has passed
597
self.disable_initiator_tag = (gobject.timeout_add
598
(self.timeout_milliseconds(),
1040
if self.disable_initiator_tag is not None:
1041
GLib.source_remove(self.disable_initiator_tag)
1042
self.disable_initiator_tag = GLib.timeout_add(
1043
int(self.timeout.total_seconds() * 1000), self.disable)
600
1044
# Also start a new checker *right now*.
601
1045
self.start_checker()
603
def checker_callback(self, pid, condition, command):
1047
def checker_callback(self, source, condition, connection,
604
1049
"""The checker has completed, so take appropriate actions."""
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)
1052
# Read return code from connection (see call_pipe)
1053
returncode = connection.recv()
1057
self.last_checker_status = returncode
1058
self.last_checker_signal = None
609
1059
if self.last_checker_status == 0:
610
1060
logger.info("Checker for %(name)s succeeded",
612
1062
self.checked_ok()
614
logger.info("Checker for %(name)s failed",
1064
logger.info("Checker for %(name)s failed", vars(self))
617
1066
self.last_checker_status = -1
1067
self.last_checker_signal = -returncode
618
1068
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,
1072
def checked_ok(self):
1073
"""Assert that the client has been seen, alive and well."""
1074
self.last_checked_ok = datetime.datetime.utcnow()
1075
self.last_checker_status = 0
1076
self.last_checker_signal = None
1079
def bump_timeout(self, timeout=None):
1080
"""Bump up the timeout for this client."""
627
1081
if timeout is None:
628
1082
timeout = self.timeout
629
self.last_checked_ok = datetime.datetime.utcnow()
630
1083
if self.disable_initiator_tag is not None:
631
gobject.source_remove(self.disable_initiator_tag)
1084
GLib.source_remove(self.disable_initiator_tag)
1085
self.disable_initiator_tag = None
632
1086
if getattr(self, "enabled", False):
633
self.disable_initiator_tag = (gobject.timeout_add
634
(timedelta_to_milliseconds
635
(timeout), self.disable))
1087
self.disable_initiator_tag = GLib.timeout_add(
1088
int(timeout.total_seconds() * 1000), self.disable)
636
1089
self.expires = datetime.datetime.utcnow() + timeout
638
1091
def need_approval(self):
639
1092
self.last_approval_request = datetime.datetime.utcnow()
641
1094
def start_checker(self):
642
1095
"""Start a new checker subprocess if one is not running.
644
1097
If a checker already exists, leave it running and do
646
1099
# 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
1100
# did that, and if a checker (for some reason) started running
1101
# slowly and taking more than 'interval' time, then the client
1102
# would inevitably timeout, since no checker would get a
1103
# chance to run to completion. If we instead leave running
651
1104
# checkers alone, the checker would have to take more time
652
1105
# 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)
1108
if self.checker is not None and not self.checker.is_alive():
1109
logger.warning("Checker was not alive; joining")
668
1112
# Start a new checker if needed
669
1113
if self.checker is None:
1114
# Escape attributes for the shell
1116
attr: re.escape(str(getattr(self, attr)))
1117
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
1119
command = self.checker_command % escaped_attrs
1120
except TypeError as error:
1121
logger.error('Could not format string "%s"',
1122
self.checker_command,
1124
return True # Try again later
689
1125
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
1126
logger.info("Starting checker %r for %s", command,
1128
# We don't need to redirect stdout and stderr, since
1129
# in normal mode, that is already done by daemon(),
1130
# and in debug mode we don't want to. (Stdin is
1131
# always replaced by /dev/null.)
1132
# The exception is when not debugging but nevertheless
1133
# running in the foreground; use the previously
1135
popen_args = {"close_fds": True,
1138
if (not self.server_settings["debug"]
1139
and self.server_settings["foreground"]):
1140
popen_args.update({"stdout": wnull,
1142
pipe = multiprocessing.Pipe(duplex=False)
1143
self.checker = multiprocessing.Process(
1145
args=(pipe[1], subprocess.call, command),
1147
self.checker.start()
1148
self.checker_callback_tag = GLib.io_add_watch(
1149
pipe[0].fileno(), GLib.IO_IN,
1150
self.checker_callback, pipe[0], command)
1151
# Re-run this periodically if run by GLib.timeout_add
716
1154
def stop_checker(self):
717
1155
"""Force the checker process, if any, to stop."""
718
1156
if self.checker_callback_tag:
719
gobject.source_remove(self.checker_callback_tag)
1157
GLib.source_remove(self.checker_callback_tag)
720
1158
self.checker_callback_tag = None
721
1159
if getattr(self, "checker", None) is None:
723
1161
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
1162
self.checker.terminate()
732
1163
self.checker = None
735
def dbus_service_property(dbus_interface, signature="v",
736
access="readwrite", byte_arrays=False):
1166
def dbus_service_property(dbus_interface,
737
1170
"""Decorators for marking methods of a DBusObjectWithProperties to
738
1171
become properties on the D-Bus.
740
1173
The decorated method will be called with no arguments by "Get"
741
1174
and with one argument by "Set".
743
1176
The parameters, where they are supported, are the same as
744
1177
dbus.service.method, except there is only "signature", since the
745
1178
type from Get() and the type sent to Set() is the same.
784
class DBusObjectWithProperties(dbus.service.Object):
1261
class DBusObjectWithAnnotations(dbus.service.Object):
1262
"""A D-Bus object with annotations.
1264
Classes inheriting from this can use the dbus_annotations
1265
decorator to add annotations to methods or signals.
1269
def _is_dbus_thing(thing):
1270
"""Returns a function testing if an attribute is a D-Bus thing
1272
If called like _is_dbus_thing("method") it returns a function
1273
suitable for use as predicate to inspect.getmembers().
1275
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1278
def _get_all_dbus_things(self, thing):
1279
"""Returns a generator of (name, attribute) pairs
1281
return ((getattr(athing.__get__(self), "_dbus_name", name),
1282
athing.__get__(self))
1283
for cls in self.__class__.__mro__
1285
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1287
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1289
path_keyword='object_path',
1290
connection_keyword='connection')
1291
def Introspect(self, object_path, connection):
1292
"""Overloading of standard D-Bus method.
1294
Inserts annotation tags on methods and signals.
1296
xmlstring = dbus.service.Object.Introspect(self, object_path,
1299
document = xml.dom.minidom.parseString(xmlstring)
1301
for if_tag in document.getElementsByTagName("interface"):
1302
# Add annotation tags
1303
for typ in ("method", "signal"):
1304
for tag in if_tag.getElementsByTagName(typ):
1306
for name, prop in (self.
1307
_get_all_dbus_things(typ)):
1308
if (name == tag.getAttribute("name")
1309
and prop._dbus_interface
1310
== if_tag.getAttribute("name")):
1311
annots.update(getattr(
1312
prop, "_dbus_annotations", {}))
1313
for name, value in annots.items():
1314
ann_tag = document.createElement(
1316
ann_tag.setAttribute("name", name)
1317
ann_tag.setAttribute("value", value)
1318
tag.appendChild(ann_tag)
1319
# Add interface annotation tags
1320
for annotation, value in dict(
1321
itertools.chain.from_iterable(
1322
annotations().items()
1323
for name, annotations
1324
in self._get_all_dbus_things("interface")
1325
if name == if_tag.getAttribute("name")
1327
ann_tag = document.createElement("annotation")
1328
ann_tag.setAttribute("name", annotation)
1329
ann_tag.setAttribute("value", value)
1330
if_tag.appendChild(ann_tag)
1331
# Fix argument name for the Introspect method itself
1332
if (if_tag.getAttribute("name")
1333
== dbus.INTROSPECTABLE_IFACE):
1334
for cn in if_tag.getElementsByTagName("method"):
1335
if cn.getAttribute("name") == "Introspect":
1336
for arg in cn.getElementsByTagName("arg"):
1337
if (arg.getAttribute("direction")
1339
arg.setAttribute("name",
1341
xmlstring = document.toxml("utf-8")
1343
except (AttributeError, xml.dom.DOMException,
1344
xml.parsers.expat.ExpatError) as error:
1345
logger.error("Failed to override Introspection method",
1350
class DBusObjectWithProperties(DBusObjectWithAnnotations):
785
1351
"""A D-Bus object with properties.
787
1353
Classes inheriting from this can use the dbus_service_property
788
1354
decorator to expose methods as D-Bus properties. It exposes the
789
1355
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
1358
def _get_dbus_property(self, interface_name, property_name):
805
1359
"""Returns a bound method if one exists which is a D-Bus
806
1360
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)):
1362
for cls in self.__class__.__mro__:
1363
for name, value in inspect.getmembers(
1364
cls, self._is_dbus_thing("property")):
811
1365
if (value._dbus_name == property_name
812
1366
and value._dbus_interface == interface_name):
813
1367
return value.__get__(self)
815
1369
# No such property
816
raise DBusPropertyNotFound(self.dbus_object_path + ":"
817
+ interface_name + "."
820
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1370
raise DBusPropertyNotFound("{}:{}.{}".format(
1371
self.dbus_object_path, interface_name, property_name))
1374
def _get_all_interface_names(cls):
1375
"""Get a sequence of all interfaces supported by an object"""
1376
return (name for name in set(getattr(getattr(x, attr),
1377
"_dbus_interface", None)
1378
for x in (inspect.getmro(cls))
1380
if name is not None)
1382
@dbus.service.method(dbus.PROPERTIES_IFACE,
821
1384
out_signature="v")
822
1385
def Get(self, interface_name, property_name):
823
1386
"""Standard D-Bus property Get() method, see D-Bus standard.
867
1433
if not hasattr(value, "variant_level"):
868
1434
properties[name] = value
870
properties[name] = type(value)(value, variant_level=
871
value.variant_level+1)
1436
properties[name] = type(value)(
1437
value, variant_level=value.variant_level + 1)
872
1438
return dbus.Dictionary(properties, signature="sv")
1440
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1441
def PropertiesChanged(self, interface_name, changed_properties,
1442
invalidated_properties):
1443
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
874
1448
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
875
1449
out_signature="s",
876
1450
path_keyword='object_path',
877
1451
connection_keyword='connection')
878
1452
def Introspect(self, object_path, connection):
879
"""Standard D-Bus method, overloaded to insert property tags.
1453
"""Overloading of standard D-Bus method.
1455
Inserts property tags and interface annotation tags.
881
xmlstring = dbus.service.Object.Introspect(self, object_path,
1457
xmlstring = DBusObjectWithAnnotations.Introspect(self,
884
1461
document = xml.dom.minidom.parseString(xmlstring)
885
1463
def make_tag(document, name, prop):
886
1464
e = document.createElement("property")
887
1465
e.setAttribute("name", name)
888
1466
e.setAttribute("type", prop._dbus_signature)
889
1467
e.setAttribute("access", prop._dbus_access)
891
1470
for if_tag in document.getElementsByTagName("interface"):
892
1472
for tag in (make_tag(document, name, prop)
894
in self._get_all_dbus_properties()
1474
in self._get_all_dbus_things("property")
895
1475
if prop._dbus_interface
896
1476
== if_tag.getAttribute("name")):
897
1477
if_tag.appendChild(tag)
1478
# Add annotation tags for properties
1479
for tag in if_tag.getElementsByTagName("property"):
1481
for name, prop in self._get_all_dbus_things(
1483
if (name == tag.getAttribute("name")
1484
and prop._dbus_interface
1485
== if_tag.getAttribute("name")):
1486
annots.update(getattr(
1487
prop, "_dbus_annotations", {}))
1488
for name, value in annots.items():
1489
ann_tag = document.createElement(
1491
ann_tag.setAttribute("name", name)
1492
ann_tag.setAttribute("value", value)
1493
tag.appendChild(ann_tag)
898
1494
# Add the names to the return values for the
899
1495
# "org.freedesktop.DBus.Properties" methods
900
1496
if (if_tag.getAttribute("name")
915
1511
except (AttributeError, xml.dom.DOMException,
916
1512
xml.parsers.expat.ExpatError) as error:
917
1513
logger.error("Failed to override Introspection method",
922
def datetime_to_dbus (dt, variant_level=0):
1519
dbus.OBJECT_MANAGER_IFACE
1520
except AttributeError:
1521
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1524
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1525
"""A D-Bus object with an ObjectManager.
1527
Classes inheriting from this exposes the standard
1528
GetManagedObjects call and the InterfacesAdded and
1529
InterfacesRemoved signals on the standard
1530
"org.freedesktop.DBus.ObjectManager" interface.
1532
Note: No signals are sent automatically; they must be sent
1535
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1536
out_signature="a{oa{sa{sv}}}")
1537
def GetManagedObjects(self):
1538
"""This function must be overridden"""
1539
raise NotImplementedError()
1541
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1542
signature="oa{sa{sv}}")
1543
def InterfacesAdded(self, object_path, interfaces_and_properties):
1546
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1547
def InterfacesRemoved(self, object_path, interfaces):
1550
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1552
path_keyword='object_path',
1553
connection_keyword='connection')
1554
def Introspect(self, object_path, connection):
1555
"""Overloading of standard D-Bus method.
1557
Override return argument name of GetManagedObjects to be
1558
"objpath_interfaces_and_properties"
1560
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1564
document = xml.dom.minidom.parseString(xmlstring)
1566
for if_tag in document.getElementsByTagName("interface"):
1567
# Fix argument name for the GetManagedObjects method
1568
if (if_tag.getAttribute("name")
1569
== dbus.OBJECT_MANAGER_IFACE):
1570
for cn in if_tag.getElementsByTagName("method"):
1571
if (cn.getAttribute("name")
1572
== "GetManagedObjects"):
1573
for arg in cn.getElementsByTagName("arg"):
1574
if (arg.getAttribute("direction")
1578
"objpath_interfaces"
1580
xmlstring = document.toxml("utf-8")
1582
except (AttributeError, xml.dom.DOMException,
1583
xml.parsers.expat.ExpatError) as error:
1584
logger.error("Failed to override Introspection method",
1589
def datetime_to_dbus(dt, variant_level=0):
923
1590
"""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.
1592
return dbus.String("", variant_level=variant_level)
1593
return dbus.String(dt.isoformat(), variant_level=variant_level)
1596
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1597
"""A class decorator; applied to a subclass of
1598
dbus.service.Object, it will add alternate D-Bus attributes with
1599
interface names according to the "alt_interface_names" mapping.
1602
@alternate_dbus_interfaces({"org.example.Interface":
1603
"net.example.AlternateInterface"})
1604
class SampleDBusObject(dbus.service.Object):
1605
@dbus.service.method("org.example.Interface")
1606
def SampleDBusMethod():
1609
The above "SampleDBusMethod" on "SampleDBusObject" will be
1610
reachable via two interfaces: "org.example.Interface" and
1611
"net.example.AlternateInterface", the latter of which will have
1612
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1613
"true", unless "deprecate" is passed with a False value.
1615
This works for methods and signals, and also for D-Bus properties
1616
(from DBusObjectWithProperties) and interfaces (from the
1617
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):
1621
for orig_interface_name, alt_interface_name in (
1622
alt_interface_names.items()):
1624
interface_names = set()
1625
# Go though all attributes of the class
1626
for attrname, attribute in inspect.getmembers(cls):
942
1627
# Ignore non-D-Bus attributes, and D-Bus attributes
943
1628
# with the wrong interface name
944
1629
if (not hasattr(attribute, "_dbus_interface")
945
or not attribute._dbus_interface
946
.startswith("se.recompile.Mandos")):
1630
or not attribute._dbus_interface.startswith(
1631
orig_interface_name)):
948
1633
# Create an alternate D-Bus interface name based on
949
1634
# the current name
950
alt_interface = (attribute._dbus_interface
951
.replace("se.recompile.Mandos",
952
"se.bsnet.fukt.Mandos"))
1635
alt_interface = attribute._dbus_interface.replace(
1636
orig_interface_name, alt_interface_name)
1637
interface_names.add(alt_interface)
953
1638
# Is this a D-Bus signal?
954
1639
if getattr(attribute, "_dbus_is_signal", False):
955
# Extract the original non-method function by
957
nonmethod_func = (dict(
1640
# Extract the original non-method undecorated
1641
# function by black magic
1642
if sys.version_info.major == 2:
1643
nonmethod_func = (dict(
958
1644
zip(attribute.func_code.co_freevars,
959
attribute.__closure__))["func"]
1645
attribute.__closure__))
1646
["func"].cell_contents)
1648
nonmethod_func = (dict(
1649
zip(attribute.__code__.co_freevars,
1650
attribute.__closure__))
1651
["func"].cell_contents)
961
1652
# Create a new, but exactly alike, function
962
1653
# object, and decorate it to be a new D-Bus signal
963
1654
# 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)))
1655
new_function = copy_function(nonmethod_func)
1656
new_function = (dbus.service.signal(
1658
attribute._dbus_signature)(new_function))
1659
# Copy annotations, if any
1661
new_function._dbus_annotations = dict(
1662
attribute._dbus_annotations)
1663
except AttributeError:
973
1666
# 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
1667
# original and alternate functions, so both the
1668
# original and alternate signals gets sent when
1669
# the function is called
976
1670
def fixscope(func1, func2):
977
1671
"""This function is a scope container to pass
978
1672
func1 and func2 to the "call_both" function
979
1673
outside of its arguments"""
1675
@functools.wraps(func2)
980
1676
def call_both(*args, **kwargs):
981
1677
"""This function will emit two D-Bus
982
1678
signals by calling func1 and func2"""
983
1679
func1(*args, **kwargs)
984
1680
func2(*args, **kwargs)
1681
# Make wrapper function look like a D-Bus
1683
for name, attr in inspect.getmembers(func2):
1684
if name.startswith("_dbus_"):
1685
setattr(call_both, name, attr)
985
1687
return call_both
986
1688
# Create the "call_both" function and add it to
988
attr[attrname] = fixscope(attribute,
1690
attr[attrname] = fixscope(attribute, new_function)
990
1691
# Is this a D-Bus method?
991
1692
elif getattr(attribute, "_dbus_is_method", False):
992
1693
# Create a new, but exactly alike, function
993
1694
# object. Decorate it to be a new D-Bus method
994
1695
# 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)))
1698
dbus.service.method(
1700
attribute._dbus_in_signature,
1701
attribute._dbus_out_signature)
1702
(copy_function(attribute)))
1703
# Copy annotations, if any
1705
attr[attrname]._dbus_annotations = dict(
1706
attribute._dbus_annotations)
1707
except AttributeError:
1006
1709
# Is this a D-Bus property?
1007
1710
elif getattr(attribute, "_dbus_is_property", False):
1008
1711
# Create a new, but exactly alike, function
1009
1712
# object, and decorate it to be a new D-Bus
1010
1713
# property with the alternate D-Bus interface
1011
1714
# 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)
1715
attr[attrname] = (dbus_service_property(
1716
alt_interface, attribute._dbus_signature,
1717
attribute._dbus_access,
1718
attribute._dbus_get_args_options
1720
(copy_function(attribute)))
1721
# Copy annotations, if any
1723
attr[attrname]._dbus_annotations = dict(
1724
attribute._dbus_annotations)
1725
except AttributeError:
1727
# Is this a D-Bus interface?
1728
elif getattr(attribute, "_dbus_is_interface", False):
1729
# Create a new, but exactly alike, function
1730
# object. Decorate it to be a new D-Bus interface
1731
# with the alternate D-Bus interface name. Add it
1734
dbus_interface_annotations(alt_interface)
1735
(copy_function(attribute)))
1737
# Deprecate all alternate interfaces
1738
iname = "_AlternateDBusNames_interface_annotation{}"
1739
for interface_name in interface_names:
1741
@dbus_interface_annotations(interface_name)
1743
return {"org.freedesktop.DBus.Deprecated":
1745
# Find an unused name
1746
for aname in (iname.format(i)
1747
for i in itertools.count()):
1748
if aname not in attr:
1752
# Replace the class with a new subclass of it with
1753
# methods, signals, etc. as created above.
1754
if sys.version_info.major == 2:
1755
cls = type(b"{}Alternate".format(cls.__name__),
1758
cls = type("{}Alternate".format(cls.__name__),
1765
@alternate_dbus_interfaces({"se.recompile.Mandos":
1766
"se.bsnet.fukt.Mandos"})
1028
1767
class ClientDBus(Client, DBusObjectWithProperties):
1029
1768
"""A Client class using D-Bus
1032
1771
dbus_object_path: dbus.ObjectPath
1033
1772
bus: dbus.SystemBus()
1036
1775
runtime_expansions = (Client.runtime_expansions
1037
+ ("dbus_object_path",))
1776
+ ("dbus_object_path", ))
1778
_interface = "se.recompile.Mandos.Client"
1039
1780
# dbus.service.Object doesn't use super(), so we can't either.
1041
def __init__(self, bus = None, *args, **kwargs):
1782
def __init__(self, bus=None, *args, **kwargs):
1043
1784
Client.__init__(self, *args, **kwargs)
1044
self._approvals_pending = 0
1046
self._approvals_pending = 0
1047
1785
# Only now, when this client is initialized, can it show up on
1049
client_object_name = unicode(self.name).translate(
1787
client_object_name = str(self.name).translate(
1050
1788
{ord("."): ord("_"),
1051
1789
ord("-"): ord("_")})
1052
self.dbus_object_path = (dbus.ObjectPath
1053
("/clients/" + client_object_name))
1790
self.dbus_object_path = dbus.ObjectPath(
1791
"/clients/" + client_object_name)
1054
1792
DBusObjectWithProperties.__init__(self, self.bus,
1055
1793
self.dbus_object_path)
1057
def notifychangeproperty(transform_func,
1058
dbus_name, type_func=lambda x: x,
1795
def notifychangeproperty(transform_func, dbus_name,
1796
type_func=lambda x: x,
1798
invalidate_only=False,
1799
_interface=_interface):
1060
1800
""" Modify a variable so that it's a property which announces
1061
1801
its changes to DBus.
1063
1803
transform_fun: Function that takes a value and a variant_level
1064
1804
and transforms it to a D-Bus type.
1065
1805
dbus_name: D-Bus name of the variable
1067
1807
to the D-Bus. Default: no transform
1068
1808
variant_level: D-Bus variant level. Default: 1
1070
attrname = "_{0}".format(dbus_name)
1810
attrname = "_{}".format(dbus_name)
1071
1812
def setter(self, value):
1072
1813
if hasattr(self, "dbus_object_path"):
1073
1814
if (not hasattr(self, attrname) or
1074
1815
type_func(getattr(self, attrname, None))
1075
1816
!= type_func(value)):
1076
dbus_value = transform_func(type_func(value),
1079
self.PropertyChanged(dbus.String(dbus_name),
1818
self.PropertiesChanged(
1819
_interface, dbus.Dictionary(),
1820
dbus.Array((dbus_name, )))
1822
dbus_value = transform_func(
1824
variant_level=variant_level)
1825
self.PropertyChanged(dbus.String(dbus_name),
1827
self.PropertiesChanged(
1829
dbus.Dictionary({dbus.String(dbus_name):
1081
1832
setattr(self, attrname, value)
1083
1834
return property(lambda self: getattr(self, attrname), setter)
1086
1836
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1087
1837
approvals_pending = notifychangeproperty(dbus.Boolean,
1088
1838
"ApprovalPending",
1090
1840
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1091
1841
last_enabled = notifychangeproperty(datetime_to_dbus,
1093
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1094
type_func = lambda checker:
1095
checker is not None)
1843
checker = notifychangeproperty(
1844
dbus.Boolean, "CheckerRunning",
1845
type_func=lambda checker: checker is not None)
1096
1846
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1097
1847
"LastCheckedOK")
1848
last_checker_status = notifychangeproperty(dbus.Int16,
1849
"LastCheckerStatus")
1098
1850
last_approval_request = notifychangeproperty(
1099
1851
datetime_to_dbus, "LastApprovalRequest")
1100
1852
approved_by_default = notifychangeproperty(dbus.Boolean,
1101
1853
"ApprovedByDefault")
1102
approval_delay = notifychangeproperty(dbus.UInt64,
1105
timedelta_to_milliseconds)
1854
approval_delay = notifychangeproperty(
1855
dbus.UInt64, "ApprovalDelay",
1856
type_func=lambda td: td.total_seconds() * 1000)
1106
1857
approval_duration = notifychangeproperty(
1107
1858
dbus.UInt64, "ApprovalDuration",
1108
type_func = timedelta_to_milliseconds)
1859
type_func=lambda td: td.total_seconds() * 1000)
1109
1860
host = notifychangeproperty(dbus.String, "Host")
1110
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1112
timedelta_to_milliseconds)
1861
timeout = notifychangeproperty(
1862
dbus.UInt64, "Timeout",
1863
type_func=lambda td: td.total_seconds() * 1000)
1113
1864
extended_timeout = notifychangeproperty(
1114
1865
dbus.UInt64, "ExtendedTimeout",
1115
type_func = timedelta_to_milliseconds)
1116
interval = notifychangeproperty(dbus.UInt64,
1119
timedelta_to_milliseconds)
1866
type_func=lambda td: td.total_seconds() * 1000)
1867
interval = notifychangeproperty(
1868
dbus.UInt64, "Interval",
1869
type_func=lambda td: td.total_seconds() * 1000)
1120
1870
checker_command = notifychangeproperty(dbus.String, "Checker")
1871
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1872
invalidate_only=True)
1122
1874
del notifychangeproperty
1124
1876
def __del__(self, *args, **kwargs):
1126
1878
self.remove_from_connection()
1206
1957
server to mandos-client
1210
1961
# Rejected - signal
1211
1962
@dbus.service.signal(_interface, signature="s")
1212
1963
def Rejected(self, reason):
1216
1967
# NeedApproval - signal
1217
1968
@dbus.service.signal(_interface, signature="tb")
1218
1969
def NeedApproval(self, timeout, default):
1220
1971
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
1975
# Approve - method
1233
1976
@dbus.service.method(_interface, in_signature="b")
1234
1977
def Approve(self, value):
1235
1978
self.approve(value)
1237
1980
# CheckedOK - method
1238
1981
@dbus.service.method(_interface)
1239
1982
def CheckedOK(self):
1240
1983
self.checked_ok()
1242
1985
# Enable - method
1986
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1243
1987
@dbus.service.method(_interface)
1244
1988
def Enable(self):
1248
1992
# StartChecker - method
1993
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1249
1994
@dbus.service.method(_interface)
1250
1995
def StartChecker(self):
1252
1997
self.start_checker()
1254
1999
# Disable - method
2000
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1255
2001
@dbus.service.method(_interface)
1256
2002
def Disable(self):
1260
2006
# StopChecker - method
2007
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1261
2008
@dbus.service.method(_interface)
1262
2009
def StopChecker(self):
1263
2010
self.stop_checker()
1267
2014
# ApprovalPending - property
1268
2015
@dbus_service_property(_interface, signature="b", access="read")
1269
2016
def ApprovalPending_dbus_property(self):
1270
2017
return dbus.Boolean(bool(self.approvals_pending))
1272
2019
# ApprovedByDefault - property
1273
@dbus_service_property(_interface, signature="b",
2020
@dbus_service_property(_interface,
1274
2022
access="readwrite")
1275
2023
def ApprovedByDefault_dbus_property(self, value=None):
1276
2024
if value is None: # get
1277
2025
return dbus.Boolean(self.approved_by_default)
1278
2026
self.approved_by_default = bool(value)
1280
2028
# ApprovalDelay - property
1281
@dbus_service_property(_interface, signature="t",
2029
@dbus_service_property(_interface,
1282
2031
access="readwrite")
1283
2032
def ApprovalDelay_dbus_property(self, value=None):
1284
2033
if value is None: # get
1285
return dbus.UInt64(self.approval_delay_milliseconds())
2034
return dbus.UInt64(self.approval_delay.total_seconds()
1286
2036
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1288
2038
# ApprovalDuration - property
1289
@dbus_service_property(_interface, signature="t",
2039
@dbus_service_property(_interface,
1290
2041
access="readwrite")
1291
2042
def ApprovalDuration_dbus_property(self, value=None):
1292
2043
if value is None: # get
1293
return dbus.UInt64(timedelta_to_milliseconds(
1294
self.approval_duration))
2044
return dbus.UInt64(self.approval_duration.total_seconds()
1295
2046
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1297
2048
# Name - property
2050
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1298
2051
@dbus_service_property(_interface, signature="s", access="read")
1299
2052
def Name_dbus_property(self):
1300
2053
return dbus.String(self.name)
2057
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2058
@dbus_service_property(_interface, signature="s", access="read")
2059
def KeyID_dbus_property(self):
2060
return dbus.String(self.key_id)
1302
2062
# Fingerprint - property
2064
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1303
2065
@dbus_service_property(_interface, signature="s", access="read")
1304
2066
def Fingerprint_dbus_property(self):
1305
2067
return dbus.String(self.fingerprint)
1307
2069
# Host - property
1308
@dbus_service_property(_interface, signature="s",
2070
@dbus_service_property(_interface,
1309
2072
access="readwrite")
1310
2073
def Host_dbus_property(self, value=None):
1311
2074
if value is None: # get
1312
2075
return dbus.String(self.host)
1313
self.host = unicode(value)
2076
self.host = str(value)
1315
2078
# Created - property
2080
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1316
2081
@dbus_service_property(_interface, signature="s", access="read")
1317
2082
def Created_dbus_property(self):
1318
2083
return datetime_to_dbus(self.created)
1320
2085
# LastEnabled - property
1321
2086
@dbus_service_property(_interface, signature="s", access="read")
1322
2087
def LastEnabled_dbus_property(self):
1323
2088
return datetime_to_dbus(self.last_enabled)
1325
2090
# Enabled - property
1326
@dbus_service_property(_interface, signature="b",
2091
@dbus_service_property(_interface,
1327
2093
access="readwrite")
1328
2094
def Enabled_dbus_property(self, value=None):
1329
2095
if value is None: # get
1336
2102
# LastCheckedOK - property
1337
@dbus_service_property(_interface, signature="s",
2103
@dbus_service_property(_interface,
1338
2105
access="readwrite")
1339
2106
def LastCheckedOK_dbus_property(self, value=None):
1340
2107
if value is not None:
1341
2108
self.checked_ok()
1343
2110
return datetime_to_dbus(self.last_checked_ok)
2112
# LastCheckerStatus - property
2113
@dbus_service_property(_interface, signature="n", access="read")
2114
def LastCheckerStatus_dbus_property(self):
2115
return dbus.Int16(self.last_checker_status)
1345
2117
# Expires - property
1346
2118
@dbus_service_property(_interface, signature="s", access="read")
1347
2119
def Expires_dbus_property(self):
1348
2120
return datetime_to_dbus(self.expires)
1350
2122
# LastApprovalRequest - property
1351
2123
@dbus_service_property(_interface, signature="s", access="read")
1352
2124
def LastApprovalRequest_dbus_property(self):
1353
2125
return datetime_to_dbus(self.last_approval_request)
1355
2127
# Timeout - property
1356
@dbus_service_property(_interface, signature="t",
2128
@dbus_service_property(_interface,
1357
2130
access="readwrite")
1358
2131
def Timeout_dbus_property(self, value=None):
1359
2132
if value is None: # get
1360
return dbus.UInt64(self.timeout_milliseconds())
2133
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2134
old_timeout = self.timeout
1361
2135
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))
2136
# Reschedule disabling
2138
now = datetime.datetime.utcnow()
2139
self.expires += self.timeout - old_timeout
2140
if self.expires <= now:
2141
# The timeout has passed
2144
if (getattr(self, "disable_initiator_tag", None)
2147
GLib.source_remove(self.disable_initiator_tag)
2148
self.disable_initiator_tag = GLib.timeout_add(
2149
int((self.expires - now).total_seconds() * 1000),
1383
2152
# ExtendedTimeout - property
1384
@dbus_service_property(_interface, signature="t",
2153
@dbus_service_property(_interface,
1385
2155
access="readwrite")
1386
2156
def ExtendedTimeout_dbus_property(self, value=None):
1387
2157
if value is None: # get
1388
return dbus.UInt64(self.extended_timeout_milliseconds())
2158
return dbus.UInt64(self.extended_timeout.total_seconds()
1389
2160
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1391
2162
# Interval - property
1392
@dbus_service_property(_interface, signature="t",
2163
@dbus_service_property(_interface,
1393
2165
access="readwrite")
1394
2166
def Interval_dbus_property(self, value=None):
1395
2167
if value is None: # get
1396
return dbus.UInt64(self.interval_milliseconds())
2168
return dbus.UInt64(self.interval.total_seconds() * 1000)
1397
2169
self.interval = datetime.timedelta(0, 0, 0, value)
1398
2170
if getattr(self, "checker_initiator_tag", None) is None:
1400
2172
if self.enabled:
1401
2173
# 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
2174
GLib.source_remove(self.checker_initiator_tag)
2175
self.checker_initiator_tag = GLib.timeout_add(
2176
value, self.start_checker)
2177
self.start_checker() # Start one now, too
1407
2179
# Checker - property
1408
@dbus_service_property(_interface, signature="s",
2180
@dbus_service_property(_interface,
1409
2182
access="readwrite")
1410
2183
def Checker_dbus_property(self, value=None):
1411
2184
if value is None: # get
1412
2185
return dbus.String(self.checker_command)
1413
self.checker_command = unicode(value)
2186
self.checker_command = str(value)
1415
2188
# CheckerRunning - property
1416
@dbus_service_property(_interface, signature="b",
2189
@dbus_service_property(_interface,
1417
2191
access="readwrite")
1418
2192
def CheckerRunning_dbus_property(self, value=None):
1419
2193
if value is None: # get
1452
2234
if data[0] == 'data':
1454
2236
if data[0] == 'function':
1455
2238
def func(*args, **kwargs):
1456
2239
self._pipe.send(('funcall', name, args, kwargs))
1457
2240
return self._pipe.recv()[1]
1460
2244
def __setattr__(self, name, value):
1461
2245
if name == '_pipe':
1462
2246
return super(ProxyClient, self).__setattr__(name, value)
1463
2247
self._pipe.send(('setattr', name, value))
1466
class ClientDBusTransitional(ClientDBus):
1467
__metaclass__ = AlternateDBusNamesMetaclass
1470
2250
class ClientHandler(socketserver.BaseRequestHandler, object):
1471
2251
"""A class to handle client connections.
1473
2253
Instantiated once for each connection to handle it.
1474
2254
Note: This will run in its own forked process."""
1476
2256
def handle(self):
1477
2257
with contextlib.closing(self.server.child_pipe) as child_pipe:
1478
2258
logger.info("TCP connection from: %s",
1479
unicode(self.client_address))
2259
str(self.client_address))
1480
2260
logger.debug("Pipe FD: %d",
1481
2261
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",
2263
session = gnutls.ClientSession(self.request)
2265
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2266
# "+AES-256-CBC", "+SHA1",
2267
# "+COMP-NULL", "+CTYPE-OPENPGP",
1497
2269
# Use a fallback default, since this MUST be set.
1498
2270
priority = self.server.gnutls_priority
1499
2271
if priority is None:
1500
2272
priority = "NORMAL"
1501
(gnutls.library.functions
1502
.gnutls_priority_set_direct(session._c_object,
2273
gnutls.priority_set_direct(session._c_object,
2274
priority.encode("utf-8"),
1505
2277
# Start communication using the Mandos protocol
1506
2278
# Get protocol number
1507
2279
line = self.request.makefile().readline()
1508
2280
logger.debug("Protocol version: %r", line)
1510
2282
if int(line.strip().split()[0]) > 1:
2283
raise RuntimeError(line)
1512
2284
except (ValueError, IndexError, RuntimeError) as error:
1513
2285
logger.error("Unknown protocol version: %s", error)
1516
2288
# Start GnuTLS connection
1518
2290
session.handshake()
1519
except gnutls.errors.GNUTLSError as error:
2291
except gnutls.Error as error:
1520
2292
logger.warning("Handshake failed: %s", error)
1521
2293
# Do not run session.bye() here: the session is not
1522
2294
# established. Just abandon the request.
1524
2296
logger.debug("Handshake succeeded")
1526
2298
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,
2300
if gnutls.has_rawpk:
2303
key_id = self.key_id(
2304
self.peer_certificate(session))
2305
except (TypeError, gnutls.Error) as error:
2306
logger.warning("Bad certificate: %s", error)
2308
logger.debug("Key ID: %s", key_id)
2313
fpr = self.fingerprint(
2314
self.peer_certificate(session))
2315
except (TypeError, gnutls.Error) as error:
2316
logger.warning("Bad certificate: %s", error)
2318
logger.debug("Fingerprint: %s", fpr)
2321
client = ProxyClient(child_pipe, key_id, fpr,
1539
2322
self.client_address)
1540
2323
except KeyError:
1543
if self.server.use_dbus:
1545
client.NewRequest(str(self.client_address))
1547
2326
if client.approval_delay:
1548
2327
delay = client.approval_delay
1549
2328
client.approvals_pending += 1
1550
2329
approval_required = True
1553
2332
if not client.enabled:
1554
2333
logger.info("Client %s is disabled",
1556
2335
if self.server.use_dbus:
1557
2336
# Emit D-Bus signal
1558
2337
client.Rejected("Disabled")
1561
2340
if client.approved or not client.approval_delay:
1562
#We are approved or approval is disabled
2341
# We are approved or approval is disabled
1564
2343
elif client.approved is None:
1565
2344
logger.info("Client %s needs approval",
1600
2377
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))
2380
session.send(client.secret)
2381
except gnutls.Error as error:
2382
logger.warning("gnutls send failed",
1614
2386
logger.info("Sending secret to %s", client.name)
1615
2387
# bump the timeout using extended_timeout
1616
client.checked_ok(client.extended_timeout)
2388
client.bump_timeout(client.extended_timeout)
1617
2389
if self.server.use_dbus:
1618
2390
# Emit D-Bus signal
1619
2391
client.GotSecret()
1622
2394
if approval_required:
1623
2395
client.approvals_pending -= 1
1626
except gnutls.errors.GNUTLSError as error:
1627
logger.warning("GnuTLS bye failed")
2398
except gnutls.Error as error:
2399
logger.warning("GnuTLS bye failed",
1630
2403
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
2404
"Return the peer's certificate as a bytestring"
2406
cert_type = gnutls.certificate_type_get2(session._c_object,
2408
except AttributeError:
2409
cert_type = gnutls.certificate_type_get(session._c_object)
2410
if gnutls.has_rawpk:
2411
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2413
valid_cert_types = frozenset((gnutls.CRT_OPENPGP,))
2414
# If not a valid certificate type...
2415
if cert_type not in valid_cert_types:
2416
logger.info("Cert type %r not in %r", cert_type,
2418
# ...return invalid data
1638
2420
list_size = ctypes.c_uint(1)
1639
cert_list = (gnutls.library.functions
1640
.gnutls_certificate_get_peers
2421
cert_list = (gnutls.certificate_get_peers
1641
2422
(session._c_object, ctypes.byref(list_size)))
1642
2423
if not bool(cert_list) and list_size.value != 0:
1643
raise gnutls.errors.GNUTLSError("error getting peer"
2424
raise gnutls.Error("error getting peer certificate")
1645
2425
if list_size.value == 0:
1647
2427
cert = cert_list[0]
1648
2428
return ctypes.string_at(cert.data, cert.size)
2431
def key_id(certificate):
2432
"Convert a certificate bytestring to a hexdigit key ID"
2433
# New GnuTLS "datum" with the public key
2434
datum = gnutls.datum_t(
2435
ctypes.cast(ctypes.c_char_p(certificate),
2436
ctypes.POINTER(ctypes.c_ubyte)),
2437
ctypes.c_uint(len(certificate)))
2438
# XXX all these need to be created in the gnutls "module"
2439
# New empty GnuTLS certificate
2440
pubkey = gnutls.pubkey_t()
2441
gnutls.pubkey_init(ctypes.byref(pubkey))
2442
# Import the raw public key into the certificate
2443
gnutls.pubkey_import(pubkey,
2444
ctypes.byref(datum),
2445
gnutls.X509_FMT_DER)
2446
# New buffer for the key ID
2447
buf = ctypes.create_string_buffer(32)
2448
buf_len = ctypes.c_size_t(len(buf))
2449
# Get the key ID from the raw public key into the buffer
2450
gnutls.pubkey_get_key_id(pubkey,
2451
gnutls.KEYID_USE_SHA256,
2452
ctypes.cast(ctypes.byref(buf),
2453
ctypes.POINTER(ctypes.c_ubyte)),
2454
ctypes.byref(buf_len))
2455
# Deinit the certificate
2456
gnutls.pubkey_deinit(pubkey)
2458
# Convert the buffer to a Python bytestring
2459
key_id = ctypes.string_at(buf, buf_len.value)
2460
# Convert the bytestring to hexadecimal notation
2461
hex_key_id = binascii.hexlify(key_id).upper()
1651
2465
def fingerprint(openpgp):
1652
2466
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1653
2467
# 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))))
2468
datum = gnutls.datum_t(
2469
ctypes.cast(ctypes.c_char_p(openpgp),
2470
ctypes.POINTER(ctypes.c_ubyte)),
2471
ctypes.c_uint(len(openpgp)))
1659
2472
# 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)))
2473
crt = gnutls.openpgp_crt_t()
2474
gnutls.openpgp_crt_init(ctypes.byref(crt))
1663
2475
# 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))
2476
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2477
gnutls.OPENPGP_FMT_RAW)
1668
2478
# Verify the self signature in the key
1669
2479
crtverify = ctypes.c_uint()
1670
(gnutls.library.functions
1671
.gnutls_openpgp_crt_verify_self(crt, 0,
1672
ctypes.byref(crtverify)))
2480
gnutls.openpgp_crt_verify_self(crt, 0,
2481
ctypes.byref(crtverify))
1673
2482
if crtverify.value != 0:
1674
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1675
raise (gnutls.errors.CertificateSecurityError
2483
gnutls.openpgp_crt_deinit(crt)
2484
raise gnutls.CertificateSecurityError(code
1677
2486
# New buffer for the fingerprint
1678
2487
buf = ctypes.create_string_buffer(20)
1679
2488
buf_len = ctypes.c_size_t()
1680
2489
# 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)))
2490
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2491
ctypes.byref(buf_len))
1684
2492
# Deinit the certificate
1685
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2493
gnutls.openpgp_crt_deinit(crt)
1686
2494
# Convert the buffer to a Python bytestring
1687
2495
fpr = ctypes.string_at(buf, buf_len.value)
1688
2496
# Convert the bytestring to hexadecimal notation
1693
2501
class MultiprocessingMixIn(object):
1694
2502
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1695
2504
def sub_process_main(self, request, address):
1697
2506
self.finish_request(request, address)
1698
2507
except Exception:
1699
2508
self.handle_error(request, address)
1700
2509
self.close_request(request)
1702
2511
def process_request(self, request, address):
1703
2512
"""Start a new process to process the request."""
1704
proc = multiprocessing.Process(target = self.sub_process_main,
2513
proc = multiprocessing.Process(target=self.sub_process_main,
2514
args=(request, address))
1711
2519
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1712
2520
""" adds a pipe to the MixIn """
1713
2522
def process_request(self, request, client_address):
1714
2523
"""Overrides and wraps the original process_request().
1716
2525
This function creates a new pipe in self.pipe
1718
2527
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1720
2529
proc = MultiprocessingMixIn.process_request(self, request,
1721
2530
client_address)
1722
2531
self.child_pipe.close()
1723
2532
self.add_pipe(parent_pipe, proc)
1725
2534
def add_pipe(self, parent_pipe, proc):
1726
2535
"""Dummy function; override as necessary"""
1727
raise NotImplementedError
2536
raise NotImplementedError()
1730
2539
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1731
2540
socketserver.TCPServer, object):
1732
2541
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1735
2544
enabled: Boolean; whether this server is activated yet
1736
2545
interface: None or a network interface name (string)
1737
2546
use_ipv6: Boolean; to use IPv6 or not
1739
2549
def __init__(self, server_address, RequestHandlerClass,
1740
interface=None, use_ipv6=True):
2553
"""If socketfd is set, use that file descriptor instead of
2554
creating a new one with socket.socket().
1741
2556
self.interface = interface
1743
2558
self.address_family = socket.AF_INET6
2559
if socketfd is not None:
2560
# Save the file descriptor
2561
self.socketfd = socketfd
2562
# Save the original socket.socket() function
2563
self.socket_socket = socket.socket
2565
# To implement --socket, we monkey patch socket.socket.
2567
# (When socketserver.TCPServer is a new-style class, we
2568
# could make self.socket into a property instead of monkey
2569
# patching socket.socket.)
2571
# Create a one-time-only replacement for socket.socket()
2572
@functools.wraps(socket.socket)
2573
def socket_wrapper(*args, **kwargs):
2574
# Restore original function so subsequent calls are
2576
socket.socket = self.socket_socket
2577
del self.socket_socket
2578
# This time only, return a new socket object from the
2579
# saved file descriptor.
2580
return socket.fromfd(self.socketfd, *args, **kwargs)
2581
# Replace socket.socket() function with wrapper
2582
socket.socket = socket_wrapper
2583
# The socketserver.TCPServer.__init__ will call
2584
# socket.socket(), which might be our replacement,
2585
# socket_wrapper(), if socketfd was set.
1744
2586
socketserver.TCPServer.__init__(self, server_address,
1745
2587
RequestHandlerClass)
1746
2589
def server_bind(self):
1747
2590
"""This overrides the normal server_bind() function
1748
2591
to bind to an interface if one was specified, and also NOT to
1749
2592
bind to an address or port if they were not specified."""
2593
global SO_BINDTODEVICE
1750
2594
if self.interface is not None:
1751
2595
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",
2596
# Fall back to a hard-coded value which seems to be
2598
logger.warning("SO_BINDTODEVICE not found, trying 25")
2599
SO_BINDTODEVICE = 25
2601
self.socket.setsockopt(
2602
socket.SOL_SOCKET, SO_BINDTODEVICE,
2603
(self.interface + "\0").encode("utf-8"))
2604
except socket.error as error:
2605
if error.errno == errno.EPERM:
2606
logger.error("No permission to bind to"
2607
" interface %s", self.interface)
2608
elif error.errno == errno.ENOPROTOOPT:
2609
logger.error("SO_BINDTODEVICE not available;"
2610
" cannot bind to interface %s",
2612
elif error.errno == errno.ENODEV:
2613
logger.error("Interface %s does not exist,"
2614
" cannot bind", self.interface)
1772
2617
# Only bind(2) the socket if we really need to.
1773
2618
if self.server_address[0] or self.server_address[1]:
1774
2619
if not self.server_address[0]:
1775
2620
if self.address_family == socket.AF_INET6:
1776
any_address = "::" # in6addr_any
2621
any_address = "::" # in6addr_any
1778
any_address = socket.INADDR_ANY
2623
any_address = "0.0.0.0" # INADDR_ANY
1779
2624
self.server_address = (any_address,
1780
2625
self.server_address[1])
1781
2626
elif not self.server_address[1]:
1782
self.server_address = (self.server_address[0],
2627
self.server_address = (self.server_address[0], 0)
1784
2628
# if self.interface:
1785
2629
# self.server_address = (self.server_address[0],
1811
2660
self.gnutls_priority = gnutls_priority
1812
2661
IPv6_TCPServer.__init__(self, server_address,
1813
2662
RequestHandlerClass,
1814
interface = interface,
1815
use_ipv6 = use_ipv6)
2663
interface=interface,
1816
2667
def server_activate(self):
1817
2668
if self.enabled:
1818
2669
return socketserver.TCPServer.server_activate(self)
1820
2671
def enable(self):
1821
2672
self.enabled = True
1823
2674
def add_pipe(self, parent_pipe, proc):
1824
2675
# Call "handle_ipc" for both data and EOF events
1825
gobject.io_add_watch(parent_pipe.fileno(),
1826
gobject.IO_IN | gobject.IO_HUP,
1827
functools.partial(self.handle_ipc,
1832
def handle_ipc(self, source, condition, parent_pipe=None,
1833
proc = None, client_object=None):
1835
gobject.IO_IN: "IN", # There is data to read.
1836
gobject.IO_OUT: "OUT", # Data can be written (without
1838
gobject.IO_PRI: "PRI", # There is urgent data to read.
1839
gobject.IO_ERR: "ERR", # Error condition.
1840
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1841
# broken, usually for pipes and
1844
conditions_string = ' | '.join(name
1846
condition_names.iteritems()
1847
if cond & condition)
2677
parent_pipe.fileno(),
2678
GLib.IO_IN | GLib.IO_HUP,
2679
functools.partial(self.handle_ipc,
2680
parent_pipe=parent_pipe,
2683
def handle_ipc(self, source, condition,
2686
client_object=None):
1848
2687
# error, or the other end of multiprocessing.Pipe has closed
1849
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2688
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1850
2689
# Wait for other process to exit
1854
2693
# Read a request from the child
1855
2694
request = parent_pipe.recv()
1856
2695
command = request[0]
1858
2697
if command == 'init':
1860
address = request[2]
1862
for c in self.clients.itervalues():
1863
if c.fingerprint == fpr:
2698
key_id = request[1].decode("ascii")
2699
fpr = request[2].decode("ascii")
2700
address = request[3]
2702
for c in self.clients.values():
2703
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2705
if key_id and c.key_id == key_id:
2708
if fpr and c.fingerprint == fpr:
1867
logger.info("Client not found for fingerprint: %s, ad"
1868
"dress: %s", fpr, address)
2712
logger.info("Client not found for key ID: %s, address"
2713
": %s", key_id or fpr, address)
1869
2714
if self.use_dbus:
1870
2715
# Emit D-Bus signal
1871
mandos_dbus_service.ClientNotFound(fpr,
2716
mandos_dbus_service.ClientNotFound(key_id or fpr,
1873
2718
parent_pipe.send(False)
1876
gobject.io_add_watch(parent_pipe.fileno(),
1877
gobject.IO_IN | gobject.IO_HUP,
1878
functools.partial(self.handle_ipc,
2722
parent_pipe.fileno(),
2723
GLib.IO_IN | GLib.IO_HUP,
2724
functools.partial(self.handle_ipc,
2725
parent_pipe=parent_pipe,
2727
client_object=client))
1884
2728
parent_pipe.send(True)
1885
2729
# remove the old hook in favor of the new above hook on
1889
2733
funcname = request[1]
1890
2734
args = request[2]
1891
2735
kwargs = request[3]
1893
2737
parent_pipe.send(('data', getattr(client_object,
1894
2738
funcname)(*args,
1897
2741
if command == 'getattr':
1898
2742
attrname = request[1]
1899
if callable(client_object.__getattribute__(attrname)):
1900
parent_pipe.send(('function',))
2743
if isinstance(client_object.__getattribute__(attrname),
2744
collections.Callable):
2745
parent_pipe.send(('function', ))
1902
parent_pipe.send(('data', client_object
1903
.__getattribute__(attrname)))
2748
'data', client_object.__getattribute__(attrname)))
1905
2750
if command == 'setattr':
1906
2751
attrname = request[1]
1907
2752
value = request[2]
1908
2753
setattr(client_object, attrname, value)
2758
def rfc3339_duration_to_delta(duration):
2759
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2761
>>> rfc3339_duration_to_delta("P7D")
2762
datetime.timedelta(7)
2763
>>> rfc3339_duration_to_delta("PT60S")
2764
datetime.timedelta(0, 60)
2765
>>> rfc3339_duration_to_delta("PT60M")
2766
datetime.timedelta(0, 3600)
2767
>>> rfc3339_duration_to_delta("PT24H")
2768
datetime.timedelta(1)
2769
>>> rfc3339_duration_to_delta("P1W")
2770
datetime.timedelta(7)
2771
>>> rfc3339_duration_to_delta("PT5M30S")
2772
datetime.timedelta(0, 330)
2773
>>> rfc3339_duration_to_delta("P1DT3M20S")
2774
datetime.timedelta(1, 200)
2777
# Parsing an RFC 3339 duration with regular expressions is not
2778
# possible - there would have to be multiple places for the same
2779
# values, like seconds. The current code, while more esoteric, is
2780
# cleaner without depending on a parsing library. If Python had a
2781
# built-in library for parsing we would use it, but we'd like to
2782
# avoid excessive use of external libraries.
2784
# New type for defining tokens, syntax, and semantics all-in-one
2785
Token = collections.namedtuple("Token", (
2786
"regexp", # To match token; if "value" is not None, must have
2787
# a "group" containing digits
2788
"value", # datetime.timedelta or None
2789
"followers")) # Tokens valid after this token
2790
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2791
# the "duration" ABNF definition in RFC 3339, Appendix A.
2792
token_end = Token(re.compile(r"$"), None, frozenset())
2793
token_second = Token(re.compile(r"(\d+)S"),
2794
datetime.timedelta(seconds=1),
2795
frozenset((token_end, )))
2796
token_minute = Token(re.compile(r"(\d+)M"),
2797
datetime.timedelta(minutes=1),
2798
frozenset((token_second, token_end)))
2799
token_hour = Token(re.compile(r"(\d+)H"),
2800
datetime.timedelta(hours=1),
2801
frozenset((token_minute, token_end)))
2802
token_time = Token(re.compile(r"T"),
2804
frozenset((token_hour, token_minute,
2806
token_day = Token(re.compile(r"(\d+)D"),
2807
datetime.timedelta(days=1),
2808
frozenset((token_time, token_end)))
2809
token_month = Token(re.compile(r"(\d+)M"),
2810
datetime.timedelta(weeks=4),
2811
frozenset((token_day, token_end)))
2812
token_year = Token(re.compile(r"(\d+)Y"),
2813
datetime.timedelta(weeks=52),
2814
frozenset((token_month, token_end)))
2815
token_week = Token(re.compile(r"(\d+)W"),
2816
datetime.timedelta(weeks=1),
2817
frozenset((token_end, )))
2818
token_duration = Token(re.compile(r"P"), None,
2819
frozenset((token_year, token_month,
2820
token_day, token_time,
2822
# Define starting values:
2824
value = datetime.timedelta()
2826
# Following valid tokens
2827
followers = frozenset((token_duration, ))
2828
# String left to parse
2830
# Loop until end token is found
2831
while found_token is not token_end:
2832
# Search for any currently valid tokens
2833
for token in followers:
2834
match = token.regexp.match(s)
2835
if match is not None:
2837
if token.value is not None:
2838
# Value found, parse digits
2839
factor = int(match.group(1), 10)
2840
# Add to value so far
2841
value += factor * token.value
2842
# Strip token from string
2843
s = token.regexp.sub("", s, 1)
2846
# Set valid next tokens
2847
followers = found_token.followers
2850
# No currently valid tokens were found
2851
raise ValueError("Invalid RFC 3339 duration: {!r}"
1913
2857
def string_to_delta(interval):
1914
2858
"""Parse a string and return a datetime.timedelta
1916
2860
>>> string_to_delta('7d')
1917
2861
datetime.timedelta(7)
1918
2862
>>> string_to_delta('60s')
2007
2957
parser.add_argument("--no-dbus", action="store_false",
2008
2958
dest="use_dbus", help="Do not provide D-Bus"
2009
" system bus interface")
2959
" system bus interface", default=None)
2010
2960
parser.add_argument("--no-ipv6", action="store_false",
2011
dest="use_ipv6", help="Do not use IPv6")
2961
dest="use_ipv6", help="Do not use IPv6",
2012
2963
parser.add_argument("--no-restore", action="store_false",
2013
2964
dest="restore", help="Do not restore stored"
2965
" state", default=None)
2966
parser.add_argument("--socket", type=int,
2967
help="Specify a file descriptor to a network"
2968
" socket to use instead of creating one")
2015
2969
parser.add_argument("--statedir", metavar="DIR",
2016
2970
help="Directory to save/restore state in")
2971
parser.add_argument("--foreground", action="store_true",
2972
help="Run in foreground", default=None)
2973
parser.add_argument("--no-zeroconf", action="store_false",
2974
dest="zeroconf", help="Do not use Zeroconf",
2018
2977
options = parser.parse_args()
2020
2979
if options.check:
2981
fail_count, test_count = doctest.testmod()
2982
sys.exit(os.EX_OK if fail_count == 0 else 1)
2025
2984
# 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"
2985
if gnutls.has_rawpk:
2986
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
2987
":!VERS-ALL:+VERS-TLS1.3:%PROFILE_ULTRA")
2989
priority = ("SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2990
":+SIGN-DSA-SHA256")
2991
server_defaults = {"interface": "",
2995
"priority": priority,
2996
"servicename": "Mandos",
3002
"statedir": "/var/lib/mandos",
3003
"foreground": "False",
2040
3008
# Parse config file for server-global settings
2041
3009
server_config = configparser.SafeConfigParser(server_defaults)
2042
3010
del server_defaults
2043
server_config.read(os.path.join(options.configdir,
3011
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2045
3012
# Convert the SafeConfigParser object to a dict
2046
3013
server_settings = server_config.defaults()
2047
3014
# Use the appropriate methods on the non-string config options
2048
for option in ("debug", "use_dbus", "use_ipv6"):
3015
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3016
"foreground", "zeroconf"):
2049
3017
server_settings[option] = server_config.getboolean("DEFAULT",
2051
3019
if server_settings["port"]:
2052
3020
server_settings["port"] = server_config.getint("DEFAULT",
3022
if server_settings["socket"]:
3023
server_settings["socket"] = server_config.getint("DEFAULT",
3025
# Later, stdin will, and stdout and stderr might, be dup'ed
3026
# over with an opened os.devnull. But we don't want this to
3027
# happen with a supplied network socket.
3028
if 0 <= server_settings["socket"] <= 2:
3029
server_settings["socket"] = os.dup(server_settings
2054
3031
del server_config
2056
3033
# Override the settings from the config file with command line
2057
3034
# options, if set.
2058
3035
for option in ("interface", "address", "port", "debug",
2059
"priority", "servicename", "configdir",
2060
"use_dbus", "use_ipv6", "debuglevel", "restore",
3036
"priority", "servicename", "configdir", "use_dbus",
3037
"use_ipv6", "debuglevel", "restore", "statedir",
3038
"socket", "foreground", "zeroconf"):
2062
3039
value = getattr(options, option)
2063
3040
if value is not None:
2064
3041
server_settings[option] = value
2066
3043
# Force all strings to be unicode
2067
3044
for option in server_settings.keys():
2068
if type(server_settings[option]) is str:
2069
server_settings[option] = unicode(server_settings[option])
3045
if isinstance(server_settings[option], bytes):
3046
server_settings[option] = (server_settings[option]
3048
# Force all boolean options to be boolean
3049
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3050
"foreground", "zeroconf"):
3051
server_settings[option] = bool(server_settings[option])
3052
# Debug implies foreground
3053
if server_settings["debug"]:
3054
server_settings["foreground"] = True
2070
3055
# Now we have our good server settings in "server_settings"
2072
3057
##################################################################
3059
if (not server_settings["zeroconf"]
3060
and not (server_settings["port"]
3061
or server_settings["socket"] != "")):
3062
parser.error("Needs port or socket to work without Zeroconf")
2074
3064
# For convenience
2075
3065
debug = server_settings["debug"]
2076
3066
debuglevel = server_settings["debuglevel"]
2088
3080
level = getattr(logging, debuglevel.upper())
2089
3081
initlogger(debug, level)
2091
3083
if server_settings["servicename"] != "Mandos":
2092
syslogger.setFormatter(logging.Formatter
2093
('Mandos (%s) [%%(process)d]:'
2094
' %%(levelname)s: %%(message)s'
2095
% server_settings["servicename"]))
3084
syslogger.setFormatter(
3085
logging.Formatter('Mandos ({}) [%(process)d]:'
3086
' %(levelname)s: %(message)s'.format(
3087
server_settings["servicename"])))
2097
3089
# Parse config file with clients
2098
client_config = configparser.SafeConfigParser(Client.client_defaults)
3090
client_config = configparser.SafeConfigParser(Client
2099
3092
client_config.read(os.path.join(server_settings["configdir"],
2100
3093
"clients.conf"))
2102
3095
global mandos_dbus_service
2103
3096
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
3099
if server_settings["socket"] != "":
3100
socketfd = server_settings["socket"]
3101
tcp_server = MandosServer(
3102
(server_settings["address"], server_settings["port"]),
3104
interface=(server_settings["interface"] or None),
3106
gnutls_priority=server_settings["priority"],
3110
pidfilename = "/run/mandos.pid"
3111
if not os.path.isdir("/run/."):
3112
pidfilename = "/var/run/mandos.pid"
3115
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
3116
except IOError as e:
3117
logger.error("Could not open file %r", pidfilename,
3120
for name, group in (("_mandos", "_mandos"),
3121
("mandos", "mandos"),
3122
("nobody", "nogroup")):
3124
uid = pwd.getpwnam(name).pw_uid
3125
gid = pwd.getpwnam(group).pw_gid
2128
3127
except KeyError:
2130
uid = pwd.getpwnam("nobody").pw_uid
2131
gid = pwd.getpwnam("nobody").pw_gid
3136
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2138
3138
except OSError as error:
2139
if error[0] != errno.EPERM:
3139
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3140
.format(uid, gid, os.strerror(error.errno)))
3141
if error.errno != errno.EPERM:
2143
3145
# Enable all possible GnuTLS debugging
2145
3147
# "Use a log level over 10 to enable all debugging options."
2146
3148
# - GnuTLS manual
2147
gnutls.library.functions.gnutls_global_set_log_level(11)
2149
@gnutls.library.types.gnutls_log_func
3149
gnutls.global_set_log_level(11)
2150
3152
def debug_gnutls(level, string):
2151
3153
logger.debug("GnuTLS: %s", string[:-1])
2153
(gnutls.library.functions
2154
.gnutls_global_set_log_function(debug_gnutls))
3155
gnutls.global_set_log_function(debug_gnutls)
2156
3157
# Redirect stdin so all checkers get /dev/null
2157
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3158
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2158
3159
os.dup2(null, sys.stdin.fileno())
2162
3163
# Need to fork before connecting to D-Bus
2164
3165
# Close all input and output, do double fork, etc.
2167
gobject.threads_init()
3168
# multiprocessing will use threads, so before we use GLib we need
3169
# to inform GLib that threads will be used.
2169
3172
global main_loop
2170
3173
# From the Avahi example code
2171
DBusGMainLoop(set_as_default=True )
2172
main_loop = gobject.MainLoop()
3174
DBusGMainLoop(set_as_default=True)
3175
main_loop = GLib.MainLoop()
2173
3176
bus = dbus.SystemBus()
2174
3177
# End of Avahi example code
2177
3180
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")
3183
old_bus_name = dbus.service.BusName(
3184
"se.bsnet.fukt.Mandos", bus,
3186
except dbus.exceptions.DBusException as e:
3187
logger.error("Disabling D-Bus:", exc_info=e)
2184
3188
use_dbus = False
2185
3189
server_settings["use_dbus"] = False
2186
3190
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"])))
3192
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3193
service = AvahiServiceToSyslog(
3194
name=server_settings["servicename"],
3195
servicetype="_mandos._tcp",
3198
if server_settings["interface"]:
3199
service.interface = if_nametoindex(
3200
server_settings["interface"].encode("utf-8"))
2196
3202
global multiprocessing_manager
2197
3203
multiprocessing_manager = multiprocessing.Manager()
2199
3205
client_class = Client
2201
client_class = functools.partial(ClientDBusTransitional,
3207
client_class = functools.partial(ClientDBus, bus=bus)
2204
3209
client_settings = Client.config_parser(client_config)
2205
3210
old_client_settings = {}
2206
3211
clients_data = {}
3213
# This is used to redirect stdout and stderr for checker processes
3215
wnull = open(os.devnull, "w") # A writable /dev/null
3216
# Only used if server is running in foreground but not in debug
3218
if debug or not foreground:
2208
3221
# Get client data and settings from last running state.
2209
3222
if server_settings["restore"]:
2211
3224
with open(stored_state_path, "rb") as stored_state:
2212
clients_data, old_client_settings = (pickle.load
3225
if sys.version_info.major == 2:
3226
clients_data, old_client_settings = pickle.load(
3229
bytes_clients_data, bytes_old_client_settings = (
3230
pickle.load(stored_state, encoding="bytes"))
3231
# Fix bytes to strings
3234
clients_data = {(key.decode("utf-8")
3235
if isinstance(key, bytes)
3238
bytes_clients_data.items()}
3239
del bytes_clients_data
3240
for key in clients_data:
3241
value = {(k.decode("utf-8")
3242
if isinstance(k, bytes) else k): v
3244
clients_data[key].items()}
3245
clients_data[key] = value
3247
value["client_structure"] = [
3249
if isinstance(s, bytes)
3251
value["client_structure"]]
3253
for k in ("name", "host"):
3254
if isinstance(value[k], bytes):
3255
value[k] = value[k].decode("utf-8")
3256
if not value.has_key("key_id"):
3257
value["key_id"] = ""
3258
elif not value.has_key("fingerprint"):
3259
value["fingerprint"] = ""
3260
# old_client_settings
3262
old_client_settings = {
3263
(key.decode("utf-8")
3264
if isinstance(key, bytes)
3267
bytes_old_client_settings.items()}
3268
del bytes_old_client_settings
3270
for value in old_client_settings.values():
3271
if isinstance(value["host"], bytes):
3272
value["host"] = (value["host"]
2214
3274
os.remove(stored_state_path)
2215
3275
except IOError as e:
2216
logger.warning("Could not load persistent state: {0}"
2218
if e.errno != errno.ENOENT:
3276
if e.errno == errno.ENOENT:
3277
logger.warning("Could not load persistent state:"
3278
" {}".format(os.strerror(e.errno)))
3280
logger.critical("Could not load persistent state:",
2220
3283
except EOFError as e:
2221
3284
logger.warning("Could not load persistent state: "
2222
"EOFError: {0}".format(e))
2224
3288
with PGPEngine() as pgp:
2225
for client_name, client in clients_data.iteritems():
3289
for client_name, client in clients_data.items():
3290
# Skip removed clients
3291
if client_name not in client_settings:
2226
3294
# Decide which value to use after restoring saved state.
2227
3295
# We have three different values: Old config file,
2228
3296
# new config file, and saved state.
2233
3301
# For each value in new config, check if it
2234
3302
# differs from the old config value (Except for
2235
3303
# the "secret" attribute)
2236
if (name != "secret" and
2237
value != old_client_settings[client_name]
3304
if (name != "secret"
3306
old_client_settings[client_name][name])):
2239
3307
client[name] = value
2240
3308
except KeyError:
2243
3311
# 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.
3312
# enabled if its last checker was successful. A Client
3313
# whose checker succeeded before we stored its state is
3314
# assumed to have successfully run all checkers during
2247
3316
if client["enabled"]:
2248
3317
if datetime.datetime.utcnow() >= client["expires"]:
2249
3318
if not client["last_checked_ok"]:
2250
3319
logger.warning(
2251
"disabling client {0} - Client never "
2252
"performed a successfull checker"
2253
.format(client["name"]))
3320
"disabling client {} - Client never "
3321
"performed a successful checker".format(
2254
3323
client["enabled"] = False
2255
3324
elif client["last_checker_status"] != 0:
2256
3325
logger.warning(
2257
"disabling client {0} - Client "
2258
"last checker failed with error code {1}"
2259
.format(client["name"],
2260
client["last_checker_status"]))
3326
"disabling client {} - Client last"
3327
" checker failed with error code"
3330
client["last_checker_status"]))
2261
3331
client["enabled"] = False
2263
client["expires"] = (datetime.datetime
2265
+ client["timeout"])
3333
client["expires"] = (
3334
datetime.datetime.utcnow()
3335
+ client["timeout"])
3336
logger.debug("Last checker succeeded,"
3337
" keeping {} enabled".format(
2268
client["secret"] = (
2269
pgp.decrypt(client["encrypted_secret"],
2270
client_settings[client_name]
3340
client["secret"] = pgp.decrypt(
3341
client["encrypted_secret"],
3342
client_settings[client_name]["secret"])
2272
3343
except PGPError:
2273
3344
# 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"])
3345
logger.debug("Failed to decrypt {} old secret".format(
3347
client["secret"] = (client_settings[client_name]
2280
3350
# Add/remove clients based on new changes made to config
2281
for client_name in set(old_client_settings) - set(client_settings):
3351
for client_name in (set(old_client_settings)
3352
- set(client_settings)):
2282
3353
del clients_data[client_name]
2283
for client_name in set(client_settings) - set(old_client_settings):
3354
for client_name in (set(client_settings)
3355
- set(old_client_settings)):
2284
3356
clients_data[client_name] = client_settings[client_name]
2286
# Create clients all clients
2287
for client_name, client in clients_data.iteritems():
3358
# Create all client objects
3359
for client_name, client in clients_data.items():
2288
3360
tcp_server.clients[client_name] = client_class(
2289
name = client_name, settings = client)
3363
server_settings=server_settings)
2291
3365
if not tcp_server.clients:
2292
3366
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
3369
if pidfile is not None:
3373
print(pid, file=pidfile)
3375
logger.error("Could not write to file %r with PID %d",
2306
3378
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())
3380
for termsig in (signal.SIGHUP, signal.SIGTERM):
3381
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3382
lambda: main_loop.quit() and False)
2313
class MandosDBusService(dbus.service.Object):
3386
@alternate_dbus_interfaces(
3387
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3388
class MandosDBusService(DBusObjectWithObjectManager):
2314
3389
"""A D-Bus proxy object"""
2315
3391
def __init__(self):
2316
3392
dbus.service.Object.__init__(self, bus, "/")
2317
3394
_interface = "se.recompile.Mandos"
2319
3396
@dbus.service.signal(_interface, signature="o")
2320
3397
def ClientAdded(self, objpath):
2324
3401
@dbus.service.signal(_interface, signature="ss")
2325
def ClientNotFound(self, fingerprint, address):
3402
def ClientNotFound(self, key_id, address):
3406
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2329
3408
@dbus.service.signal(_interface, signature="os")
2330
3409
def ClientRemoved(self, objpath, name):
3413
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2334
3415
@dbus.service.method(_interface, out_signature="ao")
2335
3416
def GetAllClients(self):
2337
return dbus.Array(c.dbus_object_path
2339
tcp_server.clients.itervalues())
3418
return dbus.Array(c.dbus_object_path for c in
3419
tcp_server.clients.values())
3421
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2341
3423
@dbus.service.method(_interface,
2342
3424
out_signature="a{oa{sv}}")
2343
3425
def GetAllClientsWithProperties(self):
2345
3427
return dbus.Dictionary(
2346
((c.dbus_object_path, c.GetAll(""))
2347
for c in tcp_server.clients.itervalues()),
3428
{c.dbus_object_path: c.GetAll(
3429
"se.recompile.Mandos.Client")
3430
for c in tcp_server.clients.values()},
2348
3431
signature="oa{sv}")
2350
3433
@dbus.service.method(_interface, in_signature="o")
2351
3434
def RemoveClient(self, object_path):
2353
for c in tcp_server.clients.itervalues():
3436
for c in tcp_server.clients.values():
2354
3437
if c.dbus_object_path == object_path:
2355
3438
del tcp_server.clients[c.name]
2356
3439
c.remove_from_connection()
2357
# Don't signal anything except ClientRemoved
3440
# Don't signal the disabling
2358
3441
c.disable(quiet=True)
2360
self.ClientRemoved(object_path, c.name)
3442
# Emit D-Bus signal for removal
3443
self.client_removed_signal(c)
2362
3445
raise KeyError(object_path)
2366
class MandosDBusServiceTransitional(MandosDBusService):
2367
__metaclass__ = AlternateDBusNamesMetaclass
2368
mandos_dbus_service = MandosDBusServiceTransitional()
3449
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3450
out_signature="a{oa{sa{sv}}}")
3451
def GetManagedObjects(self):
3453
return dbus.Dictionary(
3454
{client.dbus_object_path:
3456
{interface: client.GetAll(interface)
3458
client._get_all_interface_names()})
3459
for client in tcp_server.clients.values()})
3461
def client_added_signal(self, client):
3462
"""Send the new standard signal and the old signal"""
3464
# New standard signal
3465
self.InterfacesAdded(
3466
client.dbus_object_path,
3468
{interface: client.GetAll(interface)
3470
client._get_all_interface_names()}))
3472
self.ClientAdded(client.dbus_object_path)
3474
def client_removed_signal(self, client):
3475
"""Send the new standard signal and the old signal"""
3477
# New standard signal
3478
self.InterfacesRemoved(
3479
client.dbus_object_path,
3480
client._get_all_interface_names())
3482
self.ClientRemoved(client.dbus_object_path,
3485
mandos_dbus_service = MandosDBusService()
3487
# Save modules to variables to exempt the modules from being
3488
# unloaded before the function registered with atexit() is run.
3489
mp = multiprocessing
2371
3493
"Cleanup function; run on exit"
2374
multiprocessing.active_children()
3497
mp.active_children()
2375
3499
if not (tcp_server.clients or client_settings):
2378
3502
# Store client before exiting. Secrets are encrypted with key
2379
3503
# based on what config file has. If config file is
2380
3504
# removed/edited, old secret will thus be unrecovable.
2382
3506
with PGPEngine() as pgp:
2383
for client in tcp_server.clients.itervalues():
3507
for client in tcp_server.clients.values():
2384
3508
key = client_settings[client.name]["secret"]
2385
3509
client.encrypted_secret = pgp.encrypt(client.secret,
2387
3511
client_dict = {}
2389
3513
# 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)):
3515
exclude = {"bus", "changedstate", "secret",
3516
"checker", "server_settings"}
3517
for name, typ in inspect.getmembers(dbus.service
2395
3519
exclude.add(name)
2397
3521
client_dict["encrypted_secret"] = (client
2398
3522
.encrypted_secret)
2399
3523
for attr in client.client_structure:
2400
3524
if attr not in exclude:
2401
3525
client_dict[attr] = getattr(client, attr)
2403
3527
clients[client.name] = client_dict
2404
3528
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)
3531
with tempfile.NamedTemporaryFile(
3535
dir=os.path.dirname(stored_state_path),
3536
delete=False) as stored_state:
3537
pickle.dump((clients, client_settings), stored_state,
3539
tempname = stored_state.name
2413
3540
os.rename(tempname, stored_state_path)
2414
3541
except (IOError, OSError) as e:
2415
logger.warning("Could not save persistent state: {0}"
2419
3544
os.remove(tempname)
2420
3545
except NameError:
2422
if e.errno not in set((errno.ENOENT, errno.EACCES,
3547
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3548
logger.warning("Could not save persistent state: {}"
3549
.format(os.strerror(e.errno)))
3551
logger.warning("Could not save persistent state:",
2426
3555
# Delete all clients, and settings from config
2427
3556
while tcp_server.clients:
2428
3557
name, client = tcp_server.clients.popitem()
2430
3559
client.remove_from_connection()
2431
# Don't signal anything except ClientRemoved
3560
# Don't signal the disabling
2432
3561
client.disable(quiet=True)
3562
# Emit D-Bus signal for removal
2435
mandos_dbus_service.ClientRemoved(client
3564
mandos_dbus_service.client_removed_signal(client)
2438
3565
client_settings.clear()
2440
3567
atexit.register(cleanup)
2442
for client in tcp_server.clients.itervalues():
3569
for client in tcp_server.clients.values():
2445
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3571
# Emit D-Bus signal for adding
3572
mandos_dbus_service.client_added_signal(client)
2446
3573
# Need to initiate checking of clients
2447
3574
if client.enabled:
2448
3575
client.init_checker()
2450
3577
tcp_server.enable()
2451
3578
tcp_server.server_activate()
2453
3580
# Find out what port we got
2454
service.port = tcp_server.socket.getsockname()[1]
3582
service.port = tcp_server.socket.getsockname()[1]
2456
3584
logger.info("Now listening on address %r, port %d,"
2457
" flowinfo %d, scope_id %d"
2458
% tcp_server.socket.getsockname())
3585
" flowinfo %d, scope_id %d",
3586
*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]
3588
logger.info("Now listening on address %r, port %d",
3589
*tcp_server.socket.getsockname())
3591
# 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))
3595
# From the Avahi example code
3598
except dbus.exceptions.DBusException as error:
3599
logger.critical("D-Bus Exception", exc_info=error)
3602
# End of Avahi example code
3604
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3605
lambda *args, **kwargs:
3606
(tcp_server.handle_request
3607
(*args[2:], **kwargs) or True))
2480
3609
logger.debug("Starting main loop")
2481
3610
main_loop.run()
2482
3611
except AvahiError as error:
2483
logger.critical("AvahiError: %s", error)
3612
logger.critical("Avahi Error", exc_info=error)
2486
3615
except KeyboardInterrupt: