To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 237.7.281
- compare with another revision
- download diff
- download tarball
- view history from revision 237.7.281
- Committer: Teddy Hogeborn
- Date: 2014-08-20 21:46:38 UTC
- mto: (237.7.304 trunk)
- mto: This revision was merged to the branch mainline in revision 323.
- Revision ID: teddy@recompile.se-20140820214638-k4naueej6hffdgfg
mandos-client: Bug fix: Check fork() return value.
When executing network hook scripts, check fork() return value.
* plugins.d/mandos-client.c (run_network_hooks): Bug fix: check if
fork() returns -1.
When executing network hook scripts, check fork() return value.
* plugins.d/mandos-client.c (run_network_hooks): Bug fix: check if
fork() returns -1.
- files removed:
- plugin-helpers
- files modified:
- DBUS-API
added
removed
mandos
1
#!/usr/bin/python
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2016 Teddy Hogeborn
15
# Copyright © 2008-2016 Björn Påhlsson
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
36
36
37
37
from future_builtins import *
38
38
39
try:
40
import SocketServer as socketserver
41
except ImportError:
42
import socketserver
39
import SocketServer as socketserver
43
40
import socket
44
41
import argparse
45
42
import datetime
46
43
import errno
47
try:
48
import ConfigParser as configparser
49
except ImportError:
50
import configparser
44
import gnutls.crypto
45
import gnutls.connection
46
import gnutls.errors
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
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
try:
66
import cPickle as pickle
67
except ImportError:
68
import pickle
65
import cPickle as pickle
69
66
import multiprocessing
70
67
import types
71
68
import binascii
72
69
import tempfile
73
70
import itertools
74
71
import collections
75
import codecs
76
72
77
73
import dbus
78
74
import dbus.service
79
try:
80
import gobject
81
except ImportError:
82
from gi.repository import GObject as gobject
75
import gobject
83
76
import avahi
84
77
from dbus.mainloop.glib import DBusGMainLoop
85
78
import ctypes
98
91
if sys.version_info.major == 2:
99
92
str = unicode
100
93
101
version = "1.7.2"
94
version = "1.6.8"
102
95
stored_state_file = "clients.pickle"
103
96
104
97
logger = logging.getLogger()
105
98
syslogger = None
106
99
107
100
try:
108
if_nametoindex = ctypes.cdll.LoadLibrary(
109
ctypes.util.find_library("c")).if_nametoindex
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
103
.if_nametoindex)
110
104
except (OSError, AttributeError):
111
112
105
def if_nametoindex(interface):
113
106
"Get an interface index the hard way, i.e. using fcntl()"
114
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
123
116
"""init logger and add loglevel"""
124
117
125
118
global syslogger
126
syslogger = (logging.handlers.SysLogHandler(
127
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
128
address = "/dev/log"))
119
syslogger = (logging.handlers.SysLogHandler
120
(facility =
121
logging.handlers.SysLogHandler.LOG_DAEMON,
122
address = "/dev/log"))
129
123
syslogger.setFormatter(logging.Formatter
130
124
('Mandos [%(process)d]: %(levelname)s:'
131
125
' %(message)s'))
148
142
149
143
class PGPEngine(object):
150
144
"""A simple class for OpenPGP symmetric encryption & decryption"""
151
152
145
def __init__(self):
153
146
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
165
147
self.gnupgargs = ['--batch',
166
'--homedir', self.tempdir,
148
'--home', self.tempdir,
167
149
'--force-mdc',
168
150
'--quiet',
169
151
'--no-use-agent']
204
186
205
187
def encrypt(self, data, password):
206
188
passphrase = self.password_encode(password)
207
with tempfile.NamedTemporaryFile(
208
dir=self.tempdir) as passfile:
189
with tempfile.NamedTemporaryFile(dir=self.tempdir
190
) as passfile:
209
191
passfile.write(passphrase)
210
192
passfile.flush()
211
proc = subprocess.Popen([self.gpg, '--symmetric',
193
proc = subprocess.Popen(['gpg', '--symmetric',
212
194
'--passphrase-file',
213
195
passfile.name]
214
196
+ self.gnupgargs,
222
204
223
205
def decrypt(self, data, password):
224
206
passphrase = self.password_encode(password)
225
with tempfile.NamedTemporaryFile(
226
dir = self.tempdir) as passfile:
207
with tempfile.NamedTemporaryFile(dir = self.tempdir
208
) as passfile:
227
209
passfile.write(passphrase)
228
210
passfile.flush()
229
proc = subprocess.Popen([self.gpg, '--decrypt',
211
proc = subprocess.Popen(['gpg', '--decrypt',
230
212
'--passphrase-file',
231
213
passfile.name]
232
214
+ self.gnupgargs,
233
215
stdin = subprocess.PIPE,
234
216
stdout = subprocess.PIPE,
235
217
stderr = subprocess.PIPE)
236
decrypted_plaintext, err = proc.communicate(input = data)
218
decrypted_plaintext, err = proc.communicate(input
219
= data)
237
220
if proc.returncode != 0:
238
221
raise PGPError(err)
239
222
return decrypted_plaintext
245
228
return super(AvahiError, self).__init__(value, *args,
246
229
**kwargs)
247
230
248
249
231
class AvahiServiceError(AvahiError):
250
232
pass
251
233
252
253
234
class AvahiGroupError(AvahiError):
254
235
pass
255
236
275
256
bus: dbus.SystemBus()
276
257
"""
277
258
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):
259
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
servicetype = None, port = None, TXT = None,
261
domain = "", host = "", max_renames = 32768,
262
protocol = avahi.PROTO_UNSPEC, bus = None):
289
263
self.interface = interface
290
264
self.name = name
291
265
self.type = servicetype
301
275
self.bus = bus
302
276
self.entry_group_state_changed_match = None
303
277
304
def rename(self, remove=True):
278
def rename(self):
305
279
"""Derived from the Avahi example code"""
306
280
if self.rename_count >= self.max_renames:
307
281
logger.critical("No suitable Zeroconf service name found"
308
282
" after %i retries, exiting.",
309
283
self.rename_count)
310
284
raise AvahiServiceError("Too many renames")
311
self.name = str(
312
self.server.GetAlternativeServiceName(self.name))
313
self.rename_count += 1
285
self.name = str(self.server
286
.GetAlternativeServiceName(self.name))
314
287
logger.info("Changing Zeroconf service name to %r ...",
315
288
self.name)
316
if remove:
317
self.remove()
289
self.remove()
318
290
try:
319
291
self.add()
320
292
except dbus.exceptions.DBusException as error:
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)
293
logger.critical("D-Bus Exception", exc_info=error)
294
self.cleanup()
295
os._exit(1)
296
self.rename_count += 1
329
297
330
298
def remove(self):
331
299
"""Derived from the Avahi example code"""
370
338
elif state == avahi.ENTRY_GROUP_FAILURE:
371
339
logger.critical("Avahi: Error in group state changed %s",
372
340
str(error))
373
raise AvahiGroupError("State changed: {!s}".format(error))
341
raise AvahiGroupError("State changed: {!s}"
342
.format(error))
374
343
375
344
def cleanup(self):
376
345
"""Derived from the Avahi example code"""
386
355
def server_state_changed(self, state, error=None):
387
356
"""Derived from the Avahi example code"""
388
357
logger.debug("Avahi server state change: %i", state)
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
}
358
bad_states = { avahi.SERVER_INVALID:
359
"Zeroconf server invalid",
360
avahi.SERVER_REGISTERING: None,
361
avahi.SERVER_COLLISION:
362
"Zeroconf server name collision",
363
avahi.SERVER_FAILURE:
364
"Zeroconf server failure" }
395
365
if state in bad_states:
396
366
if bad_states[state] is not None:
397
367
if error is None:
400
370
logger.error(bad_states[state] + ": %r", error)
401
371
self.cleanup()
402
372
elif state == avahi.SERVER_RUNNING:
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)
373
self.add()
415
374
else:
416
375
if error is None:
417
376
logger.debug("Unknown state: %r", state)
427
386
follow_name_owner_changes=True),
428
387
avahi.DBUS_INTERFACE_SERVER)
429
388
self.server.connect_to_signal("StateChanged",
430
self.server_state_changed)
389
self.server_state_changed)
431
390
self.server_state_changed(self.server.GetState())
432
391
433
392
434
393
class AvahiServiceToSyslog(AvahiService):
435
def rename(self, *args, **kwargs):
394
def rename(self):
436
395
"""Add the new name to the syslog messages"""
437
ret = AvahiService.rename(self, *args, **kwargs)
438
syslogger.setFormatter(logging.Formatter(
439
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
440
.format(self.name)))
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
400
.format(self.name)))
441
401
return ret
442
402
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()
707
403
708
404
class Client(object):
709
405
"""A representation of a client host served by this server.
736
432
last_checker_status: integer between 0 and 255 reflecting exit
737
433
status of last checker. -1 reflects crashed
738
434
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
741
435
last_enabled: datetime.datetime(); (UTC) or None
742
436
name: string; from the config file, used in log messages and
743
437
D-Bus identifiers
756
450
"fingerprint", "host", "interval",
757
451
"last_approval_request", "last_checked_ok",
758
452
"last_enabled", "name", "timeout")
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
}
453
client_defaults = { "timeout": "PT5M",
454
"extended_timeout": "PT15M",
455
"interval": "PT2M",
456
"checker": "fping -q -- %%(host)s",
457
"host": "",
458
"approval_delay": "PT0S",
459
"approval_duration": "PT1S",
460
"approved_by_default": "True",
461
"enabled": "True",
462
}
770
463
771
464
@staticmethod
772
465
def config_parser(config):
788
481
client["enabled"] = config.getboolean(client_name,
789
482
"enabled")
790
483
791
# Uppercase and remove spaces from fingerprint for later
792
# comparison purposes with return value from the
793
# fingerprint() function
794
484
client["fingerprint"] = (section["fingerprint"].upper()
795
485
.replace(" ", ""))
796
486
if "secret" in section:
838
528
self.expires = None
839
529
840
530
logger.debug("Creating client %r", self.name)
531
# Uppercase and remove spaces from fingerprint for later
532
# comparison purposes with return value from the fingerprint()
533
# function
841
534
logger.debug(" Fingerprint: %s", self.fingerprint)
842
535
self.created = settings.get("created",
843
536
datetime.datetime.utcnow())
850
543
self.current_checker_command = None
851
544
self.approved = None
852
545
self.approvals_pending = 0
853
self.changedstate = multiprocessing_manager.Condition(
854
multiprocessing_manager.Lock())
855
self.client_structure = [attr
856
for attr in self.__dict__.iterkeys()
546
self.changedstate = (multiprocessing_manager
547
.Condition(multiprocessing_manager
548
.Lock()))
549
self.client_structure = [attr for attr in
550
self.__dict__.iterkeys()
857
551
if not attr.startswith("_")]
858
552
self.client_structure.append("client_structure")
859
553
860
for name, t in inspect.getmembers(
861
type(self), lambda obj: isinstance(obj, property)):
554
for name, t in inspect.getmembers(type(self),
555
lambda obj:
556
isinstance(obj,
557
property)):
862
558
if not name.startswith("_"):
863
559
self.client_structure.append(name)
864
560
906
602
# and every interval from then on.
907
603
if self.checker_initiator_tag is not None:
908
604
gobject.source_remove(self.checker_initiator_tag)
909
self.checker_initiator_tag = gobject.timeout_add(
910
int(self.interval.total_seconds() * 1000),
911
self.start_checker)
605
self.checker_initiator_tag = (gobject.timeout_add
606
(int(self.interval
607
.total_seconds() * 1000),
608
self.start_checker))
912
609
# Schedule a disable() when 'timeout' has passed
913
610
if self.disable_initiator_tag is not None:
914
611
gobject.source_remove(self.disable_initiator_tag)
915
self.disable_initiator_tag = gobject.timeout_add(
916
int(self.timeout.total_seconds() * 1000), self.disable)
612
self.disable_initiator_tag = (gobject.timeout_add
613
(int(self.timeout
614
.total_seconds() * 1000),
615
self.disable))
917
616
# Also start a new checker *right now*.
918
617
self.start_checker()
919
618
920
def checker_callback(self, source, condition, connection,
921
command):
619
def checker_callback(self, pid, condition, command):
922
620
"""The checker has completed, so take appropriate actions."""
923
621
self.checker_callback_tag = None
924
622
self.checker = None
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
623
if os.WIFEXITED(condition):
624
self.last_checker_status = os.WEXITSTATUS(condition)
932
625
if self.last_checker_status == 0:
933
626
logger.info("Checker for %(name)s succeeded",
934
627
vars(self))
935
628
self.checked_ok()
936
629
else:
937
logger.info("Checker for %(name)s failed", vars(self))
630
logger.info("Checker for %(name)s failed",
631
vars(self))
938
632
else:
939
633
self.last_checker_status = -1
940
self.last_checker_signal = -returncode
941
634
logger.warning("Checker for %(name)s crashed?",
942
635
vars(self))
943
return False
944
636
945
637
def checked_ok(self):
946
638
"""Assert that the client has been seen, alive and well."""
947
639
self.last_checked_ok = datetime.datetime.utcnow()
948
640
self.last_checker_status = 0
949
self.last_checker_signal = None
950
641
self.bump_timeout()
951
642
952
643
def bump_timeout(self, timeout=None):
957
648
gobject.source_remove(self.disable_initiator_tag)
958
649
self.disable_initiator_tag = None
959
650
if getattr(self, "enabled", False):
960
self.disable_initiator_tag = gobject.timeout_add(
961
int(timeout.total_seconds() * 1000), self.disable)
651
self.disable_initiator_tag = (gobject.timeout_add
652
(int(timeout.total_seconds()
653
* 1000), self.disable))
962
654
self.expires = datetime.datetime.utcnow() + timeout
963
655
964
656
def need_approval(self):
978
670
# than 'timeout' for the client to be disabled, which is as it
979
671
# should be.
980
672
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
673
# If a checker exists, make sure it is not a zombie
674
try:
675
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
except AttributeError:
677
pass
678
except OSError as error:
679
if error.errno != errno.ECHILD:
680
raise
681
else:
682
if pid:
683
logger.warning("Checker was a zombie")
684
gobject.source_remove(self.checker_callback_tag)
685
self.checker_callback(pid, status,
686
self.current_checker_command)
985
687
# Start a new checker if needed
986
688
if self.checker is None:
987
689
# Escape attributes for the shell
988
escaped_attrs = {
989
attr: re.escape(str(getattr(self, attr)))
990
for attr in self.runtime_expansions }
690
escaped_attrs = { attr:
691
re.escape(str(getattr(self, attr)))
692
for attr in self.runtime_expansions }
991
693
try:
992
694
command = self.checker_command % escaped_attrs
993
695
except TypeError as error:
994
696
logger.error('Could not format string "%s"',
995
self.checker_command,
697
self.checker_command, exc_info=error)
698
return True # Try again later
699
self.current_checker_command = command
700
try:
701
logger.info("Starting checker %r for %s",
702
command, self.name)
703
# We don't need to redirect stdout and stderr, since
704
# in normal mode, that is already done by daemon(),
705
# and in debug mode we don't want to. (Stdin is
706
# always replaced by /dev/null.)
707
# The exception is when not debugging but nevertheless
708
# running in the foreground; use the previously
709
# created wnull.
710
popen_args = {}
711
if (not self.server_settings["debug"]
712
and self.server_settings["foreground"]):
713
popen_args.update({"stdout": wnull,
714
"stderr": wnull })
715
self.checker = subprocess.Popen(command,
716
close_fds=True,
717
shell=True, cwd="/",
718
**popen_args)
719
except OSError as error:
720
logger.error("Failed to start subprocess",
996
721
exc_info=error)
997
return True # Try again later
998
self.current_checker_command = 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)
722
return True
723
self.checker_callback_tag = (gobject.child_watch_add
724
(self.checker.pid,
725
self.checker_callback,
726
data=command))
727
# The checker may have completed before the gobject
728
# watch was added. Check for this.
729
try:
730
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
731
except OSError as error:
732
if error.errno == errno.ECHILD:
733
# This should never happen
734
logger.error("Child process vanished",
735
exc_info=error)
736
return True
737
raise
738
if pid:
739
gobject.source_remove(self.checker_callback_tag)
740
self.checker_callback(pid, status, command)
1024
741
# Re-run this periodically if run by gobject.timeout_add
1025
742
return True
1026
743
1032
749
if getattr(self, "checker", None) is None:
1033
750
return
1034
751
logger.debug("Stopping checker for %(name)s", vars(self))
1035
self.checker.terminate()
752
try:
753
self.checker.terminate()
754
#time.sleep(0.5)
755
#if self.checker.poll() is None:
756
# self.checker.kill()
757
except OSError as error:
758
if error.errno != errno.ESRCH: # No such process
759
raise
1036
760
self.checker = None
1037
761
1038
762
1039
def dbus_service_property(dbus_interface,
1040
signature="v",
1041
access="readwrite",
1042
byte_arrays=False):
763
def dbus_service_property(dbus_interface, signature="v",
764
access="readwrite", byte_arrays=False):
1043
765
"""Decorators for marking methods of a DBusObjectWithProperties to
1044
766
become properties on the D-Bus.
1045
767
1055
777
if byte_arrays and signature != "ay":
1056
778
raise ValueError("Byte arrays not supported for non-'ay'"
1057
779
" signature {!r}".format(signature))
1058
1059
780
def decorator(func):
1060
781
func._dbus_is_property = True
1061
782
func._dbus_interface = dbus_interface
1066
787
func._dbus_name = func._dbus_name[:-14]
1067
788
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1068
789
return func
1069
1070
790
return decorator
1071
791
1072
792
1081
801
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1082
802
"false"}
1083
803
"""
1084
1085
804
def decorator(func):
1086
805
func._dbus_is_interface = True
1087
806
func._dbus_interface = dbus_interface
1088
807
func._dbus_name = dbus_interface
1089
808
return func
1090
1091
809
return decorator
1092
810
1093
811
1102
820
access="r")
1103
821
def Property_dbus_property(self):
1104
822
return dbus.Boolean(False)
1105
1106
See also the DBusObjectWithAnnotations class.
1107
823
"""
1108
1109
824
def decorator(func):
1110
825
func._dbus_annotations = annotations
1111
826
return func
1112
1113
827
return decorator
1114
828
1115
829
1118
832
"""
1119
833
pass
1120
834
1121
1122
835
class DBusPropertyAccessException(DBusPropertyException):
1123
836
"""A property's access permissions disallows an operation.
1124
837
"""
1131
844
pass
1132
845
1133
846
1134
class DBusObjectWithAnnotations(dbus.service.Object):
1135
"""A D-Bus object with annotations.
847
class DBusObjectWithProperties(dbus.service.Object):
848
"""A D-Bus object with properties.
1136
849
1137
Classes inheriting from this can use the dbus_annotations
1138
decorator to add annotations to methods or signals.
850
Classes inheriting from this can use the dbus_service_property
851
decorator to expose methods as D-Bus properties. It exposes the
852
standard Get(), Set(), and GetAll() methods on the D-Bus.
1139
853
"""
1140
854
1141
855
@staticmethod
1151
865
def _get_all_dbus_things(self, thing):
1152
866
"""Returns a generator of (name, attribute) pairs
1153
867
"""
1154
return ((getattr(athing.__get__(self), "_dbus_name", name),
868
return ((getattr(athing.__get__(self), "_dbus_name",
869
name),
1155
870
athing.__get__(self))
1156
871
for cls in self.__class__.__mro__
1157
872
for name, athing in
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
inspect.getmembers(cls,
874
self._is_dbus_thing(thing)))
1230
875
1231
876
def _get_dbus_property(self, interface_name, property_name):
1232
877
"""Returns a bound method if one exists which is a D-Bus
1233
878
property with the specified name and interface.
1234
879
"""
1235
for cls in self.__class__.__mro__:
1236
for name, value in inspect.getmembers(
1237
cls, self._is_dbus_thing("property")):
880
for cls in self.__class__.__mro__:
881
for name, value in (inspect.getmembers
882
(cls,
883
self._is_dbus_thing("property"))):
1238
884
if (value._dbus_name == property_name
1239
885
and value._dbus_interface == interface_name):
1240
886
return value.__get__(self)
1241
887
1242
888
# No such property
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",
889
raise DBusPropertyNotFound(self.dbus_object_path + ":"
890
+ interface_name + "."
891
+ property_name)
892
893
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1257
894
out_signature="v")
1258
895
def Get(self, interface_name, property_name):
1259
896
"""Standard D-Bus property Get() method, see D-Bus standard.
1284
921
for byte in value))
1285
922
prop(value)
1286
923
1287
@dbus.service.method(dbus.PROPERTIES_IFACE,
1288
in_signature="s",
924
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1289
925
out_signature="a{sv}")
1290
926
def GetAll(self, interface_name):
1291
927
"""Standard D-Bus property GetAll() method, see D-Bus
1306
942
if not hasattr(value, "variant_level"):
1307
943
properties[name] = value
1308
944
continue
1309
properties[name] = type(value)(
1310
value, variant_level = value.variant_level + 1)
945
properties[name] = type(value)(value, variant_level=
946
value.variant_level+1)
1311
947
return dbus.Dictionary(properties, signature="sv")
1312
948
1313
949
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1327
963
1328
964
Inserts property tags and interface annotation tags.
1329
965
"""
1330
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1331
object_path,
1332
connection)
966
xmlstring = dbus.service.Object.Introspect(self, object_path,
967
connection)
1333
968
try:
1334
969
document = xml.dom.minidom.parseString(xmlstring)
1335
1336
970
def make_tag(document, name, prop):
1337
971
e = document.createElement("property")
1338
972
e.setAttribute("name", name)
1339
973
e.setAttribute("type", prop._dbus_signature)
1340
974
e.setAttribute("access", prop._dbus_access)
1341
975
return e
1342
1343
976
for if_tag in document.getElementsByTagName("interface"):
1344
977
# Add property tags
1345
978
for tag in (make_tag(document, name, prop)
1348
981
if prop._dbus_interface
1349
982
== if_tag.getAttribute("name")):
1350
983
if_tag.appendChild(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)
984
# Add annotation tags
985
for typ in ("method", "signal", "property"):
986
for tag in if_tag.getElementsByTagName(typ):
987
annots = dict()
988
for name, prop in (self.
989
_get_all_dbus_things(typ)):
990
if (name == tag.getAttribute("name")
991
and prop._dbus_interface
992
== if_tag.getAttribute("name")):
993
annots.update(getattr
994
(prop,
995
"_dbus_annotations",
996
{}))
997
for name, value in annots.items():
998
ann_tag = document.createElement(
999
"annotation")
1000
ann_tag.setAttribute("name", name)
1001
ann_tag.setAttribute("value", value)
1002
tag.appendChild(ann_tag)
1003
# Add interface annotation tags
1004
for annotation, value in dict(
1005
itertools.chain.from_iterable(
1006
annotations().items()
1007
for name, annotations in
1008
self._get_all_dbus_things("interface")
1009
if name == if_tag.getAttribute("name")
1010
)).items():
1011
ann_tag = document.createElement("annotation")
1012
ann_tag.setAttribute("name", annotation)
1013
ann_tag.setAttribute("value", value)
1014
if_tag.appendChild(ann_tag)
1367
1015
# Add the names to the return values for the
1368
1016
# "org.freedesktop.DBus.Properties" methods
1369
1017
if (if_tag.getAttribute("name")
1387
1035
exc_info=error)
1388
1036
return xmlstring
1389
1037
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
1458
1038
1459
1039
def datetime_to_dbus(dt, variant_level=0):
1460
1040
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1461
1041
if dt is None:
1462
1042
return dbus.String("", variant_level = variant_level)
1463
return dbus.String(dt.isoformat(), variant_level=variant_level)
1043
return dbus.String(dt.isoformat(),
1044
variant_level=variant_level)
1464
1045
1465
1046
1466
1047
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1486
1067
(from DBusObjectWithProperties) and interfaces (from the
1487
1068
dbus_interface_annotations decorator).
1488
1069
"""
1489
1490
1070
def wrapper(cls):
1491
1071
for orig_interface_name, alt_interface_name in (
1492
alt_interface_names.items()):
1072
alt_interface_names.items()):
1493
1073
attr = {}
1494
1074
interface_names = set()
1495
1075
# Go though all attributes of the class
1497
1077
# Ignore non-D-Bus attributes, and D-Bus attributes
1498
1078
# with the wrong interface name
1499
1079
if (not hasattr(attribute, "_dbus_interface")
1500
or not attribute._dbus_interface.startswith(
1501
orig_interface_name)):
1080
or not attribute._dbus_interface
1081
.startswith(orig_interface_name)):
1502
1082
continue
1503
1083
# Create an alternate D-Bus interface name based on
1504
1084
# the current name
1505
alt_interface = attribute._dbus_interface.replace(
1506
orig_interface_name, alt_interface_name)
1085
alt_interface = (attribute._dbus_interface
1086
.replace(orig_interface_name,
1087
alt_interface_name))
1507
1088
interface_names.add(alt_interface)
1508
1089
# Is this a D-Bus signal?
1509
1090
if getattr(attribute, "_dbus_is_signal", False):
1510
if sys.version_info.major == 2:
1511
# Extract the original non-method undecorated
1512
# function by black magic
1513
nonmethod_func = (dict(
1091
# Extract the original non-method undecorated
1092
# function by black magic
1093
nonmethod_func = (dict(
1514
1094
zip(attribute.func_code.co_freevars,
1515
attribute.__closure__))
1516
["func"].cell_contents)
1517
else:
1518
nonmethod_func = attribute
1095
attribute.__closure__))["func"]
1096
.cell_contents)
1519
1097
# Create a new, but exactly alike, function
1520
1098
# object, and decorate it to be a new D-Bus signal
1521
1099
# with the alternate D-Bus interface name
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))
1100
new_function = (dbus.service.signal
1101
(alt_interface,
1102
attribute._dbus_signature)
1103
(types.FunctionType(
1104
nonmethod_func.func_code,
1105
nonmethod_func.func_globals,
1106
nonmethod_func.func_name,
1107
nonmethod_func.func_defaults,
1108
nonmethod_func.func_closure)))
1539
1109
# Copy annotations, if any
1540
1110
try:
1541
new_function._dbus_annotations = dict(
1542
attribute._dbus_annotations)
1111
new_function._dbus_annotations = (
1112
dict(attribute._dbus_annotations))
1543
1113
except AttributeError:
1544
1114
pass
1545
1115
# Define a creator of a function to call both the
1550
1120
"""This function is a scope container to pass
1551
1121
func1 and func2 to the "call_both" function
1552
1122
outside of its arguments"""
1553
1554
@functools.wraps(func2)
1555
1123
def call_both(*args, **kwargs):
1556
1124
"""This function will emit two D-Bus
1557
1125
signals by calling func1 and func2"""
1558
1126
func1(*args, **kwargs)
1559
1127
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
1565
1128
return call_both
1566
1129
# Create the "call_both" function and add it to
1567
1130
# the class
1572
1135
# object. Decorate it to be a new D-Bus method
1573
1136
# with the alternate D-Bus interface name. Add it
1574
1137
# to the class.
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
attr[attrname] = (dbus.service.method
1139
(alt_interface,
1140
attribute._dbus_in_signature,
1141
attribute._dbus_out_signature)
1142
(types.FunctionType
1143
(attribute.func_code,
1144
attribute.func_globals,
1145
attribute.func_name,
1146
attribute.func_defaults,
1147
attribute.func_closure)))
1585
1148
# Copy annotations, if any
1586
1149
try:
1587
attr[attrname]._dbus_annotations = dict(
1588
attribute._dbus_annotations)
1150
attr[attrname]._dbus_annotations = (
1151
dict(attribute._dbus_annotations))
1589
1152
except AttributeError:
1590
1153
pass
1591
1154
# Is this a D-Bus property?
1594
1157
# object, and decorate it to be a new D-Bus
1595
1158
# property with the alternate D-Bus interface
1596
1159
# name. Add it to the class.
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)))
1160
attr[attrname] = (dbus_service_property
1161
(alt_interface,
1162
attribute._dbus_signature,
1163
attribute._dbus_access,
1164
attribute
1165
._dbus_get_args_options
1166
["byte_arrays"])
1167
(types.FunctionType
1168
(attribute.func_code,
1169
attribute.func_globals,
1170
attribute.func_name,
1171
attribute.func_defaults,
1172
attribute.func_closure)))
1608
1173
# Copy annotations, if any
1609
1174
try:
1610
attr[attrname]._dbus_annotations = dict(
1611
attribute._dbus_annotations)
1175
attr[attrname]._dbus_annotations = (
1176
dict(attribute._dbus_annotations))
1612
1177
except AttributeError:
1613
1178
pass
1614
1179
# Is this a D-Bus interface?
1617
1182
# object. Decorate it to be a new D-Bus interface
1618
1183
# with the alternate D-Bus interface name. Add it
1619
1184
# to the class.
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)))
1185
attr[attrname] = (dbus_interface_annotations
1186
(alt_interface)
1187
(types.FunctionType
1188
(attribute.func_code,
1189
attribute.func_globals,
1190
attribute.func_name,
1191
attribute.func_defaults,
1192
attribute.func_closure)))
1627
1193
if deprecate:
1628
1194
# Deprecate all alternate interfaces
1629
1195
iname="_AlternateDBusNames_interface_annotation{}"
1630
1196
for interface_name in interface_names:
1631
1632
1197
@dbus_interface_annotations(interface_name)
1633
1198
def func(self):
1634
1199
return { "org.freedesktop.DBus.Deprecated":
1635
"true" }
1200
"true" }
1636
1201
# Find an unused name
1637
1202
for aname in (iname.format(i)
1638
1203
for i in itertools.count()):
1643
1208
# Replace the class with a new subclass of it with
1644
1209
# methods, signals, etc. as created above.
1645
1210
cls = type(b"{}Alternate".format(cls.__name__),
1646
(cls, ), attr)
1211
(cls,), attr)
1647
1212
return cls
1648
1649
1213
return wrapper
1650
1214
1651
1215
1652
1216
@alternate_dbus_interfaces({"se.recompile.Mandos":
1653
"se.bsnet.fukt.Mandos"})
1217
"se.bsnet.fukt.Mandos"})
1654
1218
class ClientDBus(Client, DBusObjectWithProperties):
1655
1219
"""A Client class using D-Bus
1656
1220
1660
1224
"""
1661
1225
1662
1226
runtime_expansions = (Client.runtime_expansions
1663
+ ("dbus_object_path", ))
1227
+ ("dbus_object_path",))
1664
1228
1665
1229
_interface = "se.recompile.Mandos.Client"
1666
1230
1674
1238
client_object_name = str(self.name).translate(
1675
1239
{ord("."): ord("_"),
1676
1240
ord("-"): ord("_")})
1677
self.dbus_object_path = dbus.ObjectPath(
1678
"/clients/" + client_object_name)
1241
self.dbus_object_path = (dbus.ObjectPath
1242
("/clients/" + client_object_name))
1679
1243
DBusObjectWithProperties.__init__(self, self.bus,
1680
1244
self.dbus_object_path)
1681
1245
1682
def notifychangeproperty(transform_func, dbus_name,
1683
type_func=lambda x: x,
1684
variant_level=1,
1685
invalidate_only=False,
1246
def notifychangeproperty(transform_func,
1247
dbus_name, type_func=lambda x: x,
1248
variant_level=1, invalidate_only=False,
1686
1249
_interface=_interface):
1687
1250
""" Modify a variable so that it's a property which announces
1688
1251
its changes to DBus.
1695
1258
variant_level: D-Bus variant level. Default: 1
1696
1259
"""
1697
1260
attrname = "_{}".format(dbus_name)
1698
1699
1261
def setter(self, value):
1700
1262
if hasattr(self, "dbus_object_path"):
1701
1263
if (not hasattr(self, attrname) or
1702
1264
type_func(getattr(self, attrname, None))
1703
1265
!= type_func(value)):
1704
1266
if invalidate_only:
1705
self.PropertiesChanged(
1706
_interface, dbus.Dictionary(),
1707
dbus.Array((dbus_name, )))
1267
self.PropertiesChanged(_interface,
1268
dbus.Dictionary(),
1269
dbus.Array
1270
((dbus_name,)))
1708
1271
else:
1709
dbus_value = transform_func(
1710
type_func(value),
1711
variant_level = variant_level)
1272
dbus_value = transform_func(type_func(value),
1273
variant_level
1274
=variant_level)
1712
1275
self.PropertyChanged(dbus.String(dbus_name),
1713
1276
dbus_value)
1714
self.PropertiesChanged(
1715
_interface,
1716
dbus.Dictionary({ dbus.String(dbus_name):
1717
dbus_value }),
1718
dbus.Array())
1277
self.PropertiesChanged(_interface,
1278
dbus.Dictionary({
1279
dbus.String(dbus_name):
1280
dbus_value }), dbus.Array())
1719
1281
setattr(self, attrname, value)
1720
1282
1721
1283
return property(lambda self: getattr(self, attrname), setter)
1727
1289
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1728
1290
last_enabled = notifychangeproperty(datetime_to_dbus,
1729
1291
"LastEnabled")
1730
checker = notifychangeproperty(
1731
dbus.Boolean, "CheckerRunning",
1732
type_func = lambda checker: checker is not None)
1292
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1293
type_func = lambda checker:
1294
checker is not None)
1733
1295
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1734
1296
"LastCheckedOK")
1735
1297
last_checker_status = notifychangeproperty(dbus.Int16,
1738
1300
datetime_to_dbus, "LastApprovalRequest")
1739
1301
approved_by_default = notifychangeproperty(dbus.Boolean,
1740
1302
"ApprovedByDefault")
1741
approval_delay = notifychangeproperty(
1742
dbus.UInt64, "ApprovalDelay",
1743
type_func = lambda td: td.total_seconds() * 1000)
1303
approval_delay = notifychangeproperty(dbus.UInt64,
1304
"ApprovalDelay",
1305
type_func =
1306
lambda td: td.total_seconds()
1307
* 1000)
1744
1308
approval_duration = notifychangeproperty(
1745
1309
dbus.UInt64, "ApprovalDuration",
1746
1310
type_func = lambda td: td.total_seconds() * 1000)
1747
1311
host = notifychangeproperty(dbus.String, "Host")
1748
timeout = notifychangeproperty(
1749
dbus.UInt64, "Timeout",
1750
type_func = lambda td: td.total_seconds() * 1000)
1312
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1313
type_func = lambda td:
1314
td.total_seconds() * 1000)
1751
1315
extended_timeout = notifychangeproperty(
1752
1316
dbus.UInt64, "ExtendedTimeout",
1753
1317
type_func = lambda td: td.total_seconds() * 1000)
1754
interval = notifychangeproperty(
1755
dbus.UInt64, "Interval",
1756
type_func = lambda td: td.total_seconds() * 1000)
1318
interval = notifychangeproperty(dbus.UInt64,
1319
"Interval",
1320
type_func =
1321
lambda td: td.total_seconds()
1322
* 1000)
1757
1323
checker_command = notifychangeproperty(dbus.String, "Checker")
1758
1324
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1759
1325
invalidate_only=True)
1769
1335
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1770
1336
Client.__del__(self, *args, **kwargs)
1771
1337
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:
1338
def checker_callback(self, pid, condition, command,
1339
*args, **kwargs):
1340
self.checker_callback_tag = None
1341
self.checker = None
1342
if os.WIFEXITED(condition):
1343
exitstatus = os.WEXITSTATUS(condition)
1779
1344
# Emit D-Bus signal
1780
1345
self.CheckerCompleted(dbus.Int16(exitstatus),
1781
# This is specific to GNU libC
1782
dbus.Int64(exitstatus << 8),
1346
dbus.Int64(condition),
1783
1347
dbus.String(command))
1784
1348
else:
1785
1349
# Emit D-Bus signal
1786
1350
self.CheckerCompleted(dbus.Int16(-1),
1787
dbus.Int64(
1788
# This is specific to GNU libC
1789
(exitstatus << 8)
1790
| self.last_checker_signal),
1351
dbus.Int64(condition),
1791
1352
dbus.String(command))
1792
return ret
1353
1354
return Client.checker_callback(self, pid, condition, command,
1355
*args, **kwargs)
1793
1356
1794
1357
def start_checker(self, *args, **kwargs):
1795
1358
old_checker_pid = getattr(self.checker, "pid", None)
1870
1433
self.checked_ok()
1871
1434
1872
1435
# Enable - method
1873
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1874
1436
@dbus.service.method(_interface)
1875
1437
def Enable(self):
1876
1438
"D-Bus method"
1877
1439
self.enable()
1878
1440
1879
1441
# StartChecker - method
1880
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1881
1442
@dbus.service.method(_interface)
1882
1443
def StartChecker(self):
1883
1444
"D-Bus method"
1884
1445
self.start_checker()
1885
1446
1886
1447
# Disable - method
1887
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1888
1448
@dbus.service.method(_interface)
1889
1449
def Disable(self):
1890
1450
"D-Bus method"
1891
1451
self.disable()
1892
1452
1893
1453
# StopChecker - method
1894
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1895
1454
@dbus.service.method(_interface)
1896
1455
def StopChecker(self):
1897
1456
self.stop_checker()
1904
1463
return dbus.Boolean(bool(self.approvals_pending))
1905
1464
1906
1465
# ApprovedByDefault - property
1907
@dbus_service_property(_interface,
1908
signature="b",
1466
@dbus_service_property(_interface, signature="b",
1909
1467
access="readwrite")
1910
1468
def ApprovedByDefault_dbus_property(self, value=None):
1911
1469
if value is None: # get
1913
1471
self.approved_by_default = bool(value)
1914
1472
1915
1473
# ApprovalDelay - property
1916
@dbus_service_property(_interface,
1917
signature="t",
1474
@dbus_service_property(_interface, signature="t",
1918
1475
access="readwrite")
1919
1476
def ApprovalDelay_dbus_property(self, value=None):
1920
1477
if value is None: # get
1923
1480
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1924
1481
1925
1482
# ApprovalDuration - property
1926
@dbus_service_property(_interface,
1927
signature="t",
1483
@dbus_service_property(_interface, signature="t",
1928
1484
access="readwrite")
1929
1485
def ApprovalDuration_dbus_property(self, value=None):
1930
1486
if value is None: # get
1933
1489
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1934
1490
1935
1491
# Name - property
1936
@dbus_annotations(
1937
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1938
1492
@dbus_service_property(_interface, signature="s", access="read")
1939
1493
def Name_dbus_property(self):
1940
1494
return dbus.String(self.name)
1941
1495
1942
1496
# Fingerprint - property
1943
@dbus_annotations(
1944
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1945
1497
@dbus_service_property(_interface, signature="s", access="read")
1946
1498
def Fingerprint_dbus_property(self):
1947
1499
return dbus.String(self.fingerprint)
1948
1500
1949
1501
# Host - property
1950
@dbus_service_property(_interface,
1951
signature="s",
1502
@dbus_service_property(_interface, signature="s",
1952
1503
access="readwrite")
1953
1504
def Host_dbus_property(self, value=None):
1954
1505
if value is None: # get
1956
1507
self.host = str(value)
1957
1508
1958
1509
# Created - property
1959
@dbus_annotations(
1960
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1961
1510
@dbus_service_property(_interface, signature="s", access="read")
1962
1511
def Created_dbus_property(self):
1963
1512
return datetime_to_dbus(self.created)
1968
1517
return datetime_to_dbus(self.last_enabled)
1969
1518
1970
1519
# Enabled - property
1971
@dbus_service_property(_interface,
1972
signature="b",
1520
@dbus_service_property(_interface, signature="b",
1973
1521
access="readwrite")
1974
1522
def Enabled_dbus_property(self, value=None):
1975
1523
if value is None: # get
1980
1528
self.disable()
1981
1529
1982
1530
# LastCheckedOK - property
1983
@dbus_service_property(_interface,
1984
signature="s",
1531
@dbus_service_property(_interface, signature="s",
1985
1532
access="readwrite")
1986
1533
def LastCheckedOK_dbus_property(self, value=None):
1987
1534
if value is not None:
1990
1537
return datetime_to_dbus(self.last_checked_ok)
1991
1538
1992
1539
# LastCheckerStatus - property
1993
@dbus_service_property(_interface, signature="n", access="read")
1540
@dbus_service_property(_interface, signature="n",
1541
access="read")
1994
1542
def LastCheckerStatus_dbus_property(self):
1995
1543
return dbus.Int16(self.last_checker_status)
1996
1544
2005
1553
return datetime_to_dbus(self.last_approval_request)
2006
1554
2007
1555
# Timeout - property
2008
@dbus_service_property(_interface,
2009
signature="t",
1556
@dbus_service_property(_interface, signature="t",
2010
1557
access="readwrite")
2011
1558
def Timeout_dbus_property(self, value=None):
2012
1559
if value is None: # get
2025
1572
is None):
2026
1573
return
2027
1574
gobject.source_remove(self.disable_initiator_tag)
2028
self.disable_initiator_tag = gobject.timeout_add(
2029
int((self.expires - now).total_seconds() * 1000),
2030
self.disable)
1575
self.disable_initiator_tag = (
1576
gobject.timeout_add(
1577
int((self.expires - now).total_seconds()
1578
* 1000), self.disable))
2031
1579
2032
1580
# ExtendedTimeout - property
2033
@dbus_service_property(_interface,
2034
signature="t",
1581
@dbus_service_property(_interface, signature="t",
2035
1582
access="readwrite")
2036
1583
def ExtendedTimeout_dbus_property(self, value=None):
2037
1584
if value is None: # get
2040
1587
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2041
1588
2042
1589
# Interval - property
2043
@dbus_service_property(_interface,
2044
signature="t",
1590
@dbus_service_property(_interface, signature="t",
2045
1591
access="readwrite")
2046
1592
def Interval_dbus_property(self, value=None):
2047
1593
if value is None: # get
2052
1598
if self.enabled:
2053
1599
# Reschedule checker run
2054
1600
gobject.source_remove(self.checker_initiator_tag)
2055
self.checker_initiator_tag = gobject.timeout_add(
2056
value, self.start_checker)
2057
self.start_checker() # Start one now, too
1601
self.checker_initiator_tag = (gobject.timeout_add
1602
(value, self.start_checker))
1603
self.start_checker() # Start one now, too
2058
1604
2059
1605
# Checker - property
2060
@dbus_service_property(_interface,
2061
signature="s",
1606
@dbus_service_property(_interface, signature="s",
2062
1607
access="readwrite")
2063
1608
def Checker_dbus_property(self, value=None):
2064
1609
if value is None: # get
2066
1611
self.checker_command = str(value)
2067
1612
2068
1613
# CheckerRunning - property
2069
@dbus_service_property(_interface,
2070
signature="b",
1614
@dbus_service_property(_interface, signature="b",
2071
1615
access="readwrite")
2072
1616
def CheckerRunning_dbus_property(self, value=None):
2073
1617
if value is None: # get
2078
1622
self.stop_checker()
2079
1623
2080
1624
# ObjectPath - property
2081
@dbus_annotations(
2082
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2083
"org.freedesktop.DBus.Deprecated": "true"})
2084
1625
@dbus_service_property(_interface, signature="o", access="read")
2085
1626
def ObjectPath_dbus_property(self):
2086
1627
return self.dbus_object_path # is already a dbus.ObjectPath
2087
1628
2088
1629
# Secret = property
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)
1630
@dbus_service_property(_interface, signature="ay",
1631
access="write", byte_arrays=True)
2096
1632
def Secret_dbus_property(self, value):
2097
1633
self.secret = bytes(value)
2098
1634
2104
1640
self._pipe = child_pipe
2105
1641
self._pipe.send(('init', fpr, address))
2106
1642
if not self._pipe.recv():
2107
raise KeyError(fpr)
1643
raise KeyError()
2108
1644
2109
1645
def __getattribute__(self, name):
2110
1646
if name == '_pipe':
2114
1650
if data[0] == 'data':
2115
1651
return data[1]
2116
1652
if data[0] == 'function':
2117
2118
1653
def func(*args, **kwargs):
2119
1654
self._pipe.send(('funcall', name, args, kwargs))
2120
1655
return self._pipe.recv()[1]
2121
2122
1656
return func
2123
1657
2124
1658
def __setattr__(self, name, value):
2140
1674
logger.debug("Pipe FD: %d",
2141
1675
self.server.child_pipe.fileno())
2142
1676
2143
session = gnutls.ClientSession(self.request)
1677
session = (gnutls.connection
1678
.ClientSession(self.request,
1679
gnutls.connection
1680
.X509Credentials()))
1681
1682
# Note: gnutls.connection.X509Credentials is really a
1683
# generic GnuTLS certificate credentials object so long as
1684
# no X.509 keys are added to it. Therefore, we can use it
1685
# here despite using OpenPGP certificates.
2144
1686
2145
1687
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2146
1688
# "+AES-256-CBC", "+SHA1",
2150
1692
priority = self.server.gnutls_priority
2151
1693
if priority is None:
2152
1694
priority = "NORMAL"
2153
gnutls.priority_set_direct(session._c_object, priority,
2154
None)
1695
(gnutls.library.functions
1696
.gnutls_priority_set_direct(session._c_object,
1697
priority, None))
2155
1698
2156
1699
# Start communication using the Mandos protocol
2157
1700
# Get protocol number
2167
1710
# Start GnuTLS connection
2168
1711
try:
2169
1712
session.handshake()
2170
except gnutls.Error as error:
1713
except gnutls.errors.GNUTLSError as error:
2171
1714
logger.warning("Handshake failed: %s", error)
2172
1715
# Do not run session.bye() here: the session is not
2173
1716
# established. Just abandon the request.
2177
1720
approval_required = False
2178
1721
try:
2179
1722
try:
2180
fpr = self.fingerprint(
2181
self.peer_certificate(session))
2182
except (TypeError, gnutls.Error) as error:
1723
fpr = self.fingerprint(self.peer_certificate
1724
(session))
1725
except (TypeError,
1726
gnutls.errors.GNUTLSError) as error:
2183
1727
logger.warning("Bad certificate: %s", error)
2184
1728
return
2185
1729
logger.debug("Fingerprint: %s", fpr)
2198
1742
while True:
2199
1743
if not client.enabled:
2200
1744
logger.info("Client %s is disabled",
2201
client.name)
1745
client.name)
2202
1746
if self.server.use_dbus:
2203
1747
# Emit D-Bus signal
2204
1748
client.Rejected("Disabled")
2243
1787
else:
2244
1788
delay -= time2 - time
2245
1789
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
1790
sent_size = 0
1791
while sent_size < len(client.secret):
1792
try:
1793
sent = session.send(client.secret[sent_size:])
1794
except gnutls.errors.GNUTLSError as error:
1795
logger.warning("gnutls send failed",
1796
exc_info=error)
1797
return
1798
logger.debug("Sent: %d, remaining: %d",
1799
sent, len(client.secret)
1800
- (sent_size + sent))
1801
sent_size += sent
2252
1802
2253
1803
logger.info("Sending secret to %s", client.name)
2254
1804
# bump the timeout using extended_timeout
2262
1812
client.approvals_pending -= 1
2263
1813
try:
2264
1814
session.bye()
2265
except gnutls.Error as error:
1815
except gnutls.errors.GNUTLSError as error:
2266
1816
logger.warning("GnuTLS bye failed",
2267
1817
exc_info=error)
2268
1818
2270
1820
def peer_certificate(session):
2271
1821
"Return the peer's OpenPGP certificate as a bytestring"
2272
1822
# If not an OpenPGP certificate...
2273
if (gnutls.certificate_type_get(session._c_object)
2274
!= gnutls.CRT_OPENPGP):
2275
# ...return invalid data
2276
return b""
1823
if (gnutls.library.functions
1824
.gnutls_certificate_type_get(session._c_object)
1825
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1826
# ...do the normal thing
1827
return session.peer_certificate
2277
1828
list_size = ctypes.c_uint(1)
2278
cert_list = (gnutls.certificate_get_peers
1829
cert_list = (gnutls.library.functions
1830
.gnutls_certificate_get_peers
2279
1831
(session._c_object, ctypes.byref(list_size)))
2280
1832
if not bool(cert_list) and list_size.value != 0:
2281
raise gnutls.Error("error getting peer certificate")
1833
raise gnutls.errors.GNUTLSError("error getting peer"
1834
" certificate")
2282
1835
if list_size.value == 0:
2283
1836
return None
2284
1837
cert = cert_list[0]
2288
1841
def fingerprint(openpgp):
2289
1842
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2290
1843
# New GnuTLS "datum" with the OpenPGP public key
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)))
1844
datum = (gnutls.library.types
1845
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1846
ctypes.POINTER
1847
(ctypes.c_ubyte)),
1848
ctypes.c_uint(len(openpgp))))
2295
1849
# New empty GnuTLS certificate
2296
crt = gnutls.openpgp_crt_t()
2297
gnutls.openpgp_crt_init(ctypes.byref(crt))
1850
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1851
(gnutls.library.functions
1852
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2298
1853
# Import the OpenPGP public key into the certificate
2299
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2300
gnutls.OPENPGP_FMT_RAW)
1854
(gnutls.library.functions
1855
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1856
gnutls.library.constants
1857
.GNUTLS_OPENPGP_FMT_RAW))
2301
1858
# Verify the self signature in the key
2302
1859
crtverify = ctypes.c_uint()
2303
gnutls.openpgp_crt_verify_self(crt, 0,
2304
ctypes.byref(crtverify))
1860
(gnutls.library.functions
1861
.gnutls_openpgp_crt_verify_self(crt, 0,
1862
ctypes.byref(crtverify)))
2305
1863
if crtverify.value != 0:
2306
gnutls.openpgp_crt_deinit(crt)
2307
raise gnutls.CertificateSecurityError("Verify failed")
1864
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1865
raise (gnutls.errors.CertificateSecurityError
1866
("Verify failed"))
2308
1867
# New buffer for the fingerprint
2309
1868
buf = ctypes.create_string_buffer(20)
2310
1869
buf_len = ctypes.c_size_t()
2311
1870
# Get the fingerprint from the certificate into the buffer
2312
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2313
ctypes.byref(buf_len))
1871
(gnutls.library.functions
1872
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1873
ctypes.byref(buf_len)))
2314
1874
# Deinit the certificate
2315
gnutls.openpgp_crt_deinit(crt)
1875
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2316
1876
# Convert the buffer to a Python bytestring
2317
1877
fpr = ctypes.string_at(buf, buf_len.value)
2318
1878
# Convert the bytestring to hexadecimal notation
2322
1882
2323
1883
class MultiprocessingMixIn(object):
2324
1884
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2325
2326
1885
def sub_process_main(self, request, address):
2327
1886
try:
2328
1887
self.finish_request(request, address)
2340
1899
2341
1900
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2342
1901
""" adds a pipe to the MixIn """
2343
2344
1902
def process_request(self, request, client_address):
2345
1903
"""Overrides and wraps the original process_request().
2346
1904
2367
1925
interface: None or a network interface name (string)
2368
1926
use_ipv6: Boolean; to use IPv6 or not
2369
1927
"""
2370
2371
1928
def __init__(self, server_address, RequestHandlerClass,
2372
interface=None,
2373
use_ipv6=True,
2374
socketfd=None):
1929
interface=None, use_ipv6=True, socketfd=None):
2375
1930
"""If socketfd is set, use that file descriptor instead of
2376
1931
creating a new one with socket.socket().
2377
1932
"""
2418
1973
self.interface)
2419
1974
else:
2420
1975
try:
2421
self.socket.setsockopt(
2422
socket.SOL_SOCKET, SO_BINDTODEVICE,
2423
(self.interface + "\0").encode("utf-8"))
1976
self.socket.setsockopt(socket.SOL_SOCKET,
1977
SO_BINDTODEVICE,
1978
(self.interface + "\0")
1979
.encode("utf-8"))
2424
1980
except socket.error as error:
2425
1981
if error.errno == errno.EPERM:
2426
1982
logger.error("No permission to bind to"
2444
2000
self.server_address = (any_address,
2445
2001
self.server_address[1])
2446
2002
elif not self.server_address[1]:
2447
self.server_address = (self.server_address[0], 0)
2003
self.server_address = (self.server_address[0],
2004
0)
2448
2005
# if self.interface:
2449
2006
# self.server_address = (self.server_address[0],
2450
2007
# 0, # port
2464
2021
2465
2022
Assumes a gobject.MainLoop event loop.
2466
2023
"""
2467
2468
2024
def __init__(self, server_address, RequestHandlerClass,
2469
interface=None,
2470
use_ipv6=True,
2471
clients=None,
2472
gnutls_priority=None,
2473
use_dbus=True,
2474
socketfd=None):
2025
interface=None, use_ipv6=True, clients=None,
2026
gnutls_priority=None, use_dbus=True, socketfd=None):
2475
2027
self.enabled = False
2476
2028
self.clients = clients
2477
2029
if self.clients is None:
2483
2035
interface = interface,
2484
2036
use_ipv6 = use_ipv6,
2485
2037
socketfd = socketfd)
2486
2487
2038
def server_activate(self):
2488
2039
if self.enabled:
2489
2040
return socketserver.TCPServer.server_activate(self)
2493
2044
2494
2045
def add_pipe(self, parent_pipe, proc):
2495
2046
# Call "handle_ipc" for both data and EOF events
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))
2047
gobject.io_add_watch(parent_pipe.fileno(),
2048
gobject.IO_IN | gobject.IO_HUP,
2049
functools.partial(self.handle_ipc,
2050
parent_pipe =
2051
parent_pipe,
2052
proc = proc))
2502
2053
2503
def handle_ipc(self, source, condition,
2504
parent_pipe=None,
2505
proc = None,
2506
client_object=None):
2054
def handle_ipc(self, source, condition, parent_pipe=None,
2055
proc = None, client_object=None):
2507
2056
# error, or the other end of multiprocessing.Pipe has closed
2508
2057
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2509
2058
# Wait for other process to exit
2532
2081
parent_pipe.send(False)
2533
2082
return False
2534
2083
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))
2084
gobject.io_add_watch(parent_pipe.fileno(),
2085
gobject.IO_IN | gobject.IO_HUP,
2086
functools.partial(self.handle_ipc,
2087
parent_pipe =
2088
parent_pipe,
2089
proc = proc,
2090
client_object =
2091
client))
2542
2092
parent_pipe.send(True)
2543
2093
# remove the old hook in favor of the new above hook on
2544
2094
# same fileno
2550
2100
2551
2101
parent_pipe.send(('data', getattr(client_object,
2552
2102
funcname)(*args,
2553
**kwargs)))
2103
**kwargs)))
2554
2104
2555
2105
if command == 'getattr':
2556
2106
attrname = request[1]
2557
if isinstance(client_object.__getattribute__(attrname),
2558
collections.Callable):
2559
parent_pipe.send(('function', ))
2107
if callable(client_object.__getattribute__(attrname)):
2108
parent_pipe.send(('function',))
2560
2109
else:
2561
parent_pipe.send((
2562
'data', client_object.__getattribute__(attrname)))
2110
parent_pipe.send(('data', client_object
2111
.__getattribute__(attrname)))
2563
2112
2564
2113
if command == 'setattr':
2565
2114
attrname = request[1]
2596
2145
# avoid excessive use of external libraries.
2597
2146
2598
2147
# New type for defining tokens, syntax, and semantics all-in-one
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
2148
Token = collections.namedtuple("Token",
2149
("regexp", # To match token; if
2150
# "value" is not None,
2151
# must have a "group"
2152
# containing digits
2153
"value", # datetime.timedelta or
2154
# None
2155
"followers")) # Tokens valid after
2156
# this token
2604
2157
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2605
2158
# the "duration" ABNF definition in RFC 3339, Appendix A.
2606
2159
token_end = Token(re.compile(r"$"), None, frozenset())
2607
2160
token_second = Token(re.compile(r"(\d+)S"),
2608
2161
datetime.timedelta(seconds=1),
2609
frozenset((token_end, )))
2162
frozenset((token_end,)))
2610
2163
token_minute = Token(re.compile(r"(\d+)M"),
2611
2164
datetime.timedelta(minutes=1),
2612
2165
frozenset((token_second, token_end)))
2628
2181
frozenset((token_month, token_end)))
2629
2182
token_week = Token(re.compile(r"(\d+)W"),
2630
2183
datetime.timedelta(weeks=1),
2631
frozenset((token_end, )))
2184
frozenset((token_end,)))
2632
2185
token_duration = Token(re.compile(r"P"), None,
2633
2186
frozenset((token_year, token_month,
2634
2187
token_day, token_time,
2636
2189
# Define starting values
2637
2190
value = datetime.timedelta() # Value so far
2638
2191
found_token = None
2639
followers = frozenset((token_duration, )) # Following valid tokens
2192
followers = frozenset((token_duration,)) # Following valid tokens
2640
2193
s = duration # String left to parse
2641
2194
# Loop until end token is found
2642
2195
while found_token is not token_end:
2659
2212
break
2660
2213
else:
2661
2214
# No currently valid tokens were found
2662
raise ValueError("Invalid RFC 3339 duration: {!r}"
2663
.format(duration))
2215
raise ValueError("Invalid RFC 3339 duration")
2664
2216
# End token found
2665
2217
return value
2666
2218
2703
2255
elif suffix == "w":
2704
2256
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2705
2257
else:
2706
raise ValueError("Unknown suffix {!r}".format(suffix))
2258
raise ValueError("Unknown suffix {!r}"
2259
.format(suffix))
2707
2260
except IndexError as e:
2708
2261
raise ValueError(*(e.args))
2709
2262
timevalue += delta
2725
2278
# Close all standard open file descriptors
2726
2279
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2727
2280
if not stat.S_ISCHR(os.fstat(null).st_mode):
2728
raise OSError(errno.ENODEV,
2729
"{} not a character device"
2281
raise OSError(errno.ENODEV, "{} not a character device"
2730
2282
.format(os.devnull))
2731
2283
os.dup2(null, sys.stdin.fileno())
2732
2284
os.dup2(null, sys.stdout.fileno())
2798
2350
"port": "",
2799
2351
"debug": "False",
2800
2352
"priority":
2801
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2802
":+SIGN-DSA-SHA256",
2353
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2803
2354
"servicename": "Mandos",
2804
2355
"use_dbus": "True",
2805
2356
"use_ipv6": "True",
2809
2360
"statedir": "/var/lib/mandos",
2810
2361
"foreground": "False",
2811
2362
"zeroconf": "True",
2812
}
2363
}
2813
2364
2814
2365
# Parse config file for server-global settings
2815
2366
server_config = configparser.SafeConfigParser(server_defaults)
2816
2367
del server_defaults
2817
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2368
server_config.read(os.path.join(options.configdir,
2369
"mandos.conf"))
2818
2370
# Convert the SafeConfigParser object to a dict
2819
2371
server_settings = server_config.defaults()
2820
2372
# Use the appropriate methods on the non-string config options
2838
2390
# Override the settings from the config file with command line
2839
2391
# options, if set.
2840
2392
for option in ("interface", "address", "port", "debug",
2841
"priority", "servicename", "configdir", "use_dbus",
2842
"use_ipv6", "debuglevel", "restore", "statedir",
2843
"socket", "foreground", "zeroconf"):
2393
"priority", "servicename", "configdir",
2394
"use_dbus", "use_ipv6", "debuglevel", "restore",
2395
"statedir", "socket", "foreground", "zeroconf"):
2844
2396
value = getattr(options, option)
2845
2397
if value is not None:
2846
2398
server_settings[option] = value
2861
2413
2862
2414
##################################################################
2863
2415
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")
2416
if (not server_settings["zeroconf"] and
2417
not (server_settings["port"]
2418
or server_settings["socket"] != "")):
2419
parser.error("Needs port or socket to work without"
2420
" Zeroconf")
2868
2421
2869
2422
# For convenience
2870
2423
debug = server_settings["debug"]
2886
2439
initlogger(debug, level)
2887
2440
2888
2441
if server_settings["servicename"] != "Mandos":
2889
syslogger.setFormatter(
2890
logging.Formatter('Mandos ({}) [%(process)d]:'
2891
' %(levelname)s: %(message)s'.format(
2892
server_settings["servicename"])))
2442
syslogger.setFormatter(logging.Formatter
2443
('Mandos ({}) [%(process)d]:'
2444
' %(levelname)s: %(message)s'
2445
.format(server_settings
2446
["servicename"])))
2893
2447
2894
2448
# Parse config file with clients
2895
2449
client_config = configparser.SafeConfigParser(Client
2903
2457
socketfd = None
2904
2458
if server_settings["socket"] != "":
2905
2459
socketfd = server_settings["socket"]
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)
2460
tcp_server = MandosServer((server_settings["address"],
2461
server_settings["port"]),
2462
ClientHandler,
2463
interface=(server_settings["interface"]
2464
or None),
2465
use_ipv6=use_ipv6,
2466
gnutls_priority=
2467
server_settings["priority"],
2468
use_dbus=use_dbus,
2469
socketfd=socketfd)
2914
2470
if not foreground:
2915
2471
pidfilename = "/run/mandos.pid"
2916
2472
if not os.path.isdir("/run/."):
2917
2473
pidfilename = "/var/run/mandos.pid"
2918
2474
pidfile = None
2919
2475
try:
2920
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2476
pidfile = open(pidfilename, "w")
2921
2477
except IOError as e:
2922
2478
logger.error("Could not open file %r", pidfilename,
2923
2479
exc_info=e)
2944
2500
2945
2501
# "Use a log level over 10 to enable all debugging options."
2946
2502
# - GnuTLS manual
2947
gnutls.global_set_log_level(11)
2503
gnutls.library.functions.gnutls_global_set_log_level(11)
2948
2504
2949
@gnutls.log_func
2505
@gnutls.library.types.gnutls_log_func
2950
2506
def debug_gnutls(level, string):
2951
2507
logger.debug("GnuTLS: %s", string[:-1])
2952
2508
2953
gnutls.global_set_log_function(debug_gnutls)
2509
(gnutls.library.functions
2510
.gnutls_global_set_log_function(debug_gnutls))
2954
2511
2955
2512
# Redirect stdin so all checkers get /dev/null
2956
2513
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2976
2533
if use_dbus:
2977
2534
try:
2978
2535
bus_name = dbus.service.BusName("se.recompile.Mandos",
2979
bus,
2980
do_not_queue=True)
2981
old_bus_name = dbus.service.BusName(
2982
"se.bsnet.fukt.Mandos", bus,
2983
do_not_queue=True)
2984
except dbus.exceptions.DBusException as e:
2536
bus, do_not_queue=True)
2537
old_bus_name = (dbus.service.BusName
2538
("se.bsnet.fukt.Mandos", bus,
2539
do_not_queue=True))
2540
except dbus.exceptions.NameExistsException as e:
2985
2541
logger.error("Disabling D-Bus:", exc_info=e)
2986
2542
use_dbus = False
2987
2543
server_settings["use_dbus"] = False
2988
2544
tcp_server.use_dbus = False
2989
2545
if zeroconf:
2990
2546
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2991
service = AvahiServiceToSyslog(
2992
name = server_settings["servicename"],
2993
servicetype = "_mandos._tcp",
2994
protocol = protocol,
2995
bus = bus)
2547
service = AvahiServiceToSyslog(name =
2548
server_settings["servicename"],
2549
servicetype = "_mandos._tcp",
2550
protocol = protocol, bus = bus)
2996
2551
if server_settings["interface"]:
2997
service.interface = if_nametoindex(
2998
server_settings["interface"].encode("utf-8"))
2552
service.interface = (if_nametoindex
2553
(server_settings["interface"]
2554
.encode("utf-8")))
2999
2555
3000
2556
global multiprocessing_manager
3001
2557
multiprocessing_manager = multiprocessing.Manager()
3020
2576
if server_settings["restore"]:
3021
2577
try:
3022
2578
with open(stored_state_path, "rb") as stored_state:
3023
clients_data, old_client_settings = pickle.load(
3024
stored_state)
2579
clients_data, old_client_settings = (pickle.load
2580
(stored_state))
3025
2581
os.remove(stored_state_path)
3026
2582
except IOError as e:
3027
2583
if e.errno == errno.ENOENT:
3028
logger.warning("Could not load persistent state:"
3029
" {}".format(os.strerror(e.errno)))
2584
logger.warning("Could not load persistent state: {}"
2585
.format(os.strerror(e.errno)))
3030
2586
else:
3031
2587
logger.critical("Could not load persistent state:",
3032
2588
exc_info=e)
3033
2589
raise
3034
2590
except EOFError as e:
3035
2591
logger.warning("Could not load persistent state: "
3036
"EOFError:",
3037
exc_info=e)
2592
"EOFError:", exc_info=e)
3038
2593
3039
2594
with PGPEngine() as pgp:
3040
2595
for client_name, client in clients_data.items():
3052
2607
# For each value in new config, check if it
3053
2608
# differs from the old config value (Except for
3054
2609
# the "secret" attribute)
3055
if (name != "secret"
3056
and (value !=
3057
old_client_settings[client_name][name])):
2610
if (name != "secret" and
2611
value != old_client_settings[client_name]
2612
[name]):
3058
2613
client[name] = value
3059
2614
except KeyError:
3060
2615
pass
3061
2616
3062
2617
# Clients who has passed its expire date can still be
3063
# enabled if its last checker was successful. A Client
2618
# enabled if its last checker was successful. Clients
3064
2619
# whose checker succeeded before we stored its state is
3065
2620
# assumed to have successfully run all checkers during
3066
2621
# downtime.
3069
2624
if not client["last_checked_ok"]:
3070
2625
logger.warning(
3071
2626
"disabling client {} - Client never "
3072
"performed a successful checker".format(
3073
client_name))
2627
"performed a successful checker"
2628
.format(client_name))
3074
2629
client["enabled"] = False
3075
2630
elif client["last_checker_status"] != 0:
3076
2631
logger.warning(
3077
2632
"disabling client {} - Client last"
3078
" checker failed with error code"
3079
" {}".format(
3080
client_name,
3081
client["last_checker_status"]))
2633
" checker failed with error code {}"
2634
.format(client_name,
2635
client["last_checker_status"]))
3082
2636
client["enabled"] = False
3083
2637
else:
3084
client["expires"] = (
3085
datetime.datetime.utcnow()
3086
+ client["timeout"])
2638
client["expires"] = (datetime.datetime
2639
.utcnow()
2640
+ client["timeout"])
3087
2641
logger.debug("Last checker succeeded,"
3088
" keeping {} enabled".format(
3089
client_name))
2642
" keeping {} enabled"
2643
.format(client_name))
3090
2644
try:
3091
client["secret"] = pgp.decrypt(
3092
client["encrypted_secret"],
3093
client_settings[client_name]["secret"])
2645
client["secret"] = (
2646
pgp.decrypt(client["encrypted_secret"],
2647
client_settings[client_name]
2648
["secret"]))
3094
2649
except PGPError:
3095
2650
# If decryption fails, we use secret from new settings
3096
logger.debug("Failed to decrypt {} old secret".format(
3097
client_name))
3098
client["secret"] = (client_settings[client_name]
3099
["secret"])
2651
logger.debug("Failed to decrypt {} old secret"
2652
.format(client_name))
2653
client["secret"] = (
2654
client_settings[client_name]["secret"])
3100
2655
3101
2656
# Add/remove clients based on new changes made to config
3102
2657
for client_name in (set(old_client_settings)
3109
2664
# Create all client objects
3110
2665
for client_name, client in clients_data.items():
3111
2666
tcp_server.clients[client_name] = client_class(
3112
name = client_name,
3113
settings = client,
2667
name = client_name, settings = client,
3114
2668
server_settings = server_settings)
3115
2669
3116
2670
if not tcp_server.clients:
3118
2672
3119
2673
if not foreground:
3120
2674
if pidfile is not None:
3121
pid = os.getpid()
3122
2675
try:
3123
2676
with pidfile:
3124
print(pid, file=pidfile)
2677
pid = os.getpid()
2678
pidfile.write("{}\n".format(pid).encode("utf-8"))
3125
2679
except IOError:
3126
2680
logger.error("Could not write to file %r with PID %d",
3127
2681
pidfilename, pid)
3132
2686
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3133
2687
3134
2688
if use_dbus:
3135
3136
@alternate_dbus_interfaces(
3137
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3138
class MandosDBusService(DBusObjectWithObjectManager):
2689
@alternate_dbus_interfaces({"se.recompile.Mandos":
2690
"se.bsnet.fukt.Mandos"})
2691
class MandosDBusService(DBusObjectWithProperties):
3139
2692
"""A D-Bus proxy object"""
3140
3141
2693
def __init__(self):
3142
2694
dbus.service.Object.__init__(self, bus, "/")
3143
3144
2695
_interface = "se.recompile.Mandos"
3145
2696
2697
@dbus_interface_annotations(_interface)
2698
def _foo(self):
2699
return { "org.freedesktop.DBus.Property"
2700
".EmitsChangedSignal":
2701
"false"}
2702
3146
2703
@dbus.service.signal(_interface, signature="o")
3147
2704
def ClientAdded(self, objpath):
3148
2705
"D-Bus signal"
3153
2710
"D-Bus signal"
3154
2711
pass
3155
2712
3156
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3157
"true"})
3158
2713
@dbus.service.signal(_interface, signature="os")
3159
2714
def ClientRemoved(self, objpath, name):
3160
2715
"D-Bus signal"
3161
2716
pass
3162
2717
3163
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3164
"true"})
3165
2718
@dbus.service.method(_interface, out_signature="ao")
3166
2719
def GetAllClients(self):
3167
2720
"D-Bus method"
3168
return dbus.Array(c.dbus_object_path for c in
2721
return dbus.Array(c.dbus_object_path
2722
for c in
3169
2723
tcp_server.clients.itervalues())
3170
2724
3171
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3172
"true"})
3173
2725
@dbus.service.method(_interface,
3174
2726
out_signature="a{oa{sv}}")
3175
2727
def GetAllClientsWithProperties(self):
3176
2728
"D-Bus method"
3177
2729
return dbus.Dictionary(
3178
{ c.dbus_object_path: c.GetAll(
3179
"se.recompile.Mandos.Client")
2730
{ c.dbus_object_path: c.GetAll("")
3180
2731
for c in tcp_server.clients.itervalues() },
3181
2732
signature="oa{sv}")
3182
2733
3187
2738
if c.dbus_object_path == object_path:
3188
2739
del tcp_server.clients[c.name]
3189
2740
c.remove_from_connection()
3190
# Don't signal the disabling
2741
# Don't signal anything except ClientRemoved
3191
2742
c.disable(quiet=True)
3192
# Emit D-Bus signal for removal
3193
self.client_removed_signal(c)
2743
# Emit D-Bus signal
2744
self.ClientRemoved(object_path, c.name)
3194
2745
return
3195
2746
raise KeyError(object_path)
3196
2747
3197
2748
del _interface
3198
3199
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3200
out_signature = "a{oa{sa{sv}}}")
3201
def GetManagedObjects(self):
3202
"""D-Bus method"""
3203
return dbus.Dictionary(
3204
{ client.dbus_object_path:
3205
dbus.Dictionary(
3206
{ interface: client.GetAll(interface)
3207
for interface in
3208
client._get_all_interface_names()})
3209
for client in tcp_server.clients.values()})
3210
3211
def client_added_signal(self, client):
3212
"""Send the new standard signal and the old signal"""
3213
if use_dbus:
3214
# New standard signal
3215
self.InterfacesAdded(
3216
client.dbus_object_path,
3217
dbus.Dictionary(
3218
{ interface: client.GetAll(interface)
3219
for interface in
3220
client._get_all_interface_names()}))
3221
# Old signal
3222
self.ClientAdded(client.dbus_object_path)
3223
3224
def client_removed_signal(self, client):
3225
"""Send the new standard signal and the old signal"""
3226
if use_dbus:
3227
# New standard signal
3228
self.InterfacesRemoved(
3229
client.dbus_object_path,
3230
client._get_all_interface_names())
3231
# Old signal
3232
self.ClientRemoved(client.dbus_object_path,
3233
client.name)
3234
2749
3235
2750
mandos_dbus_service = MandosDBusService()
3236
2751
3259
2774
# + secret.
3260
2775
exclude = { "bus", "changedstate", "secret",
3261
2776
"checker", "server_settings" }
3262
for name, typ in inspect.getmembers(dbus.service
3263
.Object):
2777
for name, typ in (inspect.getmembers
2778
(dbus.service.Object)):
3264
2779
exclude.add(name)
3265
2780
3266
2781
client_dict["encrypted_secret"] = (client
3273
2788
del client_settings[client.name]["secret"]
3274
2789
3275
2790
try:
3276
with tempfile.NamedTemporaryFile(
3277
mode='wb',
3278
suffix=".pickle",
3279
prefix='clients-',
3280
dir=os.path.dirname(stored_state_path),
3281
delete=False) as stored_state:
2791
with (tempfile.NamedTemporaryFile
2792
(mode='wb', suffix=".pickle", prefix='clients-',
2793
dir=os.path.dirname(stored_state_path),
2794
delete=False)) as stored_state:
3282
2795
pickle.dump((clients, client_settings), stored_state)
3283
tempname = stored_state.name
2796
tempname=stored_state.name
3284
2797
os.rename(tempname, stored_state_path)
3285
2798
except (IOError, OSError) as e:
3286
2799
if not debug:
3301
2814
name, client = tcp_server.clients.popitem()
3302
2815
if use_dbus:
3303
2816
client.remove_from_connection()
3304
# Don't signal the disabling
2817
# Don't signal anything except ClientRemoved
3305
2818
client.disable(quiet=True)
3306
# Emit D-Bus signal for removal
3307
2819
if use_dbus:
3308
mandos_dbus_service.client_removed_signal(client)
2820
# Emit D-Bus signal
2821
mandos_dbus_service.ClientRemoved(client
2822
.dbus_object_path,
2823
client.name)
3309
2824
client_settings.clear()
3310
2825
3311
2826
atexit.register(cleanup)
3312
2827
3313
2828
for client in tcp_server.clients.itervalues():
3314
2829
if use_dbus:
3315
# Emit D-Bus signal for adding
3316
mandos_dbus_service.client_added_signal(client)
2830
# Emit D-Bus signal
2831
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3317
2832
# Need to initiate checking of clients
3318
2833
if client.enabled:
3319
2834
client.init_checker()
3364
2879
# Must run before the D-Bus bus name gets deregistered
3365
2880
cleanup()
3366
2881
3367
3368
2882
if __name__ == '__main__':
3369
2883
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0