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