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