To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 713
- compare with another revision
- download diff
- download tarball
- view history from revision 713
- Committer: Teddy Hogeborn
- Date: 2014-07-14 21:41:08 UTC
- Revision ID: teddy@recompile.se-20140714214108-awg7u6gaiy7d40dz
mandos-monitor: New "verbose" mode to see less important log messages.
* mandos-monitor (MandosClientWidget.__init__): Log client creation.
(MandosClientWidget.checker_completed): Log a successful checker.
(MandosClientWidget.checker_started): Log starting of a checker.
(UserInterface.__init__): New optional "log_level" argument.
(UserInterface.log_message, UserInterface.log_message_raw): Take
optional
"level"
arg.
(UserInterface.toggle_log_display): Log visibility change.
(UserInterface.change_log_display): Log wrap mode change.
(UserInterface.process_input): Show new "v" key in help message and
process "v" key if pressed.
* mandos-monitor.xml (KEYS): Document new "v" key.
* mandos-monitor (MandosClientWidget.__init__): Log client creation.
(MandosClientWidget.checker_completed): Log a successful checker.
(MandosClientWidget.checker_started): Log starting of a checker.
(UserInterface.__init__): New optional "log_level" argument.
(UserInterface.log_message, UserInterface.log_message_raw): Take
optional
"level"
arg.
(UserInterface.toggle_log_display): Log visibility change.
(UserInterface.change_log_display): Log wrap mode change.
(UserInterface.process_input): Show new "v" key in help message and
process "v" key if pressed.
* mandos-monitor.xml (KEYS): Document new "v" key.
- files removed:
- plugin-helpers
- files modified:
- DBUS-API
added
removed
mandos
1
#!/usr/bin/python2.7
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 Björn Påhlsson
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
36
36
37
37
from future_builtins import *
38
38
39
try:
40
import SocketServer as socketserver
41
except ImportError:
42
import socketserver
39
import SocketServer as socketserver
43
40
import socket
44
41
import argparse
45
42
import datetime
46
43
import errno
47
try:
48
import ConfigParser as configparser
49
except ImportError:
50
import configparser
44
import gnutls.crypto
45
import gnutls.connection
46
import gnutls.errors
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
51
51
import sys
52
52
import re
53
53
import os
62
62
import struct
63
63
import fcntl
64
64
import functools
65
try:
66
import cPickle as pickle
67
except ImportError:
68
import pickle
65
import cPickle as pickle
69
66
import multiprocessing
70
67
import types
71
68
import binascii
72
69
import tempfile
73
70
import itertools
74
71
import collections
75
import codecs
76
72
77
73
import dbus
78
74
import dbus.service
79
try:
80
import gobject
81
except ImportError:
82
from gi.repository import GObject as gobject
75
import gobject
83
76
import avahi
84
77
from dbus.mainloop.glib import DBusGMainLoop
85
78
import ctypes
95
88
except ImportError:
96
89
SO_BINDTODEVICE = None
97
90
98
if sys.version_info.major == 2:
99
str = unicode
100
101
version = "1.7.1"
91
version = "1.6.6"
102
92
stored_state_file = "clients.pickle"
103
93
104
94
logger = logging.getLogger()
105
95
syslogger = None
106
96
107
97
try:
108
if_nametoindex = ctypes.cdll.LoadLibrary(
109
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
110
101
except (OSError, AttributeError):
111
112
102
def if_nametoindex(interface):
113
103
"Get an interface index the hard way, i.e. using fcntl()"
114
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
115
105
with contextlib.closing(socket.socket()) as s:
116
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
117
struct.pack(b"16s16x", interface))
118
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
119
111
return interface_index
120
112
121
113
123
115
"""init logger and add loglevel"""
124
116
125
117
global syslogger
126
syslogger = (logging.handlers.SysLogHandler(
127
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
128
address = "/dev/log"))
118
syslogger = (logging.handlers.SysLogHandler
119
(facility =
120
logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = str("/dev/log")))
129
122
syslogger.setFormatter(logging.Formatter
130
123
('Mandos [%(process)d]: %(levelname)s:'
131
124
' %(message)s'))
148
141
149
142
class PGPEngine(object):
150
143
"""A simple class for OpenPGP symmetric encryption & decryption"""
151
152
144
def __init__(self):
153
145
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
154
146
self.gnupgargs = ['--batch',
193
185
194
186
def encrypt(self, data, password):
195
187
passphrase = self.password_encode(password)
196
with tempfile.NamedTemporaryFile(
197
dir=self.tempdir) as passfile:
188
with tempfile.NamedTemporaryFile(dir=self.tempdir
189
) as passfile:
198
190
passfile.write(passphrase)
199
191
passfile.flush()
200
192
proc = subprocess.Popen(['gpg', '--symmetric',
211
203
212
204
def decrypt(self, data, password):
213
205
passphrase = self.password_encode(password)
214
with tempfile.NamedTemporaryFile(
215
dir = self.tempdir) as passfile:
206
with tempfile.NamedTemporaryFile(dir = self.tempdir
207
) as passfile:
216
208
passfile.write(passphrase)
217
209
passfile.flush()
218
210
proc = subprocess.Popen(['gpg', '--decrypt',
222
214
stdin = subprocess.PIPE,
223
215
stdout = subprocess.PIPE,
224
216
stderr = subprocess.PIPE)
225
decrypted_plaintext, err = proc.communicate(input = data)
217
decrypted_plaintext, err = proc.communicate(input
218
= data)
226
219
if proc.returncode != 0:
227
220
raise PGPError(err)
228
221
return decrypted_plaintext
231
224
class AvahiError(Exception):
232
225
def __init__(self, value, *args, **kwargs):
233
226
self.value = value
234
return super(AvahiError, self).__init__(value, *args,
235
**kwargs)
236
227
super(AvahiError, self).__init__(value, *args, **kwargs)
228
def __unicode__(self):
229
return unicode(repr(self.value))
237
230
238
231
class AvahiServiceError(AvahiError):
239
232
pass
240
233
241
242
234
class AvahiGroupError(AvahiError):
243
235
pass
244
236
264
256
bus: dbus.SystemBus()
265
257
"""
266
258
267
def __init__(self,
268
interface = avahi.IF_UNSPEC,
269
name = None,
270
servicetype = None,
271
port = None,
272
TXT = None,
273
domain = "",
274
host = "",
275
max_renames = 32768,
276
protocol = avahi.PROTO_UNSPEC,
277
bus = None):
259
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
servicetype = None, port = None, TXT = None,
261
domain = "", host = "", max_renames = 32768,
262
protocol = avahi.PROTO_UNSPEC, bus = None):
278
263
self.interface = interface
279
264
self.name = name
280
265
self.type = servicetype
290
275
self.bus = bus
291
276
self.entry_group_state_changed_match = None
292
277
293
def rename(self, remove=True):
278
def rename(self):
294
279
"""Derived from the Avahi example code"""
295
280
if self.rename_count >= self.max_renames:
296
281
logger.critical("No suitable Zeroconf service name found"
297
282
" after %i retries, exiting.",
298
283
self.rename_count)
299
284
raise AvahiServiceError("Too many renames")
300
self.name = str(
301
self.server.GetAlternativeServiceName(self.name))
302
self.rename_count += 1
285
self.name = unicode(self.server
286
.GetAlternativeServiceName(self.name))
303
287
logger.info("Changing Zeroconf service name to %r ...",
304
288
self.name)
305
if remove:
306
self.remove()
289
self.remove()
307
290
try:
308
291
self.add()
309
292
except dbus.exceptions.DBusException as error:
310
if (error.get_dbus_name()
311
== "org.freedesktop.Avahi.CollisionError"):
312
logger.info("Local Zeroconf service name collision.")
313
return self.rename(remove=False)
314
else:
315
logger.critical("D-Bus Exception", exc_info=error)
316
self.cleanup()
317
os._exit(1)
293
logger.critical("D-Bus Exception", exc_info=error)
294
self.cleanup()
295
os._exit(1)
296
self.rename_count += 1
318
297
319
298
def remove(self):
320
299
"""Derived from the Avahi example code"""
358
337
self.rename()
359
338
elif state == avahi.ENTRY_GROUP_FAILURE:
360
339
logger.critical("Avahi: Error in group state changed %s",
361
str(error))
362
raise AvahiGroupError("State changed: {!s}".format(error))
340
unicode(error))
341
raise AvahiGroupError("State changed: {0!s}"
342
.format(error))
363
343
364
344
def cleanup(self):
365
345
"""Derived from the Avahi example code"""
375
355
def server_state_changed(self, state, error=None):
376
356
"""Derived from the Avahi example code"""
377
357
logger.debug("Avahi server state change: %i", state)
378
bad_states = {
379
avahi.SERVER_INVALID: "Zeroconf server invalid",
380
avahi.SERVER_REGISTERING: None,
381
avahi.SERVER_COLLISION: "Zeroconf server name collision",
382
avahi.SERVER_FAILURE: "Zeroconf server failure",
383
}
358
bad_states = { avahi.SERVER_INVALID:
359
"Zeroconf server invalid",
360
avahi.SERVER_REGISTERING: None,
361
avahi.SERVER_COLLISION:
362
"Zeroconf server name collision",
363
avahi.SERVER_FAILURE:
364
"Zeroconf server failure" }
384
365
if state in bad_states:
385
366
if bad_states[state] is not None:
386
367
if error is None:
389
370
logger.error(bad_states[state] + ": %r", error)
390
371
self.cleanup()
391
372
elif state == avahi.SERVER_RUNNING:
392
try:
393
self.add()
394
except dbus.exceptions.DBusException as error:
395
if (error.get_dbus_name()
396
== "org.freedesktop.Avahi.CollisionError"):
397
logger.info("Local Zeroconf service name"
398
" collision.")
399
return self.rename(remove=False)
400
else:
401
logger.critical("D-Bus Exception", exc_info=error)
402
self.cleanup()
403
os._exit(1)
373
self.add()
404
374
else:
405
375
if error is None:
406
376
logger.debug("Unknown state: %r", state)
416
386
follow_name_owner_changes=True),
417
387
avahi.DBUS_INTERFACE_SERVER)
418
388
self.server.connect_to_signal("StateChanged",
419
self.server_state_changed)
389
self.server_state_changed)
420
390
self.server_state_changed(self.server.GetState())
421
391
422
392
423
393
class AvahiServiceToSyslog(AvahiService):
424
def rename(self, *args, **kwargs):
394
def rename(self):
425
395
"""Add the new name to the syslog messages"""
426
ret = AvahiService.rename(self, *args, **kwargs)
427
syslogger.setFormatter(logging.Formatter(
428
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
429
.format(self.name)))
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({0}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
400
.format(self.name)))
430
401
return ret
431
402
432
# Pretend that we have a GnuTLS module
433
class GnuTLS(object):
434
"""This isn't so much a class as it is a module-like namespace.
435
It is instantiated once, and simulates having a GnuTLS module."""
436
437
_library = ctypes.cdll.LoadLibrary(
438
ctypes.util.find_library("gnutls"))
439
_need_version = "3.3.0"
440
def __init__(self):
441
# Need to use class name "GnuTLS" here, since this method is
442
# called before the assignment to the "gnutls" global variable
443
# happens.
444
if GnuTLS.check_version(self._need_version) is None:
445
raise GnuTLS.Error("Needs GnuTLS {} or later"
446
.format(self._need_version))
447
448
# Unless otherwise indicated, the constants and types below are
449
# all from the gnutls/gnutls.h C header file.
450
451
# Constants
452
E_SUCCESS = 0
453
E_INTERRUPTED = -52
454
E_AGAIN = -28
455
CRT_OPENPGP = 2
456
CLIENT = 2
457
SHUT_RDWR = 0
458
CRD_CERTIFICATE = 1
459
E_NO_CERTIFICATE_FOUND = -49
460
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
461
462
# Types
463
class session_int(ctypes.Structure):
464
_fields_ = []
465
session_t = ctypes.POINTER(session_int)
466
class certificate_credentials_st(ctypes.Structure):
467
_fields_ = []
468
certificate_credentials_t = ctypes.POINTER(
469
certificate_credentials_st)
470
certificate_type_t = ctypes.c_int
471
class datum_t(ctypes.Structure):
472
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
473
('size', ctypes.c_uint)]
474
class openpgp_crt_int(ctypes.Structure):
475
_fields_ = []
476
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
477
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
478
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
479
credentials_type_t = ctypes.c_int #
480
transport_ptr_t = ctypes.c_void_p
481
close_request_t = ctypes.c_int
482
483
# Exceptions
484
class Error(Exception):
485
# We need to use the class name "GnuTLS" here, since this
486
# exception might be raised from within GnuTLS.__init__,
487
# which is called before the assignment to the "gnutls"
488
# global variable has happened.
489
def __init__(self, message = None, code = None, args=()):
490
# Default usage is by a message string, but if a return
491
# code is passed, convert it to a string with
492
# gnutls.strerror()
493
self.code = code
494
if message is None and code is not None:
495
message = GnuTLS.strerror(code)
496
return super(GnuTLS.Error, self).__init__(
497
message, *args)
498
499
class CertificateSecurityError(Error):
500
pass
501
502
# Classes
503
class Credentials(object):
504
def __init__(self):
505
self._c_object = gnutls.certificate_credentials_t()
506
gnutls.certificate_allocate_credentials(
507
ctypes.byref(self._c_object))
508
self.type = gnutls.CRD_CERTIFICATE
509
510
def __del__(self):
511
gnutls.certificate_free_credentials(self._c_object)
512
513
class ClientSession(object):
514
def __init__(self, socket, credentials = None):
515
self._c_object = gnutls.session_t()
516
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
517
gnutls.set_default_priority(self._c_object)
518
gnutls.transport_set_ptr(self._c_object, socket.fileno())
519
gnutls.handshake_set_private_extensions(self._c_object,
520
True)
521
self.socket = socket
522
if credentials is None:
523
credentials = gnutls.Credentials()
524
gnutls.credentials_set(self._c_object, credentials.type,
525
ctypes.cast(credentials._c_object,
526
ctypes.c_void_p))
527
self.credentials = credentials
528
529
def __del__(self):
530
gnutls.deinit(self._c_object)
531
532
def handshake(self):
533
return gnutls.handshake(self._c_object)
534
535
def send(self, data):
536
data = bytes(data)
537
data_len = len(data)
538
while data_len > 0:
539
data_len -= gnutls.record_send(self._c_object,
540
data[-data_len:],
541
data_len)
542
543
def bye(self):
544
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
545
546
# Error handling functions
547
def _error_code(result):
548
"""A function to raise exceptions on errors, suitable
549
for the 'restype' attribute on ctypes functions"""
550
if result >= 0:
551
return result
552
if result == gnutls.E_NO_CERTIFICATE_FOUND:
553
raise gnutls.CertificateSecurityError(code = result)
554
raise gnutls.Error(code = result)
555
556
def _retry_on_error(result, func, arguments):
557
"""A function to retry on some errors, suitable
558
for the 'errcheck' attribute on ctypes functions"""
559
while result < 0:
560
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
561
return _error_code(result)
562
result = func(*arguments)
563
return result
564
565
# Unless otherwise indicated, the function declarations below are
566
# all from the gnutls/gnutls.h C header file.
567
568
# Functions
569
priority_set_direct = _library.gnutls_priority_set_direct
570
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
571
ctypes.POINTER(ctypes.c_char_p)]
572
priority_set_direct.restype = _error_code
573
574
init = _library.gnutls_init
575
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
576
init.restype = _error_code
577
578
set_default_priority = _library.gnutls_set_default_priority
579
set_default_priority.argtypes = [session_t]
580
set_default_priority.restype = _error_code
581
582
record_send = _library.gnutls_record_send
583
record_send.argtypes = [session_t, ctypes.c_void_p,
584
ctypes.c_size_t]
585
record_send.restype = ctypes.c_ssize_t
586
record_send.errcheck = _retry_on_error
587
588
certificate_allocate_credentials = (
589
_library.gnutls_certificate_allocate_credentials)
590
certificate_allocate_credentials.argtypes = [
591
ctypes.POINTER(certificate_credentials_t)]
592
certificate_allocate_credentials.restype = _error_code
593
594
certificate_free_credentials = (
595
_library.gnutls_certificate_free_credentials)
596
certificate_free_credentials.argtypes = [certificate_credentials_t]
597
certificate_free_credentials.restype = None
598
599
handshake_set_private_extensions = (
600
_library.gnutls_handshake_set_private_extensions)
601
handshake_set_private_extensions.argtypes = [session_t,
602
ctypes.c_int]
603
handshake_set_private_extensions.restype = None
604
605
credentials_set = _library.gnutls_credentials_set
606
credentials_set.argtypes = [session_t, credentials_type_t,
607
ctypes.c_void_p]
608
credentials_set.restype = _error_code
609
610
strerror = _library.gnutls_strerror
611
strerror.argtypes = [ctypes.c_int]
612
strerror.restype = ctypes.c_char_p
613
614
certificate_type_get = _library.gnutls_certificate_type_get
615
certificate_type_get.argtypes = [session_t]
616
certificate_type_get.restype = _error_code
617
618
certificate_get_peers = _library.gnutls_certificate_get_peers
619
certificate_get_peers.argtypes = [session_t,
620
ctypes.POINTER(ctypes.c_uint)]
621
certificate_get_peers.restype = ctypes.POINTER(datum_t)
622
623
global_set_log_level = _library.gnutls_global_set_log_level
624
global_set_log_level.argtypes = [ctypes.c_int]
625
global_set_log_level.restype = None
626
627
global_set_log_function = _library.gnutls_global_set_log_function
628
global_set_log_function.argtypes = [log_func]
629
global_set_log_function.restype = None
630
631
deinit = _library.gnutls_deinit
632
deinit.argtypes = [session_t]
633
deinit.restype = None
634
635
handshake = _library.gnutls_handshake
636
handshake.argtypes = [session_t]
637
handshake.restype = _error_code
638
handshake.errcheck = _retry_on_error
639
640
transport_set_ptr = _library.gnutls_transport_set_ptr
641
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
642
transport_set_ptr.restype = None
643
644
bye = _library.gnutls_bye
645
bye.argtypes = [session_t, close_request_t]
646
bye.restype = _error_code
647
bye.errcheck = _retry_on_error
648
649
check_version = _library.gnutls_check_version
650
check_version.argtypes = [ctypes.c_char_p]
651
check_version.restype = ctypes.c_char_p
652
653
# All the function declarations below are from gnutls/openpgp.h
654
655
openpgp_crt_init = _library.gnutls_openpgp_crt_init
656
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
657
openpgp_crt_init.restype = _error_code
658
659
openpgp_crt_import = _library.gnutls_openpgp_crt_import
660
openpgp_crt_import.argtypes = [openpgp_crt_t,
661
ctypes.POINTER(datum_t),
662
openpgp_crt_fmt_t]
663
openpgp_crt_import.restype = _error_code
664
665
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
666
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
667
ctypes.POINTER(ctypes.c_uint)]
668
openpgp_crt_verify_self.restype = _error_code
669
670
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
671
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
672
openpgp_crt_deinit.restype = None
673
674
openpgp_crt_get_fingerprint = (
675
_library.gnutls_openpgp_crt_get_fingerprint)
676
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
677
ctypes.c_void_p,
678
ctypes.POINTER(
679
ctypes.c_size_t)]
680
openpgp_crt_get_fingerprint.restype = _error_code
681
682
# Remove non-public functions
683
del _error_code, _retry_on_error
684
# Create the global "gnutls" object, simulating a module
685
gnutls = GnuTLS()
686
687
def call_pipe(connection, # : multiprocessing.Connection
688
func, *args, **kwargs):
689
"""This function is meant to be called by multiprocessing.Process
690
691
This function runs func(*args, **kwargs), and writes the resulting
692
return value on the provided multiprocessing.Connection.
693
"""
694
connection.send(func(*args, **kwargs))
695
connection.close()
403
404
def timedelta_to_milliseconds(td):
405
"Convert a datetime.timedelta() to milliseconds"
406
return ((td.days * 24 * 60 * 60 * 1000)
407
+ (td.seconds * 1000)
408
+ (td.microseconds // 1000))
409
696
410
697
411
class Client(object):
698
412
"""A representation of a client host served by this server.
725
439
last_checker_status: integer between 0 and 255 reflecting exit
726
440
status of last checker. -1 reflects crashed
727
441
checker, -2 means no checker completed yet.
728
last_checker_signal: The signal which killed the last checker, if
729
last_checker_status is -1
730
442
last_enabled: datetime.datetime(); (UTC) or None
731
443
name: string; from the config file, used in log messages and
732
444
D-Bus identifiers
745
457
"fingerprint", "host", "interval",
746
458
"last_approval_request", "last_checked_ok",
747
459
"last_enabled", "name", "timeout")
748
client_defaults = {
749
"timeout": "PT5M",
750
"extended_timeout": "PT15M",
751
"interval": "PT2M",
752
"checker": "fping -q -- %%(host)s",
753
"host": "",
754
"approval_delay": "PT0S",
755
"approval_duration": "PT1S",
756
"approved_by_default": "True",
757
"enabled": "True",
758
}
460
client_defaults = { "timeout": "PT5M",
461
"extended_timeout": "PT15M",
462
"interval": "PT2M",
463
"checker": "fping -q -- %%(host)s",
464
"host": "",
465
"approval_delay": "PT0S",
466
"approval_duration": "PT1S",
467
"approved_by_default": "True",
468
"enabled": "True",
469
}
470
471
def timeout_milliseconds(self):
472
"Return the 'timeout' attribute in milliseconds"
473
return timedelta_to_milliseconds(self.timeout)
474
475
def extended_timeout_milliseconds(self):
476
"Return the 'extended_timeout' attribute in milliseconds"
477
return timedelta_to_milliseconds(self.extended_timeout)
478
479
def interval_milliseconds(self):
480
"Return the 'interval' attribute in milliseconds"
481
return timedelta_to_milliseconds(self.interval)
482
483
def approval_delay_milliseconds(self):
484
return timedelta_to_milliseconds(self.approval_delay)
759
485
760
486
@staticmethod
761
487
def config_parser(config):
777
503
client["enabled"] = config.getboolean(client_name,
778
504
"enabled")
779
505
780
# Uppercase and remove spaces from fingerprint for later
781
# comparison purposes with return value from the
782
# fingerprint() function
783
506
client["fingerprint"] = (section["fingerprint"].upper()
784
507
.replace(" ", ""))
785
508
if "secret" in section:
790
513
"rb") as secfile:
791
514
client["secret"] = secfile.read()
792
515
else:
793
raise TypeError("No secret or secfile for section {}"
516
raise TypeError("No secret or secfile for section {0}"
794
517
.format(section))
795
518
client["timeout"] = string_to_delta(section["timeout"])
796
519
client["extended_timeout"] = string_to_delta(
813
536
server_settings = {}
814
537
self.server_settings = server_settings
815
538
# adding all client settings
816
for setting, value in settings.items():
539
for setting, value in settings.iteritems():
817
540
setattr(self, setting, value)
818
541
819
542
if self.enabled:
827
550
self.expires = None
828
551
829
552
logger.debug("Creating client %r", self.name)
553
# Uppercase and remove spaces from fingerprint for later
554
# comparison purposes with return value from the fingerprint()
555
# function
830
556
logger.debug(" Fingerprint: %s", self.fingerprint)
831
557
self.created = settings.get("created",
832
558
datetime.datetime.utcnow())
839
565
self.current_checker_command = None
840
566
self.approved = None
841
567
self.approvals_pending = 0
842
self.changedstate = multiprocessing_manager.Condition(
843
multiprocessing_manager.Lock())
844
self.client_structure = [attr
845
for attr in self.__dict__.iterkeys()
568
self.changedstate = (multiprocessing_manager
569
.Condition(multiprocessing_manager
570
.Lock()))
571
self.client_structure = [attr for attr in
572
self.__dict__.iterkeys()
846
573
if not attr.startswith("_")]
847
574
self.client_structure.append("client_structure")
848
575
849
for name, t in inspect.getmembers(
850
type(self), lambda obj: isinstance(obj, property)):
576
for name, t in inspect.getmembers(type(self),
577
lambda obj:
578
isinstance(obj,
579
property)):
851
580
if not name.startswith("_"):
852
581
self.client_structure.append(name)
853
582
895
624
# and every interval from then on.
896
625
if self.checker_initiator_tag is not None:
897
626
gobject.source_remove(self.checker_initiator_tag)
898
self.checker_initiator_tag = gobject.timeout_add(
899
int(self.interval.total_seconds() * 1000),
900
self.start_checker)
627
self.checker_initiator_tag = (gobject.timeout_add
628
(self.interval_milliseconds(),
629
self.start_checker))
901
630
# Schedule a disable() when 'timeout' has passed
902
631
if self.disable_initiator_tag is not None:
903
632
gobject.source_remove(self.disable_initiator_tag)
904
self.disable_initiator_tag = gobject.timeout_add(
905
int(self.timeout.total_seconds() * 1000), self.disable)
633
self.disable_initiator_tag = (gobject.timeout_add
634
(self.timeout_milliseconds(),
635
self.disable))
906
636
# Also start a new checker *right now*.
907
637
self.start_checker()
908
638
909
def checker_callback(self, source, condition, connection,
910
command):
639
def checker_callback(self, pid, condition, command):
911
640
"""The checker has completed, so take appropriate actions."""
912
641
self.checker_callback_tag = None
913
642
self.checker = None
914
# Read return code from connection (see call_pipe)
915
returncode = connection.recv()
916
connection.close()
917
918
if returncode >= 0:
919
self.last_checker_status = returncode
920
self.last_checker_signal = None
643
if os.WIFEXITED(condition):
644
self.last_checker_status = os.WEXITSTATUS(condition)
921
645
if self.last_checker_status == 0:
922
646
logger.info("Checker for %(name)s succeeded",
923
647
vars(self))
924
648
self.checked_ok()
925
649
else:
926
logger.info("Checker for %(name)s failed", vars(self))
650
logger.info("Checker for %(name)s failed",
651
vars(self))
927
652
else:
928
653
self.last_checker_status = -1
929
self.last_checker_signal = -returncode
930
654
logger.warning("Checker for %(name)s crashed?",
931
655
vars(self))
932
return False
933
656
934
657
def checked_ok(self):
935
658
"""Assert that the client has been seen, alive and well."""
936
659
self.last_checked_ok = datetime.datetime.utcnow()
937
660
self.last_checker_status = 0
938
self.last_checker_signal = None
939
661
self.bump_timeout()
940
662
941
663
def bump_timeout(self, timeout=None):
946
668
gobject.source_remove(self.disable_initiator_tag)
947
669
self.disable_initiator_tag = None
948
670
if getattr(self, "enabled", False):
949
self.disable_initiator_tag = gobject.timeout_add(
950
int(timeout.total_seconds() * 1000), self.disable)
671
self.disable_initiator_tag = (gobject.timeout_add
672
(timedelta_to_milliseconds
673
(timeout), self.disable))
951
674
self.expires = datetime.datetime.utcnow() + timeout
952
675
953
676
def need_approval(self):
967
690
# than 'timeout' for the client to be disabled, which is as it
968
691
# should be.
969
692
970
if self.checker is not None and not self.checker.is_alive():
971
logger.warning("Checker was not alive; joining")
972
self.checker.join()
973
self.checker = None
693
# If a checker exists, make sure it is not a zombie
694
try:
695
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
696
except AttributeError:
697
pass
698
except OSError as error:
699
if error.errno != errno.ECHILD:
700
raise
701
else:
702
if pid:
703
logger.warning("Checker was a zombie")
704
gobject.source_remove(self.checker_callback_tag)
705
self.checker_callback(pid, status,
706
self.current_checker_command)
974
707
# Start a new checker if needed
975
708
if self.checker is None:
976
709
# Escape attributes for the shell
977
escaped_attrs = {
978
attr: re.escape(str(getattr(self, attr)))
979
for attr in self.runtime_expansions }
710
escaped_attrs = dict(
711
(attr, re.escape(unicode(getattr(self, attr))))
712
for attr in
713
self.runtime_expansions)
980
714
try:
981
715
command = self.checker_command % escaped_attrs
982
716
except TypeError as error:
983
717
logger.error('Could not format string "%s"',
984
self.checker_command,
718
self.checker_command, exc_info=error)
719
return True # Try again later
720
self.current_checker_command = command
721
try:
722
logger.info("Starting checker %r for %s",
723
command, self.name)
724
# We don't need to redirect stdout and stderr, since
725
# in normal mode, that is already done by daemon(),
726
# and in debug mode we don't want to. (Stdin is
727
# always replaced by /dev/null.)
728
# The exception is when not debugging but nevertheless
729
# running in the foreground; use the previously
730
# created wnull.
731
popen_args = {}
732
if (not self.server_settings["debug"]
733
and self.server_settings["foreground"]):
734
popen_args.update({"stdout": wnull,
735
"stderr": wnull })
736
self.checker = subprocess.Popen(command,
737
close_fds=True,
738
shell=True, cwd="/",
739
**popen_args)
740
except OSError as error:
741
logger.error("Failed to start subprocess",
985
742
exc_info=error)
986
return True # Try again later
987
self.current_checker_command = command
988
logger.info("Starting checker %r for %s", command,
989
self.name)
990
# We don't need to redirect stdout and stderr, since
991
# in normal mode, that is already done by daemon(),
992
# and in debug mode we don't want to. (Stdin is
993
# always replaced by /dev/null.)
994
# The exception is when not debugging but nevertheless
995
# running in the foreground; use the previously
996
# created wnull.
997
popen_args = { "close_fds": True,
998
"shell": True,
999
"cwd": "/" }
1000
if (not self.server_settings["debug"]
1001
and self.server_settings["foreground"]):
1002
popen_args.update({"stdout": wnull,
1003
"stderr": wnull })
1004
pipe = multiprocessing.Pipe(duplex = False)
1005
self.checker = multiprocessing.Process(
1006
target = call_pipe,
1007
args = (pipe[1], subprocess.call, command),
1008
kwargs = popen_args)
1009
self.checker.start()
1010
self.checker_callback_tag = gobject.io_add_watch(
1011
pipe[0].fileno(), gobject.IO_IN,
1012
self.checker_callback, pipe[0], command)
743
return True
744
self.checker_callback_tag = (gobject.child_watch_add
745
(self.checker.pid,
746
self.checker_callback,
747
data=command))
748
# The checker may have completed before the gobject
749
# watch was added. Check for this.
750
try:
751
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
752
except OSError as error:
753
if error.errno == errno.ECHILD:
754
# This should never happen
755
logger.error("Child process vanished",
756
exc_info=error)
757
return True
758
raise
759
if pid:
760
gobject.source_remove(self.checker_callback_tag)
761
self.checker_callback(pid, status, command)
1013
762
# Re-run this periodically if run by gobject.timeout_add
1014
763
return True
1015
764
1021
770
if getattr(self, "checker", None) is None:
1022
771
return
1023
772
logger.debug("Stopping checker for %(name)s", vars(self))
1024
self.checker.terminate()
773
try:
774
self.checker.terminate()
775
#time.sleep(0.5)
776
#if self.checker.poll() is None:
777
# self.checker.kill()
778
except OSError as error:
779
if error.errno != errno.ESRCH: # No such process
780
raise
1025
781
self.checker = None
1026
782
1027
783
1028
def dbus_service_property(dbus_interface,
1029
signature="v",
1030
access="readwrite",
1031
byte_arrays=False):
784
def dbus_service_property(dbus_interface, signature="v",
785
access="readwrite", byte_arrays=False):
1032
786
"""Decorators for marking methods of a DBusObjectWithProperties to
1033
787
become properties on the D-Bus.
1034
788
1043
797
# "Set" method, so we fail early here:
1044
798
if byte_arrays and signature != "ay":
1045
799
raise ValueError("Byte arrays not supported for non-'ay'"
1046
" signature {!r}".format(signature))
1047
800
" signature {0!r}".format(signature))
1048
801
def decorator(func):
1049
802
func._dbus_is_property = True
1050
803
func._dbus_interface = dbus_interface
1055
808
func._dbus_name = func._dbus_name[:-14]
1056
809
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1057
810
return func
1058
1059
811
return decorator
1060
812
1061
813
1070
822
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1071
823
"false"}
1072
824
"""
1073
1074
825
def decorator(func):
1075
826
func._dbus_is_interface = True
1076
827
func._dbus_interface = dbus_interface
1077
828
func._dbus_name = dbus_interface
1078
829
return func
1079
1080
830
return decorator
1081
831
1082
832
1084
834
"""Decorator to annotate D-Bus methods, signals or properties
1085
835
Usage:
1086
836
1087
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1088
"org.freedesktop.DBus.Property."
1089
"EmitsChangedSignal": "false"})
1090
837
@dbus_service_property("org.example.Interface", signature="b",
1091
838
access="r")
839
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
840
"org.freedesktop.DBus.Property."
841
"EmitsChangedSignal": "false"})
1092
842
def Property_dbus_property(self):
1093
843
return dbus.Boolean(False)
1094
1095
See also the DBusObjectWithAnnotations class.
1096
844
"""
1097
1098
845
def decorator(func):
1099
846
func._dbus_annotations = annotations
1100
847
return func
1101
1102
848
return decorator
1103
849
1104
850
1105
851
class DBusPropertyException(dbus.exceptions.DBusException):
1106
852
"""A base class for D-Bus property-related exceptions
1107
853
"""
1108
pass
854
def __unicode__(self):
855
return unicode(str(self))
1109
856
1110
857
1111
858
class DBusPropertyAccessException(DBusPropertyException):
1120
867
pass
1121
868
1122
869
1123
class DBusObjectWithAnnotations(dbus.service.Object):
1124
"""A D-Bus object with annotations.
870
class DBusObjectWithProperties(dbus.service.Object):
871
"""A D-Bus object with properties.
1125
872
1126
Classes inheriting from this can use the dbus_annotations
1127
decorator to add annotations to methods or signals.
873
Classes inheriting from this can use the dbus_service_property
874
decorator to expose methods as D-Bus properties. It exposes the
875
standard Get(), Set(), and GetAll() methods on the D-Bus.
1128
876
"""
1129
877
1130
878
@staticmethod
1134
882
If called like _is_dbus_thing("method") it returns a function
1135
883
suitable for use as predicate to inspect.getmembers().
1136
884
"""
1137
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1138
886
False)
1139
887
1140
888
def _get_all_dbus_things(self, thing):
1141
889
"""Returns a generator of (name, attribute) pairs
1142
890
"""
1143
return ((getattr(athing.__get__(self), "_dbus_name", name),
891
return ((getattr(athing.__get__(self), "_dbus_name",
892
name),
1144
893
athing.__get__(self))
1145
894
for cls in self.__class__.__mro__
1146
895
for name, athing in
1147
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1148
1149
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1150
out_signature = "s",
1151
path_keyword = 'object_path',
1152
connection_keyword = 'connection')
1153
def Introspect(self, object_path, connection):
1154
"""Overloading of standard D-Bus method.
1155
1156
Inserts annotation tags on methods and signals.
1157
"""
1158
xmlstring = dbus.service.Object.Introspect(self, object_path,
1159
connection)
1160
try:
1161
document = xml.dom.minidom.parseString(xmlstring)
1162
1163
for if_tag in document.getElementsByTagName("interface"):
1164
# Add annotation tags
1165
for typ in ("method", "signal"):
1166
for tag in if_tag.getElementsByTagName(typ):
1167
annots = dict()
1168
for name, prop in (self.
1169
_get_all_dbus_things(typ)):
1170
if (name == tag.getAttribute("name")
1171
and prop._dbus_interface
1172
== if_tag.getAttribute("name")):
1173
annots.update(getattr(
1174
prop, "_dbus_annotations", {}))
1175
for name, value in annots.items():
1176
ann_tag = document.createElement(
1177
"annotation")
1178
ann_tag.setAttribute("name", name)
1179
ann_tag.setAttribute("value", value)
1180
tag.appendChild(ann_tag)
1181
# Add interface annotation tags
1182
for annotation, value in dict(
1183
itertools.chain.from_iterable(
1184
annotations().items()
1185
for name, annotations
1186
in self._get_all_dbus_things("interface")
1187
if name == if_tag.getAttribute("name")
1188
)).items():
1189
ann_tag = document.createElement("annotation")
1190
ann_tag.setAttribute("name", annotation)
1191
ann_tag.setAttribute("value", value)
1192
if_tag.appendChild(ann_tag)
1193
# Fix argument name for the Introspect method itself
1194
if (if_tag.getAttribute("name")
1195
== dbus.INTROSPECTABLE_IFACE):
1196
for cn in if_tag.getElementsByTagName("method"):
1197
if cn.getAttribute("name") == "Introspect":
1198
for arg in cn.getElementsByTagName("arg"):
1199
if (arg.getAttribute("direction")
1200
== "out"):
1201
arg.setAttribute("name",
1202
"xml_data")
1203
xmlstring = document.toxml("utf-8")
1204
document.unlink()
1205
except (AttributeError, xml.dom.DOMException,
1206
xml.parsers.expat.ExpatError) as error:
1207
logger.error("Failed to override Introspection method",
1208
exc_info=error)
1209
return xmlstring
1210
1211
1212
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1213
"""A D-Bus object with properties.
1214
1215
Classes inheriting from this can use the dbus_service_property
1216
decorator to expose methods as D-Bus properties. It exposes the
1217
standard Get(), Set(), and GetAll() methods on the D-Bus.
1218
"""
896
inspect.getmembers(cls,
897
self._is_dbus_thing(thing)))
1219
898
1220
899
def _get_dbus_property(self, interface_name, property_name):
1221
900
"""Returns a bound method if one exists which is a D-Bus
1222
901
property with the specified name and interface.
1223
902
"""
1224
for cls in self.__class__.__mro__:
1225
for name, value in inspect.getmembers(
1226
cls, self._is_dbus_thing("property")):
903
for cls in self.__class__.__mro__:
904
for name, value in (inspect.getmembers
905
(cls,
906
self._is_dbus_thing("property"))):
1227
907
if (value._dbus_name == property_name
1228
908
and value._dbus_interface == interface_name):
1229
909
return value.__get__(self)
1230
910
1231
911
# No such property
1232
raise DBusPropertyNotFound("{}:{}.{}".format(
1233
self.dbus_object_path, interface_name, property_name))
1234
1235
@classmethod
1236
def _get_all_interface_names(cls):
1237
"""Get a sequence of all interfaces supported by an object"""
1238
return (name for name in set(getattr(getattr(x, attr),
1239
"_dbus_interface", None)
1240
for x in (inspect.getmro(cls))
1241
for attr in dir(x))
1242
if name is not None)
1243
1244
@dbus.service.method(dbus.PROPERTIES_IFACE,
1245
in_signature="ss",
912
raise DBusPropertyNotFound(self.dbus_object_path + ":"
913
+ interface_name + "."
914
+ property_name)
915
916
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1246
917
out_signature="v")
1247
918
def Get(self, interface_name, property_name):
1248
919
"""Standard D-Bus property Get() method, see D-Bus standard.
1267
938
# signatures other than "ay".
1268
939
if prop._dbus_signature != "ay":
1269
940
raise ValueError("Byte arrays not supported for non-"
1270
"'ay' signature {!r}"
941
"'ay' signature {0!r}"
1271
942
.format(prop._dbus_signature))
1272
943
value = dbus.ByteArray(b''.join(chr(byte)
1273
944
for byte in value))
1274
945
prop(value)
1275
946
1276
@dbus.service.method(dbus.PROPERTIES_IFACE,
1277
in_signature="s",
947
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1278
948
out_signature="a{sv}")
1279
949
def GetAll(self, interface_name):
1280
950
"""Standard D-Bus property GetAll() method, see D-Bus
1295
965
if not hasattr(value, "variant_level"):
1296
966
properties[name] = value
1297
967
continue
1298
properties[name] = type(value)(
1299
value, variant_level = value.variant_level + 1)
968
properties[name] = type(value)(value, variant_level=
969
value.variant_level+1)
1300
970
return dbus.Dictionary(properties, signature="sv")
1301
971
1302
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1303
def PropertiesChanged(self, interface_name, changed_properties,
1304
invalidated_properties):
1305
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
1306
standard.
1307
"""
1308
pass
1309
1310
972
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1311
973
out_signature="s",
1312
974
path_keyword='object_path',
1316
978
1317
979
Inserts property tags and interface annotation tags.
1318
980
"""
1319
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1320
object_path,
1321
connection)
981
xmlstring = dbus.service.Object.Introspect(self, object_path,
982
connection)
1322
983
try:
1323
984
document = xml.dom.minidom.parseString(xmlstring)
1324
1325
985
def make_tag(document, name, prop):
1326
986
e = document.createElement("property")
1327
987
e.setAttribute("name", name)
1328
988
e.setAttribute("type", prop._dbus_signature)
1329
989
e.setAttribute("access", prop._dbus_access)
1330
990
return e
1331
1332
991
for if_tag in document.getElementsByTagName("interface"):
1333
992
# Add property tags
1334
993
for tag in (make_tag(document, name, prop)
1337
996
if prop._dbus_interface
1338
997
== if_tag.getAttribute("name")):
1339
998
if_tag.appendChild(tag)
1340
# Add annotation tags for properties
1341
for tag in if_tag.getElementsByTagName("property"):
1342
annots = dict()
1343
for name, prop in self._get_all_dbus_things(
1344
"property"):
1345
if (name == tag.getAttribute("name")
1346
and prop._dbus_interface
1347
== if_tag.getAttribute("name")):
1348
annots.update(getattr(
1349
prop, "_dbus_annotations", {}))
1350
for name, value in annots.items():
1351
ann_tag = document.createElement(
1352
"annotation")
1353
ann_tag.setAttribute("name", name)
1354
ann_tag.setAttribute("value", value)
1355
tag.appendChild(ann_tag)
999
# Add annotation tags
1000
for typ in ("method", "signal", "property"):
1001
for tag in if_tag.getElementsByTagName(typ):
1002
annots = dict()
1003
for name, prop in (self.
1004
_get_all_dbus_things(typ)):
1005
if (name == tag.getAttribute("name")
1006
and prop._dbus_interface
1007
== if_tag.getAttribute("name")):
1008
annots.update(getattr
1009
(prop,
1010
"_dbus_annotations",
1011
{}))
1012
for name, value in annots.iteritems():
1013
ann_tag = document.createElement(
1014
"annotation")
1015
ann_tag.setAttribute("name", name)
1016
ann_tag.setAttribute("value", value)
1017
tag.appendChild(ann_tag)
1018
# Add interface annotation tags
1019
for annotation, value in dict(
1020
itertools.chain.from_iterable(
1021
annotations().iteritems()
1022
for name, annotations in
1023
self._get_all_dbus_things("interface")
1024
if name == if_tag.getAttribute("name")
1025
)).iteritems():
1026
ann_tag = document.createElement("annotation")
1027
ann_tag.setAttribute("name", annotation)
1028
ann_tag.setAttribute("value", value)
1029
if_tag.appendChild(ann_tag)
1356
1030
# Add the names to the return values for the
1357
1031
# "org.freedesktop.DBus.Properties" methods
1358
1032
if (if_tag.getAttribute("name")
1376
1050
exc_info=error)
1377
1051
return xmlstring
1378
1052
1379
try:
1380
dbus.OBJECT_MANAGER_IFACE
1381
except AttributeError:
1382
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1383
1384
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1385
"""A D-Bus object with an ObjectManager.
1386
1387
Classes inheriting from this exposes the standard
1388
GetManagedObjects call and the InterfacesAdded and
1389
InterfacesRemoved signals on the standard
1390
"org.freedesktop.DBus.ObjectManager" interface.
1391
1392
Note: No signals are sent automatically; they must be sent
1393
manually.
1394
"""
1395
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1396
out_signature = "a{oa{sa{sv}}}")
1397
def GetManagedObjects(self):
1398
"""This function must be overridden"""
1399
raise NotImplementedError()
1400
1401
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1402
signature = "oa{sa{sv}}")
1403
def InterfacesAdded(self, object_path, interfaces_and_properties):
1404
pass
1405
1406
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1407
def InterfacesRemoved(self, object_path, interfaces):
1408
pass
1409
1410
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1411
out_signature = "s",
1412
path_keyword = 'object_path',
1413
connection_keyword = 'connection')
1414
def Introspect(self, object_path, connection):
1415
"""Overloading of standard D-Bus method.
1416
1417
Override return argument name of GetManagedObjects to be
1418
"objpath_interfaces_and_properties"
1419
"""
1420
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1421
object_path,
1422
connection)
1423
try:
1424
document = xml.dom.minidom.parseString(xmlstring)
1425
1426
for if_tag in document.getElementsByTagName("interface"):
1427
# Fix argument name for the GetManagedObjects method
1428
if (if_tag.getAttribute("name")
1429
== dbus.OBJECT_MANAGER_IFACE):
1430
for cn in if_tag.getElementsByTagName("method"):
1431
if (cn.getAttribute("name")
1432
== "GetManagedObjects"):
1433
for arg in cn.getElementsByTagName("arg"):
1434
if (arg.getAttribute("direction")
1435
== "out"):
1436
arg.setAttribute(
1437
"name",
1438
"objpath_interfaces"
1439
"_and_properties")
1440
xmlstring = document.toxml("utf-8")
1441
document.unlink()
1442
except (AttributeError, xml.dom.DOMException,
1443
xml.parsers.expat.ExpatError) as error:
1444
logger.error("Failed to override Introspection method",
1445
exc_info = error)
1446
return xmlstring
1447
1053
1448
1054
def datetime_to_dbus(dt, variant_level=0):
1449
1055
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1450
1056
if dt is None:
1451
1057
return dbus.String("", variant_level = variant_level)
1452
return dbus.String(dt.isoformat(), variant_level=variant_level)
1058
return dbus.String(dt.isoformat(),
1059
variant_level=variant_level)
1453
1060
1454
1061
1455
1062
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1475
1082
(from DBusObjectWithProperties) and interfaces (from the
1476
1083
dbus_interface_annotations decorator).
1477
1084
"""
1478
1479
1085
def wrapper(cls):
1480
1086
for orig_interface_name, alt_interface_name in (
1481
alt_interface_names.items()):
1087
alt_interface_names.iteritems()):
1482
1088
attr = {}
1483
1089
interface_names = set()
1484
1090
# Go though all attributes of the class
1486
1092
# Ignore non-D-Bus attributes, and D-Bus attributes
1487
1093
# with the wrong interface name
1488
1094
if (not hasattr(attribute, "_dbus_interface")
1489
or not attribute._dbus_interface.startswith(
1490
orig_interface_name)):
1095
or not attribute._dbus_interface
1096
.startswith(orig_interface_name)):
1491
1097
continue
1492
1098
# Create an alternate D-Bus interface name based on
1493
1099
# the current name
1494
alt_interface = attribute._dbus_interface.replace(
1495
orig_interface_name, alt_interface_name)
1100
alt_interface = (attribute._dbus_interface
1101
.replace(orig_interface_name,
1102
alt_interface_name))
1496
1103
interface_names.add(alt_interface)
1497
1104
# Is this a D-Bus signal?
1498
1105
if getattr(attribute, "_dbus_is_signal", False):
1499
if sys.version_info.major == 2:
1500
# Extract the original non-method undecorated
1501
# function by black magic
1502
nonmethod_func = (dict(
1106
# Extract the original non-method undecorated
1107
# function by black magic
1108
nonmethod_func = (dict(
1503
1109
zip(attribute.func_code.co_freevars,
1504
attribute.__closure__))
1505
["func"].cell_contents)
1506
else:
1507
nonmethod_func = attribute
1110
attribute.__closure__))["func"]
1111
.cell_contents)
1508
1112
# Create a new, but exactly alike, function
1509
1113
# object, and decorate it to be a new D-Bus signal
1510
1114
# with the alternate D-Bus interface name
1511
if sys.version_info.major == 2:
1512
new_function = types.FunctionType(
1513
nonmethod_func.func_code,
1514
nonmethod_func.func_globals,
1515
nonmethod_func.func_name,
1516
nonmethod_func.func_defaults,
1517
nonmethod_func.func_closure)
1518
else:
1519
new_function = types.FunctionType(
1520
nonmethod_func.__code__,
1521
nonmethod_func.__globals__,
1522
nonmethod_func.__name__,
1523
nonmethod_func.__defaults__,
1524
nonmethod_func.__closure__)
1525
new_function = (dbus.service.signal(
1526
alt_interface,
1527
attribute._dbus_signature)(new_function))
1115
new_function = (dbus.service.signal
1116
(alt_interface,
1117
attribute._dbus_signature)
1118
(types.FunctionType(
1119
nonmethod_func.func_code,
1120
nonmethod_func.func_globals,
1121
nonmethod_func.func_name,
1122
nonmethod_func.func_defaults,
1123
nonmethod_func.func_closure)))
1528
1124
# Copy annotations, if any
1529
1125
try:
1530
new_function._dbus_annotations = dict(
1531
attribute._dbus_annotations)
1126
new_function._dbus_annotations = (
1127
dict(attribute._dbus_annotations))
1532
1128
except AttributeError:
1533
1129
pass
1534
1130
# Define a creator of a function to call both the
1539
1135
"""This function is a scope container to pass
1540
1136
func1 and func2 to the "call_both" function
1541
1137
outside of its arguments"""
1542
1543
@functools.wraps(func2)
1544
1138
def call_both(*args, **kwargs):
1545
1139
"""This function will emit two D-Bus
1546
1140
signals by calling func1 and func2"""
1547
1141
func1(*args, **kwargs)
1548
1142
func2(*args, **kwargs)
1549
# Make wrapper function look like a D-Bus signal
1550
for name, attr in inspect.getmembers(func2):
1551
if name.startswith("_dbus_"):
1552
setattr(call_both, name, attr)
1553
1554
1143
return call_both
1555
1144
# Create the "call_both" function and add it to
1556
1145
# the class
1561
1150
# object. Decorate it to be a new D-Bus method
1562
1151
# with the alternate D-Bus interface name. Add it
1563
1152
# to the class.
1564
attr[attrname] = (
1565
dbus.service.method(
1566
alt_interface,
1567
attribute._dbus_in_signature,
1568
attribute._dbus_out_signature)
1569
(types.FunctionType(attribute.func_code,
1570
attribute.func_globals,
1571
attribute.func_name,
1572
attribute.func_defaults,
1573
attribute.func_closure)))
1153
attr[attrname] = (dbus.service.method
1154
(alt_interface,
1155
attribute._dbus_in_signature,
1156
attribute._dbus_out_signature)
1157
(types.FunctionType
1158
(attribute.func_code,
1159
attribute.func_globals,
1160
attribute.func_name,
1161
attribute.func_defaults,
1162
attribute.func_closure)))
1574
1163
# Copy annotations, if any
1575
1164
try:
1576
attr[attrname]._dbus_annotations = dict(
1577
attribute._dbus_annotations)
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1578
1167
except AttributeError:
1579
1168
pass
1580
1169
# Is this a D-Bus property?
1583
1172
# object, and decorate it to be a new D-Bus
1584
1173
# property with the alternate D-Bus interface
1585
1174
# name. Add it to the class.
1586
attr[attrname] = (dbus_service_property(
1587
alt_interface, attribute._dbus_signature,
1588
attribute._dbus_access,
1589
attribute._dbus_get_args_options
1590
["byte_arrays"])
1591
(types.FunctionType(
1592
attribute.func_code,
1593
attribute.func_globals,
1594
attribute.func_name,
1595
attribute.func_defaults,
1596
attribute.func_closure)))
1175
attr[attrname] = (dbus_service_property
1176
(alt_interface,
1177
attribute._dbus_signature,
1178
attribute._dbus_access,
1179
attribute
1180
._dbus_get_args_options
1181
["byte_arrays"])
1182
(types.FunctionType
1183
(attribute.func_code,
1184
attribute.func_globals,
1185
attribute.func_name,
1186
attribute.func_defaults,
1187
attribute.func_closure)))
1597
1188
# Copy annotations, if any
1598
1189
try:
1599
attr[attrname]._dbus_annotations = dict(
1600
attribute._dbus_annotations)
1190
attr[attrname]._dbus_annotations = (
1191
dict(attribute._dbus_annotations))
1601
1192
except AttributeError:
1602
1193
pass
1603
1194
# Is this a D-Bus interface?
1606
1197
# object. Decorate it to be a new D-Bus interface
1607
1198
# with the alternate D-Bus interface name. Add it
1608
1199
# to the class.
1609
attr[attrname] = (
1610
dbus_interface_annotations(alt_interface)
1611
(types.FunctionType(attribute.func_code,
1612
attribute.func_globals,
1613
attribute.func_name,
1614
attribute.func_defaults,
1615
attribute.func_closure)))
1200
attr[attrname] = (dbus_interface_annotations
1201
(alt_interface)
1202
(types.FunctionType
1203
(attribute.func_code,
1204
attribute.func_globals,
1205
attribute.func_name,
1206
attribute.func_defaults,
1207
attribute.func_closure)))
1616
1208
if deprecate:
1617
1209
# Deprecate all alternate interfaces
1618
iname="_AlternateDBusNames_interface_annotation{}"
1210
iname="_AlternateDBusNames_interface_annotation{0}"
1619
1211
for interface_name in interface_names:
1620
1621
1212
@dbus_interface_annotations(interface_name)
1622
1213
def func(self):
1623
1214
return { "org.freedesktop.DBus.Deprecated":
1624
"true" }
1215
"true" }
1625
1216
# Find an unused name
1626
1217
for aname in (iname.format(i)
1627
1218
for i in itertools.count()):
1631
1222
if interface_names:
1632
1223
# Replace the class with a new subclass of it with
1633
1224
# methods, signals, etc. as created above.
1634
cls = type(b"{}Alternate".format(cls.__name__),
1635
(cls, ), attr)
1225
cls = type(b"{0}Alternate".format(cls.__name__),
1226
(cls,), attr)
1636
1227
return cls
1637
1638
1228
return wrapper
1639
1229
1640
1230
1641
1231
@alternate_dbus_interfaces({"se.recompile.Mandos":
1642
"se.bsnet.fukt.Mandos"})
1232
"se.bsnet.fukt.Mandos"})
1643
1233
class ClientDBus(Client, DBusObjectWithProperties):
1644
1234
"""A Client class using D-Bus
1645
1235
1649
1239
"""
1650
1240
1651
1241
runtime_expansions = (Client.runtime_expansions
1652
+ ("dbus_object_path", ))
1653
1654
_interface = "se.recompile.Mandos.Client"
1242
+ ("dbus_object_path",))
1655
1243
1656
1244
# dbus.service.Object doesn't use super(), so we can't either.
1657
1245
1660
1248
Client.__init__(self, *args, **kwargs)
1661
1249
# Only now, when this client is initialized, can it show up on
1662
1250
# the D-Bus
1663
client_object_name = str(self.name).translate(
1251
client_object_name = unicode(self.name).translate(
1664
1252
{ord("."): ord("_"),
1665
1253
ord("-"): ord("_")})
1666
self.dbus_object_path = dbus.ObjectPath(
1667
"/clients/" + client_object_name)
1254
self.dbus_object_path = (dbus.ObjectPath
1255
("/clients/" + client_object_name))
1668
1256
DBusObjectWithProperties.__init__(self, self.bus,
1669
1257
self.dbus_object_path)
1670
1258
1671
def notifychangeproperty(transform_func, dbus_name,
1672
type_func=lambda x: x,
1673
variant_level=1,
1674
invalidate_only=False,
1675
_interface=_interface):
1259
def notifychangeproperty(transform_func,
1260
dbus_name, type_func=lambda x: x,
1261
variant_level=1):
1676
1262
""" Modify a variable so that it's a property which announces
1677
1263
its changes to DBus.
1678
1264
1683
1269
to the D-Bus. Default: no transform
1684
1270
variant_level: D-Bus variant level. Default: 1
1685
1271
"""
1686
attrname = "_{}".format(dbus_name)
1687
1272
attrname = "_{0}".format(dbus_name)
1688
1273
def setter(self, value):
1689
1274
if hasattr(self, "dbus_object_path"):
1690
1275
if (not hasattr(self, attrname) or
1691
1276
type_func(getattr(self, attrname, None))
1692
1277
!= type_func(value)):
1693
if invalidate_only:
1694
self.PropertiesChanged(
1695
_interface, dbus.Dictionary(),
1696
dbus.Array((dbus_name, )))
1697
else:
1698
dbus_value = transform_func(
1699
type_func(value),
1700
variant_level = variant_level)
1701
self.PropertyChanged(dbus.String(dbus_name),
1702
dbus_value)
1703
self.PropertiesChanged(
1704
_interface,
1705
dbus.Dictionary({ dbus.String(dbus_name):
1706
dbus_value }),
1707
dbus.Array())
1278
dbus_value = transform_func(type_func(value),
1279
variant_level
1280
=variant_level)
1281
self.PropertyChanged(dbus.String(dbus_name),
1282
dbus_value)
1708
1283
setattr(self, attrname, value)
1709
1284
1710
1285
return property(lambda self: getattr(self, attrname), setter)
1716
1291
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1717
1292
last_enabled = notifychangeproperty(datetime_to_dbus,
1718
1293
"LastEnabled")
1719
checker = notifychangeproperty(
1720
dbus.Boolean, "CheckerRunning",
1721
type_func = lambda checker: checker is not None)
1294
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1295
type_func = lambda checker:
1296
checker is not None)
1722
1297
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1723
1298
"LastCheckedOK")
1724
1299
last_checker_status = notifychangeproperty(dbus.Int16,
1727
1302
datetime_to_dbus, "LastApprovalRequest")
1728
1303
approved_by_default = notifychangeproperty(dbus.Boolean,
1729
1304
"ApprovedByDefault")
1730
approval_delay = notifychangeproperty(
1731
dbus.UInt64, "ApprovalDelay",
1732
type_func = lambda td: td.total_seconds() * 1000)
1305
approval_delay = notifychangeproperty(dbus.UInt64,
1306
"ApprovalDelay",
1307
type_func =
1308
timedelta_to_milliseconds)
1733
1309
approval_duration = notifychangeproperty(
1734
1310
dbus.UInt64, "ApprovalDuration",
1735
type_func = lambda td: td.total_seconds() * 1000)
1311
type_func = timedelta_to_milliseconds)
1736
1312
host = notifychangeproperty(dbus.String, "Host")
1737
timeout = notifychangeproperty(
1738
dbus.UInt64, "Timeout",
1739
type_func = lambda td: td.total_seconds() * 1000)
1313
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1314
type_func =
1315
timedelta_to_milliseconds)
1740
1316
extended_timeout = notifychangeproperty(
1741
1317
dbus.UInt64, "ExtendedTimeout",
1742
type_func = lambda td: td.total_seconds() * 1000)
1743
interval = notifychangeproperty(
1744
dbus.UInt64, "Interval",
1745
type_func = lambda td: td.total_seconds() * 1000)
1318
type_func = timedelta_to_milliseconds)
1319
interval = notifychangeproperty(dbus.UInt64,
1320
"Interval",
1321
type_func =
1322
timedelta_to_milliseconds)
1746
1323
checker_command = notifychangeproperty(dbus.String, "Checker")
1747
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1748
invalidate_only=True)
1749
1324
1750
1325
del notifychangeproperty
1751
1326
1758
1333
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1759
1334
Client.__del__(self, *args, **kwargs)
1760
1335
1761
def checker_callback(self, source, condition,
1762
connection, command, *args, **kwargs):
1763
ret = Client.checker_callback(self, source, condition,
1764
connection, command, *args,
1765
**kwargs)
1766
exitstatus = self.last_checker_status
1767
if exitstatus >= 0:
1336
def checker_callback(self, pid, condition, command,
1337
*args, **kwargs):
1338
self.checker_callback_tag = None
1339
self.checker = None
1340
if os.WIFEXITED(condition):
1341
exitstatus = os.WEXITSTATUS(condition)
1768
1342
# Emit D-Bus signal
1769
1343
self.CheckerCompleted(dbus.Int16(exitstatus),
1770
# This is specific to GNU libC
1771
dbus.Int64(exitstatus << 8),
1344
dbus.Int64(condition),
1772
1345
dbus.String(command))
1773
1346
else:
1774
1347
# Emit D-Bus signal
1775
1348
self.CheckerCompleted(dbus.Int16(-1),
1776
dbus.Int64(
1777
# This is specific to GNU libC
1778
(exitstatus << 8)
1779
| self.last_checker_signal),
1349
dbus.Int64(condition),
1780
1350
dbus.String(command))
1781
return ret
1351
1352
return Client.checker_callback(self, pid, condition, command,
1353
*args, **kwargs)
1782
1354
1783
1355
def start_checker(self, *args, **kwargs):
1784
1356
old_checker_pid = getattr(self.checker, "pid", None)
1796
1368
1797
1369
def approve(self, value=True):
1798
1370
self.approved = value
1799
gobject.timeout_add(int(self.approval_duration.total_seconds()
1800
* 1000), self._reset_approved)
1371
gobject.timeout_add(timedelta_to_milliseconds
1372
(self.approval_duration),
1373
self._reset_approved)
1801
1374
self.send_changedstate()
1802
1375
1803
1376
## D-Bus methods, signals & properties
1377
_interface = "se.recompile.Mandos.Client"
1804
1378
1805
1379
## Interfaces
1806
1380
1381
@dbus_interface_annotations(_interface)
1382
def _foo(self):
1383
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1384
"false"}
1385
1807
1386
## Signals
1808
1387
1809
1388
# CheckerCompleted - signal
1819
1398
pass
1820
1399
1821
1400
# PropertyChanged - signal
1822
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1823
1401
@dbus.service.signal(_interface, signature="sv")
1824
1402
def PropertyChanged(self, property, value):
1825
1403
"D-Bus signal"
1859
1437
self.checked_ok()
1860
1438
1861
1439
# Enable - method
1862
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1863
1440
@dbus.service.method(_interface)
1864
1441
def Enable(self):
1865
1442
"D-Bus method"
1866
1443
self.enable()
1867
1444
1868
1445
# StartChecker - method
1869
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1870
1446
@dbus.service.method(_interface)
1871
1447
def StartChecker(self):
1872
1448
"D-Bus method"
1873
1449
self.start_checker()
1874
1450
1875
1451
# Disable - method
1876
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1877
1452
@dbus.service.method(_interface)
1878
1453
def Disable(self):
1879
1454
"D-Bus method"
1880
1455
self.disable()
1881
1456
1882
1457
# StopChecker - method
1883
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1884
1458
@dbus.service.method(_interface)
1885
1459
def StopChecker(self):
1886
1460
self.stop_checker()
1893
1467
return dbus.Boolean(bool(self.approvals_pending))
1894
1468
1895
1469
# ApprovedByDefault - property
1896
@dbus_service_property(_interface,
1897
signature="b",
1470
@dbus_service_property(_interface, signature="b",
1898
1471
access="readwrite")
1899
1472
def ApprovedByDefault_dbus_property(self, value=None):
1900
1473
if value is None: # get
1902
1475
self.approved_by_default = bool(value)
1903
1476
1904
1477
# ApprovalDelay - property
1905
@dbus_service_property(_interface,
1906
signature="t",
1478
@dbus_service_property(_interface, signature="t",
1907
1479
access="readwrite")
1908
1480
def ApprovalDelay_dbus_property(self, value=None):
1909
1481
if value is None: # get
1910
return dbus.UInt64(self.approval_delay.total_seconds()
1911
* 1000)
1482
return dbus.UInt64(self.approval_delay_milliseconds())
1912
1483
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1913
1484
1914
1485
# ApprovalDuration - property
1915
@dbus_service_property(_interface,
1916
signature="t",
1486
@dbus_service_property(_interface, signature="t",
1917
1487
access="readwrite")
1918
1488
def ApprovalDuration_dbus_property(self, value=None):
1919
1489
if value is None: # get
1920
return dbus.UInt64(self.approval_duration.total_seconds()
1921
* 1000)
1490
return dbus.UInt64(timedelta_to_milliseconds(
1491
self.approval_duration))
1922
1492
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1923
1493
1924
1494
# Name - property
1925
@dbus_annotations(
1926
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1927
1495
@dbus_service_property(_interface, signature="s", access="read")
1928
1496
def Name_dbus_property(self):
1929
1497
return dbus.String(self.name)
1930
1498
1931
1499
# Fingerprint - property
1932
@dbus_annotations(
1933
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1934
1500
@dbus_service_property(_interface, signature="s", access="read")
1935
1501
def Fingerprint_dbus_property(self):
1936
1502
return dbus.String(self.fingerprint)
1937
1503
1938
1504
# Host - property
1939
@dbus_service_property(_interface,
1940
signature="s",
1505
@dbus_service_property(_interface, signature="s",
1941
1506
access="readwrite")
1942
1507
def Host_dbus_property(self, value=None):
1943
1508
if value is None: # get
1944
1509
return dbus.String(self.host)
1945
self.host = str(value)
1510
self.host = unicode(value)
1946
1511
1947
1512
# Created - property
1948
@dbus_annotations(
1949
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1950
1513
@dbus_service_property(_interface, signature="s", access="read")
1951
1514
def Created_dbus_property(self):
1952
1515
return datetime_to_dbus(self.created)
1957
1520
return datetime_to_dbus(self.last_enabled)
1958
1521
1959
1522
# Enabled - property
1960
@dbus_service_property(_interface,
1961
signature="b",
1523
@dbus_service_property(_interface, signature="b",
1962
1524
access="readwrite")
1963
1525
def Enabled_dbus_property(self, value=None):
1964
1526
if value is None: # get
1969
1531
self.disable()
1970
1532
1971
1533
# LastCheckedOK - property
1972
@dbus_service_property(_interface,
1973
signature="s",
1534
@dbus_service_property(_interface, signature="s",
1974
1535
access="readwrite")
1975
1536
def LastCheckedOK_dbus_property(self, value=None):
1976
1537
if value is not None:
1979
1540
return datetime_to_dbus(self.last_checked_ok)
1980
1541
1981
1542
# LastCheckerStatus - property
1982
@dbus_service_property(_interface, signature="n", access="read")
1543
@dbus_service_property(_interface, signature="n",
1544
access="read")
1983
1545
def LastCheckerStatus_dbus_property(self):
1984
1546
return dbus.Int16(self.last_checker_status)
1985
1547
1994
1556
return datetime_to_dbus(self.last_approval_request)
1995
1557
1996
1558
# Timeout - property
1997
@dbus_service_property(_interface,
1998
signature="t",
1559
@dbus_service_property(_interface, signature="t",
1999
1560
access="readwrite")
2000
1561
def Timeout_dbus_property(self, value=None):
2001
1562
if value is None: # get
2002
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1563
return dbus.UInt64(self.timeout_milliseconds())
2003
1564
old_timeout = self.timeout
2004
1565
self.timeout = datetime.timedelta(0, 0, 0, value)
2005
1566
# Reschedule disabling
2014
1575
is None):
2015
1576
return
2016
1577
gobject.source_remove(self.disable_initiator_tag)
2017
self.disable_initiator_tag = gobject.timeout_add(
2018
int((self.expires - now).total_seconds() * 1000),
2019
self.disable)
1578
self.disable_initiator_tag = (
1579
gobject.timeout_add(
1580
timedelta_to_milliseconds(self.expires - now),
1581
self.disable))
2020
1582
2021
1583
# ExtendedTimeout - property
2022
@dbus_service_property(_interface,
2023
signature="t",
1584
@dbus_service_property(_interface, signature="t",
2024
1585
access="readwrite")
2025
1586
def ExtendedTimeout_dbus_property(self, value=None):
2026
1587
if value is None: # get
2027
return dbus.UInt64(self.extended_timeout.total_seconds()
2028
* 1000)
1588
return dbus.UInt64(self.extended_timeout_milliseconds())
2029
1589
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2030
1590
2031
1591
# Interval - property
2032
@dbus_service_property(_interface,
2033
signature="t",
1592
@dbus_service_property(_interface, signature="t",
2034
1593
access="readwrite")
2035
1594
def Interval_dbus_property(self, value=None):
2036
1595
if value is None: # get
2037
return dbus.UInt64(self.interval.total_seconds() * 1000)
1596
return dbus.UInt64(self.interval_milliseconds())
2038
1597
self.interval = datetime.timedelta(0, 0, 0, value)
2039
1598
if getattr(self, "checker_initiator_tag", None) is None:
2040
1599
return
2041
1600
if self.enabled:
2042
1601
# Reschedule checker run
2043
1602
gobject.source_remove(self.checker_initiator_tag)
2044
self.checker_initiator_tag = gobject.timeout_add(
2045
value, self.start_checker)
2046
self.start_checker() # Start one now, too
1603
self.checker_initiator_tag = (gobject.timeout_add
1604
(value, self.start_checker))
1605
self.start_checker() # Start one now, too
2047
1606
2048
1607
# Checker - property
2049
@dbus_service_property(_interface,
2050
signature="s",
1608
@dbus_service_property(_interface, signature="s",
2051
1609
access="readwrite")
2052
1610
def Checker_dbus_property(self, value=None):
2053
1611
if value is None: # get
2054
1612
return dbus.String(self.checker_command)
2055
self.checker_command = str(value)
1613
self.checker_command = unicode(value)
2056
1614
2057
1615
# CheckerRunning - property
2058
@dbus_service_property(_interface,
2059
signature="b",
1616
@dbus_service_property(_interface, signature="b",
2060
1617
access="readwrite")
2061
1618
def CheckerRunning_dbus_property(self, value=None):
2062
1619
if value is None: # get
2067
1624
self.stop_checker()
2068
1625
2069
1626
# ObjectPath - property
2070
@dbus_annotations(
2071
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2072
"org.freedesktop.DBus.Deprecated": "true"})
2073
1627
@dbus_service_property(_interface, signature="o", access="read")
2074
1628
def ObjectPath_dbus_property(self):
2075
1629
return self.dbus_object_path # is already a dbus.ObjectPath
2076
1630
2077
1631
# Secret = property
2078
@dbus_annotations(
2079
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2080
"invalidates"})
2081
@dbus_service_property(_interface,
2082
signature="ay",
2083
access="write",
2084
byte_arrays=True)
1632
@dbus_service_property(_interface, signature="ay",
1633
access="write", byte_arrays=True)
2085
1634
def Secret_dbus_property(self, value):
2086
self.secret = bytes(value)
1635
self.secret = str(value)
2087
1636
2088
1637
del _interface
2089
1638
2093
1642
self._pipe = child_pipe
2094
1643
self._pipe.send(('init', fpr, address))
2095
1644
if not self._pipe.recv():
2096
raise KeyError(fpr)
1645
raise KeyError()
2097
1646
2098
1647
def __getattribute__(self, name):
2099
1648
if name == '_pipe':
2103
1652
if data[0] == 'data':
2104
1653
return data[1]
2105
1654
if data[0] == 'function':
2106
2107
1655
def func(*args, **kwargs):
2108
1656
self._pipe.send(('funcall', name, args, kwargs))
2109
1657
return self._pipe.recv()[1]
2110
2111
1658
return func
2112
1659
2113
1660
def __setattr__(self, name, value):
2125
1672
def handle(self):
2126
1673
with contextlib.closing(self.server.child_pipe) as child_pipe:
2127
1674
logger.info("TCP connection from: %s",
2128
str(self.client_address))
1675
unicode(self.client_address))
2129
1676
logger.debug("Pipe FD: %d",
2130
1677
self.server.child_pipe.fileno())
2131
1678
2132
session = gnutls.ClientSession(self.request)
1679
session = (gnutls.connection
1680
.ClientSession(self.request,
1681
gnutls.connection
1682
.X509Credentials()))
1683
1684
# Note: gnutls.connection.X509Credentials is really a
1685
# generic GnuTLS certificate credentials object so long as
1686
# no X.509 keys are added to it. Therefore, we can use it
1687
# here despite using OpenPGP certificates.
2133
1688
2134
1689
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2135
1690
# "+AES-256-CBC", "+SHA1",
2139
1694
priority = self.server.gnutls_priority
2140
1695
if priority is None:
2141
1696
priority = "NORMAL"
2142
gnutls.priority_set_direct(session._c_object, priority,
2143
None)
1697
(gnutls.library.functions
1698
.gnutls_priority_set_direct(session._c_object,
1699
priority, None))
2144
1700
2145
1701
# Start communication using the Mandos protocol
2146
1702
# Get protocol number
2156
1712
# Start GnuTLS connection
2157
1713
try:
2158
1714
session.handshake()
2159
except gnutls.Error as error:
1715
except gnutls.errors.GNUTLSError as error:
2160
1716
logger.warning("Handshake failed: %s", error)
2161
1717
# Do not run session.bye() here: the session is not
2162
1718
# established. Just abandon the request.
2166
1722
approval_required = False
2167
1723
try:
2168
1724
try:
2169
fpr = self.fingerprint(
2170
self.peer_certificate(session))
2171
except (TypeError, gnutls.Error) as error:
1725
fpr = self.fingerprint(self.peer_certificate
1726
(session))
1727
except (TypeError,
1728
gnutls.errors.GNUTLSError) as error:
2172
1729
logger.warning("Bad certificate: %s", error)
2173
1730
return
2174
1731
logger.debug("Fingerprint: %s", fpr)
2187
1744
while True:
2188
1745
if not client.enabled:
2189
1746
logger.info("Client %s is disabled",
2190
client.name)
1747
client.name)
2191
1748
if self.server.use_dbus:
2192
1749
# Emit D-Bus signal
2193
1750
client.Rejected("Disabled")
2202
1759
if self.server.use_dbus:
2203
1760
# Emit D-Bus signal
2204
1761
client.NeedApproval(
2205
client.approval_delay.total_seconds()
2206
* 1000, client.approved_by_default)
1762
client.approval_delay_milliseconds(),
1763
client.approved_by_default)
2207
1764
else:
2208
1765
logger.warning("Client %s was not approved",
2209
1766
client.name)
2215
1772
#wait until timeout or approved
2216
1773
time = datetime.datetime.now()
2217
1774
client.changedstate.acquire()
2218
client.changedstate.wait(delay.total_seconds())
1775
client.changedstate.wait(
1776
float(timedelta_to_milliseconds(delay)
1777
/ 1000))
2219
1778
client.changedstate.release()
2220
1779
time2 = datetime.datetime.now()
2221
1780
if (time2 - time) >= delay:
2232
1791
else:
2233
1792
delay -= time2 - time
2234
1793
2235
try:
2236
session.send(client.secret)
2237
except gnutls.Error as error:
2238
logger.warning("gnutls send failed",
2239
exc_info = error)
2240
return
1794
sent_size = 0
1795
while sent_size < len(client.secret):
1796
try:
1797
sent = session.send(client.secret[sent_size:])
1798
except gnutls.errors.GNUTLSError as error:
1799
logger.warning("gnutls send failed",
1800
exc_info=error)
1801
return
1802
logger.debug("Sent: %d, remaining: %d",
1803
sent, len(client.secret)
1804
- (sent_size + sent))
1805
sent_size += sent
2241
1806
2242
1807
logger.info("Sending secret to %s", client.name)
2243
1808
# bump the timeout using extended_timeout
2251
1816
client.approvals_pending -= 1
2252
1817
try:
2253
1818
session.bye()
2254
except gnutls.Error as error:
1819
except gnutls.errors.GNUTLSError as error:
2255
1820
logger.warning("GnuTLS bye failed",
2256
1821
exc_info=error)
2257
1822
2259
1824
def peer_certificate(session):
2260
1825
"Return the peer's OpenPGP certificate as a bytestring"
2261
1826
# If not an OpenPGP certificate...
2262
if (gnutls.certificate_type_get(session._c_object)
2263
!= gnutls.CRT_OPENPGP):
2264
# ...return invalid data
2265
return b""
1827
if (gnutls.library.functions
1828
.gnutls_certificate_type_get(session._c_object)
1829
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1830
# ...do the normal thing
1831
return session.peer_certificate
2266
1832
list_size = ctypes.c_uint(1)
2267
cert_list = (gnutls.certificate_get_peers
1833
cert_list = (gnutls.library.functions
1834
.gnutls_certificate_get_peers
2268
1835
(session._c_object, ctypes.byref(list_size)))
2269
1836
if not bool(cert_list) and list_size.value != 0:
2270
raise gnutls.Error("error getting peer certificate")
1837
raise gnutls.errors.GNUTLSError("error getting peer"
1838
" certificate")
2271
1839
if list_size.value == 0:
2272
1840
return None
2273
1841
cert = cert_list[0]
2277
1845
def fingerprint(openpgp):
2278
1846
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2279
1847
# New GnuTLS "datum" with the OpenPGP public key
2280
datum = gnutls.datum_t(
2281
ctypes.cast(ctypes.c_char_p(openpgp),
2282
ctypes.POINTER(ctypes.c_ubyte)),
2283
ctypes.c_uint(len(openpgp)))
1848
datum = (gnutls.library.types
1849
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1850
ctypes.POINTER
1851
(ctypes.c_ubyte)),
1852
ctypes.c_uint(len(openpgp))))
2284
1853
# New empty GnuTLS certificate
2285
crt = gnutls.openpgp_crt_t()
2286
gnutls.openpgp_crt_init(ctypes.byref(crt))
1854
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1855
(gnutls.library.functions
1856
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2287
1857
# Import the OpenPGP public key into the certificate
2288
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2289
gnutls.OPENPGP_FMT_RAW)
1858
(gnutls.library.functions
1859
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1860
gnutls.library.constants
1861
.GNUTLS_OPENPGP_FMT_RAW))
2290
1862
# Verify the self signature in the key
2291
1863
crtverify = ctypes.c_uint()
2292
gnutls.openpgp_crt_verify_self(crt, 0,
2293
ctypes.byref(crtverify))
1864
(gnutls.library.functions
1865
.gnutls_openpgp_crt_verify_self(crt, 0,
1866
ctypes.byref(crtverify)))
2294
1867
if crtverify.value != 0:
2295
gnutls.openpgp_crt_deinit(crt)
2296
raise gnutls.CertificateSecurityError("Verify failed")
1868
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1869
raise (gnutls.errors.CertificateSecurityError
1870
("Verify failed"))
2297
1871
# New buffer for the fingerprint
2298
1872
buf = ctypes.create_string_buffer(20)
2299
1873
buf_len = ctypes.c_size_t()
2300
1874
# Get the fingerprint from the certificate into the buffer
2301
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2302
ctypes.byref(buf_len))
1875
(gnutls.library.functions
1876
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1877
ctypes.byref(buf_len)))
2303
1878
# Deinit the certificate
2304
gnutls.openpgp_crt_deinit(crt)
1879
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2305
1880
# Convert the buffer to a Python bytestring
2306
1881
fpr = ctypes.string_at(buf, buf_len.value)
2307
1882
# Convert the bytestring to hexadecimal notation
2311
1886
2312
1887
class MultiprocessingMixIn(object):
2313
1888
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2314
2315
1889
def sub_process_main(self, request, address):
2316
1890
try:
2317
1891
self.finish_request(request, address)
2329
1903
2330
1904
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2331
1905
""" adds a pipe to the MixIn """
2332
2333
1906
def process_request(self, request, client_address):
2334
1907
"""Overrides and wraps the original process_request().
2335
1908
2356
1929
interface: None or a network interface name (string)
2357
1930
use_ipv6: Boolean; to use IPv6 or not
2358
1931
"""
2359
2360
1932
def __init__(self, server_address, RequestHandlerClass,
2361
interface=None,
2362
use_ipv6=True,
2363
socketfd=None):
1933
interface=None, use_ipv6=True, socketfd=None):
2364
1934
"""If socketfd is set, use that file descriptor instead of
2365
1935
creating a new one with socket.socket().
2366
1936
"""
2407
1977
self.interface)
2408
1978
else:
2409
1979
try:
2410
self.socket.setsockopt(
2411
socket.SOL_SOCKET, SO_BINDTODEVICE,
2412
(self.interface + "\0").encode("utf-8"))
1980
self.socket.setsockopt(socket.SOL_SOCKET,
1981
SO_BINDTODEVICE,
1982
str(self.interface + '\0'))
2413
1983
except socket.error as error:
2414
1984
if error.errno == errno.EPERM:
2415
1985
logger.error("No permission to bind to"
2433
2003
self.server_address = (any_address,
2434
2004
self.server_address[1])
2435
2005
elif not self.server_address[1]:
2436
self.server_address = (self.server_address[0], 0)
2006
self.server_address = (self.server_address[0],
2007
0)
2437
2008
# if self.interface:
2438
2009
# self.server_address = (self.server_address[0],
2439
2010
# 0, # port
2453
2024
2454
2025
Assumes a gobject.MainLoop event loop.
2455
2026
"""
2456
2457
2027
def __init__(self, server_address, RequestHandlerClass,
2458
interface=None,
2459
use_ipv6=True,
2460
clients=None,
2461
gnutls_priority=None,
2462
use_dbus=True,
2463
socketfd=None):
2028
interface=None, use_ipv6=True, clients=None,
2029
gnutls_priority=None, use_dbus=True, socketfd=None):
2464
2030
self.enabled = False
2465
2031
self.clients = clients
2466
2032
if self.clients is None:
2472
2038
interface = interface,
2473
2039
use_ipv6 = use_ipv6,
2474
2040
socketfd = socketfd)
2475
2476
2041
def server_activate(self):
2477
2042
if self.enabled:
2478
2043
return socketserver.TCPServer.server_activate(self)
2482
2047
2483
2048
def add_pipe(self, parent_pipe, proc):
2484
2049
# Call "handle_ipc" for both data and EOF events
2485
gobject.io_add_watch(
2486
parent_pipe.fileno(),
2487
gobject.IO_IN | gobject.IO_HUP,
2488
functools.partial(self.handle_ipc,
2489
parent_pipe = parent_pipe,
2490
proc = proc))
2050
gobject.io_add_watch(parent_pipe.fileno(),
2051
gobject.IO_IN | gobject.IO_HUP,
2052
functools.partial(self.handle_ipc,
2053
parent_pipe =
2054
parent_pipe,
2055
proc = proc))
2491
2056
2492
def handle_ipc(self, source, condition,
2493
parent_pipe=None,
2494
proc = None,
2495
client_object=None):
2057
def handle_ipc(self, source, condition, parent_pipe=None,
2058
proc = None, client_object=None):
2496
2059
# error, or the other end of multiprocessing.Pipe has closed
2497
2060
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2498
2061
# Wait for other process to exit
2521
2084
parent_pipe.send(False)
2522
2085
return False
2523
2086
2524
gobject.io_add_watch(
2525
parent_pipe.fileno(),
2526
gobject.IO_IN | gobject.IO_HUP,
2527
functools.partial(self.handle_ipc,
2528
parent_pipe = parent_pipe,
2529
proc = proc,
2530
client_object = client))
2087
gobject.io_add_watch(parent_pipe.fileno(),
2088
gobject.IO_IN | gobject.IO_HUP,
2089
functools.partial(self.handle_ipc,
2090
parent_pipe =
2091
parent_pipe,
2092
proc = proc,
2093
client_object =
2094
client))
2531
2095
parent_pipe.send(True)
2532
2096
# remove the old hook in favor of the new above hook on
2533
2097
# same fileno
2539
2103
2540
2104
parent_pipe.send(('data', getattr(client_object,
2541
2105
funcname)(*args,
2542
**kwargs)))
2106
**kwargs)))
2543
2107
2544
2108
if command == 'getattr':
2545
2109
attrname = request[1]
2546
if isinstance(client_object.__getattribute__(attrname),
2547
collections.Callable):
2548
parent_pipe.send(('function', ))
2110
if callable(client_object.__getattribute__(attrname)):
2111
parent_pipe.send(('function',))
2549
2112
else:
2550
parent_pipe.send((
2551
'data', client_object.__getattribute__(attrname)))
2113
parent_pipe.send(('data', client_object
2114
.__getattribute__(attrname)))
2552
2115
2553
2116
if command == 'setattr':
2554
2117
attrname = request[1]
2585
2148
# avoid excessive use of external libraries.
2586
2149
2587
2150
# New type for defining tokens, syntax, and semantics all-in-one
2588
Token = collections.namedtuple("Token", (
2589
"regexp", # To match token; if "value" is not None, must have
2590
# a "group" containing digits
2591
"value", # datetime.timedelta or None
2592
"followers")) # Tokens valid after this token
2151
Token = collections.namedtuple("Token",
2152
("regexp", # To match token; if
2153
# "value" is not None,
2154
# must have a "group"
2155
# containing digits
2156
"value", # datetime.timedelta or
2157
# None
2158
"followers")) # Tokens valid after
2159
# this token
2593
2160
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2594
2161
# the "duration" ABNF definition in RFC 3339, Appendix A.
2595
2162
token_end = Token(re.compile(r"$"), None, frozenset())
2596
2163
token_second = Token(re.compile(r"(\d+)S"),
2597
2164
datetime.timedelta(seconds=1),
2598
frozenset((token_end, )))
2165
frozenset((token_end,)))
2599
2166
token_minute = Token(re.compile(r"(\d+)M"),
2600
2167
datetime.timedelta(minutes=1),
2601
2168
frozenset((token_second, token_end)))
2617
2184
frozenset((token_month, token_end)))
2618
2185
token_week = Token(re.compile(r"(\d+)W"),
2619
2186
datetime.timedelta(weeks=1),
2620
frozenset((token_end, )))
2187
frozenset((token_end,)))
2621
2188
token_duration = Token(re.compile(r"P"), None,
2622
2189
frozenset((token_year, token_month,
2623
2190
token_day, token_time,
2624
token_week)))
2191
token_week))),
2625
2192
# Define starting values
2626
2193
value = datetime.timedelta() # Value so far
2627
2194
found_token = None
2628
followers = frozenset((token_duration, )) # Following valid tokens
2195
followers = frozenset(token_duration,) # Following valid tokens
2629
2196
s = duration # String left to parse
2630
2197
# Loop until end token is found
2631
2198
while found_token is not token_end:
2648
2215
break
2649
2216
else:
2650
2217
# No currently valid tokens were found
2651
raise ValueError("Invalid RFC 3339 duration: {!r}"
2652
.format(duration))
2218
raise ValueError("Invalid RFC 3339 duration")
2653
2219
# End token found
2654
2220
return value
2655
2221
2679
2245
timevalue = datetime.timedelta(0)
2680
2246
for s in interval.split():
2681
2247
try:
2682
suffix = s[-1]
2248
suffix = unicode(s[-1])
2683
2249
value = int(s[:-1])
2684
2250
if suffix == "d":
2685
2251
delta = datetime.timedelta(value)
2692
2258
elif suffix == "w":
2693
2259
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2694
2260
else:
2695
raise ValueError("Unknown suffix {!r}".format(suffix))
2261
raise ValueError("Unknown suffix {0!r}"
2262
.format(suffix))
2696
2263
except IndexError as e:
2697
2264
raise ValueError(*(e.args))
2698
2265
timevalue += delta
2715
2282
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2716
2283
if not stat.S_ISCHR(os.fstat(null).st_mode):
2717
2284
raise OSError(errno.ENODEV,
2718
"{} not a character device"
2285
"{0} not a character device"
2719
2286
.format(os.devnull))
2720
2287
os.dup2(null, sys.stdin.fileno())
2721
2288
os.dup2(null, sys.stdout.fileno())
2731
2298
2732
2299
parser = argparse.ArgumentParser()
2733
2300
parser.add_argument("-v", "--version", action="version",
2734
version = "%(prog)s {}".format(version),
2301
version = "%(prog)s {0}".format(version),
2735
2302
help="show version number and exit")
2736
2303
parser.add_argument("-i", "--interface", metavar="IF",
2737
2304
help="Bind to interface IF")
2787
2354
"port": "",
2788
2355
"debug": "False",
2789
2356
"priority":
2790
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2791
":+SIGN-DSA-SHA256",
2357
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2792
2358
"servicename": "Mandos",
2793
2359
"use_dbus": "True",
2794
2360
"use_ipv6": "True",
2798
2364
"statedir": "/var/lib/mandos",
2799
2365
"foreground": "False",
2800
2366
"zeroconf": "True",
2801
}
2367
}
2802
2368
2803
2369
# Parse config file for server-global settings
2804
2370
server_config = configparser.SafeConfigParser(server_defaults)
2805
2371
del server_defaults
2806
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2372
server_config.read(os.path.join(options.configdir,
2373
"mandos.conf"))
2807
2374
# Convert the SafeConfigParser object to a dict
2808
2375
server_settings = server_config.defaults()
2809
2376
# Use the appropriate methods on the non-string config options
2827
2394
# Override the settings from the config file with command line
2828
2395
# options, if set.
2829
2396
for option in ("interface", "address", "port", "debug",
2830
"priority", "servicename", "configdir", "use_dbus",
2831
"use_ipv6", "debuglevel", "restore", "statedir",
2832
"socket", "foreground", "zeroconf"):
2397
"priority", "servicename", "configdir",
2398
"use_dbus", "use_ipv6", "debuglevel", "restore",
2399
"statedir", "socket", "foreground", "zeroconf"):
2833
2400
value = getattr(options, option)
2834
2401
if value is not None:
2835
2402
server_settings[option] = value
2836
2403
del options
2837
2404
# Force all strings to be unicode
2838
2405
for option in server_settings.keys():
2839
if isinstance(server_settings[option], bytes):
2840
server_settings[option] = (server_settings[option]
2841
.decode("utf-8"))
2406
if type(server_settings[option]) is str:
2407
server_settings[option] = unicode(server_settings[option])
2842
2408
# Force all boolean options to be boolean
2843
2409
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2844
2410
"foreground", "zeroconf"):
2850
2416
2851
2417
##################################################################
2852
2418
2853
if (not server_settings["zeroconf"]
2854
and not (server_settings["port"]
2855
or server_settings["socket"] != "")):
2856
parser.error("Needs port or socket to work without Zeroconf")
2419
if (not server_settings["zeroconf"] and
2420
not (server_settings["port"]
2421
or server_settings["socket"] != "")):
2422
parser.error("Needs port or socket to work without"
2423
" Zeroconf")
2857
2424
2858
2425
# For convenience
2859
2426
debug = server_settings["debug"]
2875
2442
initlogger(debug, level)
2876
2443
2877
2444
if server_settings["servicename"] != "Mandos":
2878
syslogger.setFormatter(
2879
logging.Formatter('Mandos ({}) [%(process)d]:'
2880
' %(levelname)s: %(message)s'.format(
2881
server_settings["servicename"])))
2445
syslogger.setFormatter(logging.Formatter
2446
('Mandos ({0}) [%(process)d]:'
2447
' %(levelname)s: %(message)s'
2448
.format(server_settings
2449
["servicename"])))
2882
2450
2883
2451
# Parse config file with clients
2884
2452
client_config = configparser.SafeConfigParser(Client
2892
2460
socketfd = None
2893
2461
if server_settings["socket"] != "":
2894
2462
socketfd = server_settings["socket"]
2895
tcp_server = MandosServer(
2896
(server_settings["address"], server_settings["port"]),
2897
ClientHandler,
2898
interface=(server_settings["interface"] or None),
2899
use_ipv6=use_ipv6,
2900
gnutls_priority=server_settings["priority"],
2901
use_dbus=use_dbus,
2902
socketfd=socketfd)
2463
tcp_server = MandosServer((server_settings["address"],
2464
server_settings["port"]),
2465
ClientHandler,
2466
interface=(server_settings["interface"]
2467
or None),
2468
use_ipv6=use_ipv6,
2469
gnutls_priority=
2470
server_settings["priority"],
2471
use_dbus=use_dbus,
2472
socketfd=socketfd)
2903
2473
if not foreground:
2904
2474
pidfilename = "/run/mandos.pid"
2905
2475
if not os.path.isdir("/run/."):
2906
2476
pidfilename = "/var/run/mandos.pid"
2907
2477
pidfile = None
2908
2478
try:
2909
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2479
pidfile = open(pidfilename, "w")
2910
2480
except IOError as e:
2911
2481
logger.error("Could not open file %r", pidfilename,
2912
2482
exc_info=e)
2933
2503
2934
2504
# "Use a log level over 10 to enable all debugging options."
2935
2505
# - GnuTLS manual
2936
gnutls.global_set_log_level(11)
2506
gnutls.library.functions.gnutls_global_set_log_level(11)
2937
2507
2938
@gnutls.log_func
2508
@gnutls.library.types.gnutls_log_func
2939
2509
def debug_gnutls(level, string):
2940
2510
logger.debug("GnuTLS: %s", string[:-1])
2941
2511
2942
gnutls.global_set_log_function(debug_gnutls)
2512
(gnutls.library.functions
2513
.gnutls_global_set_log_function(debug_gnutls))
2943
2514
2944
2515
# Redirect stdin so all checkers get /dev/null
2945
2516
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2965
2536
if use_dbus:
2966
2537
try:
2967
2538
bus_name = dbus.service.BusName("se.recompile.Mandos",
2968
bus,
2969
do_not_queue=True)
2970
old_bus_name = dbus.service.BusName(
2971
"se.bsnet.fukt.Mandos", bus,
2972
do_not_queue=True)
2973
except dbus.exceptions.DBusException as e:
2539
bus, do_not_queue=True)
2540
old_bus_name = (dbus.service.BusName
2541
("se.bsnet.fukt.Mandos", bus,
2542
do_not_queue=True))
2543
except dbus.exceptions.NameExistsException as e:
2974
2544
logger.error("Disabling D-Bus:", exc_info=e)
2975
2545
use_dbus = False
2976
2546
server_settings["use_dbus"] = False
2977
2547
tcp_server.use_dbus = False
2978
2548
if zeroconf:
2979
2549
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2980
service = AvahiServiceToSyslog(
2981
name = server_settings["servicename"],
2982
servicetype = "_mandos._tcp",
2983
protocol = protocol,
2984
bus = bus)
2550
service = AvahiServiceToSyslog(name =
2551
server_settings["servicename"],
2552
servicetype = "_mandos._tcp",
2553
protocol = protocol, bus = bus)
2985
2554
if server_settings["interface"]:
2986
service.interface = if_nametoindex(
2987
server_settings["interface"].encode("utf-8"))
2555
service.interface = (if_nametoindex
2556
(str(server_settings["interface"])))
2988
2557
2989
2558
global multiprocessing_manager
2990
2559
multiprocessing_manager = multiprocessing.Manager()
3009
2578
if server_settings["restore"]:
3010
2579
try:
3011
2580
with open(stored_state_path, "rb") as stored_state:
3012
clients_data, old_client_settings = pickle.load(
3013
stored_state)
2581
clients_data, old_client_settings = (pickle.load
2582
(stored_state))
3014
2583
os.remove(stored_state_path)
3015
2584
except IOError as e:
3016
2585
if e.errno == errno.ENOENT:
3017
logger.warning("Could not load persistent state:"
3018
" {}".format(os.strerror(e.errno)))
2586
logger.warning("Could not load persistent state: {0}"
2587
.format(os.strerror(e.errno)))
3019
2588
else:
3020
2589
logger.critical("Could not load persistent state:",
3021
2590
exc_info=e)
3022
2591
raise
3023
2592
except EOFError as e:
3024
2593
logger.warning("Could not load persistent state: "
3025
"EOFError:",
3026
exc_info=e)
2594
"EOFError:", exc_info=e)
3027
2595
3028
2596
with PGPEngine() as pgp:
3029
for client_name, client in clients_data.items():
2597
for client_name, client in clients_data.iteritems():
3030
2598
# Skip removed clients
3031
2599
if client_name not in client_settings:
3032
2600
continue
3041
2609
# For each value in new config, check if it
3042
2610
# differs from the old config value (Except for
3043
2611
# the "secret" attribute)
3044
if (name != "secret"
3045
and (value !=
3046
old_client_settings[client_name][name])):
2612
if (name != "secret" and
2613
value != old_client_settings[client_name]
2614
[name]):
3047
2615
client[name] = value
3048
2616
except KeyError:
3049
2617
pass
3050
2618
3051
2619
# Clients who has passed its expire date can still be
3052
# enabled if its last checker was successful. A Client
2620
# enabled if its last checker was successful. Clients
3053
2621
# whose checker succeeded before we stored its state is
3054
2622
# assumed to have successfully run all checkers during
3055
2623
# downtime.
3057
2625
if datetime.datetime.utcnow() >= client["expires"]:
3058
2626
if not client["last_checked_ok"]:
3059
2627
logger.warning(
3060
"disabling client {} - Client never "
3061
"performed a successful checker".format(
3062
client_name))
2628
"disabling client {0} - Client never "
2629
"performed a successful checker"
2630
.format(client_name))
3063
2631
client["enabled"] = False
3064
2632
elif client["last_checker_status"] != 0:
3065
2633
logger.warning(
3066
"disabling client {} - Client last"
3067
" checker failed with error code"
3068
" {}".format(
3069
client_name,
3070
client["last_checker_status"]))
2634
"disabling client {0} - Client "
2635
"last checker failed with error code {1}"
2636
.format(client_name,
2637
client["last_checker_status"]))
3071
2638
client["enabled"] = False
3072
2639
else:
3073
client["expires"] = (
3074
datetime.datetime.utcnow()
3075
+ client["timeout"])
2640
client["expires"] = (datetime.datetime
2641
.utcnow()
2642
+ client["timeout"])
3076
2643
logger.debug("Last checker succeeded,"
3077
" keeping {} enabled".format(
3078
client_name))
2644
" keeping {0} enabled"
2645
.format(client_name))
3079
2646
try:
3080
client["secret"] = pgp.decrypt(
3081
client["encrypted_secret"],
3082
client_settings[client_name]["secret"])
2647
client["secret"] = (
2648
pgp.decrypt(client["encrypted_secret"],
2649
client_settings[client_name]
2650
["secret"]))
3083
2651
except PGPError:
3084
2652
# If decryption fails, we use secret from new settings
3085
logger.debug("Failed to decrypt {} old secret".format(
3086
client_name))
3087
client["secret"] = (client_settings[client_name]
3088
["secret"])
2653
logger.debug("Failed to decrypt {0} old secret"
2654
.format(client_name))
2655
client["secret"] = (
2656
client_settings[client_name]["secret"])
3089
2657
3090
2658
# Add/remove clients based on new changes made to config
3091
2659
for client_name in (set(old_client_settings)
3096
2664
clients_data[client_name] = client_settings[client_name]
3097
2665
3098
2666
# Create all client objects
3099
for client_name, client in clients_data.items():
2667
for client_name, client in clients_data.iteritems():
3100
2668
tcp_server.clients[client_name] = client_class(
3101
name = client_name,
3102
settings = client,
2669
name = client_name, settings = client,
3103
2670
server_settings = server_settings)
3104
2671
3105
2672
if not tcp_server.clients:
3107
2674
3108
2675
if not foreground:
3109
2676
if pidfile is not None:
3110
pid = os.getpid()
3111
2677
try:
3112
2678
with pidfile:
3113
print(pid, file=pidfile)
2679
pid = os.getpid()
2680
pidfile.write(str(pid) + "\n".encode("utf-8"))
3114
2681
except IOError:
3115
2682
logger.error("Could not write to file %r with PID %d",
3116
2683
pidfilename, pid)
3121
2688
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3122
2689
3123
2690
if use_dbus:
3124
3125
@alternate_dbus_interfaces(
3126
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3127
class MandosDBusService(DBusObjectWithObjectManager):
2691
@alternate_dbus_interfaces({"se.recompile.Mandos":
2692
"se.bsnet.fukt.Mandos"})
2693
class MandosDBusService(DBusObjectWithProperties):
3128
2694
"""A D-Bus proxy object"""
3129
3130
2695
def __init__(self):
3131
2696
dbus.service.Object.__init__(self, bus, "/")
3132
3133
2697
_interface = "se.recompile.Mandos"
3134
2698
2699
@dbus_interface_annotations(_interface)
2700
def _foo(self):
2701
return { "org.freedesktop.DBus.Property"
2702
".EmitsChangedSignal":
2703
"false"}
2704
3135
2705
@dbus.service.signal(_interface, signature="o")
3136
2706
def ClientAdded(self, objpath):
3137
2707
"D-Bus signal"
3142
2712
"D-Bus signal"
3143
2713
pass
3144
2714
3145
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3146
"true"})
3147
2715
@dbus.service.signal(_interface, signature="os")
3148
2716
def ClientRemoved(self, objpath, name):
3149
2717
"D-Bus signal"
3150
2718
pass
3151
2719
3152
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3153
"true"})
3154
2720
@dbus.service.method(_interface, out_signature="ao")
3155
2721
def GetAllClients(self):
3156
2722
"D-Bus method"
3157
return dbus.Array(c.dbus_object_path for c in
2723
return dbus.Array(c.dbus_object_path
2724
for c in
3158
2725
tcp_server.clients.itervalues())
3159
2726
3160
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3161
"true"})
3162
2727
@dbus.service.method(_interface,
3163
2728
out_signature="a{oa{sv}}")
3164
2729
def GetAllClientsWithProperties(self):
3165
2730
"D-Bus method"
3166
2731
return dbus.Dictionary(
3167
{ c.dbus_object_path: c.GetAll(
3168
"se.recompile.Mandos.Client")
3169
for c in tcp_server.clients.itervalues() },
2732
((c.dbus_object_path, c.GetAll(""))
2733
for c in tcp_server.clients.itervalues()),
3170
2734
signature="oa{sv}")
3171
2735
3172
2736
@dbus.service.method(_interface, in_signature="o")
3176
2740
if c.dbus_object_path == object_path:
3177
2741
del tcp_server.clients[c.name]
3178
2742
c.remove_from_connection()
3179
# Don't signal the disabling
2743
# Don't signal anything except ClientRemoved
3180
2744
c.disable(quiet=True)
3181
# Emit D-Bus signal for removal
3182
self.client_removed_signal(c)
2745
# Emit D-Bus signal
2746
self.ClientRemoved(object_path, c.name)
3183
2747
return
3184
2748
raise KeyError(object_path)
3185
2749
3186
2750
del _interface
3187
3188
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3189
out_signature = "a{oa{sa{sv}}}")
3190
def GetManagedObjects(self):
3191
"""D-Bus method"""
3192
return dbus.Dictionary(
3193
{ client.dbus_object_path:
3194
dbus.Dictionary(
3195
{ interface: client.GetAll(interface)
3196
for interface in
3197
client._get_all_interface_names()})
3198
for client in tcp_server.clients.values()})
3199
3200
def client_added_signal(self, client):
3201
"""Send the new standard signal and the old signal"""
3202
if use_dbus:
3203
# New standard signal
3204
self.InterfacesAdded(
3205
client.dbus_object_path,
3206
dbus.Dictionary(
3207
{ interface: client.GetAll(interface)
3208
for interface in
3209
client._get_all_interface_names()}))
3210
# Old signal
3211
self.ClientAdded(client.dbus_object_path)
3212
3213
def client_removed_signal(self, client):
3214
"""Send the new standard signal and the old signal"""
3215
if use_dbus:
3216
# New standard signal
3217
self.InterfacesRemoved(
3218
client.dbus_object_path,
3219
client._get_all_interface_names())
3220
# Old signal
3221
self.ClientRemoved(client.dbus_object_path,
3222
client.name)
3223
2751
3224
2752
mandos_dbus_service = MandosDBusService()
3225
2753
3246
2774
3247
2775
# A list of attributes that can not be pickled
3248
2776
# + secret.
3249
exclude = { "bus", "changedstate", "secret",
3250
"checker", "server_settings" }
3251
for name, typ in inspect.getmembers(dbus.service
3252
.Object):
2777
exclude = set(("bus", "changedstate", "secret",
2778
"checker", "server_settings"))
2779
for name, typ in (inspect.getmembers
2780
(dbus.service.Object)):
3253
2781
exclude.add(name)
3254
2782
3255
2783
client_dict["encrypted_secret"] = (client
3262
2790
del client_settings[client.name]["secret"]
3263
2791
3264
2792
try:
3265
with tempfile.NamedTemporaryFile(
3266
mode='wb',
3267
suffix=".pickle",
3268
prefix='clients-',
3269
dir=os.path.dirname(stored_state_path),
3270
delete=False) as stored_state:
2793
with (tempfile.NamedTemporaryFile
2794
(mode='wb', suffix=".pickle", prefix='clients-',
2795
dir=os.path.dirname(stored_state_path),
2796
delete=False)) as stored_state:
3271
2797
pickle.dump((clients, client_settings), stored_state)
3272
tempname = stored_state.name
2798
tempname=stored_state.name
3273
2799
os.rename(tempname, stored_state_path)
3274
2800
except (IOError, OSError) as e:
3275
2801
if not debug:
3278
2804
except NameError:
3279
2805
pass
3280
2806
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3281
logger.warning("Could not save persistent state: {}"
2807
logger.warning("Could not save persistent state: {0}"
3282
2808
.format(os.strerror(e.errno)))
3283
2809
else:
3284
2810
logger.warning("Could not save persistent state:",
3290
2816
name, client = tcp_server.clients.popitem()
3291
2817
if use_dbus:
3292
2818
client.remove_from_connection()
3293
# Don't signal the disabling
2819
# Don't signal anything except ClientRemoved
3294
2820
client.disable(quiet=True)
3295
# Emit D-Bus signal for removal
3296
2821
if use_dbus:
3297
mandos_dbus_service.client_removed_signal(client)
2822
# Emit D-Bus signal
2823
mandos_dbus_service.ClientRemoved(client
2824
.dbus_object_path,
2825
client.name)
3298
2826
client_settings.clear()
3299
2827
3300
2828
atexit.register(cleanup)
3301
2829
3302
2830
for client in tcp_server.clients.itervalues():
3303
2831
if use_dbus:
3304
# Emit D-Bus signal for adding
3305
mandos_dbus_service.client_added_signal(client)
2832
# Emit D-Bus signal
2833
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3306
2834
# Need to initiate checking of clients
3307
2835
if client.enabled:
3308
2836
client.init_checker()
3353
2881
# Must run before the D-Bus bus name gets deregistered
3354
2882
cleanup()
3355
2883
3356
3357
2884
if __name__ == '__main__':
3358
2885
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0