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