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