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 819
- compare with another revision
- download diff
- download tarball
- view history from revision 819
- Committer: Teddy Hogeborn
- Date: 2016-03-05 20:11:10 UTC
- Revision ID: teddy@recompile.se-20160305201110-6f7nws77k1h96e8k
errno is of type int, not error_t
* plugins.d/mandos-client.c (raise_privileges,
raise_privileges_permanently, lower_privileges,
lower_privileges_permanently, bring_up_interface,
take_down_interface, ): Change return type and all errno-containing
variables to type "int".
(get_flags): Change all errno-containing variables to type "int".
(main): Change all errno-containing variables to type "int", except
for values which are explicitly of type error_t.
* plugins.d/mandos-client.c (raise_privileges,
raise_privileges_permanently, lower_privileges,
lower_privileges_permanently, bring_up_interface,
take_down_interface, ): Change return type and all errno-containing
variables to type "int".
(get_flags): Change all errno-containing variables to type "int".
(main): Change all errno-containing variables to type "int", except
for values which are explicitly of type error_t.
- files added:
- plugin-helpers
- files modified:
- DBUS-API
added
removed
mandos
1
#!/usr/bin/python2.7
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
14
# Copyright © 2008-2016 Teddy Hogeborn
15
# Copyright © 2008-2016 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
36
36
37
37
from future_builtins import *
38
38
39
import SocketServer as socketserver
39
try:
40
import SocketServer as socketserver
41
except ImportError:
42
import socketserver
40
43
import socket
41
44
import argparse
42
45
import datetime
43
46
import errno
44
import gnutls.crypto
45
import gnutls.connection
46
import gnutls.errors
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
47
try:
48
import ConfigParser as configparser
49
except ImportError:
50
import configparser
51
51
import sys
52
52
import re
53
53
import os
62
62
import struct
63
63
import fcntl
64
64
import functools
65
import cPickle as pickle
65
try:
66
import cPickle as pickle
67
except ImportError:
68
import pickle
66
69
import multiprocessing
67
70
import types
68
71
import binascii
69
72
import tempfile
70
73
import itertools
71
74
import collections
75
import codecs
72
76
73
77
import dbus
74
78
import dbus.service
75
import gobject
79
try:
80
import gobject
81
except ImportError:
82
from gi.repository import GObject as gobject
76
83
import avahi
77
84
from dbus.mainloop.glib import DBusGMainLoop
78
85
import ctypes
88
95
except ImportError:
89
96
SO_BINDTODEVICE = None
90
97
91
version = "1.6.8"
98
if sys.version_info.major == 2:
99
str = unicode
100
101
version = "1.7.3"
92
102
stored_state_file = "clients.pickle"
93
103
94
104
logger = logging.getLogger()
95
105
syslogger = None
96
106
97
107
try:
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
108
if_nametoindex = ctypes.cdll.LoadLibrary(
109
ctypes.util.find_library("c")).if_nametoindex
101
110
except (OSError, AttributeError):
111
102
112
def if_nametoindex(interface):
103
113
"Get an interface index the hard way, i.e. using fcntl()"
104
114
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
113
123
"""init logger and add loglevel"""
114
124
115
125
global syslogger
116
syslogger = (logging.handlers.SysLogHandler
117
(facility =
118
logging.handlers.SysLogHandler.LOG_DAEMON,
119
address = "/dev/log"))
126
syslogger = (logging.handlers.SysLogHandler(
127
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
128
address = "/dev/log"))
120
129
syslogger.setFormatter(logging.Formatter
121
130
('Mandos [%(process)d]: %(levelname)s:'
122
131
' %(message)s'))
139
148
140
149
class PGPEngine(object):
141
150
"""A simple class for OpenPGP symmetric encryption & decryption"""
151
142
152
def __init__(self):
143
153
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
154
self.gpg = "gpg"
155
try:
156
output = subprocess.check_output(["gpgconf"])
157
for line in output.splitlines():
158
name, text, path = line.split(":")
159
if name == "gpg":
160
self.gpg = path
161
break
162
except OSError as e:
163
if e.errno != errno.ENOENT:
164
raise
144
165
self.gnupgargs = ['--batch',
145
'--home', self.tempdir,
166
'--homedir', self.tempdir,
146
167
'--force-mdc',
147
168
'--quiet',
148
169
'--no-use-agent']
183
204
184
205
def encrypt(self, data, password):
185
206
passphrase = self.password_encode(password)
186
with tempfile.NamedTemporaryFile(dir=self.tempdir
187
) as passfile:
207
with tempfile.NamedTemporaryFile(
208
dir=self.tempdir) as passfile:
188
209
passfile.write(passphrase)
189
210
passfile.flush()
190
proc = subprocess.Popen(['gpg', '--symmetric',
211
proc = subprocess.Popen([self.gpg, '--symmetric',
191
212
'--passphrase-file',
192
213
passfile.name]
193
214
+ self.gnupgargs,
201
222
202
223
def decrypt(self, data, password):
203
224
passphrase = self.password_encode(password)
204
with tempfile.NamedTemporaryFile(dir = self.tempdir
205
) as passfile:
225
with tempfile.NamedTemporaryFile(
226
dir = self.tempdir) as passfile:
206
227
passfile.write(passphrase)
207
228
passfile.flush()
208
proc = subprocess.Popen(['gpg', '--decrypt',
229
proc = subprocess.Popen([self.gpg, '--decrypt',
209
230
'--passphrase-file',
210
231
passfile.name]
211
232
+ self.gnupgargs,
212
233
stdin = subprocess.PIPE,
213
234
stdout = subprocess.PIPE,
214
235
stderr = subprocess.PIPE)
215
decrypted_plaintext, err = proc.communicate(input
216
= data)
236
decrypted_plaintext, err = proc.communicate(input = data)
217
237
if proc.returncode != 0:
218
238
raise PGPError(err)
219
239
return decrypted_plaintext
225
245
return super(AvahiError, self).__init__(value, *args,
226
246
**kwargs)
227
247
248
228
249
class AvahiServiceError(AvahiError):
229
250
pass
230
251
252
231
253
class AvahiGroupError(AvahiError):
232
254
pass
233
255
253
275
bus: dbus.SystemBus()
254
276
"""
255
277
256
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
servicetype = None, port = None, TXT = None,
258
domain = "", host = "", max_renames = 32768,
259
protocol = avahi.PROTO_UNSPEC, bus = None):
278
def __init__(self,
279
interface = avahi.IF_UNSPEC,
280
name = None,
281
servicetype = None,
282
port = None,
283
TXT = None,
284
domain = "",
285
host = "",
286
max_renames = 32768,
287
protocol = avahi.PROTO_UNSPEC,
288
bus = None):
260
289
self.interface = interface
261
290
self.name = name
262
291
self.type = servicetype
272
301
self.bus = bus
273
302
self.entry_group_state_changed_match = None
274
303
275
def rename(self):
304
def rename(self, remove=True):
276
305
"""Derived from the Avahi example code"""
277
306
if self.rename_count >= self.max_renames:
278
307
logger.critical("No suitable Zeroconf service name found"
279
308
" after %i retries, exiting.",
280
309
self.rename_count)
281
310
raise AvahiServiceError("Too many renames")
282
self.name = unicode(self.server
283
.GetAlternativeServiceName(self.name))
311
self.name = str(
312
self.server.GetAlternativeServiceName(self.name))
313
self.rename_count += 1
284
314
logger.info("Changing Zeroconf service name to %r ...",
285
315
self.name)
286
self.remove()
316
if remove:
317
self.remove()
287
318
try:
288
319
self.add()
289
320
except dbus.exceptions.DBusException as error:
290
logger.critical("D-Bus Exception", exc_info=error)
291
self.cleanup()
292
os._exit(1)
293
self.rename_count += 1
321
if (error.get_dbus_name()
322
== "org.freedesktop.Avahi.CollisionError"):
323
logger.info("Local Zeroconf service name collision.")
324
return self.rename(remove=False)
325
else:
326
logger.critical("D-Bus Exception", exc_info=error)
327
self.cleanup()
328
os._exit(1)
294
329
295
330
def remove(self):
296
331
"""Derived from the Avahi example code"""
334
369
self.rename()
335
370
elif state == avahi.ENTRY_GROUP_FAILURE:
336
371
logger.critical("Avahi: Error in group state changed %s",
337
unicode(error))
338
raise AvahiGroupError("State changed: {!s}"
339
.format(error))
372
str(error))
373
raise AvahiGroupError("State changed: {!s}".format(error))
340
374
341
375
def cleanup(self):
342
376
"""Derived from the Avahi example code"""
352
386
def server_state_changed(self, state, error=None):
353
387
"""Derived from the Avahi example code"""
354
388
logger.debug("Avahi server state change: %i", state)
355
bad_states = { avahi.SERVER_INVALID:
356
"Zeroconf server invalid",
357
avahi.SERVER_REGISTERING: None,
358
avahi.SERVER_COLLISION:
359
"Zeroconf server name collision",
360
avahi.SERVER_FAILURE:
361
"Zeroconf server failure" }
389
bad_states = {
390
avahi.SERVER_INVALID: "Zeroconf server invalid",
391
avahi.SERVER_REGISTERING: None,
392
avahi.SERVER_COLLISION: "Zeroconf server name collision",
393
avahi.SERVER_FAILURE: "Zeroconf server failure",
394
}
362
395
if state in bad_states:
363
396
if bad_states[state] is not None:
364
397
if error is None:
367
400
logger.error(bad_states[state] + ": %r", error)
368
401
self.cleanup()
369
402
elif state == avahi.SERVER_RUNNING:
370
self.add()
403
try:
404
self.add()
405
except dbus.exceptions.DBusException as error:
406
if (error.get_dbus_name()
407
== "org.freedesktop.Avahi.CollisionError"):
408
logger.info("Local Zeroconf service name"
409
" collision.")
410
return self.rename(remove=False)
411
else:
412
logger.critical("D-Bus Exception", exc_info=error)
413
self.cleanup()
414
os._exit(1)
371
415
else:
372
416
if error is None:
373
417
logger.debug("Unknown state: %r", state)
383
427
follow_name_owner_changes=True),
384
428
avahi.DBUS_INTERFACE_SERVER)
385
429
self.server.connect_to_signal("StateChanged",
386
self.server_state_changed)
430
self.server_state_changed)
387
431
self.server_state_changed(self.server.GetState())
388
432
389
433
390
434
class AvahiServiceToSyslog(AvahiService):
391
def rename(self):
435
def rename(self, *args, **kwargs):
392
436
"""Add the new name to the syslog messages"""
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
397
.format(self.name)))
437
ret = AvahiService.rename(self, *args, **kwargs)
438
syslogger.setFormatter(logging.Formatter(
439
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
440
.format(self.name)))
398
441
return ret
399
442
443
# Pretend that we have a GnuTLS module
444
class GnuTLS(object):
445
"""This isn't so much a class as it is a module-like namespace.
446
It is instantiated once, and simulates having a GnuTLS module."""
447
448
_library = ctypes.cdll.LoadLibrary(
449
ctypes.util.find_library("gnutls"))
450
_need_version = "3.3.0"
451
def __init__(self):
452
# Need to use class name "GnuTLS" here, since this method is
453
# called before the assignment to the "gnutls" global variable
454
# happens.
455
if GnuTLS.check_version(self._need_version) is None:
456
raise GnuTLS.Error("Needs GnuTLS {} or later"
457
.format(self._need_version))
458
459
# Unless otherwise indicated, the constants and types below are
460
# all from the gnutls/gnutls.h C header file.
461
462
# Constants
463
E_SUCCESS = 0
464
E_INTERRUPTED = -52
465
E_AGAIN = -28
466
CRT_OPENPGP = 2
467
CLIENT = 2
468
SHUT_RDWR = 0
469
CRD_CERTIFICATE = 1
470
E_NO_CERTIFICATE_FOUND = -49
471
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
472
473
# Types
474
class session_int(ctypes.Structure):
475
_fields_ = []
476
session_t = ctypes.POINTER(session_int)
477
class certificate_credentials_st(ctypes.Structure):
478
_fields_ = []
479
certificate_credentials_t = ctypes.POINTER(
480
certificate_credentials_st)
481
certificate_type_t = ctypes.c_int
482
class datum_t(ctypes.Structure):
483
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
484
('size', ctypes.c_uint)]
485
class openpgp_crt_int(ctypes.Structure):
486
_fields_ = []
487
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
488
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
489
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
490
credentials_type_t = ctypes.c_int #
491
transport_ptr_t = ctypes.c_void_p
492
close_request_t = ctypes.c_int
493
494
# Exceptions
495
class Error(Exception):
496
# We need to use the class name "GnuTLS" here, since this
497
# exception might be raised from within GnuTLS.__init__,
498
# which is called before the assignment to the "gnutls"
499
# global variable has happened.
500
def __init__(self, message = None, code = None, args=()):
501
# Default usage is by a message string, but if a return
502
# code is passed, convert it to a string with
503
# gnutls.strerror()
504
self.code = code
505
if message is None and code is not None:
506
message = GnuTLS.strerror(code)
507
return super(GnuTLS.Error, self).__init__(
508
message, *args)
509
510
class CertificateSecurityError(Error):
511
pass
512
513
# Classes
514
class Credentials(object):
515
def __init__(self):
516
self._c_object = gnutls.certificate_credentials_t()
517
gnutls.certificate_allocate_credentials(
518
ctypes.byref(self._c_object))
519
self.type = gnutls.CRD_CERTIFICATE
520
521
def __del__(self):
522
gnutls.certificate_free_credentials(self._c_object)
523
524
class ClientSession(object):
525
def __init__(self, socket, credentials = None):
526
self._c_object = gnutls.session_t()
527
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
528
gnutls.set_default_priority(self._c_object)
529
gnutls.transport_set_ptr(self._c_object, socket.fileno())
530
gnutls.handshake_set_private_extensions(self._c_object,
531
True)
532
self.socket = socket
533
if credentials is None:
534
credentials = gnutls.Credentials()
535
gnutls.credentials_set(self._c_object, credentials.type,
536
ctypes.cast(credentials._c_object,
537
ctypes.c_void_p))
538
self.credentials = credentials
539
540
def __del__(self):
541
gnutls.deinit(self._c_object)
542
543
def handshake(self):
544
return gnutls.handshake(self._c_object)
545
546
def send(self, data):
547
data = bytes(data)
548
data_len = len(data)
549
while data_len > 0:
550
data_len -= gnutls.record_send(self._c_object,
551
data[-data_len:],
552
data_len)
553
554
def bye(self):
555
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
556
557
# Error handling functions
558
def _error_code(result):
559
"""A function to raise exceptions on errors, suitable
560
for the 'restype' attribute on ctypes functions"""
561
if result >= 0:
562
return result
563
if result == gnutls.E_NO_CERTIFICATE_FOUND:
564
raise gnutls.CertificateSecurityError(code = result)
565
raise gnutls.Error(code = result)
566
567
def _retry_on_error(result, func, arguments):
568
"""A function to retry on some errors, suitable
569
for the 'errcheck' attribute on ctypes functions"""
570
while result < 0:
571
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
572
return _error_code(result)
573
result = func(*arguments)
574
return result
575
576
# Unless otherwise indicated, the function declarations below are
577
# all from the gnutls/gnutls.h C header file.
578
579
# Functions
580
priority_set_direct = _library.gnutls_priority_set_direct
581
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
582
ctypes.POINTER(ctypes.c_char_p)]
583
priority_set_direct.restype = _error_code
584
585
init = _library.gnutls_init
586
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
587
init.restype = _error_code
588
589
set_default_priority = _library.gnutls_set_default_priority
590
set_default_priority.argtypes = [session_t]
591
set_default_priority.restype = _error_code
592
593
record_send = _library.gnutls_record_send
594
record_send.argtypes = [session_t, ctypes.c_void_p,
595
ctypes.c_size_t]
596
record_send.restype = ctypes.c_ssize_t
597
record_send.errcheck = _retry_on_error
598
599
certificate_allocate_credentials = (
600
_library.gnutls_certificate_allocate_credentials)
601
certificate_allocate_credentials.argtypes = [
602
ctypes.POINTER(certificate_credentials_t)]
603
certificate_allocate_credentials.restype = _error_code
604
605
certificate_free_credentials = (
606
_library.gnutls_certificate_free_credentials)
607
certificate_free_credentials.argtypes = [certificate_credentials_t]
608
certificate_free_credentials.restype = None
609
610
handshake_set_private_extensions = (
611
_library.gnutls_handshake_set_private_extensions)
612
handshake_set_private_extensions.argtypes = [session_t,
613
ctypes.c_int]
614
handshake_set_private_extensions.restype = None
615
616
credentials_set = _library.gnutls_credentials_set
617
credentials_set.argtypes = [session_t, credentials_type_t,
618
ctypes.c_void_p]
619
credentials_set.restype = _error_code
620
621
strerror = _library.gnutls_strerror
622
strerror.argtypes = [ctypes.c_int]
623
strerror.restype = ctypes.c_char_p
624
625
certificate_type_get = _library.gnutls_certificate_type_get
626
certificate_type_get.argtypes = [session_t]
627
certificate_type_get.restype = _error_code
628
629
certificate_get_peers = _library.gnutls_certificate_get_peers
630
certificate_get_peers.argtypes = [session_t,
631
ctypes.POINTER(ctypes.c_uint)]
632
certificate_get_peers.restype = ctypes.POINTER(datum_t)
633
634
global_set_log_level = _library.gnutls_global_set_log_level
635
global_set_log_level.argtypes = [ctypes.c_int]
636
global_set_log_level.restype = None
637
638
global_set_log_function = _library.gnutls_global_set_log_function
639
global_set_log_function.argtypes = [log_func]
640
global_set_log_function.restype = None
641
642
deinit = _library.gnutls_deinit
643
deinit.argtypes = [session_t]
644
deinit.restype = None
645
646
handshake = _library.gnutls_handshake
647
handshake.argtypes = [session_t]
648
handshake.restype = _error_code
649
handshake.errcheck = _retry_on_error
650
651
transport_set_ptr = _library.gnutls_transport_set_ptr
652
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
653
transport_set_ptr.restype = None
654
655
bye = _library.gnutls_bye
656
bye.argtypes = [session_t, close_request_t]
657
bye.restype = _error_code
658
bye.errcheck = _retry_on_error
659
660
check_version = _library.gnutls_check_version
661
check_version.argtypes = [ctypes.c_char_p]
662
check_version.restype = ctypes.c_char_p
663
664
# All the function declarations below are from gnutls/openpgp.h
665
666
openpgp_crt_init = _library.gnutls_openpgp_crt_init
667
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
668
openpgp_crt_init.restype = _error_code
669
670
openpgp_crt_import = _library.gnutls_openpgp_crt_import
671
openpgp_crt_import.argtypes = [openpgp_crt_t,
672
ctypes.POINTER(datum_t),
673
openpgp_crt_fmt_t]
674
openpgp_crt_import.restype = _error_code
675
676
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
677
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
678
ctypes.POINTER(ctypes.c_uint)]
679
openpgp_crt_verify_self.restype = _error_code
680
681
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
682
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
683
openpgp_crt_deinit.restype = None
684
685
openpgp_crt_get_fingerprint = (
686
_library.gnutls_openpgp_crt_get_fingerprint)
687
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
688
ctypes.c_void_p,
689
ctypes.POINTER(
690
ctypes.c_size_t)]
691
openpgp_crt_get_fingerprint.restype = _error_code
692
693
# Remove non-public functions
694
del _error_code, _retry_on_error
695
# Create the global "gnutls" object, simulating a module
696
gnutls = GnuTLS()
697
698
def call_pipe(connection, # : multiprocessing.Connection
699
func, *args, **kwargs):
700
"""This function is meant to be called by multiprocessing.Process
701
702
This function runs func(*args, **kwargs), and writes the resulting
703
return value on the provided multiprocessing.Connection.
704
"""
705
connection.send(func(*args, **kwargs))
706
connection.close()
400
707
401
708
class Client(object):
402
709
"""A representation of a client host served by this server.
429
736
last_checker_status: integer between 0 and 255 reflecting exit
430
737
status of last checker. -1 reflects crashed
431
738
checker, -2 means no checker completed yet.
739
last_checker_signal: The signal which killed the last checker, if
740
last_checker_status is -1
432
741
last_enabled: datetime.datetime(); (UTC) or None
433
742
name: string; from the config file, used in log messages and
434
743
D-Bus identifiers
447
756
"fingerprint", "host", "interval",
448
757
"last_approval_request", "last_checked_ok",
449
758
"last_enabled", "name", "timeout")
450
client_defaults = { "timeout": "PT5M",
451
"extended_timeout": "PT15M",
452
"interval": "PT2M",
453
"checker": "fping -q -- %%(host)s",
454
"host": "",
455
"approval_delay": "PT0S",
456
"approval_duration": "PT1S",
457
"approved_by_default": "True",
458
"enabled": "True",
459
}
759
client_defaults = {
760
"timeout": "PT5M",
761
"extended_timeout": "PT15M",
762
"interval": "PT2M",
763
"checker": "fping -q -- %%(host)s",
764
"host": "",
765
"approval_delay": "PT0S",
766
"approval_duration": "PT1S",
767
"approved_by_default": "True",
768
"enabled": "True",
769
}
460
770
461
771
@staticmethod
462
772
def config_parser(config):
478
788
client["enabled"] = config.getboolean(client_name,
479
789
"enabled")
480
790
791
# Uppercase and remove spaces from fingerprint for later
792
# comparison purposes with return value from the
793
# fingerprint() function
481
794
client["fingerprint"] = (section["fingerprint"].upper()
482
795
.replace(" ", ""))
483
796
if "secret" in section:
525
838
self.expires = None
526
839
527
840
logger.debug("Creating client %r", self.name)
528
# Uppercase and remove spaces from fingerprint for later
529
# comparison purposes with return value from the fingerprint()
530
# function
531
841
logger.debug(" Fingerprint: %s", self.fingerprint)
532
842
self.created = settings.get("created",
533
843
datetime.datetime.utcnow())
540
850
self.current_checker_command = None
541
851
self.approved = None
542
852
self.approvals_pending = 0
543
self.changedstate = (multiprocessing_manager
544
.Condition(multiprocessing_manager
545
.Lock()))
546
self.client_structure = [attr for attr in
547
self.__dict__.iterkeys()
853
self.changedstate = multiprocessing_manager.Condition(
854
multiprocessing_manager.Lock())
855
self.client_structure = [attr
856
for attr in self.__dict__.iterkeys()
548
857
if not attr.startswith("_")]
549
858
self.client_structure.append("client_structure")
550
859
551
for name, t in inspect.getmembers(type(self),
552
lambda obj:
553
isinstance(obj,
554
property)):
860
for name, t in inspect.getmembers(
861
type(self), lambda obj: isinstance(obj, property)):
555
862
if not name.startswith("_"):
556
863
self.client_structure.append(name)
557
864
599
906
# and every interval from then on.
600
907
if self.checker_initiator_tag is not None:
601
908
gobject.source_remove(self.checker_initiator_tag)
602
self.checker_initiator_tag = (gobject.timeout_add
603
(int(self.interval
604
.total_seconds() * 1000),
605
self.start_checker))
909
self.checker_initiator_tag = gobject.timeout_add(
910
int(self.interval.total_seconds() * 1000),
911
self.start_checker)
606
912
# Schedule a disable() when 'timeout' has passed
607
913
if self.disable_initiator_tag is not None:
608
914
gobject.source_remove(self.disable_initiator_tag)
609
self.disable_initiator_tag = (gobject.timeout_add
610
(int(self.timeout
611
.total_seconds() * 1000),
612
self.disable))
915
self.disable_initiator_tag = gobject.timeout_add(
916
int(self.timeout.total_seconds() * 1000), self.disable)
613
917
# Also start a new checker *right now*.
614
918
self.start_checker()
615
919
616
def checker_callback(self, pid, condition, command):
920
def checker_callback(self, source, condition, connection,
921
command):
617
922
"""The checker has completed, so take appropriate actions."""
618
923
self.checker_callback_tag = None
619
924
self.checker = None
620
if os.WIFEXITED(condition):
621
self.last_checker_status = os.WEXITSTATUS(condition)
925
# Read return code from connection (see call_pipe)
926
returncode = connection.recv()
927
connection.close()
928
929
if returncode >= 0:
930
self.last_checker_status = returncode
931
self.last_checker_signal = None
622
932
if self.last_checker_status == 0:
623
933
logger.info("Checker for %(name)s succeeded",
624
934
vars(self))
625
935
self.checked_ok()
626
936
else:
627
logger.info("Checker for %(name)s failed",
628
vars(self))
937
logger.info("Checker for %(name)s failed", vars(self))
629
938
else:
630
939
self.last_checker_status = -1
940
self.last_checker_signal = -returncode
631
941
logger.warning("Checker for %(name)s crashed?",
632
942
vars(self))
943
return False
633
944
634
945
def checked_ok(self):
635
946
"""Assert that the client has been seen, alive and well."""
636
947
self.last_checked_ok = datetime.datetime.utcnow()
637
948
self.last_checker_status = 0
949
self.last_checker_signal = None
638
950
self.bump_timeout()
639
951
640
952
def bump_timeout(self, timeout=None):
645
957
gobject.source_remove(self.disable_initiator_tag)
646
958
self.disable_initiator_tag = None
647
959
if getattr(self, "enabled", False):
648
self.disable_initiator_tag = (gobject.timeout_add
649
(int(timeout.total_seconds()
650
* 1000), self.disable))
960
self.disable_initiator_tag = gobject.timeout_add(
961
int(timeout.total_seconds() * 1000), self.disable)
651
962
self.expires = datetime.datetime.utcnow() + timeout
652
963
653
964
def need_approval(self):
667
978
# than 'timeout' for the client to be disabled, which is as it
668
979
# should be.
669
980
670
# If a checker exists, make sure it is not a zombie
671
try:
672
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
673
except AttributeError:
674
pass
675
except OSError as error:
676
if error.errno != errno.ECHILD:
677
raise
678
else:
679
if pid:
680
logger.warning("Checker was a zombie")
681
gobject.source_remove(self.checker_callback_tag)
682
self.checker_callback(pid, status,
683
self.current_checker_command)
981
if self.checker is not None and not self.checker.is_alive():
982
logger.warning("Checker was not alive; joining")
983
self.checker.join()
984
self.checker = None
684
985
# Start a new checker if needed
685
986
if self.checker is None:
686
987
# Escape attributes for the shell
687
escaped_attrs = { attr:
688
re.escape(unicode(getattr(self,
689
attr)))
690
for attr in self.runtime_expansions }
988
escaped_attrs = {
989
attr: re.escape(str(getattr(self, attr)))
990
for attr in self.runtime_expansions }
691
991
try:
692
992
command = self.checker_command % escaped_attrs
693
993
except TypeError as error:
694
994
logger.error('Could not format string "%s"',
695
self.checker_command, exc_info=error)
696
return True # Try again later
995
self.checker_command,
996
exc_info=error)
997
return True # Try again later
697
998
self.current_checker_command = command
698
try:
699
logger.info("Starting checker %r for %s",
700
command, self.name)
701
# We don't need to redirect stdout and stderr, since
702
# in normal mode, that is already done by daemon(),
703
# and in debug mode we don't want to. (Stdin is
704
# always replaced by /dev/null.)
705
# The exception is when not debugging but nevertheless
706
# running in the foreground; use the previously
707
# created wnull.
708
popen_args = {}
709
if (not self.server_settings["debug"]
710
and self.server_settings["foreground"]):
711
popen_args.update({"stdout": wnull,
712
"stderr": wnull })
713
self.checker = subprocess.Popen(command,
714
close_fds=True,
715
shell=True, cwd="/",
716
**popen_args)
717
except OSError as error:
718
logger.error("Failed to start subprocess",
719
exc_info=error)
720
return True
721
self.checker_callback_tag = (gobject.child_watch_add
722
(self.checker.pid,
723
self.checker_callback,
724
data=command))
725
# The checker may have completed before the gobject
726
# watch was added. Check for this.
727
try:
728
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
729
except OSError as error:
730
if error.errno == errno.ECHILD:
731
# This should never happen
732
logger.error("Child process vanished",
733
exc_info=error)
734
return True
735
raise
736
if pid:
737
gobject.source_remove(self.checker_callback_tag)
738
self.checker_callback(pid, status, command)
999
logger.info("Starting checker %r for %s", command,
1000
self.name)
1001
# We don't need to redirect stdout and stderr, since
1002
# in normal mode, that is already done by daemon(),
1003
# and in debug mode we don't want to. (Stdin is
1004
# always replaced by /dev/null.)
1005
# The exception is when not debugging but nevertheless
1006
# running in the foreground; use the previously
1007
# created wnull.
1008
popen_args = { "close_fds": True,
1009
"shell": True,
1010
"cwd": "/" }
1011
if (not self.server_settings["debug"]
1012
and self.server_settings["foreground"]):
1013
popen_args.update({"stdout": wnull,
1014
"stderr": wnull })
1015
pipe = multiprocessing.Pipe(duplex = False)
1016
self.checker = multiprocessing.Process(
1017
target = call_pipe,
1018
args = (pipe[1], subprocess.call, command),
1019
kwargs = popen_args)
1020
self.checker.start()
1021
self.checker_callback_tag = gobject.io_add_watch(
1022
pipe[0].fileno(), gobject.IO_IN,
1023
self.checker_callback, pipe[0], command)
739
1024
# Re-run this periodically if run by gobject.timeout_add
740
1025
return True
741
1026
747
1032
if getattr(self, "checker", None) is None:
748
1033
return
749
1034
logger.debug("Stopping checker for %(name)s", vars(self))
750
try:
751
self.checker.terminate()
752
#time.sleep(0.5)
753
#if self.checker.poll() is None:
754
# self.checker.kill()
755
except OSError as error:
756
if error.errno != errno.ESRCH: # No such process
757
raise
1035
self.checker.terminate()
758
1036
self.checker = None
759
1037
760
1038
761
def dbus_service_property(dbus_interface, signature="v",
762
access="readwrite", byte_arrays=False):
1039
def dbus_service_property(dbus_interface,
1040
signature="v",
1041
access="readwrite",
1042
byte_arrays=False):
763
1043
"""Decorators for marking methods of a DBusObjectWithProperties to
764
1044
become properties on the D-Bus.
765
1045
775
1055
if byte_arrays and signature != "ay":
776
1056
raise ValueError("Byte arrays not supported for non-'ay'"
777
1057
" signature {!r}".format(signature))
1058
778
1059
def decorator(func):
779
1060
func._dbus_is_property = True
780
1061
func._dbus_interface = dbus_interface
785
1066
func._dbus_name = func._dbus_name[:-14]
786
1067
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
787
1068
return func
1069
788
1070
return decorator
789
1071
790
1072
799
1081
"org.freedesktop.DBus.Property.EmitsChangedSignal":
800
1082
"false"}
801
1083
"""
1084
802
1085
def decorator(func):
803
1086
func._dbus_is_interface = True
804
1087
func._dbus_interface = dbus_interface
805
1088
func._dbus_name = dbus_interface
806
1089
return func
1090
807
1091
return decorator
808
1092
809
1093
811
1095
"""Decorator to annotate D-Bus methods, signals or properties
812
1096
Usage:
813
1097
1098
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1099
"org.freedesktop.DBus.Property."
1100
"EmitsChangedSignal": "false"})
814
1101
@dbus_service_property("org.example.Interface", signature="b",
815
1102
access="r")
816
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
817
"org.freedesktop.DBus.Property."
818
"EmitsChangedSignal": "false"})
819
1103
def Property_dbus_property(self):
820
1104
return dbus.Boolean(False)
1105
1106
See also the DBusObjectWithAnnotations class.
821
1107
"""
1108
822
1109
def decorator(func):
823
1110
func._dbus_annotations = annotations
824
1111
return func
1112
825
1113
return decorator
826
1114
827
1115
830
1118
"""
831
1119
pass
832
1120
1121
833
1122
class DBusPropertyAccessException(DBusPropertyException):
834
1123
"""A property's access permissions disallows an operation.
835
1124
"""
842
1131
pass
843
1132
844
1133
845
class DBusObjectWithProperties(dbus.service.Object):
846
"""A D-Bus object with properties.
1134
class DBusObjectWithAnnotations(dbus.service.Object):
1135
"""A D-Bus object with annotations.
847
1136
848
Classes inheriting from this can use the dbus_service_property
849
decorator to expose methods as D-Bus properties. It exposes the
850
standard Get(), Set(), and GetAll() methods on the D-Bus.
1137
Classes inheriting from this can use the dbus_annotations
1138
decorator to add annotations to methods or signals.
851
1139
"""
852
1140
853
1141
@staticmethod
863
1151
def _get_all_dbus_things(self, thing):
864
1152
"""Returns a generator of (name, attribute) pairs
865
1153
"""
866
return ((getattr(athing.__get__(self), "_dbus_name",
867
name),
1154
return ((getattr(athing.__get__(self), "_dbus_name", name),
868
1155
athing.__get__(self))
869
1156
for cls in self.__class__.__mro__
870
1157
for name, athing in
871
inspect.getmembers(cls,
872
self._is_dbus_thing(thing)))
1158
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1159
1160
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1161
out_signature = "s",
1162
path_keyword = 'object_path',
1163
connection_keyword = 'connection')
1164
def Introspect(self, object_path, connection):
1165
"""Overloading of standard D-Bus method.
1166
1167
Inserts annotation tags on methods and signals.
1168
"""
1169
xmlstring = dbus.service.Object.Introspect(self, object_path,
1170
connection)
1171
try:
1172
document = xml.dom.minidom.parseString(xmlstring)
1173
1174
for if_tag in document.getElementsByTagName("interface"):
1175
# Add annotation tags
1176
for typ in ("method", "signal"):
1177
for tag in if_tag.getElementsByTagName(typ):
1178
annots = dict()
1179
for name, prop in (self.
1180
_get_all_dbus_things(typ)):
1181
if (name == tag.getAttribute("name")
1182
and prop._dbus_interface
1183
== if_tag.getAttribute("name")):
1184
annots.update(getattr(
1185
prop, "_dbus_annotations", {}))
1186
for name, value in annots.items():
1187
ann_tag = document.createElement(
1188
"annotation")
1189
ann_tag.setAttribute("name", name)
1190
ann_tag.setAttribute("value", value)
1191
tag.appendChild(ann_tag)
1192
# Add interface annotation tags
1193
for annotation, value in dict(
1194
itertools.chain.from_iterable(
1195
annotations().items()
1196
for name, annotations
1197
in self._get_all_dbus_things("interface")
1198
if name == if_tag.getAttribute("name")
1199
)).items():
1200
ann_tag = document.createElement("annotation")
1201
ann_tag.setAttribute("name", annotation)
1202
ann_tag.setAttribute("value", value)
1203
if_tag.appendChild(ann_tag)
1204
# Fix argument name for the Introspect method itself
1205
if (if_tag.getAttribute("name")
1206
== dbus.INTROSPECTABLE_IFACE):
1207
for cn in if_tag.getElementsByTagName("method"):
1208
if cn.getAttribute("name") == "Introspect":
1209
for arg in cn.getElementsByTagName("arg"):
1210
if (arg.getAttribute("direction")
1211
== "out"):
1212
arg.setAttribute("name",
1213
"xml_data")
1214
xmlstring = document.toxml("utf-8")
1215
document.unlink()
1216
except (AttributeError, xml.dom.DOMException,
1217
xml.parsers.expat.ExpatError) as error:
1218
logger.error("Failed to override Introspection method",
1219
exc_info=error)
1220
return xmlstring
1221
1222
1223
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1224
"""A D-Bus object with properties.
1225
1226
Classes inheriting from this can use the dbus_service_property
1227
decorator to expose methods as D-Bus properties. It exposes the
1228
standard Get(), Set(), and GetAll() methods on the D-Bus.
1229
"""
873
1230
874
1231
def _get_dbus_property(self, interface_name, property_name):
875
1232
"""Returns a bound method if one exists which is a D-Bus
876
1233
property with the specified name and interface.
877
1234
"""
878
for cls in self.__class__.__mro__:
879
for name, value in (inspect.getmembers
880
(cls,
881
self._is_dbus_thing("property"))):
1235
for cls in self.__class__.__mro__:
1236
for name, value in inspect.getmembers(
1237
cls, self._is_dbus_thing("property")):
882
1238
if (value._dbus_name == property_name
883
1239
and value._dbus_interface == interface_name):
884
1240
return value.__get__(self)
885
1241
886
1242
# No such property
887
raise DBusPropertyNotFound(self.dbus_object_path + ":"
888
+ interface_name + "."
889
+ property_name)
890
891
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1243
raise DBusPropertyNotFound("{}:{}.{}".format(
1244
self.dbus_object_path, interface_name, property_name))
1245
1246
@classmethod
1247
def _get_all_interface_names(cls):
1248
"""Get a sequence of all interfaces supported by an object"""
1249
return (name for name in set(getattr(getattr(x, attr),
1250
"_dbus_interface", None)
1251
for x in (inspect.getmro(cls))
1252
for attr in dir(x))
1253
if name is not None)
1254
1255
@dbus.service.method(dbus.PROPERTIES_IFACE,
1256
in_signature="ss",
892
1257
out_signature="v")
893
1258
def Get(self, interface_name, property_name):
894
1259
"""Standard D-Bus property Get() method, see D-Bus standard.
919
1284
for byte in value))
920
1285
prop(value)
921
1286
922
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1287
@dbus.service.method(dbus.PROPERTIES_IFACE,
1288
in_signature="s",
923
1289
out_signature="a{sv}")
924
1290
def GetAll(self, interface_name):
925
1291
"""Standard D-Bus property GetAll() method, see D-Bus
940
1306
if not hasattr(value, "variant_level"):
941
1307
properties[name] = value
942
1308
continue
943
properties[name] = type(value)(value, variant_level=
944
value.variant_level+1)
1309
properties[name] = type(value)(
1310
value, variant_level = value.variant_level + 1)
945
1311
return dbus.Dictionary(properties, signature="sv")
946
1312
1313
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1314
def PropertiesChanged(self, interface_name, changed_properties,
1315
invalidated_properties):
1316
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
1317
standard.
1318
"""
1319
pass
1320
947
1321
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
948
1322
out_signature="s",
949
1323
path_keyword='object_path',
953
1327
954
1328
Inserts property tags and interface annotation tags.
955
1329
"""
956
xmlstring = dbus.service.Object.Introspect(self, object_path,
957
connection)
1330
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1331
object_path,
1332
connection)
958
1333
try:
959
1334
document = xml.dom.minidom.parseString(xmlstring)
1335
960
1336
def make_tag(document, name, prop):
961
1337
e = document.createElement("property")
962
1338
e.setAttribute("name", name)
963
1339
e.setAttribute("type", prop._dbus_signature)
964
1340
e.setAttribute("access", prop._dbus_access)
965
1341
return e
1342
966
1343
for if_tag in document.getElementsByTagName("interface"):
967
1344
# Add property tags
968
1345
for tag in (make_tag(document, name, prop)
971
1348
if prop._dbus_interface
972
1349
== if_tag.getAttribute("name")):
973
1350
if_tag.appendChild(tag)
974
# Add annotation tags
975
for typ in ("method", "signal", "property"):
976
for tag in if_tag.getElementsByTagName(typ):
977
annots = dict()
978
for name, prop in (self.
979
_get_all_dbus_things(typ)):
980
if (name == tag.getAttribute("name")
981
and prop._dbus_interface
982
== if_tag.getAttribute("name")):
983
annots.update(getattr
984
(prop,
985
"_dbus_annotations",
986
{}))
987
for name, value in annots.items():
988
ann_tag = document.createElement(
989
"annotation")
990
ann_tag.setAttribute("name", name)
991
ann_tag.setAttribute("value", value)
992
tag.appendChild(ann_tag)
993
# Add interface annotation tags
994
for annotation, value in dict(
995
itertools.chain.from_iterable(
996
annotations().items()
997
for name, annotations in
998
self._get_all_dbus_things("interface")
999
if name == if_tag.getAttribute("name")
1000
)).items():
1001
ann_tag = document.createElement("annotation")
1002
ann_tag.setAttribute("name", annotation)
1003
ann_tag.setAttribute("value", value)
1004
if_tag.appendChild(ann_tag)
1351
# Add annotation tags for properties
1352
for tag in if_tag.getElementsByTagName("property"):
1353
annots = dict()
1354
for name, prop in self._get_all_dbus_things(
1355
"property"):
1356
if (name == tag.getAttribute("name")
1357
and prop._dbus_interface
1358
== if_tag.getAttribute("name")):
1359
annots.update(getattr(
1360
prop, "_dbus_annotations", {}))
1361
for name, value in annots.items():
1362
ann_tag = document.createElement(
1363
"annotation")
1364
ann_tag.setAttribute("name", name)
1365
ann_tag.setAttribute("value", value)
1366
tag.appendChild(ann_tag)
1005
1367
# Add the names to the return values for the
1006
1368
# "org.freedesktop.DBus.Properties" methods
1007
1369
if (if_tag.getAttribute("name")
1025
1387
exc_info=error)
1026
1388
return xmlstring
1027
1389
1390
try:
1391
dbus.OBJECT_MANAGER_IFACE
1392
except AttributeError:
1393
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1394
1395
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1396
"""A D-Bus object with an ObjectManager.
1397
1398
Classes inheriting from this exposes the standard
1399
GetManagedObjects call and the InterfacesAdded and
1400
InterfacesRemoved signals on the standard
1401
"org.freedesktop.DBus.ObjectManager" interface.
1402
1403
Note: No signals are sent automatically; they must be sent
1404
manually.
1405
"""
1406
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1407
out_signature = "a{oa{sa{sv}}}")
1408
def GetManagedObjects(self):
1409
"""This function must be overridden"""
1410
raise NotImplementedError()
1411
1412
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1413
signature = "oa{sa{sv}}")
1414
def InterfacesAdded(self, object_path, interfaces_and_properties):
1415
pass
1416
1417
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1418
def InterfacesRemoved(self, object_path, interfaces):
1419
pass
1420
1421
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1422
out_signature = "s",
1423
path_keyword = 'object_path',
1424
connection_keyword = 'connection')
1425
def Introspect(self, object_path, connection):
1426
"""Overloading of standard D-Bus method.
1427
1428
Override return argument name of GetManagedObjects to be
1429
"objpath_interfaces_and_properties"
1430
"""
1431
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1432
object_path,
1433
connection)
1434
try:
1435
document = xml.dom.minidom.parseString(xmlstring)
1436
1437
for if_tag in document.getElementsByTagName("interface"):
1438
# Fix argument name for the GetManagedObjects method
1439
if (if_tag.getAttribute("name")
1440
== dbus.OBJECT_MANAGER_IFACE):
1441
for cn in if_tag.getElementsByTagName("method"):
1442
if (cn.getAttribute("name")
1443
== "GetManagedObjects"):
1444
for arg in cn.getElementsByTagName("arg"):
1445
if (arg.getAttribute("direction")
1446
== "out"):
1447
arg.setAttribute(
1448
"name",
1449
"objpath_interfaces"
1450
"_and_properties")
1451
xmlstring = document.toxml("utf-8")
1452
document.unlink()
1453
except (AttributeError, xml.dom.DOMException,
1454
xml.parsers.expat.ExpatError) as error:
1455
logger.error("Failed to override Introspection method",
1456
exc_info = error)
1457
return xmlstring
1028
1458
1029
1459
def datetime_to_dbus(dt, variant_level=0):
1030
1460
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1031
1461
if dt is None:
1032
1462
return dbus.String("", variant_level = variant_level)
1033
return dbus.String(dt.isoformat(),
1034
variant_level=variant_level)
1463
return dbus.String(dt.isoformat(), variant_level=variant_level)
1035
1464
1036
1465
1037
1466
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1057
1486
(from DBusObjectWithProperties) and interfaces (from the
1058
1487
dbus_interface_annotations decorator).
1059
1488
"""
1489
1060
1490
def wrapper(cls):
1061
1491
for orig_interface_name, alt_interface_name in (
1062
alt_interface_names.items()):
1492
alt_interface_names.items()):
1063
1493
attr = {}
1064
1494
interface_names = set()
1065
1495
# Go though all attributes of the class
1067
1497
# Ignore non-D-Bus attributes, and D-Bus attributes
1068
1498
# with the wrong interface name
1069
1499
if (not hasattr(attribute, "_dbus_interface")
1070
or not attribute._dbus_interface
1071
.startswith(orig_interface_name)):
1500
or not attribute._dbus_interface.startswith(
1501
orig_interface_name)):
1072
1502
continue
1073
1503
# Create an alternate D-Bus interface name based on
1074
1504
# the current name
1075
alt_interface = (attribute._dbus_interface
1076
.replace(orig_interface_name,
1077
alt_interface_name))
1505
alt_interface = attribute._dbus_interface.replace(
1506
orig_interface_name, alt_interface_name)
1078
1507
interface_names.add(alt_interface)
1079
1508
# Is this a D-Bus signal?
1080
1509
if getattr(attribute, "_dbus_is_signal", False):
1081
# Extract the original non-method undecorated
1082
# function by black magic
1083
nonmethod_func = (dict(
1510
if sys.version_info.major == 2:
1511
# Extract the original non-method undecorated
1512
# function by black magic
1513
nonmethod_func = (dict(
1084
1514
zip(attribute.func_code.co_freevars,
1085
attribute.__closure__))["func"]
1086
.cell_contents)
1515
attribute.__closure__))
1516
["func"].cell_contents)
1517
else:
1518
nonmethod_func = attribute
1087
1519
# Create a new, but exactly alike, function
1088
1520
# object, and decorate it to be a new D-Bus signal
1089
1521
# with the alternate D-Bus interface name
1090
new_function = (dbus.service.signal
1091
(alt_interface,
1092
attribute._dbus_signature)
1093
(types.FunctionType(
1094
nonmethod_func.func_code,
1095
nonmethod_func.func_globals,
1096
nonmethod_func.func_name,
1097
nonmethod_func.func_defaults,
1098
nonmethod_func.func_closure)))
1522
if sys.version_info.major == 2:
1523
new_function = types.FunctionType(
1524
nonmethod_func.func_code,
1525
nonmethod_func.func_globals,
1526
nonmethod_func.func_name,
1527
nonmethod_func.func_defaults,
1528
nonmethod_func.func_closure)
1529
else:
1530
new_function = types.FunctionType(
1531
nonmethod_func.__code__,
1532
nonmethod_func.__globals__,
1533
nonmethod_func.__name__,
1534
nonmethod_func.__defaults__,
1535
nonmethod_func.__closure__)
1536
new_function = (dbus.service.signal(
1537
alt_interface,
1538
attribute._dbus_signature)(new_function))
1099
1539
# Copy annotations, if any
1100
1540
try:
1101
new_function._dbus_annotations = (
1102
dict(attribute._dbus_annotations))
1541
new_function._dbus_annotations = dict(
1542
attribute._dbus_annotations)
1103
1543
except AttributeError:
1104
1544
pass
1105
1545
# Define a creator of a function to call both the
1110
1550
"""This function is a scope container to pass
1111
1551
func1 and func2 to the "call_both" function
1112
1552
outside of its arguments"""
1553
1554
@functools.wraps(func2)
1113
1555
def call_both(*args, **kwargs):
1114
1556
"""This function will emit two D-Bus
1115
1557
signals by calling func1 and func2"""
1116
1558
func1(*args, **kwargs)
1117
1559
func2(*args, **kwargs)
1560
# Make wrapper function look like a D-Bus signal
1561
for name, attr in inspect.getmembers(func2):
1562
if name.startswith("_dbus_"):
1563
setattr(call_both, name, attr)
1564
1118
1565
return call_both
1119
1566
# Create the "call_both" function and add it to
1120
1567
# the class
1125
1572
# object. Decorate it to be a new D-Bus method
1126
1573
# with the alternate D-Bus interface name. Add it
1127
1574
# to the class.
1128
attr[attrname] = (dbus.service.method
1129
(alt_interface,
1130
attribute._dbus_in_signature,
1131
attribute._dbus_out_signature)
1132
(types.FunctionType
1133
(attribute.func_code,
1134
attribute.func_globals,
1135
attribute.func_name,
1136
attribute.func_defaults,
1137
attribute.func_closure)))
1575
attr[attrname] = (
1576
dbus.service.method(
1577
alt_interface,
1578
attribute._dbus_in_signature,
1579
attribute._dbus_out_signature)
1580
(types.FunctionType(attribute.func_code,
1581
attribute.func_globals,
1582
attribute.func_name,
1583
attribute.func_defaults,
1584
attribute.func_closure)))
1138
1585
# Copy annotations, if any
1139
1586
try:
1140
attr[attrname]._dbus_annotations = (
1141
dict(attribute._dbus_annotations))
1587
attr[attrname]._dbus_annotations = dict(
1588
attribute._dbus_annotations)
1142
1589
except AttributeError:
1143
1590
pass
1144
1591
# Is this a D-Bus property?
1147
1594
# object, and decorate it to be a new D-Bus
1148
1595
# property with the alternate D-Bus interface
1149
1596
# name. Add it to the class.
1150
attr[attrname] = (dbus_service_property
1151
(alt_interface,
1152
attribute._dbus_signature,
1153
attribute._dbus_access,
1154
attribute
1155
._dbus_get_args_options
1156
["byte_arrays"])
1157
(types.FunctionType
1158
(attribute.func_code,
1159
attribute.func_globals,
1160
attribute.func_name,
1161
attribute.func_defaults,
1162
attribute.func_closure)))
1597
attr[attrname] = (dbus_service_property(
1598
alt_interface, attribute._dbus_signature,
1599
attribute._dbus_access,
1600
attribute._dbus_get_args_options
1601
["byte_arrays"])
1602
(types.FunctionType(
1603
attribute.func_code,
1604
attribute.func_globals,
1605
attribute.func_name,
1606
attribute.func_defaults,
1607
attribute.func_closure)))
1163
1608
# Copy annotations, if any
1164
1609
try:
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1610
attr[attrname]._dbus_annotations = dict(
1611
attribute._dbus_annotations)
1167
1612
except AttributeError:
1168
1613
pass
1169
1614
# Is this a D-Bus interface?
1172
1617
# object. Decorate it to be a new D-Bus interface
1173
1618
# with the alternate D-Bus interface name. Add it
1174
1619
# to the class.
1175
attr[attrname] = (dbus_interface_annotations
1176
(alt_interface)
1177
(types.FunctionType
1178
(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1620
attr[attrname] = (
1621
dbus_interface_annotations(alt_interface)
1622
(types.FunctionType(attribute.func_code,
1623
attribute.func_globals,
1624
attribute.func_name,
1625
attribute.func_defaults,
1626
attribute.func_closure)))
1183
1627
if deprecate:
1184
1628
# Deprecate all alternate interfaces
1185
1629
iname="_AlternateDBusNames_interface_annotation{}"
1186
1630
for interface_name in interface_names:
1631
1187
1632
@dbus_interface_annotations(interface_name)
1188
1633
def func(self):
1189
1634
return { "org.freedesktop.DBus.Deprecated":
1190
"true" }
1635
"true" }
1191
1636
# Find an unused name
1192
1637
for aname in (iname.format(i)
1193
1638
for i in itertools.count()):
1198
1643
# Replace the class with a new subclass of it with
1199
1644
# methods, signals, etc. as created above.
1200
1645
cls = type(b"{}Alternate".format(cls.__name__),
1201
(cls,), attr)
1646
(cls, ), attr)
1202
1647
return cls
1648
1203
1649
return wrapper
1204
1650
1205
1651
1206
1652
@alternate_dbus_interfaces({"se.recompile.Mandos":
1207
"se.bsnet.fukt.Mandos"})
1653
"se.bsnet.fukt.Mandos"})
1208
1654
class ClientDBus(Client, DBusObjectWithProperties):
1209
1655
"""A Client class using D-Bus
1210
1656
1214
1660
"""
1215
1661
1216
1662
runtime_expansions = (Client.runtime_expansions
1217
+ ("dbus_object_path",))
1663
+ ("dbus_object_path", ))
1664
1665
_interface = "se.recompile.Mandos.Client"
1218
1666
1219
1667
# dbus.service.Object doesn't use super(), so we can't either.
1220
1668
1223
1671
Client.__init__(self, *args, **kwargs)
1224
1672
# Only now, when this client is initialized, can it show up on
1225
1673
# the D-Bus
1226
client_object_name = unicode(self.name).translate(
1674
client_object_name = str(self.name).translate(
1227
1675
{ord("."): ord("_"),
1228
1676
ord("-"): ord("_")})
1229
self.dbus_object_path = (dbus.ObjectPath
1230
("/clients/" + client_object_name))
1677
self.dbus_object_path = dbus.ObjectPath(
1678
"/clients/" + client_object_name)
1231
1679
DBusObjectWithProperties.__init__(self, self.bus,
1232
1680
self.dbus_object_path)
1233
1681
1234
def notifychangeproperty(transform_func,
1235
dbus_name, type_func=lambda x: x,
1236
variant_level=1):
1682
def notifychangeproperty(transform_func, dbus_name,
1683
type_func=lambda x: x,
1684
variant_level=1,
1685
invalidate_only=False,
1686
_interface=_interface):
1237
1687
""" Modify a variable so that it's a property which announces
1238
1688
its changes to DBus.
1239
1689
1245
1695
variant_level: D-Bus variant level. Default: 1
1246
1696
"""
1247
1697
attrname = "_{}".format(dbus_name)
1698
1248
1699
def setter(self, value):
1249
1700
if hasattr(self, "dbus_object_path"):
1250
1701
if (not hasattr(self, attrname) or
1251
1702
type_func(getattr(self, attrname, None))
1252
1703
!= type_func(value)):
1253
dbus_value = transform_func(type_func(value),
1254
variant_level
1255
=variant_level)
1256
self.PropertyChanged(dbus.String(dbus_name),
1257
dbus_value)
1704
if invalidate_only:
1705
self.PropertiesChanged(
1706
_interface, dbus.Dictionary(),
1707
dbus.Array((dbus_name, )))
1708
else:
1709
dbus_value = transform_func(
1710
type_func(value),
1711
variant_level = variant_level)
1712
self.PropertyChanged(dbus.String(dbus_name),
1713
dbus_value)
1714
self.PropertiesChanged(
1715
_interface,
1716
dbus.Dictionary({ dbus.String(dbus_name):
1717
dbus_value }),
1718
dbus.Array())
1258
1719
setattr(self, attrname, value)
1259
1720
1260
1721
return property(lambda self: getattr(self, attrname), setter)
1266
1727
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1267
1728
last_enabled = notifychangeproperty(datetime_to_dbus,
1268
1729
"LastEnabled")
1269
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1270
type_func = lambda checker:
1271
checker is not None)
1730
checker = notifychangeproperty(
1731
dbus.Boolean, "CheckerRunning",
1732
type_func = lambda checker: checker is not None)
1272
1733
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1273
1734
"LastCheckedOK")
1274
1735
last_checker_status = notifychangeproperty(dbus.Int16,
1277
1738
datetime_to_dbus, "LastApprovalRequest")
1278
1739
approved_by_default = notifychangeproperty(dbus.Boolean,
1279
1740
"ApprovedByDefault")
1280
approval_delay = notifychangeproperty(dbus.UInt64,
1281
"ApprovalDelay",
1282
type_func =
1283
lambda td: td.total_seconds()
1284
* 1000)
1741
approval_delay = notifychangeproperty(
1742
dbus.UInt64, "ApprovalDelay",
1743
type_func = lambda td: td.total_seconds() * 1000)
1285
1744
approval_duration = notifychangeproperty(
1286
1745
dbus.UInt64, "ApprovalDuration",
1287
1746
type_func = lambda td: td.total_seconds() * 1000)
1288
1747
host = notifychangeproperty(dbus.String, "Host")
1289
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1290
type_func = lambda td:
1291
td.total_seconds() * 1000)
1748
timeout = notifychangeproperty(
1749
dbus.UInt64, "Timeout",
1750
type_func = lambda td: td.total_seconds() * 1000)
1292
1751
extended_timeout = notifychangeproperty(
1293
1752
dbus.UInt64, "ExtendedTimeout",
1294
1753
type_func = lambda td: td.total_seconds() * 1000)
1295
interval = notifychangeproperty(dbus.UInt64,
1296
"Interval",
1297
type_func =
1298
lambda td: td.total_seconds()
1299
* 1000)
1754
interval = notifychangeproperty(
1755
dbus.UInt64, "Interval",
1756
type_func = lambda td: td.total_seconds() * 1000)
1300
1757
checker_command = notifychangeproperty(dbus.String, "Checker")
1758
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1759
invalidate_only=True)
1301
1760
1302
1761
del notifychangeproperty
1303
1762
1310
1769
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1311
1770
Client.__del__(self, *args, **kwargs)
1312
1771
1313
def checker_callback(self, pid, condition, command,
1314
*args, **kwargs):
1315
self.checker_callback_tag = None
1316
self.checker = None
1317
if os.WIFEXITED(condition):
1318
exitstatus = os.WEXITSTATUS(condition)
1772
def checker_callback(self, source, condition,
1773
connection, command, *args, **kwargs):
1774
ret = Client.checker_callback(self, source, condition,
1775
connection, command, *args,
1776
**kwargs)
1777
exitstatus = self.last_checker_status
1778
if exitstatus >= 0:
1319
1779
# Emit D-Bus signal
1320
1780
self.CheckerCompleted(dbus.Int16(exitstatus),
1321
dbus.Int64(condition),
1781
# This is specific to GNU libC
1782
dbus.Int64(exitstatus << 8),
1322
1783
dbus.String(command))
1323
1784
else:
1324
1785
# Emit D-Bus signal
1325
1786
self.CheckerCompleted(dbus.Int16(-1),
1326
dbus.Int64(condition),
1787
dbus.Int64(
1788
# This is specific to GNU libC
1789
(exitstatus << 8)
1790
| self.last_checker_signal),
1327
1791
dbus.String(command))
1328
1329
return Client.checker_callback(self, pid, condition, command,
1330
*args, **kwargs)
1792
return ret
1331
1793
1332
1794
def start_checker(self, *args, **kwargs):
1333
1795
old_checker_pid = getattr(self.checker, "pid", None)
1350
1812
self.send_changedstate()
1351
1813
1352
1814
## D-Bus methods, signals & properties
1353
_interface = "se.recompile.Mandos.Client"
1354
1815
1355
1816
## Interfaces
1356
1817
1357
@dbus_interface_annotations(_interface)
1358
def _foo(self):
1359
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1360
"false"}
1361
1362
1818
## Signals
1363
1819
1364
1820
# CheckerCompleted - signal
1374
1830
pass
1375
1831
1376
1832
# PropertyChanged - signal
1833
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1377
1834
@dbus.service.signal(_interface, signature="sv")
1378
1835
def PropertyChanged(self, property, value):
1379
1836
"D-Bus signal"
1413
1870
self.checked_ok()
1414
1871
1415
1872
# Enable - method
1873
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1416
1874
@dbus.service.method(_interface)
1417
1875
def Enable(self):
1418
1876
"D-Bus method"
1419
1877
self.enable()
1420
1878
1421
1879
# StartChecker - method
1880
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1422
1881
@dbus.service.method(_interface)
1423
1882
def StartChecker(self):
1424
1883
"D-Bus method"
1425
1884
self.start_checker()
1426
1885
1427
1886
# Disable - method
1887
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1428
1888
@dbus.service.method(_interface)
1429
1889
def Disable(self):
1430
1890
"D-Bus method"
1431
1891
self.disable()
1432
1892
1433
1893
# StopChecker - method
1894
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1434
1895
@dbus.service.method(_interface)
1435
1896
def StopChecker(self):
1436
1897
self.stop_checker()
1443
1904
return dbus.Boolean(bool(self.approvals_pending))
1444
1905
1445
1906
# ApprovedByDefault - property
1446
@dbus_service_property(_interface, signature="b",
1907
@dbus_service_property(_interface,
1908
signature="b",
1447
1909
access="readwrite")
1448
1910
def ApprovedByDefault_dbus_property(self, value=None):
1449
1911
if value is None: # get
1451
1913
self.approved_by_default = bool(value)
1452
1914
1453
1915
# ApprovalDelay - property
1454
@dbus_service_property(_interface, signature="t",
1916
@dbus_service_property(_interface,
1917
signature="t",
1455
1918
access="readwrite")
1456
1919
def ApprovalDelay_dbus_property(self, value=None):
1457
1920
if value is None: # get
1460
1923
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1461
1924
1462
1925
# ApprovalDuration - property
1463
@dbus_service_property(_interface, signature="t",
1926
@dbus_service_property(_interface,
1927
signature="t",
1464
1928
access="readwrite")
1465
1929
def ApprovalDuration_dbus_property(self, value=None):
1466
1930
if value is None: # get
1469
1933
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1470
1934
1471
1935
# Name - property
1936
@dbus_annotations(
1937
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1472
1938
@dbus_service_property(_interface, signature="s", access="read")
1473
1939
def Name_dbus_property(self):
1474
1940
return dbus.String(self.name)
1475
1941
1476
1942
# Fingerprint - property
1943
@dbus_annotations(
1944
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1477
1945
@dbus_service_property(_interface, signature="s", access="read")
1478
1946
def Fingerprint_dbus_property(self):
1479
1947
return dbus.String(self.fingerprint)
1480
1948
1481
1949
# Host - property
1482
@dbus_service_property(_interface, signature="s",
1950
@dbus_service_property(_interface,
1951
signature="s",
1483
1952
access="readwrite")
1484
1953
def Host_dbus_property(self, value=None):
1485
1954
if value is None: # get
1486
1955
return dbus.String(self.host)
1487
self.host = unicode(value)
1956
self.host = str(value)
1488
1957
1489
1958
# Created - property
1959
@dbus_annotations(
1960
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1490
1961
@dbus_service_property(_interface, signature="s", access="read")
1491
1962
def Created_dbus_property(self):
1492
1963
return datetime_to_dbus(self.created)
1497
1968
return datetime_to_dbus(self.last_enabled)
1498
1969
1499
1970
# Enabled - property
1500
@dbus_service_property(_interface, signature="b",
1971
@dbus_service_property(_interface,
1972
signature="b",
1501
1973
access="readwrite")
1502
1974
def Enabled_dbus_property(self, value=None):
1503
1975
if value is None: # get
1508
1980
self.disable()
1509
1981
1510
1982
# LastCheckedOK - property
1511
@dbus_service_property(_interface, signature="s",
1983
@dbus_service_property(_interface,
1984
signature="s",
1512
1985
access="readwrite")
1513
1986
def LastCheckedOK_dbus_property(self, value=None):
1514
1987
if value is not None:
1517
1990
return datetime_to_dbus(self.last_checked_ok)
1518
1991
1519
1992
# LastCheckerStatus - property
1520
@dbus_service_property(_interface, signature="n",
1521
access="read")
1993
@dbus_service_property(_interface, signature="n", access="read")
1522
1994
def LastCheckerStatus_dbus_property(self):
1523
1995
return dbus.Int16(self.last_checker_status)
1524
1996
1533
2005
return datetime_to_dbus(self.last_approval_request)
1534
2006
1535
2007
# Timeout - property
1536
@dbus_service_property(_interface, signature="t",
2008
@dbus_service_property(_interface,
2009
signature="t",
1537
2010
access="readwrite")
1538
2011
def Timeout_dbus_property(self, value=None):
1539
2012
if value is None: # get
1552
2025
is None):
1553
2026
return
1554
2027
gobject.source_remove(self.disable_initiator_tag)
1555
self.disable_initiator_tag = (
1556
gobject.timeout_add(
1557
int((self.expires - now).total_seconds()
1558
* 1000), self.disable))
2028
self.disable_initiator_tag = gobject.timeout_add(
2029
int((self.expires - now).total_seconds() * 1000),
2030
self.disable)
1559
2031
1560
2032
# ExtendedTimeout - property
1561
@dbus_service_property(_interface, signature="t",
2033
@dbus_service_property(_interface,
2034
signature="t",
1562
2035
access="readwrite")
1563
2036
def ExtendedTimeout_dbus_property(self, value=None):
1564
2037
if value is None: # get
1567
2040
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1568
2041
1569
2042
# Interval - property
1570
@dbus_service_property(_interface, signature="t",
2043
@dbus_service_property(_interface,
2044
signature="t",
1571
2045
access="readwrite")
1572
2046
def Interval_dbus_property(self, value=None):
1573
2047
if value is None: # get
1578
2052
if self.enabled:
1579
2053
# Reschedule checker run
1580
2054
gobject.source_remove(self.checker_initiator_tag)
1581
self.checker_initiator_tag = (gobject.timeout_add
1582
(value, self.start_checker))
1583
self.start_checker() # Start one now, too
2055
self.checker_initiator_tag = gobject.timeout_add(
2056
value, self.start_checker)
2057
self.start_checker() # Start one now, too
1584
2058
1585
2059
# Checker - property
1586
@dbus_service_property(_interface, signature="s",
2060
@dbus_service_property(_interface,
2061
signature="s",
1587
2062
access="readwrite")
1588
2063
def Checker_dbus_property(self, value=None):
1589
2064
if value is None: # get
1590
2065
return dbus.String(self.checker_command)
1591
self.checker_command = unicode(value)
2066
self.checker_command = str(value)
1592
2067
1593
2068
# CheckerRunning - property
1594
@dbus_service_property(_interface, signature="b",
2069
@dbus_service_property(_interface,
2070
signature="b",
1595
2071
access="readwrite")
1596
2072
def CheckerRunning_dbus_property(self, value=None):
1597
2073
if value is None: # get
1602
2078
self.stop_checker()
1603
2079
1604
2080
# ObjectPath - property
2081
@dbus_annotations(
2082
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2083
"org.freedesktop.DBus.Deprecated": "true"})
1605
2084
@dbus_service_property(_interface, signature="o", access="read")
1606
2085
def ObjectPath_dbus_property(self):
1607
2086
return self.dbus_object_path # is already a dbus.ObjectPath
1608
2087
1609
2088
# Secret = property
1610
@dbus_service_property(_interface, signature="ay",
1611
access="write", byte_arrays=True)
2089
@dbus_annotations(
2090
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2091
"invalidates"})
2092
@dbus_service_property(_interface,
2093
signature="ay",
2094
access="write",
2095
byte_arrays=True)
1612
2096
def Secret_dbus_property(self, value):
1613
2097
self.secret = bytes(value)
1614
2098
1620
2104
self._pipe = child_pipe
1621
2105
self._pipe.send(('init', fpr, address))
1622
2106
if not self._pipe.recv():
1623
raise KeyError()
2107
raise KeyError(fpr)
1624
2108
1625
2109
def __getattribute__(self, name):
1626
2110
if name == '_pipe':
1630
2114
if data[0] == 'data':
1631
2115
return data[1]
1632
2116
if data[0] == 'function':
2117
1633
2118
def func(*args, **kwargs):
1634
2119
self._pipe.send(('funcall', name, args, kwargs))
1635
2120
return self._pipe.recv()[1]
2121
1636
2122
return func
1637
2123
1638
2124
def __setattr__(self, name, value):
1650
2136
def handle(self):
1651
2137
with contextlib.closing(self.server.child_pipe) as child_pipe:
1652
2138
logger.info("TCP connection from: %s",
1653
unicode(self.client_address))
2139
str(self.client_address))
1654
2140
logger.debug("Pipe FD: %d",
1655
2141
self.server.child_pipe.fileno())
1656
2142
1657
session = (gnutls.connection
1658
.ClientSession(self.request,
1659
gnutls.connection
1660
.X509Credentials()))
1661
1662
# Note: gnutls.connection.X509Credentials is really a
1663
# generic GnuTLS certificate credentials object so long as
1664
# no X.509 keys are added to it. Therefore, we can use it
1665
# here despite using OpenPGP certificates.
2143
session = gnutls.ClientSession(self.request)
1666
2144
1667
2145
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1668
2146
# "+AES-256-CBC", "+SHA1",
1672
2150
priority = self.server.gnutls_priority
1673
2151
if priority is None:
1674
2152
priority = "NORMAL"
1675
(gnutls.library.functions
1676
.gnutls_priority_set_direct(session._c_object,
1677
priority, None))
2153
gnutls.priority_set_direct(session._c_object, priority,
2154
None)
1678
2155
1679
2156
# Start communication using the Mandos protocol
1680
2157
# Get protocol number
1690
2167
# Start GnuTLS connection
1691
2168
try:
1692
2169
session.handshake()
1693
except gnutls.errors.GNUTLSError as error:
2170
except gnutls.Error as error:
1694
2171
logger.warning("Handshake failed: %s", error)
1695
2172
# Do not run session.bye() here: the session is not
1696
2173
# established. Just abandon the request.
1700
2177
approval_required = False
1701
2178
try:
1702
2179
try:
1703
fpr = self.fingerprint(self.peer_certificate
1704
(session))
1705
except (TypeError,
1706
gnutls.errors.GNUTLSError) as error:
2180
fpr = self.fingerprint(
2181
self.peer_certificate(session))
2182
except (TypeError, gnutls.Error) as error:
1707
2183
logger.warning("Bad certificate: %s", error)
1708
2184
return
1709
2185
logger.debug("Fingerprint: %s", fpr)
1722
2198
while True:
1723
2199
if not client.enabled:
1724
2200
logger.info("Client %s is disabled",
1725
client.name)
2201
client.name)
1726
2202
if self.server.use_dbus:
1727
2203
# Emit D-Bus signal
1728
2204
client.Rejected("Disabled")
1767
2243
else:
1768
2244
delay -= time2 - time
1769
2245
1770
sent_size = 0
1771
while sent_size < len(client.secret):
1772
try:
1773
sent = session.send(client.secret[sent_size:])
1774
except gnutls.errors.GNUTLSError as error:
1775
logger.warning("gnutls send failed",
1776
exc_info=error)
1777
return
1778
logger.debug("Sent: %d, remaining: %d",
1779
sent, len(client.secret)
1780
- (sent_size + sent))
1781
sent_size += sent
2246
try:
2247
session.send(client.secret)
2248
except gnutls.Error as error:
2249
logger.warning("gnutls send failed",
2250
exc_info = error)
2251
return
1782
2252
1783
2253
logger.info("Sending secret to %s", client.name)
1784
2254
# bump the timeout using extended_timeout
1792
2262
client.approvals_pending -= 1
1793
2263
try:
1794
2264
session.bye()
1795
except gnutls.errors.GNUTLSError as error:
2265
except gnutls.Error as error:
1796
2266
logger.warning("GnuTLS bye failed",
1797
2267
exc_info=error)
1798
2268
1800
2270
def peer_certificate(session):
1801
2271
"Return the peer's OpenPGP certificate as a bytestring"
1802
2272
# If not an OpenPGP certificate...
1803
if (gnutls.library.functions
1804
.gnutls_certificate_type_get(session._c_object)
1805
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1806
# ...do the normal thing
1807
return session.peer_certificate
2273
if (gnutls.certificate_type_get(session._c_object)
2274
!= gnutls.CRT_OPENPGP):
2275
# ...return invalid data
2276
return b""
1808
2277
list_size = ctypes.c_uint(1)
1809
cert_list = (gnutls.library.functions
1810
.gnutls_certificate_get_peers
2278
cert_list = (gnutls.certificate_get_peers
1811
2279
(session._c_object, ctypes.byref(list_size)))
1812
2280
if not bool(cert_list) and list_size.value != 0:
1813
raise gnutls.errors.GNUTLSError("error getting peer"
1814
" certificate")
2281
raise gnutls.Error("error getting peer certificate")
1815
2282
if list_size.value == 0:
1816
2283
return None
1817
2284
cert = cert_list[0]
1821
2288
def fingerprint(openpgp):
1822
2289
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1823
2290
# New GnuTLS "datum" with the OpenPGP public key
1824
datum = (gnutls.library.types
1825
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1826
ctypes.POINTER
1827
(ctypes.c_ubyte)),
1828
ctypes.c_uint(len(openpgp))))
2291
datum = gnutls.datum_t(
2292
ctypes.cast(ctypes.c_char_p(openpgp),
2293
ctypes.POINTER(ctypes.c_ubyte)),
2294
ctypes.c_uint(len(openpgp)))
1829
2295
# New empty GnuTLS certificate
1830
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1831
(gnutls.library.functions
1832
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2296
crt = gnutls.openpgp_crt_t()
2297
gnutls.openpgp_crt_init(ctypes.byref(crt))
1833
2298
# Import the OpenPGP public key into the certificate
1834
(gnutls.library.functions
1835
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1836
gnutls.library.constants
1837
.GNUTLS_OPENPGP_FMT_RAW))
2299
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2300
gnutls.OPENPGP_FMT_RAW)
1838
2301
# Verify the self signature in the key
1839
2302
crtverify = ctypes.c_uint()
1840
(gnutls.library.functions
1841
.gnutls_openpgp_crt_verify_self(crt, 0,
1842
ctypes.byref(crtverify)))
2303
gnutls.openpgp_crt_verify_self(crt, 0,
2304
ctypes.byref(crtverify))
1843
2305
if crtverify.value != 0:
1844
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1845
raise (gnutls.errors.CertificateSecurityError
1846
("Verify failed"))
2306
gnutls.openpgp_crt_deinit(crt)
2307
raise gnutls.CertificateSecurityError("Verify failed")
1847
2308
# New buffer for the fingerprint
1848
2309
buf = ctypes.create_string_buffer(20)
1849
2310
buf_len = ctypes.c_size_t()
1850
2311
# Get the fingerprint from the certificate into the buffer
1851
(gnutls.library.functions
1852
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1853
ctypes.byref(buf_len)))
2312
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2313
ctypes.byref(buf_len))
1854
2314
# Deinit the certificate
1855
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2315
gnutls.openpgp_crt_deinit(crt)
1856
2316
# Convert the buffer to a Python bytestring
1857
2317
fpr = ctypes.string_at(buf, buf_len.value)
1858
2318
# Convert the bytestring to hexadecimal notation
1862
2322
1863
2323
class MultiprocessingMixIn(object):
1864
2324
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2325
1865
2326
def sub_process_main(self, request, address):
1866
2327
try:
1867
2328
self.finish_request(request, address)
1879
2340
1880
2341
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1881
2342
""" adds a pipe to the MixIn """
2343
1882
2344
def process_request(self, request, client_address):
1883
2345
"""Overrides and wraps the original process_request().
1884
2346
1905
2367
interface: None or a network interface name (string)
1906
2368
use_ipv6: Boolean; to use IPv6 or not
1907
2369
"""
2370
1908
2371
def __init__(self, server_address, RequestHandlerClass,
1909
interface=None, use_ipv6=True, socketfd=None):
2372
interface=None,
2373
use_ipv6=True,
2374
socketfd=None):
1910
2375
"""If socketfd is set, use that file descriptor instead of
1911
2376
creating a new one with socket.socket().
1912
2377
"""
1953
2418
self.interface)
1954
2419
else:
1955
2420
try:
1956
self.socket.setsockopt(socket.SOL_SOCKET,
1957
SO_BINDTODEVICE,
1958
(self.interface + "\0")
1959
.encode("utf-8"))
2421
self.socket.setsockopt(
2422
socket.SOL_SOCKET, SO_BINDTODEVICE,
2423
(self.interface + "\0").encode("utf-8"))
1960
2424
except socket.error as error:
1961
2425
if error.errno == errno.EPERM:
1962
2426
logger.error("No permission to bind to"
1980
2444
self.server_address = (any_address,
1981
2445
self.server_address[1])
1982
2446
elif not self.server_address[1]:
1983
self.server_address = (self.server_address[0],
1984
0)
2447
self.server_address = (self.server_address[0], 0)
1985
2448
# if self.interface:
1986
2449
# self.server_address = (self.server_address[0],
1987
2450
# 0, # port
2001
2464
2002
2465
Assumes a gobject.MainLoop event loop.
2003
2466
"""
2467
2004
2468
def __init__(self, server_address, RequestHandlerClass,
2005
interface=None, use_ipv6=True, clients=None,
2006
gnutls_priority=None, use_dbus=True, socketfd=None):
2469
interface=None,
2470
use_ipv6=True,
2471
clients=None,
2472
gnutls_priority=None,
2473
use_dbus=True,
2474
socketfd=None):
2007
2475
self.enabled = False
2008
2476
self.clients = clients
2009
2477
if self.clients is None:
2015
2483
interface = interface,
2016
2484
use_ipv6 = use_ipv6,
2017
2485
socketfd = socketfd)
2486
2018
2487
def server_activate(self):
2019
2488
if self.enabled:
2020
2489
return socketserver.TCPServer.server_activate(self)
2024
2493
2025
2494
def add_pipe(self, parent_pipe, proc):
2026
2495
# Call "handle_ipc" for both data and EOF events
2027
gobject.io_add_watch(parent_pipe.fileno(),
2028
gobject.IO_IN | gobject.IO_HUP,
2029
functools.partial(self.handle_ipc,
2030
parent_pipe =
2031
parent_pipe,
2032
proc = proc))
2496
gobject.io_add_watch(
2497
parent_pipe.fileno(),
2498
gobject.IO_IN | gobject.IO_HUP,
2499
functools.partial(self.handle_ipc,
2500
parent_pipe = parent_pipe,
2501
proc = proc))
2033
2502
2034
def handle_ipc(self, source, condition, parent_pipe=None,
2035
proc = None, client_object=None):
2503
def handle_ipc(self, source, condition,
2504
parent_pipe=None,
2505
proc = None,
2506
client_object=None):
2036
2507
# error, or the other end of multiprocessing.Pipe has closed
2037
2508
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2038
2509
# Wait for other process to exit
2061
2532
parent_pipe.send(False)
2062
2533
return False
2063
2534
2064
gobject.io_add_watch(parent_pipe.fileno(),
2065
gobject.IO_IN | gobject.IO_HUP,
2066
functools.partial(self.handle_ipc,
2067
parent_pipe =
2068
parent_pipe,
2069
proc = proc,
2070
client_object =
2071
client))
2535
gobject.io_add_watch(
2536
parent_pipe.fileno(),
2537
gobject.IO_IN | gobject.IO_HUP,
2538
functools.partial(self.handle_ipc,
2539
parent_pipe = parent_pipe,
2540
proc = proc,
2541
client_object = client))
2072
2542
parent_pipe.send(True)
2073
2543
# remove the old hook in favor of the new above hook on
2074
2544
# same fileno
2080
2550
2081
2551
parent_pipe.send(('data', getattr(client_object,
2082
2552
funcname)(*args,
2083
**kwargs)))
2553
**kwargs)))
2084
2554
2085
2555
if command == 'getattr':
2086
2556
attrname = request[1]
2087
if callable(client_object.__getattribute__(attrname)):
2088
parent_pipe.send(('function',))
2557
if isinstance(client_object.__getattribute__(attrname),
2558
collections.Callable):
2559
parent_pipe.send(('function', ))
2089
2560
else:
2090
parent_pipe.send(('data', client_object
2091
.__getattribute__(attrname)))
2561
parent_pipe.send((
2562
'data', client_object.__getattribute__(attrname)))
2092
2563
2093
2564
if command == 'setattr':
2094
2565
attrname = request[1]
2125
2596
# avoid excessive use of external libraries.
2126
2597
2127
2598
# New type for defining tokens, syntax, and semantics all-in-one
2128
Token = collections.namedtuple("Token",
2129
("regexp", # To match token; if
2130
# "value" is not None,
2131
# must have a "group"
2132
# containing digits
2133
"value", # datetime.timedelta or
2134
# None
2135
"followers")) # Tokens valid after
2136
# this token
2599
Token = collections.namedtuple("Token", (
2600
"regexp", # To match token; if "value" is not None, must have
2601
# a "group" containing digits
2602
"value", # datetime.timedelta or None
2603
"followers")) # Tokens valid after this token
2137
2604
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2138
2605
# the "duration" ABNF definition in RFC 3339, Appendix A.
2139
2606
token_end = Token(re.compile(r"$"), None, frozenset())
2140
2607
token_second = Token(re.compile(r"(\d+)S"),
2141
2608
datetime.timedelta(seconds=1),
2142
frozenset((token_end,)))
2609
frozenset((token_end, )))
2143
2610
token_minute = Token(re.compile(r"(\d+)M"),
2144
2611
datetime.timedelta(minutes=1),
2145
2612
frozenset((token_second, token_end)))
2161
2628
frozenset((token_month, token_end)))
2162
2629
token_week = Token(re.compile(r"(\d+)W"),
2163
2630
datetime.timedelta(weeks=1),
2164
frozenset((token_end,)))
2631
frozenset((token_end, )))
2165
2632
token_duration = Token(re.compile(r"P"), None,
2166
2633
frozenset((token_year, token_month,
2167
2634
token_day, token_time,
2169
2636
# Define starting values
2170
2637
value = datetime.timedelta() # Value so far
2171
2638
found_token = None
2172
followers = frozenset((token_duration,)) # Following valid tokens
2639
followers = frozenset((token_duration, )) # Following valid tokens
2173
2640
s = duration # String left to parse
2174
2641
# Loop until end token is found
2175
2642
while found_token is not token_end:
2192
2659
break
2193
2660
else:
2194
2661
# No currently valid tokens were found
2195
raise ValueError("Invalid RFC 3339 duration")
2662
raise ValueError("Invalid RFC 3339 duration: {!r}"
2663
.format(duration))
2196
2664
# End token found
2197
2665
return value
2198
2666
2235
2703
elif suffix == "w":
2236
2704
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2237
2705
else:
2238
raise ValueError("Unknown suffix {!r}"
2239
.format(suffix))
2706
raise ValueError("Unknown suffix {!r}".format(suffix))
2240
2707
except IndexError as e:
2241
2708
raise ValueError(*(e.args))
2242
2709
timevalue += delta
2258
2725
# Close all standard open file descriptors
2259
2726
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2260
2727
if not stat.S_ISCHR(os.fstat(null).st_mode):
2261
raise OSError(errno.ENODEV, "{} not a character device"
2728
raise OSError(errno.ENODEV,
2729
"{} not a character device"
2262
2730
.format(os.devnull))
2263
2731
os.dup2(null, sys.stdin.fileno())
2264
2732
os.dup2(null, sys.stdout.fileno())
2330
2798
"port": "",
2331
2799
"debug": "False",
2332
2800
"priority":
2333
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2801
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2802
":+SIGN-DSA-SHA256",
2334
2803
"servicename": "Mandos",
2335
2804
"use_dbus": "True",
2336
2805
"use_ipv6": "True",
2340
2809
"statedir": "/var/lib/mandos",
2341
2810
"foreground": "False",
2342
2811
"zeroconf": "True",
2343
}
2812
}
2344
2813
2345
2814
# Parse config file for server-global settings
2346
2815
server_config = configparser.SafeConfigParser(server_defaults)
2347
2816
del server_defaults
2348
server_config.read(os.path.join(options.configdir,
2349
"mandos.conf"))
2817
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2350
2818
# Convert the SafeConfigParser object to a dict
2351
2819
server_settings = server_config.defaults()
2352
2820
# Use the appropriate methods on the non-string config options
2370
2838
# Override the settings from the config file with command line
2371
2839
# options, if set.
2372
2840
for option in ("interface", "address", "port", "debug",
2373
"priority", "servicename", "configdir",
2374
"use_dbus", "use_ipv6", "debuglevel", "restore",
2375
"statedir", "socket", "foreground", "zeroconf"):
2841
"priority", "servicename", "configdir", "use_dbus",
2842
"use_ipv6", "debuglevel", "restore", "statedir",
2843
"socket", "foreground", "zeroconf"):
2376
2844
value = getattr(options, option)
2377
2845
if value is not None:
2378
2846
server_settings[option] = value
2393
2861
2394
2862
##################################################################
2395
2863
2396
if (not server_settings["zeroconf"] and
2397
not (server_settings["port"]
2398
or server_settings["socket"] != "")):
2399
parser.error("Needs port or socket to work without"
2400
" Zeroconf")
2864
if (not server_settings["zeroconf"]
2865
and not (server_settings["port"]
2866
or server_settings["socket"] != "")):
2867
parser.error("Needs port or socket to work without Zeroconf")
2401
2868
2402
2869
# For convenience
2403
2870
debug = server_settings["debug"]
2419
2886
initlogger(debug, level)
2420
2887
2421
2888
if server_settings["servicename"] != "Mandos":
2422
syslogger.setFormatter(logging.Formatter
2423
('Mandos ({}) [%(process)d]:'
2424
' %(levelname)s: %(message)s'
2425
.format(server_settings
2426
["servicename"])))
2889
syslogger.setFormatter(
2890
logging.Formatter('Mandos ({}) [%(process)d]:'
2891
' %(levelname)s: %(message)s'.format(
2892
server_settings["servicename"])))
2427
2893
2428
2894
# Parse config file with clients
2429
2895
client_config = configparser.SafeConfigParser(Client
2437
2903
socketfd = None
2438
2904
if server_settings["socket"] != "":
2439
2905
socketfd = server_settings["socket"]
2440
tcp_server = MandosServer((server_settings["address"],
2441
server_settings["port"]),
2442
ClientHandler,
2443
interface=(server_settings["interface"]
2444
or None),
2445
use_ipv6=use_ipv6,
2446
gnutls_priority=
2447
server_settings["priority"],
2448
use_dbus=use_dbus,
2449
socketfd=socketfd)
2906
tcp_server = MandosServer(
2907
(server_settings["address"], server_settings["port"]),
2908
ClientHandler,
2909
interface=(server_settings["interface"] or None),
2910
use_ipv6=use_ipv6,
2911
gnutls_priority=server_settings["priority"],
2912
use_dbus=use_dbus,
2913
socketfd=socketfd)
2450
2914
if not foreground:
2451
2915
pidfilename = "/run/mandos.pid"
2452
2916
if not os.path.isdir("/run/."):
2453
2917
pidfilename = "/var/run/mandos.pid"
2454
2918
pidfile = None
2455
2919
try:
2456
pidfile = open(pidfilename, "w")
2920
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2457
2921
except IOError as e:
2458
2922
logger.error("Could not open file %r", pidfilename,
2459
2923
exc_info=e)
2460
2924
2461
for name in ("_mandos", "mandos", "nobody"):
2925
for name, group in (("_mandos", "_mandos"),
2926
("mandos", "mandos"),
2927
("nobody", "nogroup")):
2462
2928
try:
2463
2929
uid = pwd.getpwnam(name).pw_uid
2464
gid = pwd.getpwnam(name).pw_gid
2930
gid = pwd.getpwnam(group).pw_gid
2465
2931
break
2466
2932
except KeyError:
2467
2933
continue
2480
2946
2481
2947
# "Use a log level over 10 to enable all debugging options."
2482
2948
# - GnuTLS manual
2483
gnutls.library.functions.gnutls_global_set_log_level(11)
2949
gnutls.global_set_log_level(11)
2484
2950
2485
@gnutls.library.types.gnutls_log_func
2951
@gnutls.log_func
2486
2952
def debug_gnutls(level, string):
2487
2953
logger.debug("GnuTLS: %s", string[:-1])
2488
2954
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
2955
gnutls.global_set_log_function(debug_gnutls)
2491
2956
2492
2957
# Redirect stdin so all checkers get /dev/null
2493
2958
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2513
2978
if use_dbus:
2514
2979
try:
2515
2980
bus_name = dbus.service.BusName("se.recompile.Mandos",
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2519
do_not_queue=True))
2520
except dbus.exceptions.NameExistsException as e:
2981
bus,
2982
do_not_queue=True)
2983
old_bus_name = dbus.service.BusName(
2984
"se.bsnet.fukt.Mandos", bus,
2985
do_not_queue=True)
2986
except dbus.exceptions.DBusException as e:
2521
2987
logger.error("Disabling D-Bus:", exc_info=e)
2522
2988
use_dbus = False
2523
2989
server_settings["use_dbus"] = False
2524
2990
tcp_server.use_dbus = False
2525
2991
if zeroconf:
2526
2992
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2527
service = AvahiServiceToSyslog(name =
2528
server_settings["servicename"],
2529
servicetype = "_mandos._tcp",
2530
protocol = protocol, bus = bus)
2993
service = AvahiServiceToSyslog(
2994
name = server_settings["servicename"],
2995
servicetype = "_mandos._tcp",
2996
protocol = protocol,
2997
bus = bus)
2531
2998
if server_settings["interface"]:
2532
service.interface = (if_nametoindex
2533
(server_settings["interface"]
2534
.encode("utf-8")))
2999
service.interface = if_nametoindex(
3000
server_settings["interface"].encode("utf-8"))
2535
3001
2536
3002
global multiprocessing_manager
2537
3003
multiprocessing_manager = multiprocessing.Manager()
2556
3022
if server_settings["restore"]:
2557
3023
try:
2558
3024
with open(stored_state_path, "rb") as stored_state:
2559
clients_data, old_client_settings = (pickle.load
2560
(stored_state))
3025
clients_data, old_client_settings = pickle.load(
3026
stored_state)
2561
3027
os.remove(stored_state_path)
2562
3028
except IOError as e:
2563
3029
if e.errno == errno.ENOENT:
2564
logger.warning("Could not load persistent state: {}"
2565
.format(os.strerror(e.errno)))
3030
logger.warning("Could not load persistent state:"
3031
" {}".format(os.strerror(e.errno)))
2566
3032
else:
2567
3033
logger.critical("Could not load persistent state:",
2568
3034
exc_info=e)
2569
3035
raise
2570
3036
except EOFError as e:
2571
3037
logger.warning("Could not load persistent state: "
2572
"EOFError:", exc_info=e)
3038
"EOFError:",
3039
exc_info=e)
2573
3040
2574
3041
with PGPEngine() as pgp:
2575
3042
for client_name, client in clients_data.items():
2587
3054
# For each value in new config, check if it
2588
3055
# differs from the old config value (Except for
2589
3056
# the "secret" attribute)
2590
if (name != "secret" and
2591
value != old_client_settings[client_name]
2592
[name]):
3057
if (name != "secret"
3058
and (value !=
3059
old_client_settings[client_name][name])):
2593
3060
client[name] = value
2594
3061
except KeyError:
2595
3062
pass
2596
3063
2597
3064
# Clients who has passed its expire date can still be
2598
# enabled if its last checker was successful. Clients
3065
# enabled if its last checker was successful. A Client
2599
3066
# whose checker succeeded before we stored its state is
2600
3067
# assumed to have successfully run all checkers during
2601
3068
# downtime.
2604
3071
if not client["last_checked_ok"]:
2605
3072
logger.warning(
2606
3073
"disabling client {} - Client never "
2607
"performed a successful checker"
2608
.format(client_name))
3074
"performed a successful checker".format(
3075
client_name))
2609
3076
client["enabled"] = False
2610
3077
elif client["last_checker_status"] != 0:
2611
3078
logger.warning(
2612
3079
"disabling client {} - Client last"
2613
" checker failed with error code {}"
2614
.format(client_name,
2615
client["last_checker_status"]))
3080
" checker failed with error code"
3081
" {}".format(
3082
client_name,
3083
client["last_checker_status"]))
2616
3084
client["enabled"] = False
2617
3085
else:
2618
client["expires"] = (datetime.datetime
2619
.utcnow()
2620
+ client["timeout"])
3086
client["expires"] = (
3087
datetime.datetime.utcnow()
3088
+ client["timeout"])
2621
3089
logger.debug("Last checker succeeded,"
2622
" keeping {} enabled"
2623
.format(client_name))
3090
" keeping {} enabled".format(
3091
client_name))
2624
3092
try:
2625
client["secret"] = (
2626
pgp.decrypt(client["encrypted_secret"],
2627
client_settings[client_name]
2628
["secret"]))
3093
client["secret"] = pgp.decrypt(
3094
client["encrypted_secret"],
3095
client_settings[client_name]["secret"])
2629
3096
except PGPError:
2630
3097
# If decryption fails, we use secret from new settings
2631
logger.debug("Failed to decrypt {} old secret"
2632
.format(client_name))
2633
client["secret"] = (
2634
client_settings[client_name]["secret"])
3098
logger.debug("Failed to decrypt {} old secret".format(
3099
client_name))
3100
client["secret"] = (client_settings[client_name]
3101
["secret"])
2635
3102
2636
3103
# Add/remove clients based on new changes made to config
2637
3104
for client_name in (set(old_client_settings)
2644
3111
# Create all client objects
2645
3112
for client_name, client in clients_data.items():
2646
3113
tcp_server.clients[client_name] = client_class(
2647
name = client_name, settings = client,
3114
name = client_name,
3115
settings = client,
2648
3116
server_settings = server_settings)
2649
3117
2650
3118
if not tcp_server.clients:
2652
3120
2653
3121
if not foreground:
2654
3122
if pidfile is not None:
3123
pid = os.getpid()
2655
3124
try:
2656
3125
with pidfile:
2657
pid = os.getpid()
2658
pidfile.write("{}\n".format(pid).encode("utf-8"))
3126
print(pid, file=pidfile)
2659
3127
except IOError:
2660
3128
logger.error("Could not write to file %r with PID %d",
2661
3129
pidfilename, pid)
2666
3134
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2667
3135
2668
3136
if use_dbus:
2669
@alternate_dbus_interfaces({"se.recompile.Mandos":
2670
"se.bsnet.fukt.Mandos"})
2671
class MandosDBusService(DBusObjectWithProperties):
3137
3138
@alternate_dbus_interfaces(
3139
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3140
class MandosDBusService(DBusObjectWithObjectManager):
2672
3141
"""A D-Bus proxy object"""
3142
2673
3143
def __init__(self):
2674
3144
dbus.service.Object.__init__(self, bus, "/")
3145
2675
3146
_interface = "se.recompile.Mandos"
2676
3147
2677
@dbus_interface_annotations(_interface)
2678
def _foo(self):
2679
return { "org.freedesktop.DBus.Property"
2680
".EmitsChangedSignal":
2681
"false"}
2682
2683
3148
@dbus.service.signal(_interface, signature="o")
2684
3149
def ClientAdded(self, objpath):
2685
3150
"D-Bus signal"
2690
3155
"D-Bus signal"
2691
3156
pass
2692
3157
3158
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3159
"true"})
2693
3160
@dbus.service.signal(_interface, signature="os")
2694
3161
def ClientRemoved(self, objpath, name):
2695
3162
"D-Bus signal"
2696
3163
pass
2697
3164
3165
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3166
"true"})
2698
3167
@dbus.service.method(_interface, out_signature="ao")
2699
3168
def GetAllClients(self):
2700
3169
"D-Bus method"
2701
return dbus.Array(c.dbus_object_path
2702
for c in
3170
return dbus.Array(c.dbus_object_path for c in
2703
3171
tcp_server.clients.itervalues())
2704
3172
3173
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3174
"true"})
2705
3175
@dbus.service.method(_interface,
2706
3176
out_signature="a{oa{sv}}")
2707
3177
def GetAllClientsWithProperties(self):
2708
3178
"D-Bus method"
2709
3179
return dbus.Dictionary(
2710
((c.dbus_object_path, c.GetAll(""))
2711
for c in tcp_server.clients.itervalues()),
3180
{ c.dbus_object_path: c.GetAll(
3181
"se.recompile.Mandos.Client")
3182
for c in tcp_server.clients.itervalues() },
2712
3183
signature="oa{sv}")
2713
3184
2714
3185
@dbus.service.method(_interface, in_signature="o")
2718
3189
if c.dbus_object_path == object_path:
2719
3190
del tcp_server.clients[c.name]
2720
3191
c.remove_from_connection()
2721
# Don't signal anything except ClientRemoved
3192
# Don't signal the disabling
2722
3193
c.disable(quiet=True)
2723
# Emit D-Bus signal
2724
self.ClientRemoved(object_path, c.name)
3194
# Emit D-Bus signal for removal
3195
self.client_removed_signal(c)
2725
3196
return
2726
3197
raise KeyError(object_path)
2727
3198
2728
3199
del _interface
3200
3201
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3202
out_signature = "a{oa{sa{sv}}}")
3203
def GetManagedObjects(self):
3204
"""D-Bus method"""
3205
return dbus.Dictionary(
3206
{ client.dbus_object_path:
3207
dbus.Dictionary(
3208
{ interface: client.GetAll(interface)
3209
for interface in
3210
client._get_all_interface_names()})
3211
for client in tcp_server.clients.values()})
3212
3213
def client_added_signal(self, client):
3214
"""Send the new standard signal and the old signal"""
3215
if use_dbus:
3216
# New standard signal
3217
self.InterfacesAdded(
3218
client.dbus_object_path,
3219
dbus.Dictionary(
3220
{ interface: client.GetAll(interface)
3221
for interface in
3222
client._get_all_interface_names()}))
3223
# Old signal
3224
self.ClientAdded(client.dbus_object_path)
3225
3226
def client_removed_signal(self, client):
3227
"""Send the new standard signal and the old signal"""
3228
if use_dbus:
3229
# New standard signal
3230
self.InterfacesRemoved(
3231
client.dbus_object_path,
3232
client._get_all_interface_names())
3233
# Old signal
3234
self.ClientRemoved(client.dbus_object_path,
3235
client.name)
2729
3236
2730
3237
mandos_dbus_service = MandosDBusService()
2731
3238
2754
3261
# + secret.
2755
3262
exclude = { "bus", "changedstate", "secret",
2756
3263
"checker", "server_settings" }
2757
for name, typ in (inspect.getmembers
2758
(dbus.service.Object)):
3264
for name, typ in inspect.getmembers(dbus.service
3265
.Object):
2759
3266
exclude.add(name)
2760
3267
2761
3268
client_dict["encrypted_secret"] = (client
2768
3275
del client_settings[client.name]["secret"]
2769
3276
2770
3277
try:
2771
with (tempfile.NamedTemporaryFile
2772
(mode='wb', suffix=".pickle", prefix='clients-',
2773
dir=os.path.dirname(stored_state_path),
2774
delete=False)) as stored_state:
3278
with tempfile.NamedTemporaryFile(
3279
mode='wb',
3280
suffix=".pickle",
3281
prefix='clients-',
3282
dir=os.path.dirname(stored_state_path),
3283
delete=False) as stored_state:
2775
3284
pickle.dump((clients, client_settings), stored_state)
2776
tempname=stored_state.name
3285
tempname = stored_state.name
2777
3286
os.rename(tempname, stored_state_path)
2778
3287
except (IOError, OSError) as e:
2779
3288
if not debug:
2794
3303
name, client = tcp_server.clients.popitem()
2795
3304
if use_dbus:
2796
3305
client.remove_from_connection()
2797
# Don't signal anything except ClientRemoved
3306
# Don't signal the disabling
2798
3307
client.disable(quiet=True)
3308
# Emit D-Bus signal for removal
2799
3309
if use_dbus:
2800
# Emit D-Bus signal
2801
mandos_dbus_service.ClientRemoved(client
2802
.dbus_object_path,
2803
client.name)
3310
mandos_dbus_service.client_removed_signal(client)
2804
3311
client_settings.clear()
2805
3312
2806
3313
atexit.register(cleanup)
2807
3314
2808
3315
for client in tcp_server.clients.itervalues():
2809
3316
if use_dbus:
2810
# Emit D-Bus signal
2811
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3317
# Emit D-Bus signal for adding
3318
mandos_dbus_service.client_added_signal(client)
2812
3319
# Need to initiate checking of clients
2813
3320
if client.enabled:
2814
3321
client.init_checker()
2859
3366
# Must run before the D-Bus bus name gets deregistered
2860
3367
cleanup()
2861
3368
3369
2862
3370
if __name__ == '__main__':
2863
3371
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0