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