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
90
stored_state_path = "/var/lib/mandos/clients.pickle"
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:
119
stored_state_file = "clients.pickle"
92
121
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
125
if_nametoindex = ctypes.cdll.LoadLibrary(
126
ctypes.util.find_library("c")).if_nametoindex
101
127
except (OSError, AttributeError):
102
129
def if_nametoindex(interface):
103
130
"Get an interface index the hard way, i.e. using fcntl()"
104
131
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
132
with contextlib.closing(socket.socket()) as s:
106
133
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
134
struct.pack(b"16s16x", interface))
135
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
136
return interface_index
114
def initlogger(level=logging.WARNING):
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__,
155
def initlogger(debug, level=logging.WARNING):
115
156
"""init logger and add loglevel"""
159
syslogger = (logging.handlers.SysLogHandler(
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
117
162
syslogger.setFormatter(logging.Formatter
118
163
('Mandos [%(process)d]: %(levelname)s:'
120
165
logger.addHandler(syslogger)
122
console = logging.StreamHandler()
123
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
logger.addHandler(console)
168
console = logging.StreamHandler()
169
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
173
logger.addHandler(console)
128
174
logger.setLevel(level)
131
class CryptoError(Exception):
177
class PGPError(Exception):
178
"""Exception if encryption/decryption fails"""
135
class Crypto(object):
182
class PGPEngine(object):
136
183
"""A simple class for OpenPGP symmetric encryption & decryption"""
137
185
def __init__(self):
138
self.gnupg = GnuPGInterface.GnuPG()
139
186
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
140
self.gnupg = GnuPGInterface.GnuPG()
141
self.gnupg.options.meta_interactive = False
142
self.gnupg.options.homedir = self.tempdir
143
self.gnupg.options.extra_args.extend(['--force-mdc',
189
output = subprocess.check_output(["gpgconf"])
190
for line in output.splitlines():
191
name, text, path = line.split(b":")
196
if e.errno != errno.ENOENT:
198
self.gnupgargs = ['--batch',
199
'--homedir', self.tempdir,
202
# Only GPG version 1 has the --no-use-agent option.
203
if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
204
self.gnupgargs.append("--no-use-agent")
146
206
def __enter__(self):
149
def __exit__ (self, exc_type, exc_value, traceback):
209
def __exit__(self, exc_type, exc_value, traceback):
153
213
def __del__(self):
156
216
def _cleanup(self):
157
217
if self.tempdir is not None:
158
218
# Delete contents of tempdir
159
219
for root, dirs, files in os.walk(self.tempdir,
161
221
for filename in files:
162
222
os.remove(os.path.join(root, filename))
163
223
for dirname in dirs:
166
226
os.rmdir(self.tempdir)
167
227
self.tempdir = None
169
229
def password_encode(self, password):
170
230
# Passphrase can not be empty and can not contain newlines or
171
231
# NUL bytes. So we prefix it and hex encode it.
172
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"))
174
240
def encrypt(self, data, password):
175
self.gnupg.passphrase = self.password_encode(password)
176
with open(os.devnull) as devnull:
178
proc = self.gnupg.run(['--symmetric'],
179
create_fhs=['stdin', 'stdout'],
180
attach_fhs={'stderr': devnull})
181
with contextlib.closing(proc.handles['stdin']) as f:
183
with contextlib.closing(proc.handles['stdout']) as f:
184
ciphertext = f.read()
188
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:
189
256
return ciphertext
191
258
def decrypt(self, data, password):
192
self.gnupg.passphrase = self.password_encode(password)
193
with open(os.devnull) as devnull:
195
proc = self.gnupg.run(['--decrypt'],
196
create_fhs=['stdin', 'stdout'],
197
attach_fhs={'stderr': devnull})
198
with contextlib.closing(proc.handles['stdin'] ) as f:
200
with contextlib.closing(proc.handles['stdout']) as f:
201
decrypted_plaintext = f.read()
205
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:
206
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
210
304
class AvahiError(Exception):
211
305
def __init__(self, value, *args, **kwargs):
212
306
self.value = value
213
super(AvahiError, self).__init__(value, *args, **kwargs)
214
def __unicode__(self):
215
return unicode(repr(self.value))
307
return super(AvahiError, self).__init__(value, *args,
217
311
class AvahiServiceError(AvahiError):
220
315
class AvahiGroupError(AvahiError):
224
319
class AvahiService(object):
225
320
"""An Avahi (Zeroconf) service.
228
323
interface: integer; avahi.IF_UNSPEC or an interface index.
229
324
Used to optionally bind to the specified interface.
230
325
name: string; Example: 'Mandos'
231
326
type: string; Example: '_mandos._tcp'.
232
See <http://www.dns-sd.org/ServiceTypes.html>
327
See <https://www.iana.org/assignments/service-names-port-numbers>
233
328
port: integer; what port to announce
234
329
TXT: list of strings; TXT record for the service
235
330
domain: string; Domain to publish on, default to .local if empty.
364
489
follow_name_owner_changes=True),
365
490
avahi.DBUS_INTERFACE_SERVER)
366
491
self.server.connect_to_signal("StateChanged",
367
self.server_state_changed)
492
self.server_state_changed)
368
493
self.server_state_changed(self.server.GetState())
370
496
class AvahiServiceToSyslog(AvahiService):
497
def rename(self, *args, **kwargs):
372
498
"""Add the new name to the syslog messages"""
373
ret = AvahiService.rename(self)
374
syslogger.setFormatter(logging.Formatter
375
('Mandos (%s) [%%(process)d]:'
376
' %%(levelname)s: %%(message)s'
499
ret = super(AvahiServiceToSyslog, self).rename(self, *args,
501
syslogger.setFormatter(logging.Formatter(
502
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
380
def _timedelta_to_milliseconds(td):
381
"Convert a datetime.timedelta() to milliseconds"
382
return ((td.days * 24 * 60 * 60 * 1000)
383
+ (td.seconds * 1000)
384
+ (td.microseconds // 1000))
507
# Pretend that we have a GnuTLS module
508
class GnuTLS(object):
509
"""This isn't so much a class as it is a module-like namespace.
510
It is instantiated once, and simulates having a GnuTLS module."""
512
library = ctypes.util.find_library("gnutls")
514
library = ctypes.util.find_library("gnutls-deb0")
515
_library = ctypes.cdll.LoadLibrary(library)
517
_need_version = b"3.3.0"
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.
537
E_NO_CERTIFICATE_FOUND = -49
538
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
541
class session_int(ctypes.Structure):
543
session_t = ctypes.POINTER(session_int)
545
class certificate_credentials_st(ctypes.Structure):
547
certificate_credentials_t = ctypes.POINTER(
548
certificate_credentials_st)
549
certificate_type_t = ctypes.c_int
551
class datum_t(ctypes.Structure):
552
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
553
('size', ctypes.c_uint)]
555
class openpgp_crt_int(ctypes.Structure):
557
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
558
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
559
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
560
credentials_type_t = ctypes.c_int
561
transport_ptr_t = ctypes.c_void_p
562
close_request_t = ctypes.c_int
565
class Error(Exception):
566
# We need to use the class name "GnuTLS" here, since this
567
# exception might be raised from within GnuTLS.__init__,
568
# which is called before the assignment to the "gnutls"
569
# global variable has happened.
570
def __init__(self, message=None, code=None, args=()):
571
# Default usage is by a message string, but if a return
572
# code is passed, convert it to a string with
575
if message is None and code is not None:
576
message = GnuTLS.strerror(code)
577
return super(GnuTLS.Error, self).__init__(
580
class CertificateSecurityError(Error):
584
class Credentials(object):
586
self._c_object = gnutls.certificate_credentials_t()
587
gnutls.certificate_allocate_credentials(
588
ctypes.byref(self._c_object))
589
self.type = gnutls.CRD_CERTIFICATE
592
gnutls.certificate_free_credentials(self._c_object)
594
class ClientSession(object):
595
def __init__(self, socket, credentials=None):
596
self._c_object = gnutls.session_t()
597
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
598
gnutls.set_default_priority(self._c_object)
599
gnutls.transport_set_ptr(self._c_object, socket.fileno())
600
gnutls.handshake_set_private_extensions(self._c_object,
603
if credentials is None:
604
credentials = gnutls.Credentials()
605
gnutls.credentials_set(self._c_object, credentials.type,
606
ctypes.cast(credentials._c_object,
608
self.credentials = credentials
611
gnutls.deinit(self._c_object)
614
return gnutls.handshake(self._c_object)
616
def send(self, data):
620
data_len -= gnutls.record_send(self._c_object,
625
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
627
# Error handling functions
628
def _error_code(result):
629
"""A function to raise exceptions on errors, suitable
630
for the 'restype' attribute on ctypes functions"""
633
if result == gnutls.E_NO_CERTIFICATE_FOUND:
634
raise gnutls.CertificateSecurityError(code=result)
635
raise gnutls.Error(code=result)
637
def _retry_on_error(result, func, arguments):
638
"""A function to retry on some errors, suitable
639
for the 'errcheck' attribute on ctypes functions"""
641
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
642
return _error_code(result)
643
result = func(*arguments)
646
# Unless otherwise indicated, the function declarations below are
647
# all from the gnutls/gnutls.h C header file.
650
priority_set_direct = _library.gnutls_priority_set_direct
651
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
652
ctypes.POINTER(ctypes.c_char_p)]
653
priority_set_direct.restype = _error_code
655
init = _library.gnutls_init
656
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
657
init.restype = _error_code
659
set_default_priority = _library.gnutls_set_default_priority
660
set_default_priority.argtypes = [session_t]
661
set_default_priority.restype = _error_code
663
record_send = _library.gnutls_record_send
664
record_send.argtypes = [session_t, ctypes.c_void_p,
666
record_send.restype = ctypes.c_ssize_t
667
record_send.errcheck = _retry_on_error
669
certificate_allocate_credentials = (
670
_library.gnutls_certificate_allocate_credentials)
671
certificate_allocate_credentials.argtypes = [
672
ctypes.POINTER(certificate_credentials_t)]
673
certificate_allocate_credentials.restype = _error_code
675
certificate_free_credentials = (
676
_library.gnutls_certificate_free_credentials)
677
certificate_free_credentials.argtypes = [
678
certificate_credentials_t]
679
certificate_free_credentials.restype = None
681
handshake_set_private_extensions = (
682
_library.gnutls_handshake_set_private_extensions)
683
handshake_set_private_extensions.argtypes = [session_t,
685
handshake_set_private_extensions.restype = None
687
credentials_set = _library.gnutls_credentials_set
688
credentials_set.argtypes = [session_t, credentials_type_t,
690
credentials_set.restype = _error_code
692
strerror = _library.gnutls_strerror
693
strerror.argtypes = [ctypes.c_int]
694
strerror.restype = ctypes.c_char_p
696
certificate_type_get = _library.gnutls_certificate_type_get
697
certificate_type_get.argtypes = [session_t]
698
certificate_type_get.restype = _error_code
700
certificate_get_peers = _library.gnutls_certificate_get_peers
701
certificate_get_peers.argtypes = [session_t,
702
ctypes.POINTER(ctypes.c_uint)]
703
certificate_get_peers.restype = ctypes.POINTER(datum_t)
705
global_set_log_level = _library.gnutls_global_set_log_level
706
global_set_log_level.argtypes = [ctypes.c_int]
707
global_set_log_level.restype = None
709
global_set_log_function = _library.gnutls_global_set_log_function
710
global_set_log_function.argtypes = [log_func]
711
global_set_log_function.restype = None
713
deinit = _library.gnutls_deinit
714
deinit.argtypes = [session_t]
715
deinit.restype = None
717
handshake = _library.gnutls_handshake
718
handshake.argtypes = [session_t]
719
handshake.restype = _error_code
720
handshake.errcheck = _retry_on_error
722
transport_set_ptr = _library.gnutls_transport_set_ptr
723
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
724
transport_set_ptr.restype = None
726
bye = _library.gnutls_bye
727
bye.argtypes = [session_t, close_request_t]
728
bye.restype = _error_code
729
bye.errcheck = _retry_on_error
731
check_version = _library.gnutls_check_version
732
check_version.argtypes = [ctypes.c_char_p]
733
check_version.restype = ctypes.c_char_p
735
# All the function declarations below are from gnutls/openpgp.h
737
openpgp_crt_init = _library.gnutls_openpgp_crt_init
738
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
739
openpgp_crt_init.restype = _error_code
741
openpgp_crt_import = _library.gnutls_openpgp_crt_import
742
openpgp_crt_import.argtypes = [openpgp_crt_t,
743
ctypes.POINTER(datum_t),
745
openpgp_crt_import.restype = _error_code
747
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
748
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
749
ctypes.POINTER(ctypes.c_uint)]
750
openpgp_crt_verify_self.restype = _error_code
752
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
753
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
754
openpgp_crt_deinit.restype = None
756
openpgp_crt_get_fingerprint = (
757
_library.gnutls_openpgp_crt_get_fingerprint)
758
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
762
openpgp_crt_get_fingerprint.restype = _error_code
764
# Remove non-public functions
765
del _error_code, _retry_on_error
766
# Create the global "gnutls" object, simulating a module
770
def call_pipe(connection, # : multiprocessing.Connection
771
func, *args, **kwargs):
772
"""This function is meant to be called by multiprocessing.Process
774
This function runs func(*args, **kwargs), and writes the resulting
775
return value on the provided multiprocessing.Connection.
777
connection.send(func(*args, **kwargs))
386
781
class Client(object):
387
782
"""A representation of a client host served by this server.
390
_approved: bool(); 'None' if not yet approved/disapproved
785
approved: bool(); 'None' if not yet approved/disapproved
391
786
approval_delay: datetime.timedelta(); Time to wait for approval
392
787
approval_duration: datetime.timedelta(); Duration of one approval
393
788
checker: subprocess.Popen(); a running checker process used
394
789
to see if the client lives.
395
790
'None' if no process is running.
396
checker_callback_tag: a gobject event source tag, or None
791
checker_callback_tag: a GLib event source tag, or None
397
792
checker_command: string; External command which is run to check
398
793
if client lives. %() expansions are done at
399
794
runtime with vars(self) as dict, so that for
400
795
instance %(name)s can be used in the command.
401
checker_initiator_tag: a gobject event source tag, or None
796
checker_initiator_tag: a GLib event source tag, or None
402
797
created: datetime.datetime(); (UTC) object creation
403
798
client_structure: Object describing what attributes a client has
404
799
and is used for storing the client at exit
405
800
current_checker_command: string; current running checker_command
406
disable_initiator_tag: a gobject event source tag, or None
801
disable_initiator_tag: a GLib event source tag, or None
408
803
fingerprint: string (40 or 32 hexadecimal digits); used to
409
804
uniquely identify the client
411
806
interval: datetime.timedelta(); How often to start a new checker
412
807
last_approval_request: datetime.datetime(); (UTC) or None
413
808
last_checked_ok: datetime.datetime(); (UTC) or None
415
809
last_checker_status: integer between 0 and 255 reflecting exit
416
810
status of last checker. -1 reflects crashed
418
last_enabled: datetime.datetime(); (UTC)
811
checker, -2 means no checker completed yet.
812
last_checker_signal: The signal which killed the last checker, if
813
last_checker_status is -1
814
last_enabled: datetime.datetime(); (UTC) or None
419
815
name: string; from the config file, used in log messages and
420
816
D-Bus identifiers
421
817
secret: bytestring; sent verbatim (over TLS) to client
422
818
timeout: datetime.timedelta(); How long from last_checked_ok
423
819
until this client is disabled
424
extended_timeout: extra long timeout when password has been sent
820
extended_timeout: extra long timeout when secret has been sent
425
821
runtime_expansions: Allowed attributes for runtime expansion.
426
822
expires: datetime.datetime(); time (UTC) when a client will be
427
823
disabled, or None
824
server_settings: The server_settings dict from main()
430
827
runtime_expansions = ("approval_delay", "approval_duration",
431
"created", "enabled", "fingerprint",
432
"host", "interval", "last_checked_ok",
828
"created", "enabled", "expires",
829
"fingerprint", "host", "interval",
830
"last_approval_request", "last_checked_ok",
433
831
"last_enabled", "name", "timeout")
435
def timeout_milliseconds(self):
436
"Return the 'timeout' attribute in milliseconds"
437
return _timedelta_to_milliseconds(self.timeout)
439
def extended_timeout_milliseconds(self):
440
"Return the 'extended_timeout' attribute in milliseconds"
441
return _timedelta_to_milliseconds(self.extended_timeout)
443
def interval_milliseconds(self):
444
"Return the 'interval' attribute in milliseconds"
445
return _timedelta_to_milliseconds(self.interval)
447
def approval_delay_milliseconds(self):
448
return _timedelta_to_milliseconds(self.approval_delay)
450
def __init__(self, name = None, config=None):
451
"""Note: the 'checker' key in 'config' sets the
452
'checker_command' attribute and *not* the 'checker'
834
"extended_timeout": "PT15M",
836
"checker": "fping -q -- %%(host)s",
838
"approval_delay": "PT0S",
839
"approval_duration": "PT1S",
840
"approved_by_default": "True",
845
def config_parser(config):
846
"""Construct a new dict of client settings of this form:
847
{ client_name: {setting_name: value, ...}, ...}
848
with exceptions for any special settings as defined above.
849
NOTE: Must be a pure function. Must return the same result
850
value given the same arguments.
853
for client_name in config.sections():
854
section = dict(config.items(client_name))
855
client = settings[client_name] = {}
857
client["host"] = section["host"]
858
# Reformat values from string types to Python types
859
client["approved_by_default"] = config.getboolean(
860
client_name, "approved_by_default")
861
client["enabled"] = config.getboolean(client_name,
864
# Uppercase and remove spaces from fingerprint for later
865
# comparison purposes with return value from the
866
# fingerprint() function
867
client["fingerprint"] = (section["fingerprint"].upper()
869
if "secret" in section:
870
client["secret"] = codecs.decode(section["secret"]
873
elif "secfile" in section:
874
with open(os.path.expanduser(os.path.expandvars
875
(section["secfile"])),
877
client["secret"] = secfile.read()
879
raise TypeError("No secret or secfile for section {}"
881
client["timeout"] = string_to_delta(section["timeout"])
882
client["extended_timeout"] = string_to_delta(
883
section["extended_timeout"])
884
client["interval"] = string_to_delta(section["interval"])
885
client["approval_delay"] = string_to_delta(
886
section["approval_delay"])
887
client["approval_duration"] = string_to_delta(
888
section["approval_duration"])
889
client["checker_command"] = section["checker"]
890
client["last_approval_request"] = None
891
client["last_checked_ok"] = None
892
client["last_checker_status"] = -2
896
def __init__(self, settings, name=None, server_settings=None):
898
if server_settings is None:
900
self.server_settings = server_settings
901
# adding all client settings
902
for setting, value in settings.items():
903
setattr(self, setting, value)
906
if not hasattr(self, "last_enabled"):
907
self.last_enabled = datetime.datetime.utcnow()
908
if not hasattr(self, "expires"):
909
self.expires = (datetime.datetime.utcnow()
912
self.last_enabled = None
457
915
logger.debug("Creating client %r", self.name)
458
# Uppercase and remove spaces from fingerprint for later
459
# comparison purposes with return value from the fingerprint()
461
self.fingerprint = (config["fingerprint"].upper()
463
916
logger.debug(" Fingerprint: %s", self.fingerprint)
464
if "secret" in config:
465
self.secret = config["secret"].decode("base64")
466
elif "secfile" in config:
467
with open(os.path.expanduser(os.path.expandvars
468
(config["secfile"])),
470
self.secret = secfile.read()
472
raise TypeError("No secret or secfile for client %s"
474
self.host = config.get("host", "")
475
self.created = datetime.datetime.utcnow()
477
self.last_approval_request = None
478
self.last_enabled = datetime.datetime.utcnow()
479
self.last_checked_ok = None
480
self.last_checker_status = None
481
self.timeout = string_to_delta(config["timeout"])
482
self.extended_timeout = string_to_delta(config
483
["extended_timeout"])
484
self.interval = string_to_delta(config["interval"])
917
self.created = settings.get("created",
918
datetime.datetime.utcnow())
920
# attributes specific for this server instance
485
921
self.checker = None
486
922
self.checker_initiator_tag = None
487
923
self.disable_initiator_tag = None
488
self.expires = datetime.datetime.utcnow() + self.timeout
489
924
self.checker_callback_tag = None
490
self.checker_command = config["checker"]
491
925
self.current_checker_command = None
492
self._approved = None
493
self.approved_by_default = config.get("approved_by_default",
495
927
self.approvals_pending = 0
496
self.approval_delay = string_to_delta(
497
config["approval_delay"])
498
self.approval_duration = string_to_delta(
499
config["approval_duration"])
500
self.changedstate = (multiprocessing_manager
501
.Condition(multiprocessing_manager
503
self.client_structure = [attr for attr in
504
self.__dict__.iterkeys()
928
self.changedstate = multiprocessing_manager.Condition(
929
multiprocessing_manager.Lock())
930
self.client_structure = [attr
931
for attr in self.__dict__.keys()
505
932
if not attr.startswith("_")]
506
933
self.client_structure.append("client_structure")
508
for name, t in inspect.getmembers(type(self),
935
for name, t in inspect.getmembers(
936
type(self), lambda obj: isinstance(obj, property)):
512
937
if not name.startswith("_"):
513
938
self.client_structure.append(name)
515
940
# Send notice to process children that client state has changed
516
941
def send_changedstate(self):
517
942
with self.changedstate:
518
943
self.changedstate.notify_all()
520
945
def enable(self):
521
946
"""Start this client's checker and timeout hooks"""
522
947
if getattr(self, "enabled", False):
523
948
# Already enabled
525
self.send_changedstate()
526
950
self.expires = datetime.datetime.utcnow() + self.timeout
527
951
self.enabled = True
528
952
self.last_enabled = datetime.datetime.utcnow()
529
953
self.init_checker()
954
self.send_changedstate()
531
956
def disable(self, quiet=True):
532
957
"""Disable this client."""
533
958
if not getattr(self, "enabled", False):
536
self.send_changedstate()
538
961
logger.info("Disabling client %s", self.name)
539
if getattr(self, "disable_initiator_tag", False):
540
gobject.source_remove(self.disable_initiator_tag)
962
if getattr(self, "disable_initiator_tag", None) is not None:
963
GLib.source_remove(self.disable_initiator_tag)
541
964
self.disable_initiator_tag = None
542
965
self.expires = None
543
if getattr(self, "checker_initiator_tag", False):
544
gobject.source_remove(self.checker_initiator_tag)
966
if getattr(self, "checker_initiator_tag", None) is not None:
967
GLib.source_remove(self.checker_initiator_tag)
545
968
self.checker_initiator_tag = None
546
969
self.stop_checker()
547
970
self.enabled = False
548
# Do not run this again if called by a gobject.timeout_add
972
self.send_changedstate()
973
# Do not run this again if called by a GLib.timeout_add
551
976
def __del__(self):
554
979
def init_checker(self):
555
980
# Schedule a new checker to be started an 'interval' from now,
556
981
# and every interval from then on.
557
self.checker_initiator_tag = (gobject.timeout_add
558
(self.interval_milliseconds(),
982
if self.checker_initiator_tag is not None:
983
GLib.source_remove(self.checker_initiator_tag)
984
self.checker_initiator_tag = GLib.timeout_add(
985
int(self.interval.total_seconds() * 1000),
560
987
# Schedule a disable() when 'timeout' has passed
561
self.disable_initiator_tag = (gobject.timeout_add
562
(self.timeout_milliseconds(),
988
if self.disable_initiator_tag is not None:
989
GLib.source_remove(self.disable_initiator_tag)
990
self.disable_initiator_tag = GLib.timeout_add(
991
int(self.timeout.total_seconds() * 1000), self.disable)
564
992
# Also start a new checker *right now*.
565
993
self.start_checker()
567
def checker_callback(self, pid, condition, command):
995
def checker_callback(self, source, condition, connection,
568
997
"""The checker has completed, so take appropriate actions."""
569
998
self.checker_callback_tag = None
570
999
self.checker = None
571
if os.WIFEXITED(condition):
572
self.last_checker_status = os.WEXITSTATUS(condition)
1000
# Read return code from connection (see call_pipe)
1001
returncode = connection.recv()
1005
self.last_checker_status = returncode
1006
self.last_checker_signal = None
573
1007
if self.last_checker_status == 0:
574
1008
logger.info("Checker for %(name)s succeeded",
576
1010
self.checked_ok()
578
logger.info("Checker for %(name)s failed",
1012
logger.info("Checker for %(name)s failed", vars(self))
581
1014
self.last_checker_status = -1
1015
self.last_checker_signal = -returncode
582
1016
logger.warning("Checker for %(name)s crashed?",
585
def checked_ok(self, timeout=None):
586
"""Bump up the timeout for this client.
588
This should only be called when the client has been seen,
1020
def checked_ok(self):
1021
"""Assert that the client has been seen, alive and well."""
1022
self.last_checked_ok = datetime.datetime.utcnow()
1023
self.last_checker_status = 0
1024
self.last_checker_signal = None
1027
def bump_timeout(self, timeout=None):
1028
"""Bump up the timeout for this client."""
591
1029
if timeout is None:
592
1030
timeout = self.timeout
593
self.last_checked_ok = datetime.datetime.utcnow()
594
1031
if self.disable_initiator_tag is not None:
595
gobject.source_remove(self.disable_initiator_tag)
1032
GLib.source_remove(self.disable_initiator_tag)
1033
self.disable_initiator_tag = None
596
1034
if getattr(self, "enabled", False):
597
self.disable_initiator_tag = (gobject.timeout_add
598
(_timedelta_to_milliseconds
599
(timeout), self.disable))
1035
self.disable_initiator_tag = GLib.timeout_add(
1036
int(timeout.total_seconds() * 1000), self.disable)
600
1037
self.expires = datetime.datetime.utcnow() + timeout
602
1039
def need_approval(self):
603
1040
self.last_approval_request = datetime.datetime.utcnow()
605
1042
def start_checker(self):
606
1043
"""Start a new checker subprocess if one is not running.
608
1045
If a checker already exists, leave it running and do
610
1047
# The reason for not killing a running checker is that if we
611
# did that, then if a checker (for some reason) started
612
# running slowly and taking more than 'interval' time, the
613
# client would inevitably timeout, since no checker would get
614
# a chance to run to completion. If we instead leave running
1048
# did that, and if a checker (for some reason) started running
1049
# slowly and taking more than 'interval' time, then the client
1050
# would inevitably timeout, since no checker would get a
1051
# chance to run to completion. If we instead leave running
615
1052
# checkers alone, the checker would have to take more time
616
1053
# than 'timeout' for the client to be disabled, which is as it
619
# If a checker exists, make sure it is not a zombie
621
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
622
except (AttributeError, OSError) as error:
623
if (isinstance(error, OSError)
624
and error.errno != errno.ECHILD):
628
logger.warning("Checker was a zombie")
629
gobject.source_remove(self.checker_callback_tag)
630
self.checker_callback(pid, status,
631
self.current_checker_command)
1056
if self.checker is not None and not self.checker.is_alive():
1057
logger.warning("Checker was not alive; joining")
632
1060
# Start a new checker if needed
633
1061
if self.checker is None:
1062
# Escape attributes for the shell
1064
attr: re.escape(str(getattr(self, attr)))
1065
for attr in self.runtime_expansions}
635
# In case checker_command has exactly one % operator
636
command = self.checker_command % self.host
638
# Escape attributes for the shell
639
escaped_attrs = dict(
641
re.escape(unicode(str(getattr(self, attr, "")),
645
self.runtime_expansions)
648
command = self.checker_command % escaped_attrs
649
except TypeError as error:
650
logger.error('Could not format string "%s":'
651
' %s', self.checker_command, error)
652
return True # Try again later
1067
command = self.checker_command % escaped_attrs
1068
except TypeError as error:
1069
logger.error('Could not format string "%s"',
1070
self.checker_command,
1072
return True # Try again later
653
1073
self.current_checker_command = command
655
logger.info("Starting checker %r for %s",
657
# We don't need to redirect stdout and stderr, since
658
# in normal mode, that is already done by daemon(),
659
# and in debug mode we don't want to. (Stdin is
660
# always replaced by /dev/null.)
661
self.checker = subprocess.Popen(command,
664
self.checker_callback_tag = (gobject.child_watch_add
666
self.checker_callback,
668
# The checker may have completed before the gobject
669
# watch was added. Check for this.
670
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
672
gobject.source_remove(self.checker_callback_tag)
673
self.checker_callback(pid, status, command)
674
except OSError as error:
675
logger.error("Failed to start subprocess: %s",
677
# Re-run this periodically if run by gobject.timeout_add
1074
logger.info("Starting checker %r for %s", command,
1076
# We don't need to redirect stdout and stderr, since
1077
# in normal mode, that is already done by daemon(),
1078
# and in debug mode we don't want to. (Stdin is
1079
# always replaced by /dev/null.)
1080
# The exception is when not debugging but nevertheless
1081
# running in the foreground; use the previously
1083
popen_args = {"close_fds": True,
1086
if (not self.server_settings["debug"]
1087
and self.server_settings["foreground"]):
1088
popen_args.update({"stdout": wnull,
1090
pipe = multiprocessing.Pipe(duplex=False)
1091
self.checker = multiprocessing.Process(
1093
args=(pipe[1], subprocess.call, command),
1095
self.checker.start()
1096
self.checker_callback_tag = GLib.io_add_watch(
1097
pipe[0].fileno(), GLib.IO_IN,
1098
self.checker_callback, pipe[0], command)
1099
# Re-run this periodically if run by GLib.timeout_add
680
1102
def stop_checker(self):
681
1103
"""Force the checker process, if any, to stop."""
682
1104
if self.checker_callback_tag:
683
gobject.source_remove(self.checker_callback_tag)
1105
GLib.source_remove(self.checker_callback_tag)
684
1106
self.checker_callback_tag = None
685
1107
if getattr(self, "checker", None) is None:
687
1109
logger.debug("Stopping checker for %(name)s", vars(self))
689
os.kill(self.checker.pid, signal.SIGTERM)
691
#if self.checker.poll() is None:
692
# os.kill(self.checker.pid, signal.SIGKILL)
693
except OSError as error:
694
if error.errno != errno.ESRCH: # No such process
1110
self.checker.terminate()
696
1111
self.checker = None
699
def dbus_service_property(dbus_interface, signature="v",
700
access="readwrite", byte_arrays=False):
1114
def dbus_service_property(dbus_interface,
701
1118
"""Decorators for marking methods of a DBusObjectWithProperties to
702
1119
become properties on the D-Bus.
704
1121
The decorated method will be called with no arguments by "Get"
705
1122
and with one argument by "Set".
707
1124
The parameters, where they are supported, are the same as
708
1125
dbus.service.method, except there is only "signature", since the
709
1126
type from Get() and the type sent to Set() is the same.
748
class DBusObjectWithProperties(dbus.service.Object):
1209
class DBusObjectWithAnnotations(dbus.service.Object):
1210
"""A D-Bus object with annotations.
1212
Classes inheriting from this can use the dbus_annotations
1213
decorator to add annotations to methods or signals.
1217
def _is_dbus_thing(thing):
1218
"""Returns a function testing if an attribute is a D-Bus thing
1220
If called like _is_dbus_thing("method") it returns a function
1221
suitable for use as predicate to inspect.getmembers().
1223
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1226
def _get_all_dbus_things(self, thing):
1227
"""Returns a generator of (name, attribute) pairs
1229
return ((getattr(athing.__get__(self), "_dbus_name", name),
1230
athing.__get__(self))
1231
for cls in self.__class__.__mro__
1233
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1235
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1237
path_keyword='object_path',
1238
connection_keyword='connection')
1239
def Introspect(self, object_path, connection):
1240
"""Overloading of standard D-Bus method.
1242
Inserts annotation tags on methods and signals.
1244
xmlstring = dbus.service.Object.Introspect(self, object_path,
1247
document = xml.dom.minidom.parseString(xmlstring)
1249
for if_tag in document.getElementsByTagName("interface"):
1250
# Add annotation tags
1251
for typ in ("method", "signal"):
1252
for tag in if_tag.getElementsByTagName(typ):
1254
for name, prop in (self.
1255
_get_all_dbus_things(typ)):
1256
if (name == tag.getAttribute("name")
1257
and prop._dbus_interface
1258
== if_tag.getAttribute("name")):
1259
annots.update(getattr(
1260
prop, "_dbus_annotations", {}))
1261
for name, value in annots.items():
1262
ann_tag = document.createElement(
1264
ann_tag.setAttribute("name", name)
1265
ann_tag.setAttribute("value", value)
1266
tag.appendChild(ann_tag)
1267
# Add interface annotation tags
1268
for annotation, value in dict(
1269
itertools.chain.from_iterable(
1270
annotations().items()
1271
for name, annotations
1272
in self._get_all_dbus_things("interface")
1273
if name == if_tag.getAttribute("name")
1275
ann_tag = document.createElement("annotation")
1276
ann_tag.setAttribute("name", annotation)
1277
ann_tag.setAttribute("value", value)
1278
if_tag.appendChild(ann_tag)
1279
# Fix argument name for the Introspect method itself
1280
if (if_tag.getAttribute("name")
1281
== dbus.INTROSPECTABLE_IFACE):
1282
for cn in if_tag.getElementsByTagName("method"):
1283
if cn.getAttribute("name") == "Introspect":
1284
for arg in cn.getElementsByTagName("arg"):
1285
if (arg.getAttribute("direction")
1287
arg.setAttribute("name",
1289
xmlstring = document.toxml("utf-8")
1291
except (AttributeError, xml.dom.DOMException,
1292
xml.parsers.expat.ExpatError) as error:
1293
logger.error("Failed to override Introspection method",
1298
class DBusObjectWithProperties(DBusObjectWithAnnotations):
749
1299
"""A D-Bus object with properties.
751
1301
Classes inheriting from this can use the dbus_service_property
752
1302
decorator to expose methods as D-Bus properties. It exposes the
753
1303
standard Get(), Set(), and GetAll() methods on the D-Bus.
757
def _is_dbus_property(obj):
758
return getattr(obj, "_dbus_is_property", False)
760
def _get_all_dbus_properties(self):
761
"""Returns a generator of (name, attribute) pairs
763
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
764
for cls in self.__class__.__mro__
766
inspect.getmembers(cls, self._is_dbus_property))
768
1306
def _get_dbus_property(self, interface_name, property_name):
769
1307
"""Returns a bound method if one exists which is a D-Bus
770
1308
property with the specified name and interface.
772
for cls in self.__class__.__mro__:
773
for name, value in (inspect.getmembers
774
(cls, self._is_dbus_property)):
1310
for cls in self.__class__.__mro__:
1311
for name, value in inspect.getmembers(
1312
cls, self._is_dbus_thing("property")):
775
1313
if (value._dbus_name == property_name
776
1314
and value._dbus_interface == interface_name):
777
1315
return value.__get__(self)
779
1317
# No such property
780
raise DBusPropertyNotFound(self.dbus_object_path + ":"
781
+ interface_name + "."
784
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1318
raise DBusPropertyNotFound("{}:{}.{}".format(
1319
self.dbus_object_path, interface_name, property_name))
1322
def _get_all_interface_names(cls):
1323
"""Get a sequence of all interfaces supported by an object"""
1324
return (name for name in set(getattr(getattr(x, attr),
1325
"_dbus_interface", None)
1326
for x in (inspect.getmro(cls))
1328
if name is not None)
1330
@dbus.service.method(dbus.PROPERTIES_IFACE,
785
1332
out_signature="v")
786
1333
def Get(self, interface_name, property_name):
787
1334
"""Standard D-Bus property Get() method, see D-Bus standard.
879
1459
except (AttributeError, xml.dom.DOMException,
880
1460
xml.parsers.expat.ExpatError) as error:
881
1461
logger.error("Failed to override Introspection method",
886
def datetime_to_dbus (dt, variant_level=0):
1467
dbus.OBJECT_MANAGER_IFACE
1468
except AttributeError:
1469
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1472
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1473
"""A D-Bus object with an ObjectManager.
1475
Classes inheriting from this exposes the standard
1476
GetManagedObjects call and the InterfacesAdded and
1477
InterfacesRemoved signals on the standard
1478
"org.freedesktop.DBus.ObjectManager" interface.
1480
Note: No signals are sent automatically; they must be sent
1483
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1484
out_signature="a{oa{sa{sv}}}")
1485
def GetManagedObjects(self):
1486
"""This function must be overridden"""
1487
raise NotImplementedError()
1489
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1490
signature="oa{sa{sv}}")
1491
def InterfacesAdded(self, object_path, interfaces_and_properties):
1494
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1495
def InterfacesRemoved(self, object_path, interfaces):
1498
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1500
path_keyword='object_path',
1501
connection_keyword='connection')
1502
def Introspect(self, object_path, connection):
1503
"""Overloading of standard D-Bus method.
1505
Override return argument name of GetManagedObjects to be
1506
"objpath_interfaces_and_properties"
1508
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1512
document = xml.dom.minidom.parseString(xmlstring)
1514
for if_tag in document.getElementsByTagName("interface"):
1515
# Fix argument name for the GetManagedObjects method
1516
if (if_tag.getAttribute("name")
1517
== dbus.OBJECT_MANAGER_IFACE):
1518
for cn in if_tag.getElementsByTagName("method"):
1519
if (cn.getAttribute("name")
1520
== "GetManagedObjects"):
1521
for arg in cn.getElementsByTagName("arg"):
1522
if (arg.getAttribute("direction")
1526
"objpath_interfaces"
1528
xmlstring = document.toxml("utf-8")
1530
except (AttributeError, xml.dom.DOMException,
1531
xml.parsers.expat.ExpatError) as error:
1532
logger.error("Failed to override Introspection method",
1537
def datetime_to_dbus(dt, variant_level=0):
887
1538
"""Convert a UTC datetime.datetime() to a D-Bus type."""
889
return dbus.String("", variant_level = variant_level)
890
return dbus.String(dt.isoformat(),
891
variant_level=variant_level)
894
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
896
"""Applied to an empty subclass of a D-Bus object, this metaclass
897
will add additional D-Bus attributes matching a certain pattern.
1540
return dbus.String("", variant_level=variant_level)
1541
return dbus.String(dt.isoformat(), variant_level=variant_level)
1544
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1545
"""A class decorator; applied to a subclass of
1546
dbus.service.Object, it will add alternate D-Bus attributes with
1547
interface names according to the "alt_interface_names" mapping.
1550
@alternate_dbus_interfaces({"org.example.Interface":
1551
"net.example.AlternateInterface"})
1552
class SampleDBusObject(dbus.service.Object):
1553
@dbus.service.method("org.example.Interface")
1554
def SampleDBusMethod():
1557
The above "SampleDBusMethod" on "SampleDBusObject" will be
1558
reachable via two interfaces: "org.example.Interface" and
1559
"net.example.AlternateInterface", the latter of which will have
1560
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1561
"true", unless "deprecate" is passed with a False value.
1563
This works for methods and signals, and also for D-Bus properties
1564
(from DBusObjectWithProperties) and interfaces (from the
1565
dbus_interface_annotations decorator).
899
def __new__(mcs, name, bases, attr):
900
# Go through all the base classes which could have D-Bus
901
# methods, signals, or properties in them
902
for base in (b for b in bases
903
if issubclass(b, dbus.service.Object)):
904
# Go though all attributes of the base class
905
for attrname, attribute in inspect.getmembers(base):
1569
for orig_interface_name, alt_interface_name in (
1570
alt_interface_names.items()):
1572
interface_names = set()
1573
# Go though all attributes of the class
1574
for attrname, attribute in inspect.getmembers(cls):
906
1575
# Ignore non-D-Bus attributes, and D-Bus attributes
907
1576
# with the wrong interface name
908
1577
if (not hasattr(attribute, "_dbus_interface")
909
or not attribute._dbus_interface
910
.startswith("se.recompile.Mandos")):
1578
or not attribute._dbus_interface.startswith(
1579
orig_interface_name)):
912
1581
# Create an alternate D-Bus interface name based on
913
1582
# the current name
914
alt_interface = (attribute._dbus_interface
915
.replace("se.recompile.Mandos",
916
"se.bsnet.fukt.Mandos"))
1583
alt_interface = attribute._dbus_interface.replace(
1584
orig_interface_name, alt_interface_name)
1585
interface_names.add(alt_interface)
917
1586
# Is this a D-Bus signal?
918
1587
if getattr(attribute, "_dbus_is_signal", False):
919
# Extract the original non-method function by
921
nonmethod_func = (dict(
1588
# Extract the original non-method undecorated
1589
# function by black magic
1590
if sys.version_info.major == 2:
1591
nonmethod_func = (dict(
922
1592
zip(attribute.func_code.co_freevars,
923
attribute.__closure__))["func"]
1593
attribute.__closure__))
1594
["func"].cell_contents)
1596
nonmethod_func = (dict(
1597
zip(attribute.__code__.co_freevars,
1598
attribute.__closure__))
1599
["func"].cell_contents)
925
1600
# Create a new, but exactly alike, function
926
1601
# object, and decorate it to be a new D-Bus signal
927
1602
# with the alternate D-Bus interface name
928
new_function = (dbus.service.signal
930
attribute._dbus_signature)
932
nonmethod_func.func_code,
933
nonmethod_func.func_globals,
934
nonmethod_func.func_name,
935
nonmethod_func.func_defaults,
936
nonmethod_func.func_closure)))
1603
new_function = copy_function(nonmethod_func)
1604
new_function = (dbus.service.signal(
1606
attribute._dbus_signature)(new_function))
1607
# Copy annotations, if any
1609
new_function._dbus_annotations = dict(
1610
attribute._dbus_annotations)
1611
except AttributeError:
937
1614
# Define a creator of a function to call both the
938
# old and new functions, so both the old and new
939
# signals gets sent when the function is called
1615
# original and alternate functions, so both the
1616
# original and alternate signals gets sent when
1617
# the function is called
940
1618
def fixscope(func1, func2):
941
1619
"""This function is a scope container to pass
942
1620
func1 and func2 to the "call_both" function
943
1621
outside of its arguments"""
1623
@functools.wraps(func2)
944
1624
def call_both(*args, **kwargs):
945
1625
"""This function will emit two D-Bus
946
1626
signals by calling func1 and func2"""
947
1627
func1(*args, **kwargs)
948
1628
func2(*args, **kwargs)
1629
# Make wrapper function look like a D-Bus
1631
for name, attr in inspect.getmembers(func2):
1632
if name.startswith("_dbus_"):
1633
setattr(call_both, name, attr)
949
1635
return call_both
950
1636
# Create the "call_both" function and add it to
952
attr[attrname] = fixscope(attribute,
1638
attr[attrname] = fixscope(attribute, new_function)
954
1639
# Is this a D-Bus method?
955
1640
elif getattr(attribute, "_dbus_is_method", False):
956
1641
# Create a new, but exactly alike, function
957
1642
# object. Decorate it to be a new D-Bus method
958
1643
# with the alternate D-Bus interface name. Add it
960
attr[attrname] = (dbus.service.method
962
attribute._dbus_in_signature,
963
attribute._dbus_out_signature)
965
(attribute.func_code,
966
attribute.func_globals,
968
attribute.func_defaults,
969
attribute.func_closure)))
1646
dbus.service.method(
1648
attribute._dbus_in_signature,
1649
attribute._dbus_out_signature)
1650
(copy_function(attribute)))
1651
# Copy annotations, if any
1653
attr[attrname]._dbus_annotations = dict(
1654
attribute._dbus_annotations)
1655
except AttributeError:
970
1657
# Is this a D-Bus property?
971
1658
elif getattr(attribute, "_dbus_is_property", False):
972
1659
# Create a new, but exactly alike, function
973
1660
# object, and decorate it to be a new D-Bus
974
1661
# property with the alternate D-Bus interface
975
1662
# name. Add it to the class.
976
attr[attrname] = (dbus_service_property
978
attribute._dbus_signature,
979
attribute._dbus_access,
981
._dbus_get_args_options
984
(attribute.func_code,
985
attribute.func_globals,
987
attribute.func_defaults,
988
attribute.func_closure)))
989
return type.__new__(mcs, name, bases, attr)
1663
attr[attrname] = (dbus_service_property(
1664
alt_interface, attribute._dbus_signature,
1665
attribute._dbus_access,
1666
attribute._dbus_get_args_options
1668
(copy_function(attribute)))
1669
# Copy annotations, if any
1671
attr[attrname]._dbus_annotations = dict(
1672
attribute._dbus_annotations)
1673
except AttributeError:
1675
# Is this a D-Bus interface?
1676
elif getattr(attribute, "_dbus_is_interface", False):
1677
# Create a new, but exactly alike, function
1678
# object. Decorate it to be a new D-Bus interface
1679
# with the alternate D-Bus interface name. Add it
1682
dbus_interface_annotations(alt_interface)
1683
(copy_function(attribute)))
1685
# Deprecate all alternate interfaces
1686
iname = "_AlternateDBusNames_interface_annotation{}"
1687
for interface_name in interface_names:
1689
@dbus_interface_annotations(interface_name)
1691
return {"org.freedesktop.DBus.Deprecated":
1693
# Find an unused name
1694
for aname in (iname.format(i)
1695
for i in itertools.count()):
1696
if aname not in attr:
1700
# Replace the class with a new subclass of it with
1701
# methods, signals, etc. as created above.
1702
if sys.version_info.major == 2:
1703
cls = type(b"{}Alternate".format(cls.__name__),
1706
cls = type("{}Alternate".format(cls.__name__),
1713
@alternate_dbus_interfaces({"se.recompile.Mandos":
1714
"se.bsnet.fukt.Mandos"})
992
1715
class ClientDBus(Client, DBusObjectWithProperties):
993
1716
"""A Client class using D-Bus
996
1719
dbus_object_path: dbus.ObjectPath
997
1720
bus: dbus.SystemBus()
1000
1723
runtime_expansions = (Client.runtime_expansions
1001
+ ("dbus_object_path",))
1724
+ ("dbus_object_path", ))
1726
_interface = "se.recompile.Mandos.Client"
1003
1728
# dbus.service.Object doesn't use super(), so we can't either.
1005
def __init__(self, bus = None, *args, **kwargs):
1730
def __init__(self, bus=None, *args, **kwargs):
1007
1732
Client.__init__(self, *args, **kwargs)
1009
self._approvals_pending = 0
1010
1733
# Only now, when this client is initialized, can it show up on
1012
client_object_name = unicode(self.name).translate(
1735
client_object_name = str(self.name).translate(
1013
1736
{ord("."): ord("_"),
1014
1737
ord("-"): ord("_")})
1015
self.dbus_object_path = (dbus.ObjectPath
1016
("/clients/" + client_object_name))
1738
self.dbus_object_path = dbus.ObjectPath(
1739
"/clients/" + client_object_name)
1017
1740
DBusObjectWithProperties.__init__(self, self.bus,
1018
1741
self.dbus_object_path)
1020
def notifychangeproperty(transform_func,
1021
dbus_name, type_func=lambda x: x,
1743
def notifychangeproperty(transform_func, dbus_name,
1744
type_func=lambda x: x,
1746
invalidate_only=False,
1747
_interface=_interface):
1023
1748
""" Modify a variable so that it's a property which announces
1024
1749
its changes to DBus.
1026
1751
transform_fun: Function that takes a value and a variant_level
1027
1752
and transforms it to a D-Bus type.
1028
1753
dbus_name: D-Bus name of the variable
1030
1755
to the D-Bus. Default: no transform
1031
1756
variant_level: D-Bus variant level. Default: 1
1033
attrname = "_{0}".format(dbus_name)
1758
attrname = "_{}".format(dbus_name)
1034
1760
def setter(self, value):
1035
1761
if hasattr(self, "dbus_object_path"):
1036
1762
if (not hasattr(self, attrname) or
1037
1763
type_func(getattr(self, attrname, None))
1038
1764
!= type_func(value)):
1039
dbus_value = transform_func(type_func(value),
1042
self.PropertyChanged(dbus.String(dbus_name),
1766
self.PropertiesChanged(
1767
_interface, dbus.Dictionary(),
1768
dbus.Array((dbus_name, )))
1770
dbus_value = transform_func(
1772
variant_level=variant_level)
1773
self.PropertyChanged(dbus.String(dbus_name),
1775
self.PropertiesChanged(
1777
dbus.Dictionary({dbus.String(dbus_name):
1044
1780
setattr(self, attrname, value)
1046
1782
return property(lambda self: getattr(self, attrname), setter)
1049
1784
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1050
1785
approvals_pending = notifychangeproperty(dbus.Boolean,
1051
1786
"ApprovalPending",
1053
1788
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1054
1789
last_enabled = notifychangeproperty(datetime_to_dbus,
1056
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1057
type_func = lambda checker:
1058
checker is not None)
1791
checker = notifychangeproperty(
1792
dbus.Boolean, "CheckerRunning",
1793
type_func=lambda checker: checker is not None)
1059
1794
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1060
1795
"LastCheckedOK")
1796
last_checker_status = notifychangeproperty(dbus.Int16,
1797
"LastCheckerStatus")
1061
1798
last_approval_request = notifychangeproperty(
1062
1799
datetime_to_dbus, "LastApprovalRequest")
1063
1800
approved_by_default = notifychangeproperty(dbus.Boolean,
1064
1801
"ApprovedByDefault")
1065
approval_delay = notifychangeproperty(dbus.UInt16,
1068
_timedelta_to_milliseconds)
1802
approval_delay = notifychangeproperty(
1803
dbus.UInt64, "ApprovalDelay",
1804
type_func=lambda td: td.total_seconds() * 1000)
1069
1805
approval_duration = notifychangeproperty(
1070
dbus.UInt16, "ApprovalDuration",
1071
type_func = _timedelta_to_milliseconds)
1806
dbus.UInt64, "ApprovalDuration",
1807
type_func=lambda td: td.total_seconds() * 1000)
1072
1808
host = notifychangeproperty(dbus.String, "Host")
1073
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1075
_timedelta_to_milliseconds)
1809
timeout = notifychangeproperty(
1810
dbus.UInt64, "Timeout",
1811
type_func=lambda td: td.total_seconds() * 1000)
1076
1812
extended_timeout = notifychangeproperty(
1077
dbus.UInt16, "ExtendedTimeout",
1078
type_func = _timedelta_to_milliseconds)
1079
interval = notifychangeproperty(dbus.UInt16,
1082
_timedelta_to_milliseconds)
1813
dbus.UInt64, "ExtendedTimeout",
1814
type_func=lambda td: td.total_seconds() * 1000)
1815
interval = notifychangeproperty(
1816
dbus.UInt64, "Interval",
1817
type_func=lambda td: td.total_seconds() * 1000)
1083
1818
checker_command = notifychangeproperty(dbus.String, "Checker")
1819
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1820
invalidate_only=True)
1085
1822
del notifychangeproperty
1087
1824
def __del__(self, *args, **kwargs):
1089
1826
self.remove_from_connection()
1169
1905
server to mandos-client
1173
1909
# Rejected - signal
1174
1910
@dbus.service.signal(_interface, signature="s")
1175
1911
def Rejected(self, reason):
1179
1915
# NeedApproval - signal
1180
1916
@dbus.service.signal(_interface, signature="tb")
1181
1917
def NeedApproval(self, timeout, default):
1183
1919
return self.need_approval()
1185
# NeRwequest - signal
1186
@dbus.service.signal(_interface, signature="s")
1187
def NewRequest(self, ip):
1189
Is sent after a client request a password.
1195
1923
# Approve - method
1196
1924
@dbus.service.method(_interface, in_signature="b")
1197
1925
def Approve(self, value):
1198
1926
self.approve(value)
1200
1928
# CheckedOK - method
1201
1929
@dbus.service.method(_interface)
1202
1930
def CheckedOK(self):
1203
1931
self.checked_ok()
1205
1933
# Enable - method
1934
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1206
1935
@dbus.service.method(_interface)
1207
1936
def Enable(self):
1211
1940
# StartChecker - method
1941
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1212
1942
@dbus.service.method(_interface)
1213
1943
def StartChecker(self):
1215
1945
self.start_checker()
1217
1947
# Disable - method
1948
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1218
1949
@dbus.service.method(_interface)
1219
1950
def Disable(self):
1223
1954
# StopChecker - method
1955
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1224
1956
@dbus.service.method(_interface)
1225
1957
def StopChecker(self):
1226
1958
self.stop_checker()
1230
1962
# ApprovalPending - property
1231
1963
@dbus_service_property(_interface, signature="b", access="read")
1232
1964
def ApprovalPending_dbus_property(self):
1233
1965
return dbus.Boolean(bool(self.approvals_pending))
1235
1967
# ApprovedByDefault - property
1236
@dbus_service_property(_interface, signature="b",
1968
@dbus_service_property(_interface,
1237
1970
access="readwrite")
1238
1971
def ApprovedByDefault_dbus_property(self, value=None):
1239
1972
if value is None: # get
1240
1973
return dbus.Boolean(self.approved_by_default)
1241
1974
self.approved_by_default = bool(value)
1243
1976
# ApprovalDelay - property
1244
@dbus_service_property(_interface, signature="t",
1977
@dbus_service_property(_interface,
1245
1979
access="readwrite")
1246
1980
def ApprovalDelay_dbus_property(self, value=None):
1247
1981
if value is None: # get
1248
return dbus.UInt64(self.approval_delay_milliseconds())
1982
return dbus.UInt64(self.approval_delay.total_seconds()
1249
1984
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1251
1986
# ApprovalDuration - property
1252
@dbus_service_property(_interface, signature="t",
1987
@dbus_service_property(_interface,
1253
1989
access="readwrite")
1254
1990
def ApprovalDuration_dbus_property(self, value=None):
1255
1991
if value is None: # get
1256
return dbus.UInt64(_timedelta_to_milliseconds(
1257
self.approval_duration))
1992
return dbus.UInt64(self.approval_duration.total_seconds()
1258
1994
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1260
1996
# Name - property
1998
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1261
1999
@dbus_service_property(_interface, signature="s", access="read")
1262
2000
def Name_dbus_property(self):
1263
2001
return dbus.String(self.name)
1265
2003
# Fingerprint - property
2005
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1266
2006
@dbus_service_property(_interface, signature="s", access="read")
1267
2007
def Fingerprint_dbus_property(self):
1268
2008
return dbus.String(self.fingerprint)
1270
2010
# Host - property
1271
@dbus_service_property(_interface, signature="s",
2011
@dbus_service_property(_interface,
1272
2013
access="readwrite")
1273
2014
def Host_dbus_property(self, value=None):
1274
2015
if value is None: # get
1275
2016
return dbus.String(self.host)
2017
self.host = str(value)
1278
2019
# Created - property
2021
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1279
2022
@dbus_service_property(_interface, signature="s", access="read")
1280
2023
def Created_dbus_property(self):
1281
return dbus.String(datetime_to_dbus(self.created))
2024
return datetime_to_dbus(self.created)
1283
2026
# LastEnabled - property
1284
2027
@dbus_service_property(_interface, signature="s", access="read")
1285
2028
def LastEnabled_dbus_property(self):
1286
2029
return datetime_to_dbus(self.last_enabled)
1288
2031
# Enabled - property
1289
@dbus_service_property(_interface, signature="b",
2032
@dbus_service_property(_interface,
1290
2034
access="readwrite")
1291
2035
def Enabled_dbus_property(self, value=None):
1292
2036
if value is None: # get
1299
2043
# LastCheckedOK - property
1300
@dbus_service_property(_interface, signature="s",
2044
@dbus_service_property(_interface,
1301
2046
access="readwrite")
1302
2047
def LastCheckedOK_dbus_property(self, value=None):
1303
2048
if value is not None:
1304
2049
self.checked_ok()
1306
2051
return datetime_to_dbus(self.last_checked_ok)
2053
# LastCheckerStatus - property
2054
@dbus_service_property(_interface, signature="n", access="read")
2055
def LastCheckerStatus_dbus_property(self):
2056
return dbus.Int16(self.last_checker_status)
1308
2058
# Expires - property
1309
2059
@dbus_service_property(_interface, signature="s", access="read")
1310
2060
def Expires_dbus_property(self):
1311
2061
return datetime_to_dbus(self.expires)
1313
2063
# LastApprovalRequest - property
1314
2064
@dbus_service_property(_interface, signature="s", access="read")
1315
2065
def LastApprovalRequest_dbus_property(self):
1316
2066
return datetime_to_dbus(self.last_approval_request)
1318
2068
# Timeout - property
1319
@dbus_service_property(_interface, signature="t",
2069
@dbus_service_property(_interface,
1320
2071
access="readwrite")
1321
2072
def Timeout_dbus_property(self, value=None):
1322
2073
if value is None: # get
1323
return dbus.UInt64(self.timeout_milliseconds())
2074
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2075
old_timeout = self.timeout
1324
2076
self.timeout = datetime.timedelta(0, 0, 0, value)
1325
if getattr(self, "disable_initiator_tag", None) is None:
1327
# Reschedule timeout
1328
gobject.source_remove(self.disable_initiator_tag)
1329
self.disable_initiator_tag = None
1331
time_to_die = _timedelta_to_milliseconds((self
1336
if time_to_die <= 0:
1337
# The timeout has passed
1340
self.expires = (datetime.datetime.utcnow()
1341
+ datetime.timedelta(milliseconds =
1343
self.disable_initiator_tag = (gobject.timeout_add
1344
(time_to_die, self.disable))
2077
# Reschedule disabling
2079
now = datetime.datetime.utcnow()
2080
self.expires += self.timeout - old_timeout
2081
if self.expires <= now:
2082
# The timeout has passed
2085
if (getattr(self, "disable_initiator_tag", None)
2088
GLib.source_remove(self.disable_initiator_tag)
2089
self.disable_initiator_tag = GLib.timeout_add(
2090
int((self.expires - now).total_seconds() * 1000),
1346
2093
# ExtendedTimeout - property
1347
@dbus_service_property(_interface, signature="t",
2094
@dbus_service_property(_interface,
1348
2096
access="readwrite")
1349
2097
def ExtendedTimeout_dbus_property(self, value=None):
1350
2098
if value is None: # get
1351
return dbus.UInt64(self.extended_timeout_milliseconds())
2099
return dbus.UInt64(self.extended_timeout.total_seconds()
1352
2101
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1354
2103
# Interval - property
1355
@dbus_service_property(_interface, signature="t",
2104
@dbus_service_property(_interface,
1356
2106
access="readwrite")
1357
2107
def Interval_dbus_property(self, value=None):
1358
2108
if value is None: # get
1359
return dbus.UInt64(self.interval_milliseconds())
2109
return dbus.UInt64(self.interval.total_seconds() * 1000)
1360
2110
self.interval = datetime.timedelta(0, 0, 0, value)
1361
2111
if getattr(self, "checker_initiator_tag", None) is None:
1363
# Reschedule checker run
1364
gobject.source_remove(self.checker_initiator_tag)
1365
self.checker_initiator_tag = (gobject.timeout_add
1366
(value, self.start_checker))
1367
self.start_checker() # Start one now, too
2114
# Reschedule checker run
2115
GLib.source_remove(self.checker_initiator_tag)
2116
self.checker_initiator_tag = GLib.timeout_add(
2117
value, self.start_checker)
2118
self.start_checker() # Start one now, too
1369
2120
# Checker - property
1370
@dbus_service_property(_interface, signature="s",
2121
@dbus_service_property(_interface,
1371
2123
access="readwrite")
1372
2124
def Checker_dbus_property(self, value=None):
1373
2125
if value is None: # get
1374
2126
return dbus.String(self.checker_command)
1375
self.checker_command = value
2127
self.checker_command = str(value)
1377
2129
# CheckerRunning - property
1378
@dbus_service_property(_interface, signature="b",
2130
@dbus_service_property(_interface,
1379
2132
access="readwrite")
1380
2133
def CheckerRunning_dbus_property(self, value=None):
1381
2134
if value is None: # get
1404
2165
self._pipe = child_pipe
1405
2166
self._pipe.send(('init', fpr, address))
1406
2167
if not self._pipe.recv():
1409
2170
def __getattribute__(self, name):
1410
if(name == '_pipe'):
1411
2172
return super(ProxyClient, self).__getattribute__(name)
1412
2173
self._pipe.send(('getattr', name))
1413
2174
data = self._pipe.recv()
1414
2175
if data[0] == 'data':
1416
2177
if data[0] == 'function':
1417
2179
def func(*args, **kwargs):
1418
2180
self._pipe.send(('funcall', name, args, kwargs))
1419
2181
return self._pipe.recv()[1]
1422
2185
def __setattr__(self, name, value):
1423
if(name == '_pipe'):
1424
2187
return super(ProxyClient, self).__setattr__(name, value)
1425
2188
self._pipe.send(('setattr', name, value))
1428
class ClientDBusTransitional(ClientDBus):
1429
__metaclass__ = AlternateDBusNamesMetaclass
1432
2191
class ClientHandler(socketserver.BaseRequestHandler, object):
1433
2192
"""A class to handle client connections.
1435
2194
Instantiated once for each connection to handle it.
1436
2195
Note: This will run in its own forked process."""
1438
2197
def handle(self):
1439
2198
with contextlib.closing(self.server.child_pipe) as child_pipe:
1440
2199
logger.info("TCP connection from: %s",
1441
unicode(self.client_address))
2200
str(self.client_address))
1442
2201
logger.debug("Pipe FD: %d",
1443
2202
self.server.child_pipe.fileno())
1445
session = (gnutls.connection
1446
.ClientSession(self.request,
1448
.X509Credentials()))
1450
# Note: gnutls.connection.X509Credentials is really a
1451
# generic GnuTLS certificate credentials object so long as
1452
# no X.509 keys are added to it. Therefore, we can use it
1453
# here despite using OpenPGP certificates.
1455
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1456
# "+AES-256-CBC", "+SHA1",
1457
# "+COMP-NULL", "+CTYPE-OPENPGP",
2204
session = gnutls.ClientSession(self.request)
2206
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2207
# "+AES-256-CBC", "+SHA1",
2208
# "+COMP-NULL", "+CTYPE-OPENPGP",
1459
2210
# Use a fallback default, since this MUST be set.
1460
2211
priority = self.server.gnutls_priority
1461
2212
if priority is None:
1462
2213
priority = "NORMAL"
1463
(gnutls.library.functions
1464
.gnutls_priority_set_direct(session._c_object,
2214
gnutls.priority_set_direct(session._c_object,
2215
priority.encode("utf-8"),
1467
2218
# Start communication using the Mandos protocol
1468
2219
# Get protocol number
1469
2220
line = self.request.makefile().readline()
1470
2221
logger.debug("Protocol version: %r", line)
1472
2223
if int(line.strip().split()[0]) > 1:
2224
raise RuntimeError(line)
1474
2225
except (ValueError, IndexError, RuntimeError) as error:
1475
2226
logger.error("Unknown protocol version: %s", error)
1478
2229
# Start GnuTLS connection
1480
2231
session.handshake()
1481
except gnutls.errors.GNUTLSError as error:
2232
except gnutls.Error as error:
1482
2233
logger.warning("Handshake failed: %s", error)
1483
2234
# Do not run session.bye() here: the session is not
1484
2235
# established. Just abandon the request.
1486
2237
logger.debug("Handshake succeeded")
1488
2239
approval_required = False
1491
fpr = self.fingerprint(self.peer_certificate
1494
gnutls.errors.GNUTLSError) as error:
2242
fpr = self.fingerprint(
2243
self.peer_certificate(session))
2244
except (TypeError, gnutls.Error) as error:
1495
2245
logger.warning("Bad certificate: %s", error)
1497
2247
logger.debug("Fingerprint: %s", fpr)
1498
if self.server.use_dbus:
1500
client.NewRequest(str(self.client_address))
1503
2250
client = ProxyClient(child_pipe, fpr,
1504
2251
self.client_address)
1505
2252
except KeyError:
1508
2255
if client.approval_delay:
1509
2256
delay = client.approval_delay
1510
2257
client.approvals_pending += 1
1511
2258
approval_required = True
1514
2261
if not client.enabled:
1515
2262
logger.info("Client %s is disabled",
1517
2264
if self.server.use_dbus:
1518
2265
# Emit D-Bus signal
1519
2266
client.Rejected("Disabled")
1522
if client._approved or not client.approval_delay:
1523
#We are approved or approval is disabled
2269
if client.approved or not client.approval_delay:
2270
# We are approved or approval is disabled
1525
elif client._approved is None:
2272
elif client.approved is None:
1526
2273
logger.info("Client %s needs approval",
1528
2275
if self.server.use_dbus:
1529
2276
# Emit D-Bus signal
1530
2277
client.NeedApproval(
1531
client.approval_delay_milliseconds(),
1532
client.approved_by_default)
2278
client.approval_delay.total_seconds()
2279
* 1000, client.approved_by_default)
1534
2281
logger.warning("Client %s was not approved",
1561
2306
delay -= time2 - time
1564
while sent_size < len(client.secret):
1566
sent = session.send(client.secret[sent_size:])
1567
except gnutls.errors.GNUTLSError as error:
1568
logger.warning("gnutls send failed")
1570
logger.debug("Sent: %d, remaining: %d",
1571
sent, len(client.secret)
1572
- (sent_size + sent))
2309
session.send(client.secret)
2310
except gnutls.Error as error:
2311
logger.warning("gnutls send failed",
1575
2315
logger.info("Sending secret to %s", client.name)
1576
2316
# bump the timeout using extended_timeout
1577
client.checked_ok(client.extended_timeout)
2317
client.bump_timeout(client.extended_timeout)
1578
2318
if self.server.use_dbus:
1579
2319
# Emit D-Bus signal
1580
2320
client.GotSecret()
1583
2323
if approval_required:
1584
2324
client.approvals_pending -= 1
1587
except gnutls.errors.GNUTLSError as error:
1588
logger.warning("GnuTLS bye failed")
2327
except gnutls.Error as error:
2328
logger.warning("GnuTLS bye failed",
1591
2332
def peer_certificate(session):
1592
2333
"Return the peer's OpenPGP certificate as a bytestring"
1593
2334
# If not an OpenPGP certificate...
1594
if (gnutls.library.functions
1595
.gnutls_certificate_type_get(session._c_object)
1596
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1597
# ...do the normal thing
1598
return session.peer_certificate
2335
if (gnutls.certificate_type_get(session._c_object)
2336
!= gnutls.CRT_OPENPGP):
2337
# ...return invalid data
1599
2339
list_size = ctypes.c_uint(1)
1600
cert_list = (gnutls.library.functions
1601
.gnutls_certificate_get_peers
2340
cert_list = (gnutls.certificate_get_peers
1602
2341
(session._c_object, ctypes.byref(list_size)))
1603
2342
if not bool(cert_list) and list_size.value != 0:
1604
raise gnutls.errors.GNUTLSError("error getting peer"
2343
raise gnutls.Error("error getting peer certificate")
1606
2344
if list_size.value == 0:
1608
2346
cert = cert_list[0]
1609
2347
return ctypes.string_at(cert.data, cert.size)
1612
2350
def fingerprint(openpgp):
1613
2351
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1614
2352
# New GnuTLS "datum" with the OpenPGP public key
1615
datum = (gnutls.library.types
1616
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1619
ctypes.c_uint(len(openpgp))))
2353
datum = gnutls.datum_t(
2354
ctypes.cast(ctypes.c_char_p(openpgp),
2355
ctypes.POINTER(ctypes.c_ubyte)),
2356
ctypes.c_uint(len(openpgp)))
1620
2357
# New empty GnuTLS certificate
1621
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1622
(gnutls.library.functions
1623
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2358
crt = gnutls.openpgp_crt_t()
2359
gnutls.openpgp_crt_init(ctypes.byref(crt))
1624
2360
# Import the OpenPGP public key into the certificate
1625
(gnutls.library.functions
1626
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1627
gnutls.library.constants
1628
.GNUTLS_OPENPGP_FMT_RAW))
2361
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2362
gnutls.OPENPGP_FMT_RAW)
1629
2363
# Verify the self signature in the key
1630
2364
crtverify = ctypes.c_uint()
1631
(gnutls.library.functions
1632
.gnutls_openpgp_crt_verify_self(crt, 0,
1633
ctypes.byref(crtverify)))
2365
gnutls.openpgp_crt_verify_self(crt, 0,
2366
ctypes.byref(crtverify))
1634
2367
if crtverify.value != 0:
1635
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1636
raise (gnutls.errors.CertificateSecurityError
2368
gnutls.openpgp_crt_deinit(crt)
2369
raise gnutls.CertificateSecurityError("Verify failed")
1638
2370
# New buffer for the fingerprint
1639
2371
buf = ctypes.create_string_buffer(20)
1640
2372
buf_len = ctypes.c_size_t()
1641
2373
# Get the fingerprint from the certificate into the buffer
1642
(gnutls.library.functions
1643
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1644
ctypes.byref(buf_len)))
2374
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2375
ctypes.byref(buf_len))
1645
2376
# Deinit the certificate
1646
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2377
gnutls.openpgp_crt_deinit(crt)
1647
2378
# Convert the buffer to a Python bytestring
1648
2379
fpr = ctypes.string_at(buf, buf_len.value)
1649
2380
# Convert the bytestring to hexadecimal notation
1654
2385
class MultiprocessingMixIn(object):
1655
2386
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1656
2388
def sub_process_main(self, request, address):
1658
2390
self.finish_request(request, address)
1660
2392
self.handle_error(request, address)
1661
2393
self.close_request(request)
1663
2395
def process_request(self, request, address):
1664
2396
"""Start a new process to process the request."""
1665
proc = multiprocessing.Process(target = self.sub_process_main,
2397
proc = multiprocessing.Process(target=self.sub_process_main,
2398
args=(request, address))
1672
2403
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1673
2404
""" adds a pipe to the MixIn """
1674
2406
def process_request(self, request, client_address):
1675
2407
"""Overrides and wraps the original process_request().
1677
2409
This function creates a new pipe in self.pipe
1679
2411
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1681
2413
proc = MultiprocessingMixIn.process_request(self, request,
1682
2414
client_address)
1683
2415
self.child_pipe.close()
1684
2416
self.add_pipe(parent_pipe, proc)
1686
2418
def add_pipe(self, parent_pipe, proc):
1687
2419
"""Dummy function; override as necessary"""
1688
raise NotImplementedError
2420
raise NotImplementedError()
1691
2423
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1692
2424
socketserver.TCPServer, object):
1693
2425
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1696
2428
enabled: Boolean; whether this server is activated yet
1697
2429
interface: None or a network interface name (string)
1698
2430
use_ipv6: Boolean; to use IPv6 or not
1700
2433
def __init__(self, server_address, RequestHandlerClass,
1701
interface=None, use_ipv6=True):
2437
"""If socketfd is set, use that file descriptor instead of
2438
creating a new one with socket.socket().
1702
2440
self.interface = interface
1704
2442
self.address_family = socket.AF_INET6
2443
if socketfd is not None:
2444
# Save the file descriptor
2445
self.socketfd = socketfd
2446
# Save the original socket.socket() function
2447
self.socket_socket = socket.socket
2449
# To implement --socket, we monkey patch socket.socket.
2451
# (When socketserver.TCPServer is a new-style class, we
2452
# could make self.socket into a property instead of monkey
2453
# patching socket.socket.)
2455
# Create a one-time-only replacement for socket.socket()
2456
@functools.wraps(socket.socket)
2457
def socket_wrapper(*args, **kwargs):
2458
# Restore original function so subsequent calls are
2460
socket.socket = self.socket_socket
2461
del self.socket_socket
2462
# This time only, return a new socket object from the
2463
# saved file descriptor.
2464
return socket.fromfd(self.socketfd, *args, **kwargs)
2465
# Replace socket.socket() function with wrapper
2466
socket.socket = socket_wrapper
2467
# The socketserver.TCPServer.__init__ will call
2468
# socket.socket(), which might be our replacement,
2469
# socket_wrapper(), if socketfd was set.
1705
2470
socketserver.TCPServer.__init__(self, server_address,
1706
2471
RequestHandlerClass)
1707
2473
def server_bind(self):
1708
2474
"""This overrides the normal server_bind() function
1709
2475
to bind to an interface if one was specified, and also NOT to
1710
2476
bind to an address or port if they were not specified."""
2477
global SO_BINDTODEVICE
1711
2478
if self.interface is not None:
1712
2479
if SO_BINDTODEVICE is None:
1713
logger.error("SO_BINDTODEVICE does not exist;"
1714
" cannot bind to interface %s",
1718
self.socket.setsockopt(socket.SOL_SOCKET,
1722
except socket.error as error:
1723
if error[0] == errno.EPERM:
1724
logger.error("No permission to"
1725
" bind to interface %s",
1727
elif error[0] == errno.ENOPROTOOPT:
1728
logger.error("SO_BINDTODEVICE not available;"
1729
" cannot bind to interface %s",
2480
# Fall back to a hard-coded value which seems to be
2482
logger.warning("SO_BINDTODEVICE not found, trying 25")
2483
SO_BINDTODEVICE = 25
2485
self.socket.setsockopt(
2486
socket.SOL_SOCKET, SO_BINDTODEVICE,
2487
(self.interface + "\0").encode("utf-8"))
2488
except socket.error as error:
2489
if error.errno == errno.EPERM:
2490
logger.error("No permission to bind to"
2491
" interface %s", self.interface)
2492
elif error.errno == errno.ENOPROTOOPT:
2493
logger.error("SO_BINDTODEVICE not available;"
2494
" cannot bind to interface %s",
2496
elif error.errno == errno.ENODEV:
2497
logger.error("Interface %s does not exist,"
2498
" cannot bind", self.interface)
1733
2501
# Only bind(2) the socket if we really need to.
1734
2502
if self.server_address[0] or self.server_address[1]:
1735
2503
if not self.server_address[0]:
1736
2504
if self.address_family == socket.AF_INET6:
1737
any_address = "::" # in6addr_any
2505
any_address = "::" # in6addr_any
1739
any_address = socket.INADDR_ANY
2507
any_address = "0.0.0.0" # INADDR_ANY
1740
2508
self.server_address = (any_address,
1741
2509
self.server_address[1])
1742
2510
elif not self.server_address[1]:
1743
self.server_address = (self.server_address[0],
2511
self.server_address = (self.server_address[0], 0)
1745
2512
# if self.interface:
1746
2513
# self.server_address = (self.server_address[0],
1850
2611
funcname = request[1]
1851
2612
args = request[2]
1852
2613
kwargs = request[3]
1854
2615
parent_pipe.send(('data', getattr(client_object,
1855
2616
funcname)(*args,
1858
2619
if command == 'getattr':
1859
2620
attrname = request[1]
1860
if callable(client_object.__getattribute__(attrname)):
1861
parent_pipe.send(('function',))
2621
if isinstance(client_object.__getattribute__(attrname),
2622
collections.Callable):
2623
parent_pipe.send(('function', ))
1863
parent_pipe.send(('data', client_object
1864
.__getattribute__(attrname)))
2626
'data', client_object.__getattribute__(attrname)))
1866
2628
if command == 'setattr':
1867
2629
attrname = request[1]
1868
2630
value = request[2]
1869
2631
setattr(client_object, attrname, value)
2636
def rfc3339_duration_to_delta(duration):
2637
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2639
>>> rfc3339_duration_to_delta("P7D")
2640
datetime.timedelta(7)
2641
>>> rfc3339_duration_to_delta("PT60S")
2642
datetime.timedelta(0, 60)
2643
>>> rfc3339_duration_to_delta("PT60M")
2644
datetime.timedelta(0, 3600)
2645
>>> rfc3339_duration_to_delta("PT24H")
2646
datetime.timedelta(1)
2647
>>> rfc3339_duration_to_delta("P1W")
2648
datetime.timedelta(7)
2649
>>> rfc3339_duration_to_delta("PT5M30S")
2650
datetime.timedelta(0, 330)
2651
>>> rfc3339_duration_to_delta("P1DT3M20S")
2652
datetime.timedelta(1, 200)
2655
# Parsing an RFC 3339 duration with regular expressions is not
2656
# possible - there would have to be multiple places for the same
2657
# values, like seconds. The current code, while more esoteric, is
2658
# cleaner without depending on a parsing library. If Python had a
2659
# built-in library for parsing we would use it, but we'd like to
2660
# avoid excessive use of external libraries.
2662
# New type for defining tokens, syntax, and semantics all-in-one
2663
Token = collections.namedtuple("Token", (
2664
"regexp", # To match token; if "value" is not None, must have
2665
# a "group" containing digits
2666
"value", # datetime.timedelta or None
2667
"followers")) # Tokens valid after this token
2668
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2669
# the "duration" ABNF definition in RFC 3339, Appendix A.
2670
token_end = Token(re.compile(r"$"), None, frozenset())
2671
token_second = Token(re.compile(r"(\d+)S"),
2672
datetime.timedelta(seconds=1),
2673
frozenset((token_end, )))
2674
token_minute = Token(re.compile(r"(\d+)M"),
2675
datetime.timedelta(minutes=1),
2676
frozenset((token_second, token_end)))
2677
token_hour = Token(re.compile(r"(\d+)H"),
2678
datetime.timedelta(hours=1),
2679
frozenset((token_minute, token_end)))
2680
token_time = Token(re.compile(r"T"),
2682
frozenset((token_hour, token_minute,
2684
token_day = Token(re.compile(r"(\d+)D"),
2685
datetime.timedelta(days=1),
2686
frozenset((token_time, token_end)))
2687
token_month = Token(re.compile(r"(\d+)M"),
2688
datetime.timedelta(weeks=4),
2689
frozenset((token_day, token_end)))
2690
token_year = Token(re.compile(r"(\d+)Y"),
2691
datetime.timedelta(weeks=52),
2692
frozenset((token_month, token_end)))
2693
token_week = Token(re.compile(r"(\d+)W"),
2694
datetime.timedelta(weeks=1),
2695
frozenset((token_end, )))
2696
token_duration = Token(re.compile(r"P"), None,
2697
frozenset((token_year, token_month,
2698
token_day, token_time,
2700
# Define starting values:
2702
value = datetime.timedelta()
2704
# Following valid tokens
2705
followers = frozenset((token_duration, ))
2706
# String left to parse
2708
# Loop until end token is found
2709
while found_token is not token_end:
2710
# Search for any currently valid tokens
2711
for token in followers:
2712
match = token.regexp.match(s)
2713
if match is not None:
2715
if token.value is not None:
2716
# Value found, parse digits
2717
factor = int(match.group(1), 10)
2718
# Add to value so far
2719
value += factor * token.value
2720
# Strip token from string
2721
s = token.regexp.sub("", s, 1)
2724
# Set valid next tokens
2725
followers = found_token.followers
2728
# No currently valid tokens were found
2729
raise ValueError("Invalid RFC 3339 duration: {!r}"
1874
2735
def string_to_delta(interval):
1875
2736
"""Parse a string and return a datetime.timedelta
1877
2738
>>> string_to_delta('7d')
1878
2739
datetime.timedelta(7)
1879
2740
>>> string_to_delta('60s')
1968
2835
parser.add_argument("--no-dbus", action="store_false",
1969
2836
dest="use_dbus", help="Do not provide D-Bus"
1970
" system bus interface")
2837
" system bus interface", default=None)
1971
2838
parser.add_argument("--no-ipv6", action="store_false",
1972
dest="use_ipv6", help="Do not use IPv6")
2839
dest="use_ipv6", help="Do not use IPv6",
1973
2841
parser.add_argument("--no-restore", action="store_false",
1974
2842
dest="restore", help="Do not restore stored"
1975
" state", default=True)
2843
" state", default=None)
2844
parser.add_argument("--socket", type=int,
2845
help="Specify a file descriptor to a network"
2846
" socket to use instead of creating one")
2847
parser.add_argument("--statedir", metavar="DIR",
2848
help="Directory to save/restore state in")
2849
parser.add_argument("--foreground", action="store_true",
2850
help="Run in foreground", default=None)
2851
parser.add_argument("--no-zeroconf", action="store_false",
2852
dest="zeroconf", help="Do not use Zeroconf",
1977
2855
options = parser.parse_args()
1979
2857
if options.check:
2859
fail_count, test_count = doctest.testmod()
2860
sys.exit(os.EX_OK if fail_count == 0 else 1)
1984
2862
# Default values for config file for server-global settings
1985
server_defaults = { "interface": "",
1990
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1991
"servicename": "Mandos",
2863
server_defaults = {"interface": "",
2868
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2869
":+SIGN-DSA-SHA256",
2870
"servicename": "Mandos",
2876
"statedir": "/var/lib/mandos",
2877
"foreground": "False",
1997
2881
# Parse config file for server-global settings
1998
2882
server_config = configparser.SafeConfigParser(server_defaults)
1999
2883
del server_defaults
2000
server_config.read(os.path.join(options.configdir,
2884
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2002
2885
# Convert the SafeConfigParser object to a dict
2003
2886
server_settings = server_config.defaults()
2004
2887
# Use the appropriate methods on the non-string config options
2005
for option in ("debug", "use_dbus", "use_ipv6"):
2888
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2889
"foreground", "zeroconf"):
2006
2890
server_settings[option] = server_config.getboolean("DEFAULT",
2008
2892
if server_settings["port"]:
2009
2893
server_settings["port"] = server_config.getint("DEFAULT",
2895
if server_settings["socket"]:
2896
server_settings["socket"] = server_config.getint("DEFAULT",
2898
# Later, stdin will, and stdout and stderr might, be dup'ed
2899
# over with an opened os.devnull. But we don't want this to
2900
# happen with a supplied network socket.
2901
if 0 <= server_settings["socket"] <= 2:
2902
server_settings["socket"] = os.dup(server_settings
2011
2904
del server_config
2013
2906
# Override the settings from the config file with command line
2014
2907
# options, if set.
2015
2908
for option in ("interface", "address", "port", "debug",
2016
"priority", "servicename", "configdir",
2017
"use_dbus", "use_ipv6", "debuglevel", "restore"):
2909
"priority", "servicename", "configdir", "use_dbus",
2910
"use_ipv6", "debuglevel", "restore", "statedir",
2911
"socket", "foreground", "zeroconf"):
2018
2912
value = getattr(options, option)
2019
2913
if value is not None:
2020
2914
server_settings[option] = value
2022
2916
# Force all strings to be unicode
2023
2917
for option in server_settings.keys():
2024
if type(server_settings[option]) is str:
2025
server_settings[option] = unicode(server_settings[option])
2918
if isinstance(server_settings[option], bytes):
2919
server_settings[option] = (server_settings[option]
2921
# Force all boolean options to be boolean
2922
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2923
"foreground", "zeroconf"):
2924
server_settings[option] = bool(server_settings[option])
2925
# Debug implies foreground
2926
if server_settings["debug"]:
2927
server_settings["foreground"] = True
2026
2928
# Now we have our good server settings in "server_settings"
2028
2930
##################################################################
2932
if (not server_settings["zeroconf"]
2933
and not (server_settings["port"]
2934
or server_settings["socket"] != "")):
2935
parser.error("Needs port or socket to work without Zeroconf")
2030
2937
# For convenience
2031
2938
debug = server_settings["debug"]
2032
2939
debuglevel = server_settings["debuglevel"]
2033
2940
use_dbus = server_settings["use_dbus"]
2034
2941
use_ipv6 = server_settings["use_ipv6"]
2942
stored_state_path = os.path.join(server_settings["statedir"],
2944
foreground = server_settings["foreground"]
2945
zeroconf = server_settings["zeroconf"]
2037
initlogger(logging.DEBUG)
2948
initlogger(debug, logging.DEBUG)
2039
2950
if not debuglevel:
2042
2953
level = getattr(logging, debuglevel.upper())
2954
initlogger(debug, level)
2045
2956
if server_settings["servicename"] != "Mandos":
2046
syslogger.setFormatter(logging.Formatter
2047
('Mandos (%s) [%%(process)d]:'
2048
' %%(levelname)s: %%(message)s'
2049
% server_settings["servicename"]))
2957
syslogger.setFormatter(
2958
logging.Formatter('Mandos ({}) [%(process)d]:'
2959
' %(levelname)s: %(message)s'.format(
2960
server_settings["servicename"])))
2051
2962
# Parse config file with clients
2052
client_defaults = { "timeout": "5m",
2053
"extended_timeout": "15m",
2055
"checker": "fping -q -- %%(host)s",
2057
"approval_delay": "0s",
2058
"approval_duration": "1s",
2060
client_config = configparser.SafeConfigParser(client_defaults)
2963
client_config = configparser.SafeConfigParser(Client
2061
2965
client_config.read(os.path.join(server_settings["configdir"],
2062
2966
"clients.conf"))
2064
2968
global mandos_dbus_service
2065
2969
mandos_dbus_service = None
2067
tcp_server = MandosServer((server_settings["address"],
2068
server_settings["port"]),
2070
interface=(server_settings["interface"]
2074
server_settings["priority"],
2077
pidfilename = "/var/run/mandos.pid"
2079
pidfile = open(pidfilename, "w")
2081
logger.error("Could not open file %r", pidfilename)
2084
uid = pwd.getpwnam("_mandos").pw_uid
2085
gid = pwd.getpwnam("_mandos").pw_gid
2088
uid = pwd.getpwnam("mandos").pw_uid
2089
gid = pwd.getpwnam("mandos").pw_gid
2972
if server_settings["socket"] != "":
2973
socketfd = server_settings["socket"]
2974
tcp_server = MandosServer(
2975
(server_settings["address"], server_settings["port"]),
2977
interface=(server_settings["interface"] or None),
2979
gnutls_priority=server_settings["priority"],
2983
pidfilename = "/run/mandos.pid"
2984
if not os.path.isdir("/run/."):
2985
pidfilename = "/var/run/mandos.pid"
2988
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2989
except IOError as e:
2990
logger.error("Could not open file %r", pidfilename,
2993
for name, group in (("_mandos", "_mandos"),
2994
("mandos", "mandos"),
2995
("nobody", "nogroup")):
2997
uid = pwd.getpwnam(name).pw_uid
2998
gid = pwd.getpwnam(group).pw_gid
2090
3000
except KeyError:
2092
uid = pwd.getpwnam("nobody").pw_uid
2093
gid = pwd.getpwnam("nobody").pw_gid
3009
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2100
3011
except OSError as error:
2101
if error[0] != errno.EPERM:
3012
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3013
.format(uid, gid, os.strerror(error.errno)))
3014
if error.errno != errno.EPERM:
2105
3018
# Enable all possible GnuTLS debugging
2107
3020
# "Use a log level over 10 to enable all debugging options."
2108
3021
# - GnuTLS manual
2109
gnutls.library.functions.gnutls_global_set_log_level(11)
2111
@gnutls.library.types.gnutls_log_func
3022
gnutls.global_set_log_level(11)
2112
3025
def debug_gnutls(level, string):
2113
3026
logger.debug("GnuTLS: %s", string[:-1])
2115
(gnutls.library.functions
2116
.gnutls_global_set_log_function(debug_gnutls))
3028
gnutls.global_set_log_function(debug_gnutls)
2118
3030
# Redirect stdin so all checkers get /dev/null
2119
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3031
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2120
3032
os.dup2(null, sys.stdin.fileno())
2124
# No console logging
2125
logger.removeHandler(console)
2127
3036
# Need to fork before connecting to D-Bus
2129
3038
# Close all input and output, do double fork, etc.
3041
# multiprocessing will use threads, so before we use GLib we need
3042
# to inform GLib that threads will be used.
2132
3045
global main_loop
2133
3046
# From the Avahi example code
2134
DBusGMainLoop(set_as_default=True )
2135
main_loop = gobject.MainLoop()
3047
DBusGMainLoop(set_as_default=True)
3048
main_loop = GLib.MainLoop()
2136
3049
bus = dbus.SystemBus()
2137
3050
# End of Avahi example code
2140
3053
bus_name = dbus.service.BusName("se.recompile.Mandos",
2141
bus, do_not_queue=True)
2142
old_bus_name = (dbus.service.BusName
2143
("se.bsnet.fukt.Mandos", bus,
2145
except dbus.exceptions.NameExistsException as e:
2146
logger.error(unicode(e) + ", disabling D-Bus")
3056
old_bus_name = dbus.service.BusName(
3057
"se.bsnet.fukt.Mandos", bus,
3059
except dbus.exceptions.DBusException as e:
3060
logger.error("Disabling D-Bus:", exc_info=e)
2147
3061
use_dbus = False
2148
3062
server_settings["use_dbus"] = False
2149
3063
tcp_server.use_dbus = False
2150
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2151
service = AvahiServiceToSyslog(name =
2152
server_settings["servicename"],
2153
servicetype = "_mandos._tcp",
2154
protocol = protocol, bus = bus)
2155
if server_settings["interface"]:
2156
service.interface = (if_nametoindex
2157
(str(server_settings["interface"])))
3065
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3066
service = AvahiServiceToSyslog(
3067
name=server_settings["servicename"],
3068
servicetype="_mandos._tcp",
3071
if server_settings["interface"]:
3072
service.interface = if_nametoindex(
3073
server_settings["interface"].encode("utf-8"))
2159
3075
global multiprocessing_manager
2160
3076
multiprocessing_manager = multiprocessing.Manager()
2162
3078
client_class = Client
2164
client_class = functools.partial(ClientDBusTransitional,
2167
special_settings = {
2168
# Some settings need to be accessd by special methods;
2169
# booleans need .getboolean(), etc. Here is a list of them:
2170
"approved_by_default":
2172
client_config.getboolean(section, "approved_by_default"),
2174
# Construct a new dict of client settings of this form:
2175
# { client_name: {setting_name: value, ...}, ...}
2176
# with exceptions for any special settings as defined above
2177
client_settings = dict((clientname,
2180
if setting not in special_settings
2181
else special_settings[setting]
2183
for setting, value in
2184
client_config.items(clientname)))
2185
for clientname in client_config.sections())
3080
client_class = functools.partial(ClientDBus, bus=bus)
3082
client_settings = Client.config_parser(client_config)
2187
3083
old_client_settings = {}
3086
# This is used to redirect stdout and stderr for checker processes
3088
wnull = open(os.devnull, "w") # A writable /dev/null
3089
# Only used if server is running in foreground but not in debug
3091
if debug or not foreground:
2190
3094
# Get client data and settings from last running state.
2191
3095
if server_settings["restore"]:
2193
3097
with open(stored_state_path, "rb") as stored_state:
2194
clients_data, old_client_settings = (pickle.load
3098
if sys.version_info.major == 2:
3099
clients_data, old_client_settings = pickle.load(
3102
bytes_clients_data, bytes_old_client_settings = (
3103
pickle.load(stored_state, encoding="bytes"))
3104
# Fix bytes to strings
3107
clients_data = {(key.decode("utf-8")
3108
if isinstance(key, bytes)
3111
bytes_clients_data.items()}
3112
del bytes_clients_data
3113
for key in clients_data:
3114
value = {(k.decode("utf-8")
3115
if isinstance(k, bytes) else k): v
3117
clients_data[key].items()}
3118
clients_data[key] = value
3120
value["client_structure"] = [
3122
if isinstance(s, bytes)
3124
value["client_structure"]]
3126
for k in ("name", "host"):
3127
if isinstance(value[k], bytes):
3128
value[k] = value[k].decode("utf-8")
3129
# old_client_settings
3131
old_client_settings = {
3132
(key.decode("utf-8")
3133
if isinstance(key, bytes)
3136
bytes_old_client_settings.items()}
3137
del bytes_old_client_settings
3139
for value in old_client_settings.values():
3140
if isinstance(value["host"], bytes):
3141
value["host"] = (value["host"]
2196
3143
os.remove(stored_state_path)
2197
3144
except IOError as e:
2198
logger.warning("Could not load persistent state: {0}"
2200
if e.errno != errno.ENOENT:
3145
if e.errno == errno.ENOENT:
3146
logger.warning("Could not load persistent state:"
3147
" {}".format(os.strerror(e.errno)))
3149
logger.critical("Could not load persistent state:",
2203
with Crypto() as crypt:
2204
for client in clients_data:
2205
client_name = client["name"]
3152
except EOFError as e:
3153
logger.warning("Could not load persistent state: "
3157
with PGPEngine() as pgp:
3158
for client_name, client in clients_data.items():
3159
# Skip removed clients
3160
if client_name not in client_settings:
2207
3163
# Decide which value to use after restoring saved state.
2208
3164
# We have three different values: Old config file,
2209
3165
# new config file, and saved state.
2214
3170
# For each value in new config, check if it
2215
3171
# differs from the old config value (Except for
2216
3172
# the "secret" attribute)
2217
if (name != "secret" and
2218
value != old_client_settings[client_name]
2220
setattr(client, name, value)
3173
if (name != "secret"
3175
old_client_settings[client_name][name])):
3176
client[name] = value
2221
3177
except KeyError:
2224
3180
# Clients who has passed its expire date can still be
2225
# enabled if its last checker was sucessful. Clients
2226
# whose checker failed before we stored its state is
2227
# assumed to have failed all checkers during downtime.
2228
if client["enabled"] and client["last_checked_ok"]:
2229
if ((datetime.datetime.utcnow()
2230
- client["last_checked_ok"])
2231
> client["interval"]):
2232
if client["last_checker_status"] != 0:
3181
# enabled if its last checker was successful. A Client
3182
# whose checker succeeded before we stored its state is
3183
# assumed to have successfully run all checkers during
3185
if client["enabled"]:
3186
if datetime.datetime.utcnow() >= client["expires"]:
3187
if not client["last_checked_ok"]:
3189
"disabling client {} - Client never "
3190
"performed a successful checker".format(
3192
client["enabled"] = False
3193
elif client["last_checker_status"] != 0:
3195
"disabling client {} - Client last"
3196
" checker failed with error code"
3199
client["last_checker_status"]))
2233
3200
client["enabled"] = False
2235
client["expires"] = (datetime.datetime
2237
+ client["timeout"])
2239
client["changedstate"] = (multiprocessing_manager
2241
(multiprocessing_manager
2244
new_client = (ClientDBusTransitional.__new__
2245
(ClientDBusTransitional))
2246
tcp_server.clients[client_name] = new_client
2247
new_client.bus = bus
2248
for name, value in client.iteritems():
2249
setattr(new_client, name, value)
2250
client_object_name = unicode(client_name).translate(
2251
{ord("."): ord("_"),
2252
ord("-"): ord("_")})
2253
new_client.dbus_object_path = (dbus.ObjectPath
2255
+ client_object_name))
2256
DBusObjectWithProperties.__init__(new_client,
2261
tcp_server.clients[client_name] = (Client.__new__
2263
for name, value in client.iteritems():
2264
setattr(tcp_server.clients[client_name],
3202
client["expires"] = (
3203
datetime.datetime.utcnow()
3204
+ client["timeout"])
3205
logger.debug("Last checker succeeded,"
3206
" keeping {} enabled".format(
2268
tcp_server.clients[client_name].secret = (
2269
crypt.decrypt(tcp_server.clients[client_name]
2271
client_settings[client_name]
3209
client["secret"] = pgp.decrypt(
3210
client["encrypted_secret"],
3211
client_settings[client_name]["secret"])
2274
3213
# If decryption fails, we use secret from new settings
2275
tcp_server.clients[client_name].secret = (
2276
client_settings[client_name]["secret"])
2278
# Create/remove clients based on new changes made to config
2279
for clientname in set(old_client_settings) - set(client_settings):
2280
del tcp_server.clients[clientname]
2281
for clientname in set(client_settings) - set(old_client_settings):
2282
tcp_server.clients[clientname] = (client_class(name
3214
logger.debug("Failed to decrypt {} old secret".format(
3216
client["secret"] = (client_settings[client_name]
3219
# Add/remove clients based on new changes made to config
3220
for client_name in (set(old_client_settings)
3221
- set(client_settings)):
3222
del clients_data[client_name]
3223
for client_name in (set(client_settings)
3224
- set(old_client_settings)):
3225
clients_data[client_name] = client_settings[client_name]
3227
# Create all client objects
3228
for client_name, client in clients_data.items():
3229
tcp_server.clients[client_name] = client_class(
3232
server_settings=server_settings)
2288
3234
if not tcp_server.clients:
2289
3235
logger.warning("No clients defined")
2295
pidfile.write(str(pid) + "\n".encode("utf-8"))
2298
logger.error("Could not write to file %r with PID %d",
2301
# "pidfile" was never created
3238
if pidfile is not None:
3242
print(pid, file=pidfile)
3244
logger.error("Could not write to file %r with PID %d",
2303
3247
del pidfilename
2305
signal.signal(signal.SIGINT, signal.SIG_IGN)
2307
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2308
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3249
for termsig in (signal.SIGHUP, signal.SIGTERM):
3250
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3251
lambda: main_loop.quit() and False)
2311
class MandosDBusService(dbus.service.Object):
3255
@alternate_dbus_interfaces(
3256
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3257
class MandosDBusService(DBusObjectWithObjectManager):
2312
3258
"""A D-Bus proxy object"""
2313
3260
def __init__(self):
2314
3261
dbus.service.Object.__init__(self, bus, "/")
2315
3263
_interface = "se.recompile.Mandos"
2317
3265
@dbus.service.signal(_interface, signature="o")
2318
3266
def ClientAdded(self, objpath):
2322
3270
@dbus.service.signal(_interface, signature="ss")
2323
3271
def ClientNotFound(self, fingerprint, address):
3275
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2327
3277
@dbus.service.signal(_interface, signature="os")
2328
3278
def ClientRemoved(self, objpath, name):
3282
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2332
3284
@dbus.service.method(_interface, out_signature="ao")
2333
3285
def GetAllClients(self):
2335
return dbus.Array(c.dbus_object_path
2337
tcp_server.clients.itervalues())
3287
return dbus.Array(c.dbus_object_path for c in
3288
tcp_server.clients.values())
3290
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2339
3292
@dbus.service.method(_interface,
2340
3293
out_signature="a{oa{sv}}")
2341
3294
def GetAllClientsWithProperties(self):
2343
3296
return dbus.Dictionary(
2344
((c.dbus_object_path, c.GetAll(""))
2345
for c in tcp_server.clients.itervalues()),
3297
{c.dbus_object_path: c.GetAll(
3298
"se.recompile.Mandos.Client")
3299
for c in tcp_server.clients.values()},
2346
3300
signature="oa{sv}")
2348
3302
@dbus.service.method(_interface, in_signature="o")
2349
3303
def RemoveClient(self, object_path):
2351
for c in tcp_server.clients.itervalues():
3305
for c in tcp_server.clients.values():
2352
3306
if c.dbus_object_path == object_path:
2353
3307
del tcp_server.clients[c.name]
2354
3308
c.remove_from_connection()
2355
# Don't signal anything except ClientRemoved
3309
# Don't signal the disabling
2356
3310
c.disable(quiet=True)
2358
self.ClientRemoved(object_path, c.name)
3311
# Emit D-Bus signal for removal
3312
self.client_removed_signal(c)
2360
3314
raise KeyError(object_path)
2364
class MandosDBusServiceTransitional(MandosDBusService):
2365
__metaclass__ = AlternateDBusNamesMetaclass
2366
mandos_dbus_service = MandosDBusServiceTransitional()
3318
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3319
out_signature="a{oa{sa{sv}}}")
3320
def GetManagedObjects(self):
3322
return dbus.Dictionary(
3323
{client.dbus_object_path:
3325
{interface: client.GetAll(interface)
3327
client._get_all_interface_names()})
3328
for client in tcp_server.clients.values()})
3330
def client_added_signal(self, client):
3331
"""Send the new standard signal and the old signal"""
3333
# New standard signal
3334
self.InterfacesAdded(
3335
client.dbus_object_path,
3337
{interface: client.GetAll(interface)
3339
client._get_all_interface_names()}))
3341
self.ClientAdded(client.dbus_object_path)
3343
def client_removed_signal(self, client):
3344
"""Send the new standard signal and the old signal"""
3346
# New standard signal
3347
self.InterfacesRemoved(
3348
client.dbus_object_path,
3349
client._get_all_interface_names())
3351
self.ClientRemoved(client.dbus_object_path,
3354
mandos_dbus_service = MandosDBusService()
3356
# Save modules to variables to exempt the modules from being
3357
# unloaded before the function registered with atexit() is run.
3358
mp = multiprocessing
2369
3362
"Cleanup function; run on exit"
2372
multiprocessing.active_children()
3366
mp.active_children()
2373
3368
if not (tcp_server.clients or client_settings):
2376
3371
# Store client before exiting. Secrets are encrypted with key
2377
3372
# based on what config file has. If config file is
2378
3373
# removed/edited, old secret will thus be unrecovable.
2380
with Crypto() as crypt:
2381
for client in tcp_server.clients.itervalues():
3375
with PGPEngine() as pgp:
3376
for client in tcp_server.clients.values():
2382
3377
key = client_settings[client.name]["secret"]
2383
client.encrypted_secret = crypt.encrypt(client.secret,
3378
client.encrypted_secret = pgp.encrypt(client.secret,
2385
3380
client_dict = {}
2387
# A list of attributes that will not be stored when
2389
exclude = set(("bus", "changedstate", "secret"))
2390
for name, typ in (inspect.getmembers
2391
(dbus.service.Object)):
3382
# A list of attributes that can not be pickled
3384
exclude = {"bus", "changedstate", "secret",
3385
"checker", "server_settings"}
3386
for name, typ in inspect.getmembers(dbus.service
2392
3388
exclude.add(name)
2394
3390
client_dict["encrypted_secret"] = (client
2395
3391
.encrypted_secret)
2396
3392
for attr in client.client_structure:
2397
3393
if attr not in exclude:
2398
3394
client_dict[attr] = getattr(client, attr)
2400
clients.append(client_dict)
3396
clients[client.name] = client_dict
2401
3397
del client_settings[client.name]["secret"]
2404
with os.fdopen(os.open(stored_state_path,
2405
os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2406
0600), "wb") as stored_state:
2407
pickle.dump((clients, client_settings), stored_state)
3400
with tempfile.NamedTemporaryFile(
3404
dir=os.path.dirname(stored_state_path),
3405
delete=False) as stored_state:
3406
pickle.dump((clients, client_settings), stored_state,
3408
tempname = stored_state.name
3409
os.rename(tempname, stored_state_path)
2408
3410
except (IOError, OSError) as e:
2409
logger.warning("Could not save persistent state: {0}"
2411
if e.errno not in (errno.ENOENT, errno.EACCES):
3416
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3417
logger.warning("Could not save persistent state: {}"
3418
.format(os.strerror(e.errno)))
3420
logger.warning("Could not save persistent state:",
2414
3424
# Delete all clients, and settings from config
2415
3425
while tcp_server.clients:
2416
3426
name, client = tcp_server.clients.popitem()
2418
3428
client.remove_from_connection()
2419
# Don't signal anything except ClientRemoved
3429
# Don't signal the disabling
2420
3430
client.disable(quiet=True)
3431
# Emit D-Bus signal for removal
2423
mandos_dbus_service.ClientRemoved(client
3433
mandos_dbus_service.client_removed_signal(client)
2426
3434
client_settings.clear()
2428
3436
atexit.register(cleanup)
2430
for client in tcp_server.clients.itervalues():
3438
for client in tcp_server.clients.values():
2433
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3440
# Emit D-Bus signal for adding
3441
mandos_dbus_service.client_added_signal(client)
2434
3442
# Need to initiate checking of clients
2435
3443
if client.enabled:
2436
3444
client.init_checker()
2438
3446
tcp_server.enable()
2439
3447
tcp_server.server_activate()
2441
3449
# Find out what port we got
2442
service.port = tcp_server.socket.getsockname()[1]
3451
service.port = tcp_server.socket.getsockname()[1]
2444
3453
logger.info("Now listening on address %r, port %d,"
2445
" flowinfo %d, scope_id %d"
2446
% tcp_server.socket.getsockname())
3454
" flowinfo %d, scope_id %d",
3455
*tcp_server.socket.getsockname())
2448
logger.info("Now listening on address %r, port %d"
2449
% tcp_server.socket.getsockname())
2451
#service.interface = tcp_server.socket.getsockname()[3]
3457
logger.info("Now listening on address %r, port %d",
3458
*tcp_server.socket.getsockname())
3460
# service.interface = tcp_server.socket.getsockname()[3]
2454
# From the Avahi example code
2457
except dbus.exceptions.DBusException as error:
2458
logger.critical("DBusException: %s", error)
2461
# End of Avahi example code
2463
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2464
lambda *args, **kwargs:
2465
(tcp_server.handle_request
2466
(*args[2:], **kwargs) or True))
3464
# From the Avahi example code
3467
except dbus.exceptions.DBusException as error:
3468
logger.critical("D-Bus Exception", exc_info=error)
3471
# End of Avahi example code
3473
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3474
lambda *args, **kwargs:
3475
(tcp_server.handle_request
3476
(*args[2:], **kwargs) or True))
2468
3478
logger.debug("Starting main loop")
2469
3479
main_loop.run()
2470
3480
except AvahiError as error:
2471
logger.critical("AvahiError: %s", error)
3481
logger.critical("Avahi Error", exc_info=error)
2474
3484
except KeyboardInterrupt: