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