To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 654
- compare with another revision
- download diff
- download tarball
- view history from revision 654
- Committer: Teddy Hogeborn
- Date: 2014-02-16 02:42:42 UTC
- Revision ID: teddy@recompile.se-20140216024242-9wiw1nkxgt7ohovj
Fix running of self-tests.
* debian/control (Build-Depends): Add Python dependencies to
successfully run self-tests.
* debian/copyright: GPLv3 now has its own license file - use it.
* debian/watch: Set PGP signature URL.
* mandos (main): Bug fix: When running self-tests, set exit code.
* mandos-ctl (main): Cosmetic fix; use os.EX_OK instead of plain 0.
* debian/control (Build-Depends): Add Python dependencies to
successfully run self-tests.
* debian/copyright: GPLv3 now has its own license file - use it.
* debian/watch: Set PGP signature URL.
* mandos (main): Bug fix: When running self-tests, set exit code.
* mandos-ctl (main): Cosmetic fix; use os.EX_OK instead of plain 0.
- files removed:
- debian/upstream
- plugin-helpers
- files modified:
- DBUS-API
added
removed
mandos
1
#!/usr/bin/python2.7
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 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
50
47
import gnutls.library.functions
51
48
import gnutls.library.constants
52
49
import gnutls.library.types
53
try:
54
import ConfigParser as configparser
55
except ImportError:
56
import configparser
50
import ConfigParser as configparser
57
51
import sys
58
52
import re
59
53
import os
68
62
import struct
69
63
import fcntl
70
64
import functools
71
try:
72
import cPickle as pickle
73
except ImportError:
74
import pickle
65
import cPickle as pickle
75
66
import multiprocessing
76
67
import types
77
68
import binascii
78
69
import tempfile
79
70
import itertools
80
71
import collections
81
import codecs
82
72
83
73
import dbus
84
74
import dbus.service
85
try:
86
import gobject
87
except ImportError:
88
from gi.repository import GObject as gobject
75
import gobject
89
76
import avahi
90
77
from dbus.mainloop.glib import DBusGMainLoop
91
78
import ctypes
101
88
except ImportError:
102
89
SO_BINDTODEVICE = None
103
90
104
if sys.version_info.major == 2:
105
str = unicode
106
107
version = "1.7.1"
91
version = "1.6.3"
108
92
stored_state_file = "clients.pickle"
109
93
110
94
logger = logging.getLogger()
111
syslogger = None
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
112
98
113
99
try:
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
102
.if_nametoindex)
116
103
except (OSError, AttributeError):
117
118
104
def if_nametoindex(interface):
119
105
"Get an interface index the hard way, i.e. using fcntl()"
120
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
107
with contextlib.closing(socket.socket()) as s:
122
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
110
interface))
111
interface_index = struct.unpack(str("I"),
112
ifreq[16:20])[0]
125
113
return interface_index
126
114
127
115
128
116
def initlogger(debug, level=logging.WARNING):
129
117
"""init logger and add loglevel"""
130
118
131
global syslogger
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
135
119
syslogger.setFormatter(logging.Formatter
136
120
('Mandos [%(process)d]: %(levelname)s:'
137
121
' %(message)s'))
154
138
155
139
class PGPEngine(object):
156
140
"""A simple class for OpenPGP symmetric encryption & decryption"""
157
158
141
def __init__(self):
159
142
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
143
self.gnupgargs = ['--batch',
199
182
200
183
def encrypt(self, data, password):
201
184
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
186
) as passfile:
204
187
passfile.write(passphrase)
205
188
passfile.flush()
206
189
proc = subprocess.Popen(['gpg', '--symmetric',
217
200
218
201
def decrypt(self, data, password):
219
202
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
204
) as passfile:
222
205
passfile.write(passphrase)
223
206
passfile.flush()
224
207
proc = subprocess.Popen(['gpg', '--decrypt',
228
211
stdin = subprocess.PIPE,
229
212
stdout = subprocess.PIPE,
230
213
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
214
decrypted_plaintext, err = proc.communicate(input
215
= data)
232
216
if proc.returncode != 0:
233
217
raise PGPError(err)
234
218
return decrypted_plaintext
237
221
class AvahiError(Exception):
238
222
def __init__(self, value, *args, **kwargs):
239
223
self.value = value
240
return super(AvahiError, self).__init__(value, *args,
241
**kwargs)
242
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
243
227
244
228
class AvahiServiceError(AvahiError):
245
229
pass
246
230
247
248
231
class AvahiGroupError(AvahiError):
249
232
pass
250
233
270
253
bus: dbus.SystemBus()
271
254
"""
272
255
273
def __init__(self,
274
interface = avahi.IF_UNSPEC,
275
name = None,
276
servicetype = None,
277
port = None,
278
TXT = None,
279
domain = "",
280
host = "",
281
max_renames = 32768,
282
protocol = avahi.PROTO_UNSPEC,
283
bus = None):
256
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
servicetype = None, port = None, TXT = None,
258
domain = "", host = "", max_renames = 32768,
259
protocol = avahi.PROTO_UNSPEC, bus = None):
284
260
self.interface = interface
285
261
self.name = name
286
262
self.type = servicetype
296
272
self.bus = bus
297
273
self.entry_group_state_changed_match = None
298
274
299
def rename(self, remove=True):
275
def rename(self):
300
276
"""Derived from the Avahi example code"""
301
277
if self.rename_count >= self.max_renames:
302
278
logger.critical("No suitable Zeroconf service name found"
303
279
" after %i retries, exiting.",
304
280
self.rename_count)
305
281
raise AvahiServiceError("Too many renames")
306
self.name = str(
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
282
self.name = unicode(self.server
283
.GetAlternativeServiceName(self.name))
309
284
logger.info("Changing Zeroconf service name to %r ...",
310
285
self.name)
311
if remove:
312
self.remove()
286
self.remove()
313
287
try:
314
288
self.add()
315
289
except dbus.exceptions.DBusException as error:
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
320
else:
321
logger.critical("D-Bus Exception", exc_info=error)
322
self.cleanup()
323
os._exit(1)
290
logger.critical("D-Bus Exception", exc_info=error)
291
self.cleanup()
292
os._exit(1)
293
self.rename_count += 1
324
294
325
295
def remove(self):
326
296
"""Derived from the Avahi example code"""
364
334
self.rename()
365
335
elif state == avahi.ENTRY_GROUP_FAILURE:
366
336
logger.critical("Avahi: Error in group state changed %s",
367
str(error))
368
raise AvahiGroupError("State changed: {!s}".format(error))
337
unicode(error))
338
raise AvahiGroupError("State changed: {0!s}"
339
.format(error))
369
340
370
341
def cleanup(self):
371
342
"""Derived from the Avahi example code"""
381
352
def server_state_changed(self, state, error=None):
382
353
"""Derived from the Avahi example code"""
383
354
logger.debug("Avahi server state change: %i", state)
384
bad_states = {
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
389
}
355
bad_states = { avahi.SERVER_INVALID:
356
"Zeroconf server invalid",
357
avahi.SERVER_REGISTERING: None,
358
avahi.SERVER_COLLISION:
359
"Zeroconf server name collision",
360
avahi.SERVER_FAILURE:
361
"Zeroconf server failure" }
390
362
if state in bad_states:
391
363
if bad_states[state] is not None:
392
364
if error is None:
395
367
logger.error(bad_states[state] + ": %r", error)
396
368
self.cleanup()
397
369
elif state == avahi.SERVER_RUNNING:
398
try:
399
self.add()
400
except dbus.exceptions.DBusException as error:
401
if (error.get_dbus_name()
402
== "org.freedesktop.Avahi.CollisionError"):
403
logger.info("Local Zeroconf service name"
404
" collision.")
405
return self.rename(remove=False)
406
else:
407
logger.critical("D-Bus Exception", exc_info=error)
408
self.cleanup()
409
os._exit(1)
370
self.add()
410
371
else:
411
372
if error is None:
412
373
logger.debug("Unknown state: %r", state)
422
383
follow_name_owner_changes=True),
423
384
avahi.DBUS_INTERFACE_SERVER)
424
385
self.server.connect_to_signal("StateChanged",
425
self.server_state_changed)
386
self.server_state_changed)
426
387
self.server_state_changed(self.server.GetState())
427
388
428
389
429
390
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
391
def rename(self):
431
392
"""Add the new name to the syslog messages"""
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
435
.format(self.name)))
393
ret = AvahiService.rename(self)
394
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
397
.format(self.name)))
436
398
return ret
437
399
438
def call_pipe(connection, # : multiprocessing.Connection
439
func, *args, **kwargs):
440
"""This function is meant to be called by multiprocessing.Process
441
442
This function runs func(*args, **kwargs), and writes the resulting
443
return value on the provided multiprocessing.Connection.
444
"""
445
connection.send(func(*args, **kwargs))
446
connection.close()
400
401
def timedelta_to_milliseconds(td):
402
"Convert a datetime.timedelta() to milliseconds"
403
return ((td.days * 24 * 60 * 60 * 1000)
404
+ (td.seconds * 1000)
405
+ (td.microseconds // 1000))
406
447
407
448
408
class Client(object):
449
409
"""A representation of a client host served by this server.
476
436
last_checker_status: integer between 0 and 255 reflecting exit
477
437
status of last checker. -1 reflects crashed
478
438
checker, -2 means no checker completed yet.
479
last_checker_signal: The signal which killed the last checker, if
480
last_checker_status is -1
481
439
last_enabled: datetime.datetime(); (UTC) or None
482
440
name: string; from the config file, used in log messages and
483
441
D-Bus identifiers
496
454
"fingerprint", "host", "interval",
497
455
"last_approval_request", "last_checked_ok",
498
456
"last_enabled", "name", "timeout")
499
client_defaults = {
500
"timeout": "PT5M",
501
"extended_timeout": "PT15M",
502
"interval": "PT2M",
503
"checker": "fping -q -- %%(host)s",
504
"host": "",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
508
"enabled": "True",
509
}
457
client_defaults = { "timeout": "PT5M",
458
"extended_timeout": "PT15M",
459
"interval": "PT2M",
460
"checker": "fping -q -- %%(host)s",
461
"host": "",
462
"approval_delay": "PT0S",
463
"approval_duration": "PT1S",
464
"approved_by_default": "True",
465
"enabled": "True",
466
}
467
468
def timeout_milliseconds(self):
469
"Return the 'timeout' attribute in milliseconds"
470
return timedelta_to_milliseconds(self.timeout)
471
472
def extended_timeout_milliseconds(self):
473
"Return the 'extended_timeout' attribute in milliseconds"
474
return timedelta_to_milliseconds(self.extended_timeout)
475
476
def interval_milliseconds(self):
477
"Return the 'interval' attribute in milliseconds"
478
return timedelta_to_milliseconds(self.interval)
479
480
def approval_delay_milliseconds(self):
481
return timedelta_to_milliseconds(self.approval_delay)
510
482
511
483
@staticmethod
512
484
def config_parser(config):
528
500
client["enabled"] = config.getboolean(client_name,
529
501
"enabled")
530
502
531
# Uppercase and remove spaces from fingerprint for later
532
# comparison purposes with return value from the
533
# fingerprint() function
534
503
client["fingerprint"] = (section["fingerprint"].upper()
535
504
.replace(" ", ""))
536
505
if "secret" in section:
541
510
"rb") as secfile:
542
511
client["secret"] = secfile.read()
543
512
else:
544
raise TypeError("No secret or secfile for section {}"
513
raise TypeError("No secret or secfile for section {0}"
545
514
.format(section))
546
515
client["timeout"] = string_to_delta(section["timeout"])
547
516
client["extended_timeout"] = string_to_delta(
564
533
server_settings = {}
565
534
self.server_settings = server_settings
566
535
# adding all client settings
567
for setting, value in settings.items():
536
for setting, value in settings.iteritems():
568
537
setattr(self, setting, value)
569
538
570
539
if self.enabled:
578
547
self.expires = None
579
548
580
549
logger.debug("Creating client %r", self.name)
550
# Uppercase and remove spaces from fingerprint for later
551
# comparison purposes with return value from the fingerprint()
552
# function
581
553
logger.debug(" Fingerprint: %s", self.fingerprint)
582
554
self.created = settings.get("created",
583
555
datetime.datetime.utcnow())
590
562
self.current_checker_command = None
591
563
self.approved = None
592
564
self.approvals_pending = 0
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
565
self.changedstate = (multiprocessing_manager
566
.Condition(multiprocessing_manager
567
.Lock()))
568
self.client_structure = [attr for attr in
569
self.__dict__.iterkeys()
597
570
if not attr.startswith("_")]
598
571
self.client_structure.append("client_structure")
599
572
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
573
for name, t in inspect.getmembers(type(self),
574
lambda obj:
575
isinstance(obj,
576
property)):
602
577
if not name.startswith("_"):
603
578
self.client_structure.append(name)
604
579
646
621
# and every interval from then on.
647
622
if self.checker_initiator_tag is not None:
648
623
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
651
self.start_checker)
624
self.checker_initiator_tag = (gobject.timeout_add
625
(self.interval_milliseconds(),
626
self.start_checker))
652
627
# Schedule a disable() when 'timeout' has passed
653
628
if self.disable_initiator_tag is not None:
654
629
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
630
self.disable_initiator_tag = (gobject.timeout_add
631
(self.timeout_milliseconds(),
632
self.disable))
657
633
# Also start a new checker *right now*.
658
634
self.start_checker()
659
635
660
def checker_callback(self, source, condition, connection,
661
command):
636
def checker_callback(self, pid, condition, command):
662
637
"""The checker has completed, so take appropriate actions."""
663
638
self.checker_callback_tag = None
664
639
self.checker = None
665
# Read return code from connection (see call_pipe)
666
returncode = connection.recv()
667
connection.close()
668
669
if returncode >= 0:
670
self.last_checker_status = returncode
671
self.last_checker_signal = None
640
if os.WIFEXITED(condition):
641
self.last_checker_status = os.WEXITSTATUS(condition)
672
642
if self.last_checker_status == 0:
673
643
logger.info("Checker for %(name)s succeeded",
674
644
vars(self))
675
645
self.checked_ok()
676
646
else:
677
logger.info("Checker for %(name)s failed", vars(self))
647
logger.info("Checker for %(name)s failed",
648
vars(self))
678
649
else:
679
650
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
651
logger.warning("Checker for %(name)s crashed?",
682
652
vars(self))
683
return False
684
653
685
654
def checked_ok(self):
686
655
"""Assert that the client has been seen, alive and well."""
687
656
self.last_checked_ok = datetime.datetime.utcnow()
688
657
self.last_checker_status = 0
689
self.last_checker_signal = None
690
658
self.bump_timeout()
691
659
692
660
def bump_timeout(self, timeout=None):
697
665
gobject.source_remove(self.disable_initiator_tag)
698
666
self.disable_initiator_tag = None
699
667
if getattr(self, "enabled", False):
700
self.disable_initiator_tag = gobject.timeout_add(
701
int(timeout.total_seconds() * 1000), self.disable)
668
self.disable_initiator_tag = (gobject.timeout_add
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
702
671
self.expires = datetime.datetime.utcnow() + timeout
703
672
704
673
def need_approval(self):
718
687
# than 'timeout' for the client to be disabled, which is as it
719
688
# should be.
720
689
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
723
self.checker.join()
724
self.checker = None
690
# If a checker exists, make sure it is not a zombie
691
try:
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
except AttributeError:
694
pass
695
except OSError as error:
696
if error.errno != errno.ECHILD:
697
raise
698
else:
699
if pid:
700
logger.warning("Checker was a zombie")
701
gobject.source_remove(self.checker_callback_tag)
702
self.checker_callback(pid, status,
703
self.current_checker_command)
725
704
# Start a new checker if needed
726
705
if self.checker is None:
727
706
# Escape attributes for the shell
728
escaped_attrs = {
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
707
escaped_attrs = dict(
708
(attr, re.escape(unicode(getattr(self, attr))))
709
for attr in
710
self.runtime_expansions)
731
711
try:
732
712
command = self.checker_command % escaped_attrs
733
713
except TypeError as error:
734
714
logger.error('Could not format string "%s"',
735
self.checker_command,
715
self.checker_command, exc_info=error)
716
return True # Try again later
717
self.current_checker_command = command
718
try:
719
logger.info("Starting checker %r for %s",
720
command, self.name)
721
# We don't need to redirect stdout and stderr, since
722
# in normal mode, that is already done by daemon(),
723
# and in debug mode we don't want to. (Stdin is
724
# always replaced by /dev/null.)
725
# The exception is when not debugging but nevertheless
726
# running in the foreground; use the previously
727
# created wnull.
728
popen_args = {}
729
if (not self.server_settings["debug"]
730
and self.server_settings["foreground"]):
731
popen_args.update({"stdout": wnull,
732
"stderr": wnull })
733
self.checker = subprocess.Popen(command,
734
close_fds=True,
735
shell=True, cwd="/",
736
**popen_args)
737
except OSError as error:
738
logger.error("Failed to start subprocess",
736
739
exc_info=error)
737
return True # Try again later
738
self.current_checker_command = command
739
logger.info("Starting checker %r for %s", command,
740
self.name)
741
# We don't need to redirect stdout and stderr, since
742
# in normal mode, that is already done by daemon(),
743
# and in debug mode we don't want to. (Stdin is
744
# always replaced by /dev/null.)
745
# The exception is when not debugging but nevertheless
746
# running in the foreground; use the previously
747
# created wnull.
748
popen_args = { "close_fds": True,
749
"shell": True,
750
"cwd": "/" }
751
if (not self.server_settings["debug"]
752
and self.server_settings["foreground"]):
753
popen_args.update({"stdout": wnull,
754
"stderr": wnull })
755
pipe = multiprocessing.Pipe(duplex = False)
756
self.checker = multiprocessing.Process(
757
target = call_pipe,
758
args = (pipe[1], subprocess.call, command),
759
kwargs = popen_args)
760
self.checker.start()
761
self.checker_callback_tag = gobject.io_add_watch(
762
pipe[0].fileno(), gobject.IO_IN,
763
self.checker_callback, pipe[0], command)
740
return True
741
self.checker_callback_tag = (gobject.child_watch_add
742
(self.checker.pid,
743
self.checker_callback,
744
data=command))
745
# The checker may have completed before the gobject
746
# watch was added. Check for this.
747
try:
748
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
749
except OSError as error:
750
if error.errno == errno.ECHILD:
751
# This should never happen
752
logger.error("Child process vanished",
753
exc_info=error)
754
return True
755
raise
756
if pid:
757
gobject.source_remove(self.checker_callback_tag)
758
self.checker_callback(pid, status, command)
764
759
# Re-run this periodically if run by gobject.timeout_add
765
760
return True
766
761
772
767
if getattr(self, "checker", None) is None:
773
768
return
774
769
logger.debug("Stopping checker for %(name)s", vars(self))
775
self.checker.terminate()
770
try:
771
self.checker.terminate()
772
#time.sleep(0.5)
773
#if self.checker.poll() is None:
774
# self.checker.kill()
775
except OSError as error:
776
if error.errno != errno.ESRCH: # No such process
777
raise
776
778
self.checker = None
777
779
778
780
779
def dbus_service_property(dbus_interface,
780
signature="v",
781
access="readwrite",
782
byte_arrays=False):
781
def dbus_service_property(dbus_interface, signature="v",
782
access="readwrite", byte_arrays=False):
783
783
"""Decorators for marking methods of a DBusObjectWithProperties to
784
784
become properties on the D-Bus.
785
785
794
794
# "Set" method, so we fail early here:
795
795
if byte_arrays and signature != "ay":
796
796
raise ValueError("Byte arrays not supported for non-'ay'"
797
" signature {!r}".format(signature))
798
797
" signature {0!r}".format(signature))
799
798
def decorator(func):
800
799
func._dbus_is_property = True
801
800
func._dbus_interface = dbus_interface
806
805
func._dbus_name = func._dbus_name[:-14]
807
806
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
808
807
return func
809
810
808
return decorator
811
809
812
810
821
819
"org.freedesktop.DBus.Property.EmitsChangedSignal":
822
820
"false"}
823
821
"""
824
825
822
def decorator(func):
826
823
func._dbus_is_interface = True
827
824
func._dbus_interface = dbus_interface
828
825
func._dbus_name = dbus_interface
829
826
return func
830
831
827
return decorator
832
828
833
829
835
831
"""Decorator to annotate D-Bus methods, signals or properties
836
832
Usage:
837
833
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
841
834
@dbus_service_property("org.example.Interface", signature="b",
842
835
access="r")
836
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
837
"org.freedesktop.DBus.Property."
838
"EmitsChangedSignal": "false"})
843
839
def Property_dbus_property(self):
844
840
return dbus.Boolean(False)
845
846
See also the DBusObjectWithAnnotations class.
847
841
"""
848
849
842
def decorator(func):
850
843
func._dbus_annotations = annotations
851
844
return func
852
853
845
return decorator
854
846
855
847
856
848
class DBusPropertyException(dbus.exceptions.DBusException):
857
849
"""A base class for D-Bus property-related exceptions
858
850
"""
859
pass
851
def __unicode__(self):
852
return unicode(str(self))
860
853
861
854
862
855
class DBusPropertyAccessException(DBusPropertyException):
871
864
pass
872
865
873
866
874
class DBusObjectWithAnnotations(dbus.service.Object):
875
"""A D-Bus object with annotations.
867
class DBusObjectWithProperties(dbus.service.Object):
868
"""A D-Bus object with properties.
876
869
877
Classes inheriting from this can use the dbus_annotations
878
decorator to add annotations to methods or signals.
870
Classes inheriting from this can use the dbus_service_property
871
decorator to expose methods as D-Bus properties. It exposes the
872
standard Get(), Set(), and GetAll() methods on the D-Bus.
879
873
"""
880
874
881
875
@staticmethod
885
879
If called like _is_dbus_thing("method") it returns a function
886
880
suitable for use as predicate to inspect.getmembers().
887
881
"""
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
882
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
889
883
False)
890
884
891
885
def _get_all_dbus_things(self, thing):
892
886
"""Returns a generator of (name, attribute) pairs
893
887
"""
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
888
return ((getattr(athing.__get__(self), "_dbus_name",
889
name),
895
890
athing.__get__(self))
896
891
for cls in self.__class__.__mro__
897
892
for name, athing in
898
inspect.getmembers(cls, self._is_dbus_thing(thing)))
899
900
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
901
out_signature = "s",
902
path_keyword = 'object_path',
903
connection_keyword = 'connection')
904
def Introspect(self, object_path, connection):
905
"""Overloading of standard D-Bus method.
906
907
Inserts annotation tags on methods and signals.
908
"""
909
xmlstring = dbus.service.Object.Introspect(self, object_path,
910
connection)
911
try:
912
document = xml.dom.minidom.parseString(xmlstring)
913
914
for if_tag in document.getElementsByTagName("interface"):
915
# Add annotation tags
916
for typ in ("method", "signal"):
917
for tag in if_tag.getElementsByTagName(typ):
918
annots = dict()
919
for name, prop in (self.
920
_get_all_dbus_things(typ)):
921
if (name == tag.getAttribute("name")
922
and prop._dbus_interface
923
== if_tag.getAttribute("name")):
924
annots.update(getattr(
925
prop, "_dbus_annotations", {}))
926
for name, value in annots.items():
927
ann_tag = document.createElement(
928
"annotation")
929
ann_tag.setAttribute("name", name)
930
ann_tag.setAttribute("value", value)
931
tag.appendChild(ann_tag)
932
# Add interface annotation tags
933
for annotation, value in dict(
934
itertools.chain.from_iterable(
935
annotations().items()
936
for name, annotations
937
in self._get_all_dbus_things("interface")
938
if name == if_tag.getAttribute("name")
939
)).items():
940
ann_tag = document.createElement("annotation")
941
ann_tag.setAttribute("name", annotation)
942
ann_tag.setAttribute("value", value)
943
if_tag.appendChild(ann_tag)
944
# Fix argument name for the Introspect method itself
945
if (if_tag.getAttribute("name")
946
== dbus.INTROSPECTABLE_IFACE):
947
for cn in if_tag.getElementsByTagName("method"):
948
if cn.getAttribute("name") == "Introspect":
949
for arg in cn.getElementsByTagName("arg"):
950
if (arg.getAttribute("direction")
951
== "out"):
952
arg.setAttribute("name",
953
"xml_data")
954
xmlstring = document.toxml("utf-8")
955
document.unlink()
956
except (AttributeError, xml.dom.DOMException,
957
xml.parsers.expat.ExpatError) as error:
958
logger.error("Failed to override Introspection method",
959
exc_info=error)
960
return xmlstring
961
962
963
class DBusObjectWithProperties(DBusObjectWithAnnotations):
964
"""A D-Bus object with properties.
965
966
Classes inheriting from this can use the dbus_service_property
967
decorator to expose methods as D-Bus properties. It exposes the
968
standard Get(), Set(), and GetAll() methods on the D-Bus.
969
"""
893
inspect.getmembers(cls,
894
self._is_dbus_thing(thing)))
970
895
971
896
def _get_dbus_property(self, interface_name, property_name):
972
897
"""Returns a bound method if one exists which is a D-Bus
973
898
property with the specified name and interface.
974
899
"""
975
for cls in self.__class__.__mro__:
976
for name, value in inspect.getmembers(
977
cls, self._is_dbus_thing("property")):
900
for cls in self.__class__.__mro__:
901
for name, value in (inspect.getmembers
902
(cls,
903
self._is_dbus_thing("property"))):
978
904
if (value._dbus_name == property_name
979
905
and value._dbus_interface == interface_name):
980
906
return value.__get__(self)
981
907
982
908
# No such property
983
raise DBusPropertyNotFound("{}:{}.{}".format(
984
self.dbus_object_path, interface_name, property_name))
985
986
@classmethod
987
def _get_all_interface_names(cls):
988
"""Get a sequence of all interfaces supported by an object"""
989
return (name for name in set(getattr(getattr(x, attr),
990
"_dbus_interface", None)
991
for x in (inspect.getmro(cls))
992
for attr in dir(x))
993
if name is not None)
994
995
@dbus.service.method(dbus.PROPERTIES_IFACE,
996
in_signature="ss",
909
raise DBusPropertyNotFound(self.dbus_object_path + ":"
910
+ interface_name + "."
911
+ property_name)
912
913
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
997
914
out_signature="v")
998
915
def Get(self, interface_name, property_name):
999
916
"""Standard D-Bus property Get() method, see D-Bus standard.
1018
935
# signatures other than "ay".
1019
936
if prop._dbus_signature != "ay":
1020
937
raise ValueError("Byte arrays not supported for non-"
1021
"'ay' signature {!r}"
938
"'ay' signature {0!r}"
1022
939
.format(prop._dbus_signature))
1023
940
value = dbus.ByteArray(b''.join(chr(byte)
1024
941
for byte in value))
1025
942
prop(value)
1026
943
1027
@dbus.service.method(dbus.PROPERTIES_IFACE,
1028
in_signature="s",
944
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1029
945
out_signature="a{sv}")
1030
946
def GetAll(self, interface_name):
1031
947
"""Standard D-Bus property GetAll() method, see D-Bus
1046
962
if not hasattr(value, "variant_level"):
1047
963
properties[name] = value
1048
964
continue
1049
properties[name] = type(value)(
1050
value, variant_level = value.variant_level + 1)
965
properties[name] = type(value)(value, variant_level=
966
value.variant_level+1)
1051
967
return dbus.Dictionary(properties, signature="sv")
1052
968
1053
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1054
def PropertiesChanged(self, interface_name, changed_properties,
1055
invalidated_properties):
1056
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
1057
standard.
1058
"""
1059
pass
1060
1061
969
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1062
970
out_signature="s",
1063
971
path_keyword='object_path',
1067
975
1068
976
Inserts property tags and interface annotation tags.
1069
977
"""
1070
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1071
object_path,
1072
connection)
978
xmlstring = dbus.service.Object.Introspect(self, object_path,
979
connection)
1073
980
try:
1074
981
document = xml.dom.minidom.parseString(xmlstring)
1075
1076
982
def make_tag(document, name, prop):
1077
983
e = document.createElement("property")
1078
984
e.setAttribute("name", name)
1079
985
e.setAttribute("type", prop._dbus_signature)
1080
986
e.setAttribute("access", prop._dbus_access)
1081
987
return e
1082
1083
988
for if_tag in document.getElementsByTagName("interface"):
1084
989
# Add property tags
1085
990
for tag in (make_tag(document, name, prop)
1088
993
if prop._dbus_interface
1089
994
== if_tag.getAttribute("name")):
1090
995
if_tag.appendChild(tag)
1091
# Add annotation tags for properties
1092
for tag in if_tag.getElementsByTagName("property"):
1093
annots = dict()
1094
for name, prop in self._get_all_dbus_things(
1095
"property"):
1096
if (name == tag.getAttribute("name")
1097
and prop._dbus_interface
1098
== if_tag.getAttribute("name")):
1099
annots.update(getattr(
1100
prop, "_dbus_annotations", {}))
1101
for name, value in annots.items():
1102
ann_tag = document.createElement(
1103
"annotation")
1104
ann_tag.setAttribute("name", name)
1105
ann_tag.setAttribute("value", value)
1106
tag.appendChild(ann_tag)
996
# Add annotation tags
997
for typ in ("method", "signal", "property"):
998
for tag in if_tag.getElementsByTagName(typ):
999
annots = dict()
1000
for name, prop in (self.
1001
_get_all_dbus_things(typ)):
1002
if (name == tag.getAttribute("name")
1003
and prop._dbus_interface
1004
== if_tag.getAttribute("name")):
1005
annots.update(getattr
1006
(prop,
1007
"_dbus_annotations",
1008
{}))
1009
for name, value in annots.iteritems():
1010
ann_tag = document.createElement(
1011
"annotation")
1012
ann_tag.setAttribute("name", name)
1013
ann_tag.setAttribute("value", value)
1014
tag.appendChild(ann_tag)
1015
# Add interface annotation tags
1016
for annotation, value in dict(
1017
itertools.chain.from_iterable(
1018
annotations().iteritems()
1019
for name, annotations in
1020
self._get_all_dbus_things("interface")
1021
if name == if_tag.getAttribute("name")
1022
)).iteritems():
1023
ann_tag = document.createElement("annotation")
1024
ann_tag.setAttribute("name", annotation)
1025
ann_tag.setAttribute("value", value)
1026
if_tag.appendChild(ann_tag)
1107
1027
# Add the names to the return values for the
1108
1028
# "org.freedesktop.DBus.Properties" methods
1109
1029
if (if_tag.getAttribute("name")
1127
1047
exc_info=error)
1128
1048
return xmlstring
1129
1049
1130
try:
1131
dbus.OBJECT_MANAGER_IFACE
1132
except AttributeError:
1133
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1134
1135
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1136
"""A D-Bus object with an ObjectManager.
1137
1138
Classes inheriting from this exposes the standard
1139
GetManagedObjects call and the InterfacesAdded and
1140
InterfacesRemoved signals on the standard
1141
"org.freedesktop.DBus.ObjectManager" interface.
1142
1143
Note: No signals are sent automatically; they must be sent
1144
manually.
1145
"""
1146
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1147
out_signature = "a{oa{sa{sv}}}")
1148
def GetManagedObjects(self):
1149
"""This function must be overridden"""
1150
raise NotImplementedError()
1151
1152
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1153
signature = "oa{sa{sv}}")
1154
def InterfacesAdded(self, object_path, interfaces_and_properties):
1155
pass
1156
1157
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1158
def InterfacesRemoved(self, object_path, interfaces):
1159
pass
1160
1161
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1162
out_signature = "s",
1163
path_keyword = 'object_path',
1164
connection_keyword = 'connection')
1165
def Introspect(self, object_path, connection):
1166
"""Overloading of standard D-Bus method.
1167
1168
Override return argument name of GetManagedObjects to be
1169
"objpath_interfaces_and_properties"
1170
"""
1171
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1172
object_path,
1173
connection)
1174
try:
1175
document = xml.dom.minidom.parseString(xmlstring)
1176
1177
for if_tag in document.getElementsByTagName("interface"):
1178
# Fix argument name for the GetManagedObjects method
1179
if (if_tag.getAttribute("name")
1180
== dbus.OBJECT_MANAGER_IFACE):
1181
for cn in if_tag.getElementsByTagName("method"):
1182
if (cn.getAttribute("name")
1183
== "GetManagedObjects"):
1184
for arg in cn.getElementsByTagName("arg"):
1185
if (arg.getAttribute("direction")
1186
== "out"):
1187
arg.setAttribute(
1188
"name",
1189
"objpath_interfaces"
1190
"_and_properties")
1191
xmlstring = document.toxml("utf-8")
1192
document.unlink()
1193
except (AttributeError, xml.dom.DOMException,
1194
xml.parsers.expat.ExpatError) as error:
1195
logger.error("Failed to override Introspection method",
1196
exc_info = error)
1197
return xmlstring
1198
1050
1199
1051
def datetime_to_dbus(dt, variant_level=0):
1200
1052
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1201
1053
if dt is None:
1202
1054
return dbus.String("", variant_level = variant_level)
1203
return dbus.String(dt.isoformat(), variant_level=variant_level)
1055
return dbus.String(dt.isoformat(),
1056
variant_level=variant_level)
1204
1057
1205
1058
1206
1059
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1226
1079
(from DBusObjectWithProperties) and interfaces (from the
1227
1080
dbus_interface_annotations decorator).
1228
1081
"""
1229
1230
1082
def wrapper(cls):
1231
1083
for orig_interface_name, alt_interface_name in (
1232
alt_interface_names.items()):
1084
alt_interface_names.iteritems()):
1233
1085
attr = {}
1234
1086
interface_names = set()
1235
1087
# Go though all attributes of the class
1237
1089
# Ignore non-D-Bus attributes, and D-Bus attributes
1238
1090
# with the wrong interface name
1239
1091
if (not hasattr(attribute, "_dbus_interface")
1240
or not attribute._dbus_interface.startswith(
1241
orig_interface_name)):
1092
or not attribute._dbus_interface
1093
.startswith(orig_interface_name)):
1242
1094
continue
1243
1095
# Create an alternate D-Bus interface name based on
1244
1096
# the current name
1245
alt_interface = attribute._dbus_interface.replace(
1246
orig_interface_name, alt_interface_name)
1097
alt_interface = (attribute._dbus_interface
1098
.replace(orig_interface_name,
1099
alt_interface_name))
1247
1100
interface_names.add(alt_interface)
1248
1101
# Is this a D-Bus signal?
1249
1102
if getattr(attribute, "_dbus_is_signal", False):
1250
if sys.version_info.major == 2:
1251
# Extract the original non-method undecorated
1252
# function by black magic
1253
nonmethod_func = (dict(
1103
# Extract the original non-method undecorated
1104
# function by black magic
1105
nonmethod_func = (dict(
1254
1106
zip(attribute.func_code.co_freevars,
1255
attribute.__closure__))
1256
["func"].cell_contents)
1257
else:
1258
nonmethod_func = attribute
1107
attribute.__closure__))["func"]
1108
.cell_contents)
1259
1109
# Create a new, but exactly alike, function
1260
1110
# object, and decorate it to be a new D-Bus signal
1261
1111
# with the alternate D-Bus interface name
1262
if sys.version_info.major == 2:
1263
new_function = types.FunctionType(
1264
nonmethod_func.func_code,
1265
nonmethod_func.func_globals,
1266
nonmethod_func.func_name,
1267
nonmethod_func.func_defaults,
1268
nonmethod_func.func_closure)
1269
else:
1270
new_function = types.FunctionType(
1271
nonmethod_func.__code__,
1272
nonmethod_func.__globals__,
1273
nonmethod_func.__name__,
1274
nonmethod_func.__defaults__,
1275
nonmethod_func.__closure__)
1276
new_function = (dbus.service.signal(
1277
alt_interface,
1278
attribute._dbus_signature)(new_function))
1112
new_function = (dbus.service.signal
1113
(alt_interface,
1114
attribute._dbus_signature)
1115
(types.FunctionType(
1116
nonmethod_func.func_code,
1117
nonmethod_func.func_globals,
1118
nonmethod_func.func_name,
1119
nonmethod_func.func_defaults,
1120
nonmethod_func.func_closure)))
1279
1121
# Copy annotations, if any
1280
1122
try:
1281
new_function._dbus_annotations = dict(
1282
attribute._dbus_annotations)
1123
new_function._dbus_annotations = (
1124
dict(attribute._dbus_annotations))
1283
1125
except AttributeError:
1284
1126
pass
1285
1127
# Define a creator of a function to call both the
1290
1132
"""This function is a scope container to pass
1291
1133
func1 and func2 to the "call_both" function
1292
1134
outside of its arguments"""
1293
1294
@functools.wraps(func2)
1295
1135
def call_both(*args, **kwargs):
1296
1136
"""This function will emit two D-Bus
1297
1137
signals by calling func1 and func2"""
1298
1138
func1(*args, **kwargs)
1299
1139
func2(*args, **kwargs)
1300
# Make wrapper function look like a D-Bus signal
1301
for name, attr in inspect.getmembers(func2):
1302
if name.startswith("_dbus_"):
1303
setattr(call_both, name, attr)
1304
1305
1140
return call_both
1306
1141
# Create the "call_both" function and add it to
1307
1142
# the class
1312
1147
# object. Decorate it to be a new D-Bus method
1313
1148
# with the alternate D-Bus interface name. Add it
1314
1149
# to the class.
1315
attr[attrname] = (
1316
dbus.service.method(
1317
alt_interface,
1318
attribute._dbus_in_signature,
1319
attribute._dbus_out_signature)
1320
(types.FunctionType(attribute.func_code,
1321
attribute.func_globals,
1322
attribute.func_name,
1323
attribute.func_defaults,
1324
attribute.func_closure)))
1150
attr[attrname] = (dbus.service.method
1151
(alt_interface,
1152
attribute._dbus_in_signature,
1153
attribute._dbus_out_signature)
1154
(types.FunctionType
1155
(attribute.func_code,
1156
attribute.func_globals,
1157
attribute.func_name,
1158
attribute.func_defaults,
1159
attribute.func_closure)))
1325
1160
# Copy annotations, if any
1326
1161
try:
1327
attr[attrname]._dbus_annotations = dict(
1328
attribute._dbus_annotations)
1162
attr[attrname]._dbus_annotations = (
1163
dict(attribute._dbus_annotations))
1329
1164
except AttributeError:
1330
1165
pass
1331
1166
# Is this a D-Bus property?
1334
1169
# object, and decorate it to be a new D-Bus
1335
1170
# property with the alternate D-Bus interface
1336
1171
# name. Add it to the class.
1337
attr[attrname] = (dbus_service_property(
1338
alt_interface, attribute._dbus_signature,
1339
attribute._dbus_access,
1340
attribute._dbus_get_args_options
1341
["byte_arrays"])
1342
(types.FunctionType(
1343
attribute.func_code,
1344
attribute.func_globals,
1345
attribute.func_name,
1346
attribute.func_defaults,
1347
attribute.func_closure)))
1172
attr[attrname] = (dbus_service_property
1173
(alt_interface,
1174
attribute._dbus_signature,
1175
attribute._dbus_access,
1176
attribute
1177
._dbus_get_args_options
1178
["byte_arrays"])
1179
(types.FunctionType
1180
(attribute.func_code,
1181
attribute.func_globals,
1182
attribute.func_name,
1183
attribute.func_defaults,
1184
attribute.func_closure)))
1348
1185
# Copy annotations, if any
1349
1186
try:
1350
attr[attrname]._dbus_annotations = dict(
1351
attribute._dbus_annotations)
1187
attr[attrname]._dbus_annotations = (
1188
dict(attribute._dbus_annotations))
1352
1189
except AttributeError:
1353
1190
pass
1354
1191
# Is this a D-Bus interface?
1357
1194
# object. Decorate it to be a new D-Bus interface
1358
1195
# with the alternate D-Bus interface name. Add it
1359
1196
# to the class.
1360
attr[attrname] = (
1361
dbus_interface_annotations(alt_interface)
1362
(types.FunctionType(attribute.func_code,
1363
attribute.func_globals,
1364
attribute.func_name,
1365
attribute.func_defaults,
1366
attribute.func_closure)))
1197
attr[attrname] = (dbus_interface_annotations
1198
(alt_interface)
1199
(types.FunctionType
1200
(attribute.func_code,
1201
attribute.func_globals,
1202
attribute.func_name,
1203
attribute.func_defaults,
1204
attribute.func_closure)))
1367
1205
if deprecate:
1368
1206
# Deprecate all alternate interfaces
1369
iname="_AlternateDBusNames_interface_annotation{}"
1207
iname="_AlternateDBusNames_interface_annotation{0}"
1370
1208
for interface_name in interface_names:
1371
1372
1209
@dbus_interface_annotations(interface_name)
1373
1210
def func(self):
1374
1211
return { "org.freedesktop.DBus.Deprecated":
1375
"true" }
1212
"true" }
1376
1213
# Find an unused name
1377
1214
for aname in (iname.format(i)
1378
1215
for i in itertools.count()):
1382
1219
if interface_names:
1383
1220
# Replace the class with a new subclass of it with
1384
1221
# methods, signals, etc. as created above.
1385
cls = type(b"{}Alternate".format(cls.__name__),
1386
(cls, ), attr)
1222
cls = type(b"{0}Alternate".format(cls.__name__),
1223
(cls,), attr)
1387
1224
return cls
1388
1389
1225
return wrapper
1390
1226
1391
1227
1392
1228
@alternate_dbus_interfaces({"se.recompile.Mandos":
1393
"se.bsnet.fukt.Mandos"})
1229
"se.bsnet.fukt.Mandos"})
1394
1230
class ClientDBus(Client, DBusObjectWithProperties):
1395
1231
"""A Client class using D-Bus
1396
1232
1400
1236
"""
1401
1237
1402
1238
runtime_expansions = (Client.runtime_expansions
1403
+ ("dbus_object_path", ))
1404
1405
_interface = "se.recompile.Mandos.Client"
1239
+ ("dbus_object_path",))
1406
1240
1407
1241
# dbus.service.Object doesn't use super(), so we can't either.
1408
1242
1411
1245
Client.__init__(self, *args, **kwargs)
1412
1246
# Only now, when this client is initialized, can it show up on
1413
1247
# the D-Bus
1414
client_object_name = str(self.name).translate(
1248
client_object_name = unicode(self.name).translate(
1415
1249
{ord("."): ord("_"),
1416
1250
ord("-"): ord("_")})
1417
self.dbus_object_path = dbus.ObjectPath(
1418
"/clients/" + client_object_name)
1251
self.dbus_object_path = (dbus.ObjectPath
1252
("/clients/" + client_object_name))
1419
1253
DBusObjectWithProperties.__init__(self, self.bus,
1420
1254
self.dbus_object_path)
1421
1255
1422
def notifychangeproperty(transform_func, dbus_name,
1423
type_func=lambda x: x,
1424
variant_level=1,
1425
invalidate_only=False,
1426
_interface=_interface):
1256
def notifychangeproperty(transform_func,
1257
dbus_name, type_func=lambda x: x,
1258
variant_level=1):
1427
1259
""" Modify a variable so that it's a property which announces
1428
1260
its changes to DBus.
1429
1261
1434
1266
to the D-Bus. Default: no transform
1435
1267
variant_level: D-Bus variant level. Default: 1
1436
1268
"""
1437
attrname = "_{}".format(dbus_name)
1438
1269
attrname = "_{0}".format(dbus_name)
1439
1270
def setter(self, value):
1440
1271
if hasattr(self, "dbus_object_path"):
1441
1272
if (not hasattr(self, attrname) or
1442
1273
type_func(getattr(self, attrname, None))
1443
1274
!= type_func(value)):
1444
if invalidate_only:
1445
self.PropertiesChanged(
1446
_interface, dbus.Dictionary(),
1447
dbus.Array((dbus_name, )))
1448
else:
1449
dbus_value = transform_func(
1450
type_func(value),
1451
variant_level = variant_level)
1452
self.PropertyChanged(dbus.String(dbus_name),
1453
dbus_value)
1454
self.PropertiesChanged(
1455
_interface,
1456
dbus.Dictionary({ dbus.String(dbus_name):
1457
dbus_value }),
1458
dbus.Array())
1275
dbus_value = transform_func(type_func(value),
1276
variant_level
1277
=variant_level)
1278
self.PropertyChanged(dbus.String(dbus_name),
1279
dbus_value)
1459
1280
setattr(self, attrname, value)
1460
1281
1461
1282
return property(lambda self: getattr(self, attrname), setter)
1467
1288
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1468
1289
last_enabled = notifychangeproperty(datetime_to_dbus,
1469
1290
"LastEnabled")
1470
checker = notifychangeproperty(
1471
dbus.Boolean, "CheckerRunning",
1472
type_func = lambda checker: checker is not None)
1291
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1292
type_func = lambda checker:
1293
checker is not None)
1473
1294
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1474
1295
"LastCheckedOK")
1475
1296
last_checker_status = notifychangeproperty(dbus.Int16,
1478
1299
datetime_to_dbus, "LastApprovalRequest")
1479
1300
approved_by_default = notifychangeproperty(dbus.Boolean,
1480
1301
"ApprovedByDefault")
1481
approval_delay = notifychangeproperty(
1482
dbus.UInt64, "ApprovalDelay",
1483
type_func = lambda td: td.total_seconds() * 1000)
1302
approval_delay = notifychangeproperty(dbus.UInt64,
1303
"ApprovalDelay",
1304
type_func =
1305
timedelta_to_milliseconds)
1484
1306
approval_duration = notifychangeproperty(
1485
1307
dbus.UInt64, "ApprovalDuration",
1486
type_func = lambda td: td.total_seconds() * 1000)
1308
type_func = timedelta_to_milliseconds)
1487
1309
host = notifychangeproperty(dbus.String, "Host")
1488
timeout = notifychangeproperty(
1489
dbus.UInt64, "Timeout",
1490
type_func = lambda td: td.total_seconds() * 1000)
1310
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1311
type_func =
1312
timedelta_to_milliseconds)
1491
1313
extended_timeout = notifychangeproperty(
1492
1314
dbus.UInt64, "ExtendedTimeout",
1493
type_func = lambda td: td.total_seconds() * 1000)
1494
interval = notifychangeproperty(
1495
dbus.UInt64, "Interval",
1496
type_func = lambda td: td.total_seconds() * 1000)
1315
type_func = timedelta_to_milliseconds)
1316
interval = notifychangeproperty(dbus.UInt64,
1317
"Interval",
1318
type_func =
1319
timedelta_to_milliseconds)
1497
1320
checker_command = notifychangeproperty(dbus.String, "Checker")
1498
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1499
invalidate_only=True)
1500
1321
1501
1322
del notifychangeproperty
1502
1323
1509
1330
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1510
1331
Client.__del__(self, *args, **kwargs)
1511
1332
1512
def checker_callback(self, source, condition,
1513
connection, command, *args, **kwargs):
1514
ret = Client.checker_callback(self, source, condition,
1515
connection, command, *args,
1516
**kwargs)
1517
exitstatus = self.last_checker_status
1518
if exitstatus >= 0:
1333
def checker_callback(self, pid, condition, command,
1334
*args, **kwargs):
1335
self.checker_callback_tag = None
1336
self.checker = None
1337
if os.WIFEXITED(condition):
1338
exitstatus = os.WEXITSTATUS(condition)
1519
1339
# Emit D-Bus signal
1520
1340
self.CheckerCompleted(dbus.Int16(exitstatus),
1521
# This is specific to GNU libC
1522
dbus.Int64(exitstatus << 8),
1341
dbus.Int64(condition),
1523
1342
dbus.String(command))
1524
1343
else:
1525
1344
# Emit D-Bus signal
1526
1345
self.CheckerCompleted(dbus.Int16(-1),
1527
dbus.Int64(
1528
# This is specific to GNU libC
1529
(exitstatus << 8)
1530
| self.last_checker_signal),
1346
dbus.Int64(condition),
1531
1347
dbus.String(command))
1532
return ret
1348
1349
return Client.checker_callback(self, pid, condition, command,
1350
*args, **kwargs)
1533
1351
1534
1352
def start_checker(self, *args, **kwargs):
1535
old_checker_pid = getattr(self.checker, "pid", None)
1353
old_checker = self.checker
1354
if self.checker is not None:
1355
old_checker_pid = self.checker.pid
1356
else:
1357
old_checker_pid = None
1536
1358
r = Client.start_checker(self, *args, **kwargs)
1537
1359
# Only if new checker process was started
1538
1360
if (self.checker is not None
1547
1369
1548
1370
def approve(self, value=True):
1549
1371
self.approved = value
1550
gobject.timeout_add(int(self.approval_duration.total_seconds()
1551
* 1000), self._reset_approved)
1372
gobject.timeout_add(timedelta_to_milliseconds
1373
(self.approval_duration),
1374
self._reset_approved)
1552
1375
self.send_changedstate()
1553
1376
1554
1377
## D-Bus methods, signals & properties
1378
_interface = "se.recompile.Mandos.Client"
1555
1379
1556
1380
## Interfaces
1557
1381
1382
@dbus_interface_annotations(_interface)
1383
def _foo(self):
1384
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1385
"false"}
1386
1558
1387
## Signals
1559
1388
1560
1389
# CheckerCompleted - signal
1570
1399
pass
1571
1400
1572
1401
# PropertyChanged - signal
1573
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1574
1402
@dbus.service.signal(_interface, signature="sv")
1575
1403
def PropertyChanged(self, property, value):
1576
1404
"D-Bus signal"
1610
1438
self.checked_ok()
1611
1439
1612
1440
# Enable - method
1613
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1614
1441
@dbus.service.method(_interface)
1615
1442
def Enable(self):
1616
1443
"D-Bus method"
1617
1444
self.enable()
1618
1445
1619
1446
# StartChecker - method
1620
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1621
1447
@dbus.service.method(_interface)
1622
1448
def StartChecker(self):
1623
1449
"D-Bus method"
1624
1450
self.start_checker()
1625
1451
1626
1452
# Disable - method
1627
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1628
1453
@dbus.service.method(_interface)
1629
1454
def Disable(self):
1630
1455
"D-Bus method"
1631
1456
self.disable()
1632
1457
1633
1458
# StopChecker - method
1634
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1635
1459
@dbus.service.method(_interface)
1636
1460
def StopChecker(self):
1637
1461
self.stop_checker()
1644
1468
return dbus.Boolean(bool(self.approvals_pending))
1645
1469
1646
1470
# ApprovedByDefault - property
1647
@dbus_service_property(_interface,
1648
signature="b",
1471
@dbus_service_property(_interface, signature="b",
1649
1472
access="readwrite")
1650
1473
def ApprovedByDefault_dbus_property(self, value=None):
1651
1474
if value is None: # get
1653
1476
self.approved_by_default = bool(value)
1654
1477
1655
1478
# ApprovalDelay - property
1656
@dbus_service_property(_interface,
1657
signature="t",
1479
@dbus_service_property(_interface, signature="t",
1658
1480
access="readwrite")
1659
1481
def ApprovalDelay_dbus_property(self, value=None):
1660
1482
if value is None: # get
1661
return dbus.UInt64(self.approval_delay.total_seconds()
1662
* 1000)
1483
return dbus.UInt64(self.approval_delay_milliseconds())
1663
1484
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1664
1485
1665
1486
# ApprovalDuration - property
1666
@dbus_service_property(_interface,
1667
signature="t",
1487
@dbus_service_property(_interface, signature="t",
1668
1488
access="readwrite")
1669
1489
def ApprovalDuration_dbus_property(self, value=None):
1670
1490
if value is None: # get
1671
return dbus.UInt64(self.approval_duration.total_seconds()
1672
* 1000)
1491
return dbus.UInt64(timedelta_to_milliseconds(
1492
self.approval_duration))
1673
1493
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1674
1494
1675
1495
# Name - property
1676
@dbus_annotations(
1677
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1678
1496
@dbus_service_property(_interface, signature="s", access="read")
1679
1497
def Name_dbus_property(self):
1680
1498
return dbus.String(self.name)
1681
1499
1682
1500
# Fingerprint - property
1683
@dbus_annotations(
1684
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1685
1501
@dbus_service_property(_interface, signature="s", access="read")
1686
1502
def Fingerprint_dbus_property(self):
1687
1503
return dbus.String(self.fingerprint)
1688
1504
1689
1505
# Host - property
1690
@dbus_service_property(_interface,
1691
signature="s",
1506
@dbus_service_property(_interface, signature="s",
1692
1507
access="readwrite")
1693
1508
def Host_dbus_property(self, value=None):
1694
1509
if value is None: # get
1695
1510
return dbus.String(self.host)
1696
self.host = str(value)
1511
self.host = unicode(value)
1697
1512
1698
1513
# Created - property
1699
@dbus_annotations(
1700
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1701
1514
@dbus_service_property(_interface, signature="s", access="read")
1702
1515
def Created_dbus_property(self):
1703
1516
return datetime_to_dbus(self.created)
1708
1521
return datetime_to_dbus(self.last_enabled)
1709
1522
1710
1523
# Enabled - property
1711
@dbus_service_property(_interface,
1712
signature="b",
1524
@dbus_service_property(_interface, signature="b",
1713
1525
access="readwrite")
1714
1526
def Enabled_dbus_property(self, value=None):
1715
1527
if value is None: # get
1720
1532
self.disable()
1721
1533
1722
1534
# LastCheckedOK - property
1723
@dbus_service_property(_interface,
1724
signature="s",
1535
@dbus_service_property(_interface, signature="s",
1725
1536
access="readwrite")
1726
1537
def LastCheckedOK_dbus_property(self, value=None):
1727
1538
if value is not None:
1730
1541
return datetime_to_dbus(self.last_checked_ok)
1731
1542
1732
1543
# LastCheckerStatus - property
1733
@dbus_service_property(_interface, signature="n", access="read")
1544
@dbus_service_property(_interface, signature="n",
1545
access="read")
1734
1546
def LastCheckerStatus_dbus_property(self):
1735
1547
return dbus.Int16(self.last_checker_status)
1736
1548
1745
1557
return datetime_to_dbus(self.last_approval_request)
1746
1558
1747
1559
# Timeout - property
1748
@dbus_service_property(_interface,
1749
signature="t",
1560
@dbus_service_property(_interface, signature="t",
1750
1561
access="readwrite")
1751
1562
def Timeout_dbus_property(self, value=None):
1752
1563
if value is None: # get
1753
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1564
return dbus.UInt64(self.timeout_milliseconds())
1754
1565
old_timeout = self.timeout
1755
1566
self.timeout = datetime.timedelta(0, 0, 0, value)
1756
1567
# Reschedule disabling
1765
1576
is None):
1766
1577
return
1767
1578
gobject.source_remove(self.disable_initiator_tag)
1768
self.disable_initiator_tag = gobject.timeout_add(
1769
int((self.expires - now).total_seconds() * 1000),
1770
self.disable)
1579
self.disable_initiator_tag = (
1580
gobject.timeout_add(
1581
timedelta_to_milliseconds(self.expires - now),
1582
self.disable))
1771
1583
1772
1584
# ExtendedTimeout - property
1773
@dbus_service_property(_interface,
1774
signature="t",
1585
@dbus_service_property(_interface, signature="t",
1775
1586
access="readwrite")
1776
1587
def ExtendedTimeout_dbus_property(self, value=None):
1777
1588
if value is None: # get
1778
return dbus.UInt64(self.extended_timeout.total_seconds()
1779
* 1000)
1589
return dbus.UInt64(self.extended_timeout_milliseconds())
1780
1590
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1781
1591
1782
1592
# Interval - property
1783
@dbus_service_property(_interface,
1784
signature="t",
1593
@dbus_service_property(_interface, signature="t",
1785
1594
access="readwrite")
1786
1595
def Interval_dbus_property(self, value=None):
1787
1596
if value is None: # get
1788
return dbus.UInt64(self.interval.total_seconds() * 1000)
1597
return dbus.UInt64(self.interval_milliseconds())
1789
1598
self.interval = datetime.timedelta(0, 0, 0, value)
1790
1599
if getattr(self, "checker_initiator_tag", None) is None:
1791
1600
return
1792
1601
if self.enabled:
1793
1602
# Reschedule checker run
1794
1603
gobject.source_remove(self.checker_initiator_tag)
1795
self.checker_initiator_tag = gobject.timeout_add(
1796
value, self.start_checker)
1797
self.start_checker() # Start one now, too
1604
self.checker_initiator_tag = (gobject.timeout_add
1605
(value, self.start_checker))
1606
self.start_checker() # Start one now, too
1798
1607
1799
1608
# Checker - property
1800
@dbus_service_property(_interface,
1801
signature="s",
1609
@dbus_service_property(_interface, signature="s",
1802
1610
access="readwrite")
1803
1611
def Checker_dbus_property(self, value=None):
1804
1612
if value is None: # get
1805
1613
return dbus.String(self.checker_command)
1806
self.checker_command = str(value)
1614
self.checker_command = unicode(value)
1807
1615
1808
1616
# CheckerRunning - property
1809
@dbus_service_property(_interface,
1810
signature="b",
1617
@dbus_service_property(_interface, signature="b",
1811
1618
access="readwrite")
1812
1619
def CheckerRunning_dbus_property(self, value=None):
1813
1620
if value is None: # get
1818
1625
self.stop_checker()
1819
1626
1820
1627
# ObjectPath - property
1821
@dbus_annotations(
1822
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
1823
"org.freedesktop.DBus.Deprecated": "true"})
1824
1628
@dbus_service_property(_interface, signature="o", access="read")
1825
1629
def ObjectPath_dbus_property(self):
1826
1630
return self.dbus_object_path # is already a dbus.ObjectPath
1827
1631
1828
1632
# Secret = property
1829
@dbus_annotations(
1830
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
1831
"invalidates"})
1832
@dbus_service_property(_interface,
1833
signature="ay",
1834
access="write",
1835
byte_arrays=True)
1633
@dbus_service_property(_interface, signature="ay",
1634
access="write", byte_arrays=True)
1836
1635
def Secret_dbus_property(self, value):
1837
self.secret = bytes(value)
1636
self.secret = str(value)
1838
1637
1839
1638
del _interface
1840
1639
1844
1643
self._pipe = child_pipe
1845
1644
self._pipe.send(('init', fpr, address))
1846
1645
if not self._pipe.recv():
1847
raise KeyError(fpr)
1646
raise KeyError()
1848
1647
1849
1648
def __getattribute__(self, name):
1850
1649
if name == '_pipe':
1854
1653
if data[0] == 'data':
1855
1654
return data[1]
1856
1655
if data[0] == 'function':
1857
1858
1656
def func(*args, **kwargs):
1859
1657
self._pipe.send(('funcall', name, args, kwargs))
1860
1658
return self._pipe.recv()[1]
1861
1862
1659
return func
1863
1660
1864
1661
def __setattr__(self, name, value):
1876
1673
def handle(self):
1877
1674
with contextlib.closing(self.server.child_pipe) as child_pipe:
1878
1675
logger.info("TCP connection from: %s",
1879
str(self.client_address))
1676
unicode(self.client_address))
1880
1677
logger.debug("Pipe FD: %d",
1881
1678
self.server.child_pipe.fileno())
1882
1679
1883
session = gnutls.connection.ClientSession(
1884
self.request, gnutls.connection .X509Credentials())
1680
session = (gnutls.connection
1681
.ClientSession(self.request,
1682
gnutls.connection
1683
.X509Credentials()))
1885
1684
1886
1685
# Note: gnutls.connection.X509Credentials is really a
1887
1686
# generic GnuTLS certificate credentials object so long as
1896
1695
priority = self.server.gnutls_priority
1897
1696
if priority is None:
1898
1697
priority = "NORMAL"
1899
gnutls.library.functions.gnutls_priority_set_direct(
1900
session._c_object, priority, None)
1698
(gnutls.library.functions
1699
.gnutls_priority_set_direct(session._c_object,
1700
priority, None))
1901
1701
1902
1702
# Start communication using the Mandos protocol
1903
1703
# Get protocol number
1923
1723
approval_required = False
1924
1724
try:
1925
1725
try:
1926
fpr = self.fingerprint(
1927
self.peer_certificate(session))
1726
fpr = self.fingerprint(self.peer_certificate
1727
(session))
1928
1728
except (TypeError,
1929
1729
gnutls.errors.GNUTLSError) as error:
1930
1730
logger.warning("Bad certificate: %s", error)
1945
1745
while True:
1946
1746
if not client.enabled:
1947
1747
logger.info("Client %s is disabled",
1948
client.name)
1748
client.name)
1949
1749
if self.server.use_dbus:
1950
1750
# Emit D-Bus signal
1951
1751
client.Rejected("Disabled")
1960
1760
if self.server.use_dbus:
1961
1761
# Emit D-Bus signal
1962
1762
client.NeedApproval(
1963
client.approval_delay.total_seconds()
1964
* 1000, client.approved_by_default)
1763
client.approval_delay_milliseconds(),
1764
client.approved_by_default)
1965
1765
else:
1966
1766
logger.warning("Client %s was not approved",
1967
1767
client.name)
1973
1773
#wait until timeout or approved
1974
1774
time = datetime.datetime.now()
1975
1775
client.changedstate.acquire()
1976
client.changedstate.wait(delay.total_seconds())
1776
client.changedstate.wait(
1777
float(timedelta_to_milliseconds(delay)
1778
/ 1000))
1977
1779
client.changedstate.release()
1978
1780
time2 = datetime.datetime.now()
1979
1781
if (time2 - time) >= delay:
1998
1800
logger.warning("gnutls send failed",
1999
1801
exc_info=error)
2000
1802
return
2001
logger.debug("Sent: %d, remaining: %d", sent,
2002
len(client.secret) - (sent_size
2003
+ sent))
1803
logger.debug("Sent: %d, remaining: %d",
1804
sent, len(client.secret)
1805
- (sent_size + sent))
2004
1806
sent_size += sent
2005
1807
2006
1808
logger.info("Sending secret to %s", client.name)
2023
1825
def peer_certificate(session):
2024
1826
"Return the peer's OpenPGP certificate as a bytestring"
2025
1827
# If not an OpenPGP certificate...
2026
if (gnutls.library.functions.gnutls_certificate_type_get(
2027
session._c_object)
1828
if (gnutls.library.functions
1829
.gnutls_certificate_type_get(session._c_object)
2028
1830
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
2029
1831
# ...do the normal thing
2030
1832
return session.peer_certificate
2044
1846
def fingerprint(openpgp):
2045
1847
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2046
1848
# New GnuTLS "datum" with the OpenPGP public key
2047
datum = gnutls.library.types.gnutls_datum_t(
2048
ctypes.cast(ctypes.c_char_p(openpgp),
2049
ctypes.POINTER(ctypes.c_ubyte)),
2050
ctypes.c_uint(len(openpgp)))
1849
datum = (gnutls.library.types
1850
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1851
ctypes.POINTER
1852
(ctypes.c_ubyte)),
1853
ctypes.c_uint(len(openpgp))))
2051
1854
# New empty GnuTLS certificate
2052
1855
crt = gnutls.library.types.gnutls_openpgp_crt_t()
2053
gnutls.library.functions.gnutls_openpgp_crt_init(
2054
ctypes.byref(crt))
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2055
1858
# Import the OpenPGP public key into the certificate
2056
gnutls.library.functions.gnutls_openpgp_crt_import(
2057
crt, ctypes.byref(datum),
2058
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1859
(gnutls.library.functions
1860
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1861
gnutls.library.constants
1862
.GNUTLS_OPENPGP_FMT_RAW))
2059
1863
# Verify the self signature in the key
2060
1864
crtverify = ctypes.c_uint()
2061
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2062
crt, 0, ctypes.byref(crtverify))
1865
(gnutls.library.functions
1866
.gnutls_openpgp_crt_verify_self(crt, 0,
1867
ctypes.byref(crtverify)))
2063
1868
if crtverify.value != 0:
2064
1869
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2065
raise gnutls.errors.CertificateSecurityError(
2066
"Verify failed")
1870
raise (gnutls.errors.CertificateSecurityError
1871
("Verify failed"))
2067
1872
# New buffer for the fingerprint
2068
1873
buf = ctypes.create_string_buffer(20)
2069
1874
buf_len = ctypes.c_size_t()
2070
1875
# Get the fingerprint from the certificate into the buffer
2071
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2072
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1876
(gnutls.library.functions
1877
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1878
ctypes.byref(buf_len)))
2073
1879
# Deinit the certificate
2074
1880
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2075
1881
# Convert the buffer to a Python bytestring
2081
1887
2082
1888
class MultiprocessingMixIn(object):
2083
1889
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2084
2085
1890
def sub_process_main(self, request, address):
2086
1891
try:
2087
1892
self.finish_request(request, address)
2099
1904
2100
1905
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2101
1906
""" adds a pipe to the MixIn """
2102
2103
1907
def process_request(self, request, client_address):
2104
1908
"""Overrides and wraps the original process_request().
2105
1909
2126
1930
interface: None or a network interface name (string)
2127
1931
use_ipv6: Boolean; to use IPv6 or not
2128
1932
"""
2129
2130
1933
def __init__(self, server_address, RequestHandlerClass,
2131
interface=None,
2132
use_ipv6=True,
2133
socketfd=None):
1934
interface=None, use_ipv6=True, socketfd=None):
2134
1935
"""If socketfd is set, use that file descriptor instead of
2135
1936
creating a new one with socket.socket().
2136
1937
"""
2177
1978
self.interface)
2178
1979
else:
2179
1980
try:
2180
self.socket.setsockopt(
2181
socket.SOL_SOCKET, SO_BINDTODEVICE,
2182
(self.interface + "\0").encode("utf-8"))
1981
self.socket.setsockopt(socket.SOL_SOCKET,
1982
SO_BINDTODEVICE,
1983
str(self.interface + '\0'))
2183
1984
except socket.error as error:
2184
1985
if error.errno == errno.EPERM:
2185
1986
logger.error("No permission to bind to"
2203
2004
self.server_address = (any_address,
2204
2005
self.server_address[1])
2205
2006
elif not self.server_address[1]:
2206
self.server_address = (self.server_address[0], 0)
2007
self.server_address = (self.server_address[0],
2008
0)
2207
2009
# if self.interface:
2208
2010
# self.server_address = (self.server_address[0],
2209
2011
# 0, # port
2223
2025
2224
2026
Assumes a gobject.MainLoop event loop.
2225
2027
"""
2226
2227
2028
def __init__(self, server_address, RequestHandlerClass,
2228
interface=None,
2229
use_ipv6=True,
2230
clients=None,
2231
gnutls_priority=None,
2232
use_dbus=True,
2233
socketfd=None):
2029
interface=None, use_ipv6=True, clients=None,
2030
gnutls_priority=None, use_dbus=True, socketfd=None):
2234
2031
self.enabled = False
2235
2032
self.clients = clients
2236
2033
if self.clients is None:
2242
2039
interface = interface,
2243
2040
use_ipv6 = use_ipv6,
2244
2041
socketfd = socketfd)
2245
2246
2042
def server_activate(self):
2247
2043
if self.enabled:
2248
2044
return socketserver.TCPServer.server_activate(self)
2252
2048
2253
2049
def add_pipe(self, parent_pipe, proc):
2254
2050
# Call "handle_ipc" for both data and EOF events
2255
gobject.io_add_watch(
2256
parent_pipe.fileno(),
2257
gobject.IO_IN | gobject.IO_HUP,
2258
functools.partial(self.handle_ipc,
2259
parent_pipe = parent_pipe,
2260
proc = proc))
2051
gobject.io_add_watch(parent_pipe.fileno(),
2052
gobject.IO_IN | gobject.IO_HUP,
2053
functools.partial(self.handle_ipc,
2054
parent_pipe =
2055
parent_pipe,
2056
proc = proc))
2261
2057
2262
def handle_ipc(self, source, condition,
2263
parent_pipe=None,
2264
proc = None,
2265
client_object=None):
2058
def handle_ipc(self, source, condition, parent_pipe=None,
2059
proc = None, client_object=None):
2266
2060
# error, or the other end of multiprocessing.Pipe has closed
2267
2061
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2268
2062
# Wait for other process to exit
2291
2085
parent_pipe.send(False)
2292
2086
return False
2293
2087
2294
gobject.io_add_watch(
2295
parent_pipe.fileno(),
2296
gobject.IO_IN | gobject.IO_HUP,
2297
functools.partial(self.handle_ipc,
2298
parent_pipe = parent_pipe,
2299
proc = proc,
2300
client_object = client))
2088
gobject.io_add_watch(parent_pipe.fileno(),
2089
gobject.IO_IN | gobject.IO_HUP,
2090
functools.partial(self.handle_ipc,
2091
parent_pipe =
2092
parent_pipe,
2093
proc = proc,
2094
client_object =
2095
client))
2301
2096
parent_pipe.send(True)
2302
2097
# remove the old hook in favor of the new above hook on
2303
2098
# same fileno
2309
2104
2310
2105
parent_pipe.send(('data', getattr(client_object,
2311
2106
funcname)(*args,
2312
**kwargs)))
2107
**kwargs)))
2313
2108
2314
2109
if command == 'getattr':
2315
2110
attrname = request[1]
2316
if isinstance(client_object.__getattribute__(attrname),
2317
collections.Callable):
2318
parent_pipe.send(('function', ))
2111
if callable(client_object.__getattribute__(attrname)):
2112
parent_pipe.send(('function',))
2319
2113
else:
2320
parent_pipe.send((
2321
'data', client_object.__getattribute__(attrname)))
2114
parent_pipe.send(('data', client_object
2115
.__getattribute__(attrname)))
2322
2116
2323
2117
if command == 'setattr':
2324
2118
attrname = request[1]
2355
2149
# avoid excessive use of external libraries.
2356
2150
2357
2151
# New type for defining tokens, syntax, and semantics all-in-one
2358
Token = collections.namedtuple("Token", (
2359
"regexp", # To match token; if "value" is not None, must have
2360
# a "group" containing digits
2361
"value", # datetime.timedelta or None
2362
"followers")) # Tokens valid after this token
2152
Token = collections.namedtuple("Token",
2153
("regexp", # To match token; if
2154
# "value" is not None,
2155
# must have a "group"
2156
# containing digits
2157
"value", # datetime.timedelta or
2158
# None
2159
"followers")) # Tokens valid after
2160
# this token
2363
2161
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2364
2162
# the "duration" ABNF definition in RFC 3339, Appendix A.
2365
2163
token_end = Token(re.compile(r"$"), None, frozenset())
2366
2164
token_second = Token(re.compile(r"(\d+)S"),
2367
2165
datetime.timedelta(seconds=1),
2368
frozenset((token_end, )))
2166
frozenset((token_end,)))
2369
2167
token_minute = Token(re.compile(r"(\d+)M"),
2370
2168
datetime.timedelta(minutes=1),
2371
2169
frozenset((token_second, token_end)))
2387
2185
frozenset((token_month, token_end)))
2388
2186
token_week = Token(re.compile(r"(\d+)W"),
2389
2187
datetime.timedelta(weeks=1),
2390
frozenset((token_end, )))
2188
frozenset((token_end,)))
2391
2189
token_duration = Token(re.compile(r"P"), None,
2392
2190
frozenset((token_year, token_month,
2393
2191
token_day, token_time,
2394
token_week)))
2192
token_week))),
2395
2193
# Define starting values
2396
2194
value = datetime.timedelta() # Value so far
2397
2195
found_token = None
2398
followers = frozenset((token_duration, )) # Following valid tokens
2196
followers = frozenset(token_duration,) # Following valid tokens
2399
2197
s = duration # String left to parse
2400
2198
# Loop until end token is found
2401
2199
while found_token is not token_end:
2418
2216
break
2419
2217
else:
2420
2218
# No currently valid tokens were found
2421
raise ValueError("Invalid RFC 3339 duration: {!r}"
2422
.format(duration))
2219
raise ValueError("Invalid RFC 3339 duration")
2423
2220
# End token found
2424
2221
return value
2425
2222
2449
2246
timevalue = datetime.timedelta(0)
2450
2247
for s in interval.split():
2451
2248
try:
2452
suffix = s[-1]
2249
suffix = unicode(s[-1])
2453
2250
value = int(s[:-1])
2454
2251
if suffix == "d":
2455
2252
delta = datetime.timedelta(value)
2462
2259
elif suffix == "w":
2463
2260
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2464
2261
else:
2465
raise ValueError("Unknown suffix {!r}".format(suffix))
2262
raise ValueError("Unknown suffix {0!r}"
2263
.format(suffix))
2466
2264
except IndexError as e:
2467
2265
raise ValueError(*(e.args))
2468
2266
timevalue += delta
2485
2283
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2486
2284
if not stat.S_ISCHR(os.fstat(null).st_mode):
2487
2285
raise OSError(errno.ENODEV,
2488
"{} not a character device"
2286
"{0} not a character device"
2489
2287
.format(os.devnull))
2490
2288
os.dup2(null, sys.stdin.fileno())
2491
2289
os.dup2(null, sys.stdout.fileno())
2501
2299
2502
2300
parser = argparse.ArgumentParser()
2503
2301
parser.add_argument("-v", "--version", action="version",
2504
version = "%(prog)s {}".format(version),
2302
version = "%(prog)s {0}".format(version),
2505
2303
help="show version number and exit")
2506
2304
parser.add_argument("-i", "--interface", metavar="IF",
2507
2305
help="Bind to interface IF")
2540
2338
help="Directory to save/restore state in")
2541
2339
parser.add_argument("--foreground", action="store_true",
2542
2340
help="Run in foreground", default=None)
2543
parser.add_argument("--no-zeroconf", action="store_false",
2544
dest="zeroconf", help="Do not use Zeroconf",
2545
default=None)
2546
2341
2547
2342
options = parser.parse_args()
2548
2343
2557
2352
"port": "",
2558
2353
"debug": "False",
2559
2354
"priority":
2560
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2561
":+SIGN-DSA-SHA256",
2355
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2562
2356
"servicename": "Mandos",
2563
2357
"use_dbus": "True",
2564
2358
"use_ipv6": "True",
2567
2361
"socket": "",
2568
2362
"statedir": "/var/lib/mandos",
2569
2363
"foreground": "False",
2570
"zeroconf": "True",
2571
}
2364
}
2572
2365
2573
2366
# Parse config file for server-global settings
2574
2367
server_config = configparser.SafeConfigParser(server_defaults)
2575
2368
del server_defaults
2576
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2369
server_config.read(os.path.join(options.configdir,
2370
"mandos.conf"))
2577
2371
# Convert the SafeConfigParser object to a dict
2578
2372
server_settings = server_config.defaults()
2579
2373
# Use the appropriate methods on the non-string config options
2597
2391
# Override the settings from the config file with command line
2598
2392
# options, if set.
2599
2393
for option in ("interface", "address", "port", "debug",
2600
"priority", "servicename", "configdir", "use_dbus",
2601
"use_ipv6", "debuglevel", "restore", "statedir",
2602
"socket", "foreground", "zeroconf"):
2394
"priority", "servicename", "configdir",
2395
"use_dbus", "use_ipv6", "debuglevel", "restore",
2396
"statedir", "socket", "foreground"):
2603
2397
value = getattr(options, option)
2604
2398
if value is not None:
2605
2399
server_settings[option] = value
2606
2400
del options
2607
2401
# Force all strings to be unicode
2608
2402
for option in server_settings.keys():
2609
if isinstance(server_settings[option], bytes):
2610
server_settings[option] = (server_settings[option]
2611
.decode("utf-8"))
2403
if type(server_settings[option]) is str:
2404
server_settings[option] = unicode(server_settings[option])
2612
2405
# Force all boolean options to be boolean
2613
2406
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2614
"foreground", "zeroconf"):
2407
"foreground"):
2615
2408
server_settings[option] = bool(server_settings[option])
2616
2409
# Debug implies foreground
2617
2410
if server_settings["debug"]:
2620
2413
2621
2414
##################################################################
2622
2415
2623
if (not server_settings["zeroconf"]
2624
and not (server_settings["port"]
2625
or server_settings["socket"] != "")):
2626
parser.error("Needs port or socket to work without Zeroconf")
2627
2628
2416
# For convenience
2629
2417
debug = server_settings["debug"]
2630
2418
debuglevel = server_settings["debuglevel"]
2633
2421
stored_state_path = os.path.join(server_settings["statedir"],
2634
2422
stored_state_file)
2635
2423
foreground = server_settings["foreground"]
2636
zeroconf = server_settings["zeroconf"]
2637
2424
2638
2425
if debug:
2639
2426
initlogger(debug, logging.DEBUG)
2645
2432
initlogger(debug, level)
2646
2433
2647
2434
if server_settings["servicename"] != "Mandos":
2648
syslogger.setFormatter(
2649
logging.Formatter('Mandos ({}) [%(process)d]:'
2650
' %(levelname)s: %(message)s'.format(
2651
server_settings["servicename"])))
2435
syslogger.setFormatter(logging.Formatter
2436
('Mandos ({0}) [%(process)d]:'
2437
' %(levelname)s: %(message)s'
2438
.format(server_settings
2439
["servicename"])))
2652
2440
2653
2441
# Parse config file with clients
2654
2442
client_config = configparser.SafeConfigParser(Client
2659
2447
global mandos_dbus_service
2660
2448
mandos_dbus_service = None
2661
2449
2662
socketfd = None
2663
if server_settings["socket"] != "":
2664
socketfd = server_settings["socket"]
2665
tcp_server = MandosServer(
2666
(server_settings["address"], server_settings["port"]),
2667
ClientHandler,
2668
interface=(server_settings["interface"] or None),
2669
use_ipv6=use_ipv6,
2670
gnutls_priority=server_settings["priority"],
2671
use_dbus=use_dbus,
2672
socketfd=socketfd)
2450
tcp_server = MandosServer((server_settings["address"],
2451
server_settings["port"]),
2452
ClientHandler,
2453
interface=(server_settings["interface"]
2454
or None),
2455
use_ipv6=use_ipv6,
2456
gnutls_priority=
2457
server_settings["priority"],
2458
use_dbus=use_dbus,
2459
socketfd=(server_settings["socket"]
2460
or None))
2673
2461
if not foreground:
2674
2462
pidfilename = "/run/mandos.pid"
2675
2463
if not os.path.isdir("/run/."):
2676
2464
pidfilename = "/var/run/mandos.pid"
2677
2465
pidfile = None
2678
2466
try:
2679
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2467
pidfile = open(pidfilename, "w")
2680
2468
except IOError as e:
2681
2469
logger.error("Could not open file %r", pidfilename,
2682
2470
exc_info=e)
2709
2497
def debug_gnutls(level, string):
2710
2498
logger.debug("GnuTLS: %s", string[:-1])
2711
2499
2712
gnutls.library.functions.gnutls_global_set_log_function(
2713
debug_gnutls)
2500
(gnutls.library.functions
2501
.gnutls_global_set_log_function(debug_gnutls))
2714
2502
2715
2503
# Redirect stdin so all checkers get /dev/null
2716
2504
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2736
2524
if use_dbus:
2737
2525
try:
2738
2526
bus_name = dbus.service.BusName("se.recompile.Mandos",
2739
bus,
2740
do_not_queue=True)
2741
old_bus_name = dbus.service.BusName(
2742
"se.bsnet.fukt.Mandos", bus,
2743
do_not_queue=True)
2744
except dbus.exceptions.DBusException as e:
2527
bus, do_not_queue=True)
2528
old_bus_name = (dbus.service.BusName
2529
("se.bsnet.fukt.Mandos", bus,
2530
do_not_queue=True))
2531
except dbus.exceptions.NameExistsException as e:
2745
2532
logger.error("Disabling D-Bus:", exc_info=e)
2746
2533
use_dbus = False
2747
2534
server_settings["use_dbus"] = False
2748
2535
tcp_server.use_dbus = False
2749
if zeroconf:
2750
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2751
service = AvahiServiceToSyslog(
2752
name = server_settings["servicename"],
2753
servicetype = "_mandos._tcp",
2754
protocol = protocol,
2755
bus = bus)
2756
if server_settings["interface"]:
2757
service.interface = if_nametoindex(
2758
server_settings["interface"].encode("utf-8"))
2536
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2537
service = AvahiServiceToSyslog(name =
2538
server_settings["servicename"],
2539
servicetype = "_mandos._tcp",
2540
protocol = protocol, bus = bus)
2541
if server_settings["interface"]:
2542
service.interface = (if_nametoindex
2543
(str(server_settings["interface"])))
2759
2544
2760
2545
global multiprocessing_manager
2761
2546
multiprocessing_manager = multiprocessing.Manager()
2780
2565
if server_settings["restore"]:
2781
2566
try:
2782
2567
with open(stored_state_path, "rb") as stored_state:
2783
clients_data, old_client_settings = pickle.load(
2784
stored_state)
2568
clients_data, old_client_settings = (pickle.load
2569
(stored_state))
2785
2570
os.remove(stored_state_path)
2786
2571
except IOError as e:
2787
2572
if e.errno == errno.ENOENT:
2788
logger.warning("Could not load persistent state:"
2789
" {}".format(os.strerror(e.errno)))
2573
logger.warning("Could not load persistent state: {0}"
2574
.format(os.strerror(e.errno)))
2790
2575
else:
2791
2576
logger.critical("Could not load persistent state:",
2792
2577
exc_info=e)
2793
2578
raise
2794
2579
except EOFError as e:
2795
2580
logger.warning("Could not load persistent state: "
2796
"EOFError:",
2797
exc_info=e)
2581
"EOFError:", exc_info=e)
2798
2582
2799
2583
with PGPEngine() as pgp:
2800
for client_name, client in clients_data.items():
2584
for client_name, client in clients_data.iteritems():
2801
2585
# Skip removed clients
2802
2586
if client_name not in client_settings:
2803
2587
continue
2812
2596
# For each value in new config, check if it
2813
2597
# differs from the old config value (Except for
2814
2598
# the "secret" attribute)
2815
if (name != "secret"
2816
and (value !=
2817
old_client_settings[client_name][name])):
2599
if (name != "secret" and
2600
value != old_client_settings[client_name]
2601
[name]):
2818
2602
client[name] = value
2819
2603
except KeyError:
2820
2604
pass
2821
2605
2822
2606
# Clients who has passed its expire date can still be
2823
# enabled if its last checker was successful. A Client
2607
# enabled if its last checker was successful. Clients
2824
2608
# whose checker succeeded before we stored its state is
2825
2609
# assumed to have successfully run all checkers during
2826
2610
# downtime.
2828
2612
if datetime.datetime.utcnow() >= client["expires"]:
2829
2613
if not client["last_checked_ok"]:
2830
2614
logger.warning(
2831
"disabling client {} - Client never "
2832
"performed a successful checker".format(
2833
client_name))
2615
"disabling client {0} - Client never "
2616
"performed a successful checker"
2617
.format(client_name))
2834
2618
client["enabled"] = False
2835
2619
elif client["last_checker_status"] != 0:
2836
2620
logger.warning(
2837
"disabling client {} - Client last"
2838
" checker failed with error code"
2839
" {}".format(
2840
client_name,
2841
client["last_checker_status"]))
2621
"disabling client {0} - Client "
2622
"last checker failed with error code {1}"
2623
.format(client_name,
2624
client["last_checker_status"]))
2842
2625
client["enabled"] = False
2843
2626
else:
2844
client["expires"] = (
2845
datetime.datetime.utcnow()
2846
+ client["timeout"])
2627
client["expires"] = (datetime.datetime
2628
.utcnow()
2629
+ client["timeout"])
2847
2630
logger.debug("Last checker succeeded,"
2848
" keeping {} enabled".format(
2849
client_name))
2631
" keeping {0} enabled"
2632
.format(client_name))
2850
2633
try:
2851
client["secret"] = pgp.decrypt(
2852
client["encrypted_secret"],
2853
client_settings[client_name]["secret"])
2634
client["secret"] = (
2635
pgp.decrypt(client["encrypted_secret"],
2636
client_settings[client_name]
2637
["secret"]))
2854
2638
except PGPError:
2855
2639
# If decryption fails, we use secret from new settings
2856
logger.debug("Failed to decrypt {} old secret".format(
2857
client_name))
2858
client["secret"] = (client_settings[client_name]
2859
["secret"])
2640
logger.debug("Failed to decrypt {0} old secret"
2641
.format(client_name))
2642
client["secret"] = (
2643
client_settings[client_name]["secret"])
2860
2644
2861
2645
# Add/remove clients based on new changes made to config
2862
2646
for client_name in (set(old_client_settings)
2867
2651
clients_data[client_name] = client_settings[client_name]
2868
2652
2869
2653
# Create all client objects
2870
for client_name, client in clients_data.items():
2654
for client_name, client in clients_data.iteritems():
2871
2655
tcp_server.clients[client_name] = client_class(
2872
name = client_name,
2873
settings = client,
2656
name = client_name, settings = client,
2874
2657
server_settings = server_settings)
2875
2658
2876
2659
if not tcp_server.clients:
2878
2661
2879
2662
if not foreground:
2880
2663
if pidfile is not None:
2881
pid = os.getpid()
2882
2664
try:
2883
2665
with pidfile:
2884
print(pid, file=pidfile)
2666
pid = os.getpid()
2667
pidfile.write(str(pid) + "\n".encode("utf-8"))
2885
2668
except IOError:
2886
2669
logger.error("Could not write to file %r with PID %d",
2887
2670
pidfilename, pid)
2892
2675
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2893
2676
2894
2677
if use_dbus:
2895
2896
@alternate_dbus_interfaces(
2897
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2898
class MandosDBusService(DBusObjectWithObjectManager):
2678
@alternate_dbus_interfaces({"se.recompile.Mandos":
2679
"se.bsnet.fukt.Mandos"})
2680
class MandosDBusService(DBusObjectWithProperties):
2899
2681
"""A D-Bus proxy object"""
2900
2901
2682
def __init__(self):
2902
2683
dbus.service.Object.__init__(self, bus, "/")
2903
2904
2684
_interface = "se.recompile.Mandos"
2905
2685
2686
@dbus_interface_annotations(_interface)
2687
def _foo(self):
2688
return { "org.freedesktop.DBus.Property"
2689
".EmitsChangedSignal":
2690
"false"}
2691
2906
2692
@dbus.service.signal(_interface, signature="o")
2907
2693
def ClientAdded(self, objpath):
2908
2694
"D-Bus signal"
2913
2699
"D-Bus signal"
2914
2700
pass
2915
2701
2916
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2917
"true"})
2918
2702
@dbus.service.signal(_interface, signature="os")
2919
2703
def ClientRemoved(self, objpath, name):
2920
2704
"D-Bus signal"
2921
2705
pass
2922
2706
2923
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2924
"true"})
2925
2707
@dbus.service.method(_interface, out_signature="ao")
2926
2708
def GetAllClients(self):
2927
2709
"D-Bus method"
2928
return dbus.Array(c.dbus_object_path for c in
2710
return dbus.Array(c.dbus_object_path
2711
for c in
2929
2712
tcp_server.clients.itervalues())
2930
2713
2931
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2932
"true"})
2933
2714
@dbus.service.method(_interface,
2934
2715
out_signature="a{oa{sv}}")
2935
2716
def GetAllClientsWithProperties(self):
2936
2717
"D-Bus method"
2937
2718
return dbus.Dictionary(
2938
{ c.dbus_object_path: c.GetAll(
2939
"se.recompile.Mandos.Client")
2940
for c in tcp_server.clients.itervalues() },
2719
((c.dbus_object_path, c.GetAll(""))
2720
for c in tcp_server.clients.itervalues()),
2941
2721
signature="oa{sv}")
2942
2722
2943
2723
@dbus.service.method(_interface, in_signature="o")
2947
2727
if c.dbus_object_path == object_path:
2948
2728
del tcp_server.clients[c.name]
2949
2729
c.remove_from_connection()
2950
# Don't signal the disabling
2730
# Don't signal anything except ClientRemoved
2951
2731
c.disable(quiet=True)
2952
# Emit D-Bus signal for removal
2953
self.client_removed_signal(c)
2732
# Emit D-Bus signal
2733
self.ClientRemoved(object_path, c.name)
2954
2734
return
2955
2735
raise KeyError(object_path)
2956
2736
2957
2737
del _interface
2958
2959
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
2960
out_signature = "a{oa{sa{sv}}}")
2961
def GetManagedObjects(self):
2962
"""D-Bus method"""
2963
return dbus.Dictionary(
2964
{ client.dbus_object_path:
2965
dbus.Dictionary(
2966
{ interface: client.GetAll(interface)
2967
for interface in
2968
client._get_all_interface_names()})
2969
for client in tcp_server.clients.values()})
2970
2971
def client_added_signal(self, client):
2972
"""Send the new standard signal and the old signal"""
2973
if use_dbus:
2974
# New standard signal
2975
self.InterfacesAdded(
2976
client.dbus_object_path,
2977
dbus.Dictionary(
2978
{ interface: client.GetAll(interface)
2979
for interface in
2980
client._get_all_interface_names()}))
2981
# Old signal
2982
self.ClientAdded(client.dbus_object_path)
2983
2984
def client_removed_signal(self, client):
2985
"""Send the new standard signal and the old signal"""
2986
if use_dbus:
2987
# New standard signal
2988
self.InterfacesRemoved(
2989
client.dbus_object_path,
2990
client._get_all_interface_names())
2991
# Old signal
2992
self.ClientRemoved(client.dbus_object_path,
2993
client.name)
2994
2738
2995
2739
mandos_dbus_service = MandosDBusService()
2996
2740
2997
2741
def cleanup():
2998
2742
"Cleanup function; run on exit"
2999
if zeroconf:
3000
service.cleanup()
2743
service.cleanup()
3001
2744
3002
2745
multiprocessing.active_children()
3003
2746
wnull.close()
3017
2760
3018
2761
# A list of attributes that can not be pickled
3019
2762
# + secret.
3020
exclude = { "bus", "changedstate", "secret",
3021
"checker", "server_settings" }
3022
for name, typ in inspect.getmembers(dbus.service
3023
.Object):
2763
exclude = set(("bus", "changedstate", "secret",
2764
"checker", "server_settings"))
2765
for name, typ in (inspect.getmembers
2766
(dbus.service.Object)):
3024
2767
exclude.add(name)
3025
2768
3026
2769
client_dict["encrypted_secret"] = (client
3033
2776
del client_settings[client.name]["secret"]
3034
2777
3035
2778
try:
3036
with tempfile.NamedTemporaryFile(
3037
mode='wb',
3038
suffix=".pickle",
3039
prefix='clients-',
3040
dir=os.path.dirname(stored_state_path),
3041
delete=False) as stored_state:
2779
with (tempfile.NamedTemporaryFile
2780
(mode='wb', suffix=".pickle", prefix='clients-',
2781
dir=os.path.dirname(stored_state_path),
2782
delete=False)) as stored_state:
3042
2783
pickle.dump((clients, client_settings), stored_state)
3043
tempname = stored_state.name
2784
tempname=stored_state.name
3044
2785
os.rename(tempname, stored_state_path)
3045
2786
except (IOError, OSError) as e:
3046
2787
if not debug:
3049
2790
except NameError:
3050
2791
pass
3051
2792
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3052
logger.warning("Could not save persistent state: {}"
2793
logger.warning("Could not save persistent state: {0}"
3053
2794
.format(os.strerror(e.errno)))
3054
2795
else:
3055
2796
logger.warning("Could not save persistent state:",
3061
2802
name, client = tcp_server.clients.popitem()
3062
2803
if use_dbus:
3063
2804
client.remove_from_connection()
3064
# Don't signal the disabling
2805
# Don't signal anything except ClientRemoved
3065
2806
client.disable(quiet=True)
3066
# Emit D-Bus signal for removal
3067
mandos_dbus_service.client_removed_signal(client)
2807
if use_dbus:
2808
# Emit D-Bus signal
2809
mandos_dbus_service.ClientRemoved(client
2810
.dbus_object_path,
2811
client.name)
3068
2812
client_settings.clear()
3069
2813
3070
2814
atexit.register(cleanup)
3071
2815
3072
2816
for client in tcp_server.clients.itervalues():
3073
2817
if use_dbus:
3074
# Emit D-Bus signal for adding
3075
mandos_dbus_service.client_added_signal(client)
2818
# Emit D-Bus signal
2819
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3076
2820
# Need to initiate checking of clients
3077
2821
if client.enabled:
3078
2822
client.init_checker()
3081
2825
tcp_server.server_activate()
3082
2826
3083
2827
# Find out what port we got
3084
if zeroconf:
3085
service.port = tcp_server.socket.getsockname()[1]
2828
service.port = tcp_server.socket.getsockname()[1]
3086
2829
if use_ipv6:
3087
2830
logger.info("Now listening on address %r, port %d,"
3088
2831
" flowinfo %d, scope_id %d",
3094
2837
#service.interface = tcp_server.socket.getsockname()[3]
3095
2838
3096
2839
try:
3097
if zeroconf:
3098
# From the Avahi example code
3099
try:
3100
service.activate()
3101
except dbus.exceptions.DBusException as error:
3102
logger.critical("D-Bus Exception", exc_info=error)
3103
cleanup()
3104
sys.exit(1)
3105
# End of Avahi example code
2840
# From the Avahi example code
2841
try:
2842
service.activate()
2843
except dbus.exceptions.DBusException as error:
2844
logger.critical("D-Bus Exception", exc_info=error)
2845
cleanup()
2846
sys.exit(1)
2847
# End of Avahi example code
3106
2848
3107
2849
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
3108
2850
lambda *args, **kwargs:
3123
2865
# Must run before the D-Bus bus name gets deregistered
3124
2866
cleanup()
3125
2867
3126
3127
2868
if __name__ == '__main__':
3128
2869
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0