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