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