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