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