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 794
- compare with another revision
- download diff
- download tarball
- view history from revision 794
- Committer: Teddy Hogeborn
- Date: 2015-12-05 02:00:01 UTC
- mfrom: (237.4.61 release)
- Revision ID: teddy@recompile.se-20151205020001-b0cpa52ame0usaul
Merge from release branch.
- files added:
- debian/upstream
- plugin-helpers
- files modified:
- DBUS-API
added
removed
mandos
1
#!/usr/bin/python
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
36
36
37
37
from future_builtins import *
38
38
39
import SocketServer as socketserver
39
try:
40
import SocketServer as socketserver
41
except ImportError:
42
import socketserver
40
43
import socket
41
44
import argparse
42
45
import datetime
47
50
import gnutls.library.functions
48
51
import gnutls.library.constants
49
52
import gnutls.library.types
50
import ConfigParser as configparser
53
try:
54
import ConfigParser as configparser
55
except ImportError:
56
import configparser
51
57
import sys
52
58
import re
53
59
import os
62
68
import struct
63
69
import fcntl
64
70
import functools
65
import cPickle as pickle
71
try:
72
import cPickle as pickle
73
except ImportError:
74
import pickle
66
75
import multiprocessing
67
76
import types
68
77
import binascii
69
78
import tempfile
70
79
import itertools
71
80
import collections
81
import codecs
72
82
73
83
import dbus
74
84
import dbus.service
75
import gobject
85
try:
86
import gobject
87
except ImportError:
88
from gi.repository import GObject as gobject
76
89
import avahi
77
90
from dbus.mainloop.glib import DBusGMainLoop
78
91
import ctypes
79
92
import ctypes.util
80
93
import xml.dom.minidom
81
94
import inspect
82
import GnuPGInterface
83
95
84
96
try:
85
97
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
89
101
except ImportError:
90
102
SO_BINDTODEVICE = None
91
103
92
version = "1.6.0"
104
if sys.version_info.major == 2:
105
str = unicode
106
107
version = "1.7.1"
93
108
stored_state_file = "clients.pickle"
94
109
95
110
logger = logging.getLogger()
96
syslogger = (logging.handlers.SysLogHandler
97
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
98
address = str("/dev/log")))
111
syslogger = None
99
112
100
113
try:
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
103
.if_nametoindex)
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
104
116
except (OSError, AttributeError):
117
105
118
def if_nametoindex(interface):
106
119
"Get an interface index the hard way, i.e. using fcntl()"
107
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
121
with contextlib.closing(socket.socket()) as s:
109
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(str("16s16x"),
111
interface))
112
interface_index = struct.unpack(str("I"),
113
ifreq[16:20])[0]
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
114
125
return interface_index
115
126
116
127
117
128
def initlogger(debug, level=logging.WARNING):
118
129
"""init logger and add loglevel"""
119
130
131
global syslogger
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
120
135
syslogger.setFormatter(logging.Formatter
121
136
('Mandos [%(process)d]: %(levelname)s:'
122
137
' %(message)s'))
139
154
140
155
class PGPEngine(object):
141
156
"""A simple class for OpenPGP symmetric encryption & decryption"""
157
142
158
def __init__(self):
143
self.gnupg = GnuPGInterface.GnuPG()
144
159
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
145
self.gnupg = GnuPGInterface.GnuPG()
146
self.gnupg.options.meta_interactive = False
147
self.gnupg.options.homedir = self.tempdir
148
self.gnupg.options.extra_args.extend(['--force-mdc',
149
'--quiet',
150
'--no-use-agent'])
160
self.gnupgargs = ['--batch',
161
'--home', self.tempdir,
162
'--force-mdc',
163
'--quiet',
164
'--no-use-agent']
151
165
152
166
def __enter__(self):
153
167
return self
175
189
def password_encode(self, password):
176
190
# Passphrase can not be empty and can not contain newlines or
177
191
# NUL bytes. So we prefix it and hex encode it.
178
return b"mandos" + binascii.hexlify(password)
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
198
return encoded
179
199
180
200
def encrypt(self, data, password):
181
self.gnupg.passphrase = self.password_encode(password)
182
with open(os.devnull, "w") as devnull:
183
try:
184
proc = self.gnupg.run(['--symmetric'],
185
create_fhs=['stdin', 'stdout'],
186
attach_fhs={'stderr': devnull})
187
with contextlib.closing(proc.handles['stdin']) as f:
188
f.write(data)
189
with contextlib.closing(proc.handles['stdout']) as f:
190
ciphertext = f.read()
191
proc.wait()
192
except IOError as e:
193
raise PGPError(e)
194
self.gnupg.passphrase = None
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
205
passfile.flush()
206
proc = subprocess.Popen(['gpg', '--symmetric',
207
'--passphrase-file',
208
passfile.name]
209
+ self.gnupgargs,
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
if proc.returncode != 0:
215
raise PGPError(err)
195
216
return ciphertext
196
217
197
218
def decrypt(self, data, password):
198
self.gnupg.passphrase = self.password_encode(password)
199
with open(os.devnull, "w") as devnull:
200
try:
201
proc = self.gnupg.run(['--decrypt'],
202
create_fhs=['stdin', 'stdout'],
203
attach_fhs={'stderr': devnull})
204
with contextlib.closing(proc.handles['stdin']) as f:
205
f.write(data)
206
with contextlib.closing(proc.handles['stdout']) as f:
207
decrypted_plaintext = f.read()
208
proc.wait()
209
except IOError as e:
210
raise PGPError(e)
211
self.gnupg.passphrase = None
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
223
passfile.flush()
224
proc = subprocess.Popen(['gpg', '--decrypt',
225
'--passphrase-file',
226
passfile.name]
227
+ self.gnupgargs,
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
if proc.returncode != 0:
233
raise PGPError(err)
212
234
return decrypted_plaintext
213
235
214
236
215
237
class AvahiError(Exception):
216
238
def __init__(self, value, *args, **kwargs):
217
239
self.value = value
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
240
return super(AvahiError, self).__init__(value, *args,
241
**kwargs)
242
221
243
222
244
class AvahiServiceError(AvahiError):
223
245
pass
224
246
247
225
248
class AvahiGroupError(AvahiError):
226
249
pass
227
250
234
257
Used to optionally bind to the specified interface.
235
258
name: string; Example: 'Mandos'
236
259
type: string; Example: '_mandos._tcp'.
237
See <http://www.dns-sd.org/ServiceTypes.html>
260
See <https://www.iana.org/assignments/service-names-port-numbers>
238
261
port: integer; what port to announce
239
262
TXT: list of strings; TXT record for the service
240
263
domain: string; Domain to publish on, default to .local if empty.
247
270
bus: dbus.SystemBus()
248
271
"""
249
272
250
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
servicetype = None, port = None, TXT = None,
252
domain = "", host = "", max_renames = 32768,
253
protocol = avahi.PROTO_UNSPEC, bus = None):
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):
254
284
self.interface = interface
255
285
self.name = name
256
286
self.type = servicetype
266
296
self.bus = bus
267
297
self.entry_group_state_changed_match = None
268
298
269
def rename(self):
299
def rename(self, remove=True):
270
300
"""Derived from the Avahi example code"""
271
301
if self.rename_count >= self.max_renames:
272
302
logger.critical("No suitable Zeroconf service name found"
273
303
" after %i retries, exiting.",
274
304
self.rename_count)
275
305
raise AvahiServiceError("Too many renames")
276
self.name = unicode(self.server
277
.GetAlternativeServiceName(self.name))
306
self.name = str(
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
278
309
logger.info("Changing Zeroconf service name to %r ...",
279
310
self.name)
280
self.remove()
311
if remove:
312
self.remove()
281
313
try:
282
314
self.add()
283
315
except dbus.exceptions.DBusException as error:
284
logger.critical("D-Bus Exception", exc_info=error)
285
self.cleanup()
286
os._exit(1)
287
self.rename_count += 1
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)
288
324
289
325
def remove(self):
290
326
"""Derived from the Avahi example code"""
328
364
self.rename()
329
365
elif state == avahi.ENTRY_GROUP_FAILURE:
330
366
logger.critical("Avahi: Error in group state changed %s",
331
unicode(error))
332
raise AvahiGroupError("State changed: {0!s}"
333
.format(error))
367
str(error))
368
raise AvahiGroupError("State changed: {!s}".format(error))
334
369
335
370
def cleanup(self):
336
371
"""Derived from the Avahi example code"""
346
381
def server_state_changed(self, state, error=None):
347
382
"""Derived from the Avahi example code"""
348
383
logger.debug("Avahi server state change: %i", state)
349
bad_states = { avahi.SERVER_INVALID:
350
"Zeroconf server invalid",
351
avahi.SERVER_REGISTERING: None,
352
avahi.SERVER_COLLISION:
353
"Zeroconf server name collision",
354
avahi.SERVER_FAILURE:
355
"Zeroconf server failure" }
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
}
356
390
if state in bad_states:
357
391
if bad_states[state] is not None:
358
392
if error is None:
361
395
logger.error(bad_states[state] + ": %r", error)
362
396
self.cleanup()
363
397
elif state == avahi.SERVER_RUNNING:
364
self.add()
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)
365
410
else:
366
411
if error is None:
367
412
logger.debug("Unknown state: %r", state)
377
422
follow_name_owner_changes=True),
378
423
avahi.DBUS_INTERFACE_SERVER)
379
424
self.server.connect_to_signal("StateChanged",
380
self.server_state_changed)
425
self.server_state_changed)
381
426
self.server_state_changed(self.server.GetState())
382
427
383
428
384
429
class AvahiServiceToSyslog(AvahiService):
385
def rename(self):
430
def rename(self, *args, **kwargs):
386
431
"""Add the new name to the syslog messages"""
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
391
.format(self.name)))
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
435
.format(self.name)))
392
436
return ret
393
437
394
395
def timedelta_to_milliseconds(td):
396
"Convert a datetime.timedelta() to milliseconds"
397
return ((td.days * 24 * 60 * 60 * 1000)
398
+ (td.seconds * 1000)
399
+ (td.microseconds // 1000))
400
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()
401
447
402
448
class Client(object):
403
449
"""A representation of a client host served by this server.
430
476
last_checker_status: integer between 0 and 255 reflecting exit
431
477
status of last checker. -1 reflects crashed
432
478
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
433
481
last_enabled: datetime.datetime(); (UTC) or None
434
482
name: string; from the config file, used in log messages and
435
483
D-Bus identifiers
440
488
runtime_expansions: Allowed attributes for runtime expansion.
441
489
expires: datetime.datetime(); time (UTC) when a client will be
442
490
disabled, or None
491
server_settings: The server_settings dict from main()
443
492
"""
444
493
445
494
runtime_expansions = ("approval_delay", "approval_duration",
447
496
"fingerprint", "host", "interval",
448
497
"last_approval_request", "last_checked_ok",
449
498
"last_enabled", "name", "timeout")
450
client_defaults = { "timeout": "PT5M",
451
"extended_timeout": "PT15M",
452
"interval": "PT2M",
453
"checker": "fping -q -- %%(host)s",
454
"host": "",
455
"approval_delay": "PT0S",
456
"approval_duration": "PT1S",
457
"approved_by_default": "True",
458
"enabled": "True",
459
}
460
461
def timeout_milliseconds(self):
462
"Return the 'timeout' attribute in milliseconds"
463
return timedelta_to_milliseconds(self.timeout)
464
465
def extended_timeout_milliseconds(self):
466
"Return the 'extended_timeout' attribute in milliseconds"
467
return timedelta_to_milliseconds(self.extended_timeout)
468
469
def interval_milliseconds(self):
470
"Return the 'interval' attribute in milliseconds"
471
return timedelta_to_milliseconds(self.interval)
472
473
def approval_delay_milliseconds(self):
474
return timedelta_to_milliseconds(self.approval_delay)
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
}
475
510
476
511
@staticmethod
477
512
def config_parser(config):
493
528
client["enabled"] = config.getboolean(client_name,
494
529
"enabled")
495
530
531
# Uppercase and remove spaces from fingerprint for later
532
# comparison purposes with return value from the
533
# fingerprint() function
496
534
client["fingerprint"] = (section["fingerprint"].upper()
497
535
.replace(" ", ""))
498
536
if "secret" in section:
503
541
"rb") as secfile:
504
542
client["secret"] = secfile.read()
505
543
else:
506
raise TypeError("No secret or secfile for section {0}"
544
raise TypeError("No secret or secfile for section {}"
507
545
.format(section))
508
546
client["timeout"] = string_to_delta(section["timeout"])
509
547
client["extended_timeout"] = string_to_delta(
520
558
521
559
return settings
522
560
523
def __init__(self, settings, name = None):
561
def __init__(self, settings, name = None, server_settings=None):
524
562
self.name = name
563
if server_settings is None:
564
server_settings = {}
565
self.server_settings = server_settings
525
566
# adding all client settings
526
for setting, value in settings.iteritems():
567
for setting, value in settings.items():
527
568
setattr(self, setting, value)
528
569
529
570
if self.enabled:
537
578
self.expires = None
538
579
539
580
logger.debug("Creating client %r", self.name)
540
# Uppercase and remove spaces from fingerprint for later
541
# comparison purposes with return value from the fingerprint()
542
# function
543
581
logger.debug(" Fingerprint: %s", self.fingerprint)
544
582
self.created = settings.get("created",
545
583
datetime.datetime.utcnow())
552
590
self.current_checker_command = None
553
591
self.approved = None
554
592
self.approvals_pending = 0
555
self.changedstate = (multiprocessing_manager
556
.Condition(multiprocessing_manager
557
.Lock()))
558
self.client_structure = [attr for attr in
559
self.__dict__.iterkeys()
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
560
597
if not attr.startswith("_")]
561
598
self.client_structure.append("client_structure")
562
599
563
for name, t in inspect.getmembers(type(self),
564
lambda obj:
565
isinstance(obj,
566
property)):
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
567
602
if not name.startswith("_"):
568
603
self.client_structure.append(name)
569
604
611
646
# and every interval from then on.
612
647
if self.checker_initiator_tag is not None:
613
648
gobject.source_remove(self.checker_initiator_tag)
614
self.checker_initiator_tag = (gobject.timeout_add
615
(self.interval_milliseconds(),
616
self.start_checker))
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
651
self.start_checker)
617
652
# Schedule a disable() when 'timeout' has passed
618
653
if self.disable_initiator_tag is not None:
619
654
gobject.source_remove(self.disable_initiator_tag)
620
self.disable_initiator_tag = (gobject.timeout_add
621
(self.timeout_milliseconds(),
622
self.disable))
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
623
657
# Also start a new checker *right now*.
624
658
self.start_checker()
625
659
626
def checker_callback(self, pid, condition, command):
660
def checker_callback(self, source, condition, connection,
661
command):
627
662
"""The checker has completed, so take appropriate actions."""
628
663
self.checker_callback_tag = None
629
664
self.checker = None
630
if os.WIFEXITED(condition):
631
self.last_checker_status = os.WEXITSTATUS(condition)
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
632
672
if self.last_checker_status == 0:
633
673
logger.info("Checker for %(name)s succeeded",
634
674
vars(self))
635
675
self.checked_ok()
636
676
else:
637
logger.info("Checker for %(name)s failed",
638
vars(self))
677
logger.info("Checker for %(name)s failed", vars(self))
639
678
else:
640
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
641
681
logger.warning("Checker for %(name)s crashed?",
642
682
vars(self))
683
return False
643
684
644
685
def checked_ok(self):
645
686
"""Assert that the client has been seen, alive and well."""
646
687
self.last_checked_ok = datetime.datetime.utcnow()
647
688
self.last_checker_status = 0
689
self.last_checker_signal = None
648
690
self.bump_timeout()
649
691
650
692
def bump_timeout(self, timeout=None):
655
697
gobject.source_remove(self.disable_initiator_tag)
656
698
self.disable_initiator_tag = None
657
699
if getattr(self, "enabled", False):
658
self.disable_initiator_tag = (gobject.timeout_add
659
(timedelta_to_milliseconds
660
(timeout), self.disable))
700
self.disable_initiator_tag = gobject.timeout_add(
701
int(timeout.total_seconds() * 1000), self.disable)
661
702
self.expires = datetime.datetime.utcnow() + timeout
662
703
663
704
def need_approval(self):
677
718
# than 'timeout' for the client to be disabled, which is as it
678
719
# should be.
679
720
680
# If a checker exists, make sure it is not a zombie
681
try:
682
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
683
except (AttributeError, OSError) as error:
684
if (isinstance(error, OSError)
685
and error.errno != errno.ECHILD):
686
raise error
687
else:
688
if pid:
689
logger.warning("Checker was a zombie")
690
gobject.source_remove(self.checker_callback_tag)
691
self.checker_callback(pid, status,
692
self.current_checker_command)
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
693
725
# Start a new checker if needed
694
726
if self.checker is None:
695
727
# Escape attributes for the shell
696
escaped_attrs = dict(
697
(attr, re.escape(unicode(getattr(self, attr))))
698
for attr in
699
self.runtime_expansions)
728
escaped_attrs = {
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
700
731
try:
701
732
command = self.checker_command % escaped_attrs
702
733
except TypeError as error:
703
734
logger.error('Could not format string "%s"',
704
self.checker_command, exc_info=error)
705
return True # Try again later
735
self.checker_command,
736
exc_info=error)
737
return True # Try again later
706
738
self.current_checker_command = command
707
try:
708
logger.info("Starting checker %r for %s",
709
command, self.name)
710
# We don't need to redirect stdout and stderr, since
711
# in normal mode, that is already done by daemon(),
712
# and in debug mode we don't want to. (Stdin is
713
# always replaced by /dev/null.)
714
self.checker = subprocess.Popen(command,
715
close_fds=True,
716
shell=True, cwd="/")
717
except OSError as error:
718
logger.error("Failed to start subprocess",
719
exc_info=error)
720
return True
721
self.checker_callback_tag = (gobject.child_watch_add
722
(self.checker.pid,
723
self.checker_callback,
724
data=command))
725
# The checker may have completed before the gobject
726
# watch was added. Check for this.
727
try:
728
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
729
except OSError as error:
730
if error.errno == errno.ECHILD:
731
logger.error("Child process vanished", exc_info=error)
732
return True
733
raise
734
if pid:
735
gobject.source_remove(self.checker_callback_tag)
736
self.checker_callback(pid, status, 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)
737
764
# Re-run this periodically if run by gobject.timeout_add
738
765
return True
739
766
745
772
if getattr(self, "checker", None) is None:
746
773
return
747
774
logger.debug("Stopping checker for %(name)s", vars(self))
748
try:
749
self.checker.terminate()
750
#time.sleep(0.5)
751
#if self.checker.poll() is None:
752
# self.checker.kill()
753
except OSError as error:
754
if error.errno != errno.ESRCH: # No such process
755
raise
775
self.checker.terminate()
756
776
self.checker = None
757
777
758
778
759
def dbus_service_property(dbus_interface, signature="v",
760
access="readwrite", byte_arrays=False):
779
def dbus_service_property(dbus_interface,
780
signature="v",
781
access="readwrite",
782
byte_arrays=False):
761
783
"""Decorators for marking methods of a DBusObjectWithProperties to
762
784
become properties on the D-Bus.
763
785
772
794
# "Set" method, so we fail early here:
773
795
if byte_arrays and signature != "ay":
774
796
raise ValueError("Byte arrays not supported for non-'ay'"
775
" signature {0!r}".format(signature))
797
" signature {!r}".format(signature))
798
776
799
def decorator(func):
777
800
func._dbus_is_property = True
778
801
func._dbus_interface = dbus_interface
783
806
func._dbus_name = func._dbus_name[:-14]
784
807
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
785
808
return func
809
786
810
return decorator
787
811
788
812
797
821
"org.freedesktop.DBus.Property.EmitsChangedSignal":
798
822
"false"}
799
823
"""
824
800
825
def decorator(func):
801
826
func._dbus_is_interface = True
802
827
func._dbus_interface = dbus_interface
803
828
func._dbus_name = dbus_interface
804
829
return func
830
805
831
return decorator
806
832
807
833
809
835
"""Decorator to annotate D-Bus methods, signals or properties
810
836
Usage:
811
837
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
812
841
@dbus_service_property("org.example.Interface", signature="b",
813
842
access="r")
814
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
815
"org.freedesktop.DBus.Property."
816
"EmitsChangedSignal": "false"})
817
843
def Property_dbus_property(self):
818
844
return dbus.Boolean(False)
845
846
See also the DBusObjectWithAnnotations class.
819
847
"""
848
820
849
def decorator(func):
821
850
func._dbus_annotations = annotations
822
851
return func
852
823
853
return decorator
824
854
825
855
826
856
class DBusPropertyException(dbus.exceptions.DBusException):
827
857
"""A base class for D-Bus property-related exceptions
828
858
"""
829
def __unicode__(self):
830
return unicode(str(self))
859
pass
831
860
832
861
833
862
class DBusPropertyAccessException(DBusPropertyException):
842
871
pass
843
872
844
873
845
class DBusObjectWithProperties(dbus.service.Object):
846
"""A D-Bus object with properties.
874
class DBusObjectWithAnnotations(dbus.service.Object):
875
"""A D-Bus object with annotations.
847
876
848
Classes inheriting from this can use the dbus_service_property
849
decorator to expose methods as D-Bus properties. It exposes the
850
standard Get(), Set(), and GetAll() methods on the D-Bus.
877
Classes inheriting from this can use the dbus_annotations
878
decorator to add annotations to methods or signals.
851
879
"""
852
880
853
881
@staticmethod
857
885
If called like _is_dbus_thing("method") it returns a function
858
886
suitable for use as predicate to inspect.getmembers().
859
887
"""
860
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
861
889
False)
862
890
863
891
def _get_all_dbus_things(self, thing):
864
892
"""Returns a generator of (name, attribute) pairs
865
893
"""
866
return ((getattr(athing.__get__(self), "_dbus_name",
867
name),
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
868
895
athing.__get__(self))
869
896
for cls in self.__class__.__mro__
870
897
for name, athing in
871
inspect.getmembers(cls,
872
self._is_dbus_thing(thing)))
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
"""
873
970
874
971
def _get_dbus_property(self, interface_name, property_name):
875
972
"""Returns a bound method if one exists which is a D-Bus
876
973
property with the specified name and interface.
877
974
"""
878
for cls in self.__class__.__mro__:
879
for name, value in (inspect.getmembers
880
(cls,
881
self._is_dbus_thing("property"))):
975
for cls in self.__class__.__mro__:
976
for name, value in inspect.getmembers(
977
cls, self._is_dbus_thing("property")):
882
978
if (value._dbus_name == property_name
883
979
and value._dbus_interface == interface_name):
884
980
return value.__get__(self)
885
981
886
982
# No such property
887
raise DBusPropertyNotFound(self.dbus_object_path + ":"
888
+ interface_name + "."
889
+ property_name)
890
891
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
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",
892
997
out_signature="v")
893
998
def Get(self, interface_name, property_name):
894
999
"""Standard D-Bus property Get() method, see D-Bus standard.
912
1017
# The byte_arrays option is not supported yet on
913
1018
# signatures other than "ay".
914
1019
if prop._dbus_signature != "ay":
915
raise ValueError
1020
raise ValueError("Byte arrays not supported for non-"
1021
"'ay' signature {!r}"
1022
.format(prop._dbus_signature))
916
1023
value = dbus.ByteArray(b''.join(chr(byte)
917
1024
for byte in value))
918
1025
prop(value)
919
1026
920
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1027
@dbus.service.method(dbus.PROPERTIES_IFACE,
1028
in_signature="s",
921
1029
out_signature="a{sv}")
922
1030
def GetAll(self, interface_name):
923
1031
"""Standard D-Bus property GetAll() method, see D-Bus
938
1046
if not hasattr(value, "variant_level"):
939
1047
properties[name] = value
940
1048
continue
941
properties[name] = type(value)(value, variant_level=
942
value.variant_level+1)
1049
properties[name] = type(value)(
1050
value, variant_level = value.variant_level + 1)
943
1051
return dbus.Dictionary(properties, signature="sv")
944
1052
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
945
1061
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
946
1062
out_signature="s",
947
1063
path_keyword='object_path',
951
1067
952
1068
Inserts property tags and interface annotation tags.
953
1069
"""
954
xmlstring = dbus.service.Object.Introspect(self, object_path,
955
connection)
1070
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1071
object_path,
1072
connection)
956
1073
try:
957
1074
document = xml.dom.minidom.parseString(xmlstring)
1075
958
1076
def make_tag(document, name, prop):
959
1077
e = document.createElement("property")
960
1078
e.setAttribute("name", name)
961
1079
e.setAttribute("type", prop._dbus_signature)
962
1080
e.setAttribute("access", prop._dbus_access)
963
1081
return e
1082
964
1083
for if_tag in document.getElementsByTagName("interface"):
965
1084
# Add property tags
966
1085
for tag in (make_tag(document, name, prop)
969
1088
if prop._dbus_interface
970
1089
== if_tag.getAttribute("name")):
971
1090
if_tag.appendChild(tag)
972
# Add annotation tags
973
for typ in ("method", "signal", "property"):
974
for tag in if_tag.getElementsByTagName(typ):
975
annots = dict()
976
for name, prop in (self.
977
_get_all_dbus_things(typ)):
978
if (name == tag.getAttribute("name")
979
and prop._dbus_interface
980
== if_tag.getAttribute("name")):
981
annots.update(getattr
982
(prop,
983
"_dbus_annotations",
984
{}))
985
for name, value in annots.iteritems():
986
ann_tag = document.createElement(
987
"annotation")
988
ann_tag.setAttribute("name", name)
989
ann_tag.setAttribute("value", value)
990
tag.appendChild(ann_tag)
991
# Add interface annotation tags
992
for annotation, value in dict(
993
itertools.chain.from_iterable(
994
annotations().iteritems()
995
for name, annotations in
996
self._get_all_dbus_things("interface")
997
if name == if_tag.getAttribute("name")
998
)).iteritems():
999
ann_tag = document.createElement("annotation")
1000
ann_tag.setAttribute("name", annotation)
1001
ann_tag.setAttribute("value", value)
1002
if_tag.appendChild(ann_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)
1003
1107
# Add the names to the return values for the
1004
1108
# "org.freedesktop.DBus.Properties" methods
1005
1109
if (if_tag.getAttribute("name")
1023
1127
exc_info=error)
1024
1128
return xmlstring
1025
1129
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
1026
1198
1027
1199
def datetime_to_dbus(dt, variant_level=0):
1028
1200
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1029
1201
if dt is None:
1030
1202
return dbus.String("", variant_level = variant_level)
1031
return dbus.String(dt.isoformat(),
1032
variant_level=variant_level)
1203
return dbus.String(dt.isoformat(), variant_level=variant_level)
1033
1204
1034
1205
1035
1206
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1055
1226
(from DBusObjectWithProperties) and interfaces (from the
1056
1227
dbus_interface_annotations decorator).
1057
1228
"""
1229
1058
1230
def wrapper(cls):
1059
1231
for orig_interface_name, alt_interface_name in (
1060
alt_interface_names.iteritems()):
1232
alt_interface_names.items()):
1061
1233
attr = {}
1062
1234
interface_names = set()
1063
1235
# Go though all attributes of the class
1065
1237
# Ignore non-D-Bus attributes, and D-Bus attributes
1066
1238
# with the wrong interface name
1067
1239
if (not hasattr(attribute, "_dbus_interface")
1068
or not attribute._dbus_interface
1069
.startswith(orig_interface_name)):
1240
or not attribute._dbus_interface.startswith(
1241
orig_interface_name)):
1070
1242
continue
1071
1243
# Create an alternate D-Bus interface name based on
1072
1244
# the current name
1073
alt_interface = (attribute._dbus_interface
1074
.replace(orig_interface_name,
1075
alt_interface_name))
1245
alt_interface = attribute._dbus_interface.replace(
1246
orig_interface_name, alt_interface_name)
1076
1247
interface_names.add(alt_interface)
1077
1248
# Is this a D-Bus signal?
1078
1249
if getattr(attribute, "_dbus_is_signal", False):
1079
# Extract the original non-method function by
1080
# black magic
1081
nonmethod_func = (dict(
1250
if sys.version_info.major == 2:
1251
# Extract the original non-method undecorated
1252
# function by black magic
1253
nonmethod_func = (dict(
1082
1254
zip(attribute.func_code.co_freevars,
1083
attribute.__closure__))["func"]
1084
.cell_contents)
1255
attribute.__closure__))
1256
["func"].cell_contents)
1257
else:
1258
nonmethod_func = attribute
1085
1259
# Create a new, but exactly alike, function
1086
1260
# object, and decorate it to be a new D-Bus signal
1087
1261
# with the alternate D-Bus interface name
1088
new_function = (dbus.service.signal
1089
(alt_interface,
1090
attribute._dbus_signature)
1091
(types.FunctionType(
1092
nonmethod_func.func_code,
1093
nonmethod_func.func_globals,
1094
nonmethod_func.func_name,
1095
nonmethod_func.func_defaults,
1096
nonmethod_func.func_closure)))
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))
1097
1279
# Copy annotations, if any
1098
1280
try:
1099
new_function._dbus_annotations = (
1100
dict(attribute._dbus_annotations))
1281
new_function._dbus_annotations = dict(
1282
attribute._dbus_annotations)
1101
1283
except AttributeError:
1102
1284
pass
1103
1285
# Define a creator of a function to call both the
1108
1290
"""This function is a scope container to pass
1109
1291
func1 and func2 to the "call_both" function
1110
1292
outside of its arguments"""
1293
1294
@functools.wraps(func2)
1111
1295
def call_both(*args, **kwargs):
1112
1296
"""This function will emit two D-Bus
1113
1297
signals by calling func1 and func2"""
1114
1298
func1(*args, **kwargs)
1115
1299
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
1116
1305
return call_both
1117
1306
# Create the "call_both" function and add it to
1118
1307
# the class
1123
1312
# object. Decorate it to be a new D-Bus method
1124
1313
# with the alternate D-Bus interface name. Add it
1125
1314
# to the class.
1126
attr[attrname] = (dbus.service.method
1127
(alt_interface,
1128
attribute._dbus_in_signature,
1129
attribute._dbus_out_signature)
1130
(types.FunctionType
1131
(attribute.func_code,
1132
attribute.func_globals,
1133
attribute.func_name,
1134
attribute.func_defaults,
1135
attribute.func_closure)))
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)))
1136
1325
# Copy annotations, if any
1137
1326
try:
1138
attr[attrname]._dbus_annotations = (
1139
dict(attribute._dbus_annotations))
1327
attr[attrname]._dbus_annotations = dict(
1328
attribute._dbus_annotations)
1140
1329
except AttributeError:
1141
1330
pass
1142
1331
# Is this a D-Bus property?
1145
1334
# object, and decorate it to be a new D-Bus
1146
1335
# property with the alternate D-Bus interface
1147
1336
# name. Add it to the class.
1148
attr[attrname] = (dbus_service_property
1149
(alt_interface,
1150
attribute._dbus_signature,
1151
attribute._dbus_access,
1152
attribute
1153
._dbus_get_args_options
1154
["byte_arrays"])
1155
(types.FunctionType
1156
(attribute.func_code,
1157
attribute.func_globals,
1158
attribute.func_name,
1159
attribute.func_defaults,
1160
attribute.func_closure)))
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)))
1161
1348
# Copy annotations, if any
1162
1349
try:
1163
attr[attrname]._dbus_annotations = (
1164
dict(attribute._dbus_annotations))
1350
attr[attrname]._dbus_annotations = dict(
1351
attribute._dbus_annotations)
1165
1352
except AttributeError:
1166
1353
pass
1167
1354
# Is this a D-Bus interface?
1170
1357
# object. Decorate it to be a new D-Bus interface
1171
1358
# with the alternate D-Bus interface name. Add it
1172
1359
# to the class.
1173
attr[attrname] = (dbus_interface_annotations
1174
(alt_interface)
1175
(types.FunctionType
1176
(attribute.func_code,
1177
attribute.func_globals,
1178
attribute.func_name,
1179
attribute.func_defaults,
1180
attribute.func_closure)))
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)))
1181
1367
if deprecate:
1182
1368
# Deprecate all alternate interfaces
1183
iname="_AlternateDBusNames_interface_annotation{0}"
1369
iname="_AlternateDBusNames_interface_annotation{}"
1184
1370
for interface_name in interface_names:
1371
1185
1372
@dbus_interface_annotations(interface_name)
1186
1373
def func(self):
1187
1374
return { "org.freedesktop.DBus.Deprecated":
1188
"true" }
1375
"true" }
1189
1376
# Find an unused name
1190
1377
for aname in (iname.format(i)
1191
1378
for i in itertools.count()):
1195
1382
if interface_names:
1196
1383
# Replace the class with a new subclass of it with
1197
1384
# methods, signals, etc. as created above.
1198
cls = type(b"{0}Alternate".format(cls.__name__),
1199
(cls,), attr)
1385
cls = type(b"{}Alternate".format(cls.__name__),
1386
(cls, ), attr)
1200
1387
return cls
1388
1201
1389
return wrapper
1202
1390
1203
1391
1204
1392
@alternate_dbus_interfaces({"se.recompile.Mandos":
1205
"se.bsnet.fukt.Mandos"})
1393
"se.bsnet.fukt.Mandos"})
1206
1394
class ClientDBus(Client, DBusObjectWithProperties):
1207
1395
"""A Client class using D-Bus
1208
1396
1212
1400
"""
1213
1401
1214
1402
runtime_expansions = (Client.runtime_expansions
1215
+ ("dbus_object_path",))
1403
+ ("dbus_object_path", ))
1404
1405
_interface = "se.recompile.Mandos.Client"
1216
1406
1217
1407
# dbus.service.Object doesn't use super(), so we can't either.
1218
1408
1221
1411
Client.__init__(self, *args, **kwargs)
1222
1412
# Only now, when this client is initialized, can it show up on
1223
1413
# the D-Bus
1224
client_object_name = unicode(self.name).translate(
1414
client_object_name = str(self.name).translate(
1225
1415
{ord("."): ord("_"),
1226
1416
ord("-"): ord("_")})
1227
self.dbus_object_path = (dbus.ObjectPath
1228
("/clients/" + client_object_name))
1417
self.dbus_object_path = dbus.ObjectPath(
1418
"/clients/" + client_object_name)
1229
1419
DBusObjectWithProperties.__init__(self, self.bus,
1230
1420
self.dbus_object_path)
1231
1421
1232
def notifychangeproperty(transform_func,
1233
dbus_name, type_func=lambda x: x,
1234
variant_level=1):
1422
def notifychangeproperty(transform_func, dbus_name,
1423
type_func=lambda x: x,
1424
variant_level=1,
1425
invalidate_only=False,
1426
_interface=_interface):
1235
1427
""" Modify a variable so that it's a property which announces
1236
1428
its changes to DBus.
1237
1429
1242
1434
to the D-Bus. Default: no transform
1243
1435
variant_level: D-Bus variant level. Default: 1
1244
1436
"""
1245
attrname = "_{0}".format(dbus_name)
1437
attrname = "_{}".format(dbus_name)
1438
1246
1439
def setter(self, value):
1247
1440
if hasattr(self, "dbus_object_path"):
1248
1441
if (not hasattr(self, attrname) or
1249
1442
type_func(getattr(self, attrname, None))
1250
1443
!= type_func(value)):
1251
dbus_value = transform_func(type_func(value),
1252
variant_level
1253
=variant_level)
1254
self.PropertyChanged(dbus.String(dbus_name),
1255
dbus_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())
1256
1459
setattr(self, attrname, value)
1257
1460
1258
1461
return property(lambda self: getattr(self, attrname), setter)
1264
1467
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1265
1468
last_enabled = notifychangeproperty(datetime_to_dbus,
1266
1469
"LastEnabled")
1267
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1268
type_func = lambda checker:
1269
checker is not None)
1470
checker = notifychangeproperty(
1471
dbus.Boolean, "CheckerRunning",
1472
type_func = lambda checker: checker is not None)
1270
1473
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1271
1474
"LastCheckedOK")
1272
1475
last_checker_status = notifychangeproperty(dbus.Int16,
1275
1478
datetime_to_dbus, "LastApprovalRequest")
1276
1479
approved_by_default = notifychangeproperty(dbus.Boolean,
1277
1480
"ApprovedByDefault")
1278
approval_delay = notifychangeproperty(dbus.UInt64,
1279
"ApprovalDelay",
1280
type_func =
1281
timedelta_to_milliseconds)
1481
approval_delay = notifychangeproperty(
1482
dbus.UInt64, "ApprovalDelay",
1483
type_func = lambda td: td.total_seconds() * 1000)
1282
1484
approval_duration = notifychangeproperty(
1283
1485
dbus.UInt64, "ApprovalDuration",
1284
type_func = timedelta_to_milliseconds)
1486
type_func = lambda td: td.total_seconds() * 1000)
1285
1487
host = notifychangeproperty(dbus.String, "Host")
1286
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1287
type_func =
1288
timedelta_to_milliseconds)
1488
timeout = notifychangeproperty(
1489
dbus.UInt64, "Timeout",
1490
type_func = lambda td: td.total_seconds() * 1000)
1289
1491
extended_timeout = notifychangeproperty(
1290
1492
dbus.UInt64, "ExtendedTimeout",
1291
type_func = timedelta_to_milliseconds)
1292
interval = notifychangeproperty(dbus.UInt64,
1293
"Interval",
1294
type_func =
1295
timedelta_to_milliseconds)
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)
1296
1497
checker_command = notifychangeproperty(dbus.String, "Checker")
1498
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1499
invalidate_only=True)
1297
1500
1298
1501
del notifychangeproperty
1299
1502
1306
1509
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1307
1510
Client.__del__(self, *args, **kwargs)
1308
1511
1309
def checker_callback(self, pid, condition, command,
1310
*args, **kwargs):
1311
self.checker_callback_tag = None
1312
self.checker = None
1313
if os.WIFEXITED(condition):
1314
exitstatus = os.WEXITSTATUS(condition)
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:
1315
1519
# Emit D-Bus signal
1316
1520
self.CheckerCompleted(dbus.Int16(exitstatus),
1317
dbus.Int64(condition),
1521
# This is specific to GNU libC
1522
dbus.Int64(exitstatus << 8),
1318
1523
dbus.String(command))
1319
1524
else:
1320
1525
# Emit D-Bus signal
1321
1526
self.CheckerCompleted(dbus.Int16(-1),
1322
dbus.Int64(condition),
1527
dbus.Int64(
1528
# This is specific to GNU libC
1529
(exitstatus << 8)
1530
| self.last_checker_signal),
1323
1531
dbus.String(command))
1324
1325
return Client.checker_callback(self, pid, condition, command,
1326
*args, **kwargs)
1532
return ret
1327
1533
1328
1534
def start_checker(self, *args, **kwargs):
1329
old_checker = self.checker
1330
if self.checker is not None:
1331
old_checker_pid = self.checker.pid
1332
else:
1333
old_checker_pid = None
1535
old_checker_pid = getattr(self.checker, "pid", None)
1334
1536
r = Client.start_checker(self, *args, **kwargs)
1335
1537
# Only if new checker process was started
1336
1538
if (self.checker is not None
1345
1547
1346
1548
def approve(self, value=True):
1347
1549
self.approved = value
1348
gobject.timeout_add(timedelta_to_milliseconds
1349
(self.approval_duration),
1350
self._reset_approved)
1550
gobject.timeout_add(int(self.approval_duration.total_seconds()
1551
* 1000), self._reset_approved)
1351
1552
self.send_changedstate()
1352
1553
1353
1554
## D-Bus methods, signals & properties
1354
_interface = "se.recompile.Mandos.Client"
1355
1555
1356
1556
## Interfaces
1357
1557
1358
@dbus_interface_annotations(_interface)
1359
def _foo(self):
1360
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1361
"false"}
1362
1363
1558
## Signals
1364
1559
1365
1560
# CheckerCompleted - signal
1375
1570
pass
1376
1571
1377
1572
# PropertyChanged - signal
1573
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1378
1574
@dbus.service.signal(_interface, signature="sv")
1379
1575
def PropertyChanged(self, property, value):
1380
1576
"D-Bus signal"
1414
1610
self.checked_ok()
1415
1611
1416
1612
# Enable - method
1613
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1417
1614
@dbus.service.method(_interface)
1418
1615
def Enable(self):
1419
1616
"D-Bus method"
1420
1617
self.enable()
1421
1618
1422
1619
# StartChecker - method
1620
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1423
1621
@dbus.service.method(_interface)
1424
1622
def StartChecker(self):
1425
1623
"D-Bus method"
1426
1624
self.start_checker()
1427
1625
1428
1626
# Disable - method
1627
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1429
1628
@dbus.service.method(_interface)
1430
1629
def Disable(self):
1431
1630
"D-Bus method"
1432
1631
self.disable()
1433
1632
1434
1633
# StopChecker - method
1634
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1435
1635
@dbus.service.method(_interface)
1436
1636
def StopChecker(self):
1437
1637
self.stop_checker()
1444
1644
return dbus.Boolean(bool(self.approvals_pending))
1445
1645
1446
1646
# ApprovedByDefault - property
1447
@dbus_service_property(_interface, signature="b",
1647
@dbus_service_property(_interface,
1648
signature="b",
1448
1649
access="readwrite")
1449
1650
def ApprovedByDefault_dbus_property(self, value=None):
1450
1651
if value is None: # get
1452
1653
self.approved_by_default = bool(value)
1453
1654
1454
1655
# ApprovalDelay - property
1455
@dbus_service_property(_interface, signature="t",
1656
@dbus_service_property(_interface,
1657
signature="t",
1456
1658
access="readwrite")
1457
1659
def ApprovalDelay_dbus_property(self, value=None):
1458
1660
if value is None: # get
1459
return dbus.UInt64(self.approval_delay_milliseconds())
1661
return dbus.UInt64(self.approval_delay.total_seconds()
1662
* 1000)
1460
1663
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1461
1664
1462
1665
# ApprovalDuration - property
1463
@dbus_service_property(_interface, signature="t",
1666
@dbus_service_property(_interface,
1667
signature="t",
1464
1668
access="readwrite")
1465
1669
def ApprovalDuration_dbus_property(self, value=None):
1466
1670
if value is None: # get
1467
return dbus.UInt64(timedelta_to_milliseconds(
1468
self.approval_duration))
1671
return dbus.UInt64(self.approval_duration.total_seconds()
1672
* 1000)
1469
1673
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1470
1674
1471
1675
# Name - property
1676
@dbus_annotations(
1677
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1472
1678
@dbus_service_property(_interface, signature="s", access="read")
1473
1679
def Name_dbus_property(self):
1474
1680
return dbus.String(self.name)
1475
1681
1476
1682
# Fingerprint - property
1683
@dbus_annotations(
1684
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1477
1685
@dbus_service_property(_interface, signature="s", access="read")
1478
1686
def Fingerprint_dbus_property(self):
1479
1687
return dbus.String(self.fingerprint)
1480
1688
1481
1689
# Host - property
1482
@dbus_service_property(_interface, signature="s",
1690
@dbus_service_property(_interface,
1691
signature="s",
1483
1692
access="readwrite")
1484
1693
def Host_dbus_property(self, value=None):
1485
1694
if value is None: # get
1486
1695
return dbus.String(self.host)
1487
self.host = unicode(value)
1696
self.host = str(value)
1488
1697
1489
1698
# Created - property
1699
@dbus_annotations(
1700
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1490
1701
@dbus_service_property(_interface, signature="s", access="read")
1491
1702
def Created_dbus_property(self):
1492
1703
return datetime_to_dbus(self.created)
1497
1708
return datetime_to_dbus(self.last_enabled)
1498
1709
1499
1710
# Enabled - property
1500
@dbus_service_property(_interface, signature="b",
1711
@dbus_service_property(_interface,
1712
signature="b",
1501
1713
access="readwrite")
1502
1714
def Enabled_dbus_property(self, value=None):
1503
1715
if value is None: # get
1508
1720
self.disable()
1509
1721
1510
1722
# LastCheckedOK - property
1511
@dbus_service_property(_interface, signature="s",
1723
@dbus_service_property(_interface,
1724
signature="s",
1512
1725
access="readwrite")
1513
1726
def LastCheckedOK_dbus_property(self, value=None):
1514
1727
if value is not None:
1517
1730
return datetime_to_dbus(self.last_checked_ok)
1518
1731
1519
1732
# LastCheckerStatus - property
1520
@dbus_service_property(_interface, signature="n",
1521
access="read")
1733
@dbus_service_property(_interface, signature="n", access="read")
1522
1734
def LastCheckerStatus_dbus_property(self):
1523
1735
return dbus.Int16(self.last_checker_status)
1524
1736
1533
1745
return datetime_to_dbus(self.last_approval_request)
1534
1746
1535
1747
# Timeout - property
1536
@dbus_service_property(_interface, signature="t",
1748
@dbus_service_property(_interface,
1749
signature="t",
1537
1750
access="readwrite")
1538
1751
def Timeout_dbus_property(self, value=None):
1539
1752
if value is None: # get
1540
return dbus.UInt64(self.timeout_milliseconds())
1753
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1541
1754
old_timeout = self.timeout
1542
1755
self.timeout = datetime.timedelta(0, 0, 0, value)
1543
1756
# Reschedule disabling
1552
1765
is None):
1553
1766
return
1554
1767
gobject.source_remove(self.disable_initiator_tag)
1555
self.disable_initiator_tag = (
1556
gobject.timeout_add(
1557
timedelta_to_milliseconds(self.expires - now),
1558
self.disable))
1768
self.disable_initiator_tag = gobject.timeout_add(
1769
int((self.expires - now).total_seconds() * 1000),
1770
self.disable)
1559
1771
1560
1772
# ExtendedTimeout - property
1561
@dbus_service_property(_interface, signature="t",
1773
@dbus_service_property(_interface,
1774
signature="t",
1562
1775
access="readwrite")
1563
1776
def ExtendedTimeout_dbus_property(self, value=None):
1564
1777
if value is None: # get
1565
return dbus.UInt64(self.extended_timeout_milliseconds())
1778
return dbus.UInt64(self.extended_timeout.total_seconds()
1779
* 1000)
1566
1780
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1567
1781
1568
1782
# Interval - property
1569
@dbus_service_property(_interface, signature="t",
1783
@dbus_service_property(_interface,
1784
signature="t",
1570
1785
access="readwrite")
1571
1786
def Interval_dbus_property(self, value=None):
1572
1787
if value is None: # get
1573
return dbus.UInt64(self.interval_milliseconds())
1788
return dbus.UInt64(self.interval.total_seconds() * 1000)
1574
1789
self.interval = datetime.timedelta(0, 0, 0, value)
1575
1790
if getattr(self, "checker_initiator_tag", None) is None:
1576
1791
return
1577
1792
if self.enabled:
1578
1793
# Reschedule checker run
1579
1794
gobject.source_remove(self.checker_initiator_tag)
1580
self.checker_initiator_tag = (gobject.timeout_add
1581
(value, self.start_checker))
1582
self.start_checker() # Start one now, too
1795
self.checker_initiator_tag = gobject.timeout_add(
1796
value, self.start_checker)
1797
self.start_checker() # Start one now, too
1583
1798
1584
1799
# Checker - property
1585
@dbus_service_property(_interface, signature="s",
1800
@dbus_service_property(_interface,
1801
signature="s",
1586
1802
access="readwrite")
1587
1803
def Checker_dbus_property(self, value=None):
1588
1804
if value is None: # get
1589
1805
return dbus.String(self.checker_command)
1590
self.checker_command = unicode(value)
1806
self.checker_command = str(value)
1591
1807
1592
1808
# CheckerRunning - property
1593
@dbus_service_property(_interface, signature="b",
1809
@dbus_service_property(_interface,
1810
signature="b",
1594
1811
access="readwrite")
1595
1812
def CheckerRunning_dbus_property(self, value=None):
1596
1813
if value is None: # get
1601
1818
self.stop_checker()
1602
1819
1603
1820
# ObjectPath - property
1821
@dbus_annotations(
1822
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
1823
"org.freedesktop.DBus.Deprecated": "true"})
1604
1824
@dbus_service_property(_interface, signature="o", access="read")
1605
1825
def ObjectPath_dbus_property(self):
1606
1826
return self.dbus_object_path # is already a dbus.ObjectPath
1607
1827
1608
1828
# Secret = property
1609
@dbus_service_property(_interface, signature="ay",
1610
access="write", byte_arrays=True)
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)
1611
1836
def Secret_dbus_property(self, value):
1612
self.secret = str(value)
1837
self.secret = bytes(value)
1613
1838
1614
1839
del _interface
1615
1840
1619
1844
self._pipe = child_pipe
1620
1845
self._pipe.send(('init', fpr, address))
1621
1846
if not self._pipe.recv():
1622
raise KeyError()
1847
raise KeyError(fpr)
1623
1848
1624
1849
def __getattribute__(self, name):
1625
1850
if name == '_pipe':
1629
1854
if data[0] == 'data':
1630
1855
return data[1]
1631
1856
if data[0] == 'function':
1857
1632
1858
def func(*args, **kwargs):
1633
1859
self._pipe.send(('funcall', name, args, kwargs))
1634
1860
return self._pipe.recv()[1]
1861
1635
1862
return func
1636
1863
1637
1864
def __setattr__(self, name, value):
1649
1876
def handle(self):
1650
1877
with contextlib.closing(self.server.child_pipe) as child_pipe:
1651
1878
logger.info("TCP connection from: %s",
1652
unicode(self.client_address))
1879
str(self.client_address))
1653
1880
logger.debug("Pipe FD: %d",
1654
1881
self.server.child_pipe.fileno())
1655
1882
1656
session = (gnutls.connection
1657
.ClientSession(self.request,
1658
gnutls.connection
1659
.X509Credentials()))
1883
session = gnutls.connection.ClientSession(
1884
self.request, gnutls.connection .X509Credentials())
1660
1885
1661
1886
# Note: gnutls.connection.X509Credentials is really a
1662
1887
# generic GnuTLS certificate credentials object so long as
1671
1896
priority = self.server.gnutls_priority
1672
1897
if priority is None:
1673
1898
priority = "NORMAL"
1674
(gnutls.library.functions
1675
.gnutls_priority_set_direct(session._c_object,
1676
priority, None))
1899
gnutls.library.functions.gnutls_priority_set_direct(
1900
session._c_object, priority, None)
1677
1901
1678
1902
# Start communication using the Mandos protocol
1679
1903
# Get protocol number
1681
1905
logger.debug("Protocol version: %r", line)
1682
1906
try:
1683
1907
if int(line.strip().split()[0]) > 1:
1684
raise RuntimeError
1908
raise RuntimeError(line)
1685
1909
except (ValueError, IndexError, RuntimeError) as error:
1686
1910
logger.error("Unknown protocol version: %s", error)
1687
1911
return
1699
1923
approval_required = False
1700
1924
try:
1701
1925
try:
1702
fpr = self.fingerprint(self.peer_certificate
1703
(session))
1926
fpr = self.fingerprint(
1927
self.peer_certificate(session))
1704
1928
except (TypeError,
1705
1929
gnutls.errors.GNUTLSError) as error:
1706
1930
logger.warning("Bad certificate: %s", error)
1721
1945
while True:
1722
1946
if not client.enabled:
1723
1947
logger.info("Client %s is disabled",
1724
client.name)
1948
client.name)
1725
1949
if self.server.use_dbus:
1726
1950
# Emit D-Bus signal
1727
1951
client.Rejected("Disabled")
1736
1960
if self.server.use_dbus:
1737
1961
# Emit D-Bus signal
1738
1962
client.NeedApproval(
1739
client.approval_delay_milliseconds(),
1740
client.approved_by_default)
1963
client.approval_delay.total_seconds()
1964
* 1000, client.approved_by_default)
1741
1965
else:
1742
1966
logger.warning("Client %s was not approved",
1743
1967
client.name)
1749
1973
#wait until timeout or approved
1750
1974
time = datetime.datetime.now()
1751
1975
client.changedstate.acquire()
1752
client.changedstate.wait(
1753
float(timedelta_to_milliseconds(delay)
1754
/ 1000))
1976
client.changedstate.wait(delay.total_seconds())
1755
1977
client.changedstate.release()
1756
1978
time2 = datetime.datetime.now()
1757
1979
if (time2 - time) >= delay:
1776
1998
logger.warning("gnutls send failed",
1777
1999
exc_info=error)
1778
2000
return
1779
logger.debug("Sent: %d, remaining: %d",
1780
sent, len(client.secret)
1781
- (sent_size + sent))
2001
logger.debug("Sent: %d, remaining: %d", sent,
2002
len(client.secret) - (sent_size
2003
+ sent))
1782
2004
sent_size += sent
1783
2005
1784
2006
logger.info("Sending secret to %s", client.name)
1801
2023
def peer_certificate(session):
1802
2024
"Return the peer's OpenPGP certificate as a bytestring"
1803
2025
# If not an OpenPGP certificate...
1804
if (gnutls.library.functions
1805
.gnutls_certificate_type_get(session._c_object)
2026
if (gnutls.library.functions.gnutls_certificate_type_get(
2027
session._c_object)
1806
2028
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1807
2029
# ...do the normal thing
1808
2030
return session.peer_certificate
1822
2044
def fingerprint(openpgp):
1823
2045
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1824
2046
# New GnuTLS "datum" with the OpenPGP public key
1825
datum = (gnutls.library.types
1826
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1827
ctypes.POINTER
1828
(ctypes.c_ubyte)),
1829
ctypes.c_uint(len(openpgp))))
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)))
1830
2051
# New empty GnuTLS certificate
1831
2052
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1832
(gnutls.library.functions
1833
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2053
gnutls.library.functions.gnutls_openpgp_crt_init(
2054
ctypes.byref(crt))
1834
2055
# Import the OpenPGP public key into the certificate
1835
(gnutls.library.functions
1836
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1837
gnutls.library.constants
1838
.GNUTLS_OPENPGP_FMT_RAW))
2056
gnutls.library.functions.gnutls_openpgp_crt_import(
2057
crt, ctypes.byref(datum),
2058
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1839
2059
# Verify the self signature in the key
1840
2060
crtverify = ctypes.c_uint()
1841
(gnutls.library.functions
1842
.gnutls_openpgp_crt_verify_self(crt, 0,
1843
ctypes.byref(crtverify)))
2061
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
2062
crt, 0, ctypes.byref(crtverify))
1844
2063
if crtverify.value != 0:
1845
2064
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1846
raise (gnutls.errors.CertificateSecurityError
1847
("Verify failed"))
2065
raise gnutls.errors.CertificateSecurityError(
2066
"Verify failed")
1848
2067
# New buffer for the fingerprint
1849
2068
buf = ctypes.create_string_buffer(20)
1850
2069
buf_len = ctypes.c_size_t()
1851
2070
# Get the fingerprint from the certificate into the buffer
1852
(gnutls.library.functions
1853
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1854
ctypes.byref(buf_len)))
2071
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
2072
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1855
2073
# Deinit the certificate
1856
2074
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1857
2075
# Convert the buffer to a Python bytestring
1863
2081
1864
2082
class MultiprocessingMixIn(object):
1865
2083
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2084
1866
2085
def sub_process_main(self, request, address):
1867
2086
try:
1868
2087
self.finish_request(request, address)
1880
2099
1881
2100
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1882
2101
""" adds a pipe to the MixIn """
2102
1883
2103
def process_request(self, request, client_address):
1884
2104
"""Overrides and wraps the original process_request().
1885
2105
1894
2114
1895
2115
def add_pipe(self, parent_pipe, proc):
1896
2116
"""Dummy function; override as necessary"""
1897
raise NotImplementedError
2117
raise NotImplementedError()
1898
2118
1899
2119
1900
2120
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1906
2126
interface: None or a network interface name (string)
1907
2127
use_ipv6: Boolean; to use IPv6 or not
1908
2128
"""
2129
1909
2130
def __init__(self, server_address, RequestHandlerClass,
1910
interface=None, use_ipv6=True, socketfd=None):
2131
interface=None,
2132
use_ipv6=True,
2133
socketfd=None):
1911
2134
"""If socketfd is set, use that file descriptor instead of
1912
2135
creating a new one with socket.socket().
1913
2136
"""
1954
2177
self.interface)
1955
2178
else:
1956
2179
try:
1957
self.socket.setsockopt(socket.SOL_SOCKET,
1958
SO_BINDTODEVICE,
1959
str(self.interface + '\0'))
2180
self.socket.setsockopt(
2181
socket.SOL_SOCKET, SO_BINDTODEVICE,
2182
(self.interface + "\0").encode("utf-8"))
1960
2183
except socket.error as error:
1961
2184
if error.errno == errno.EPERM:
1962
2185
logger.error("No permission to bind to"
1976
2199
if self.address_family == socket.AF_INET6:
1977
2200
any_address = "::" # in6addr_any
1978
2201
else:
1979
any_address = socket.INADDR_ANY
2202
any_address = "0.0.0.0" # INADDR_ANY
1980
2203
self.server_address = (any_address,
1981
2204
self.server_address[1])
1982
2205
elif not self.server_address[1]:
1983
self.server_address = (self.server_address[0],
1984
0)
2206
self.server_address = (self.server_address[0], 0)
1985
2207
# if self.interface:
1986
2208
# self.server_address = (self.server_address[0],
1987
2209
# 0, # port
2001
2223
2002
2224
Assumes a gobject.MainLoop event loop.
2003
2225
"""
2226
2004
2227
def __init__(self, server_address, RequestHandlerClass,
2005
interface=None, use_ipv6=True, clients=None,
2006
gnutls_priority=None, use_dbus=True, socketfd=None):
2228
interface=None,
2229
use_ipv6=True,
2230
clients=None,
2231
gnutls_priority=None,
2232
use_dbus=True,
2233
socketfd=None):
2007
2234
self.enabled = False
2008
2235
self.clients = clients
2009
2236
if self.clients is None:
2015
2242
interface = interface,
2016
2243
use_ipv6 = use_ipv6,
2017
2244
socketfd = socketfd)
2245
2018
2246
def server_activate(self):
2019
2247
if self.enabled:
2020
2248
return socketserver.TCPServer.server_activate(self)
2024
2252
2025
2253
def add_pipe(self, parent_pipe, proc):
2026
2254
# Call "handle_ipc" for both data and EOF events
2027
gobject.io_add_watch(parent_pipe.fileno(),
2028
gobject.IO_IN | gobject.IO_HUP,
2029
functools.partial(self.handle_ipc,
2030
parent_pipe =
2031
parent_pipe,
2032
proc = proc))
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))
2033
2261
2034
def handle_ipc(self, source, condition, parent_pipe=None,
2035
proc = None, client_object=None):
2262
def handle_ipc(self, source, condition,
2263
parent_pipe=None,
2264
proc = None,
2265
client_object=None):
2036
2266
# error, or the other end of multiprocessing.Pipe has closed
2037
2267
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2038
2268
# Wait for other process to exit
2061
2291
parent_pipe.send(False)
2062
2292
return False
2063
2293
2064
gobject.io_add_watch(parent_pipe.fileno(),
2065
gobject.IO_IN | gobject.IO_HUP,
2066
functools.partial(self.handle_ipc,
2067
parent_pipe =
2068
parent_pipe,
2069
proc = proc,
2070
client_object =
2071
client))
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))
2072
2301
parent_pipe.send(True)
2073
2302
# remove the old hook in favor of the new above hook on
2074
2303
# same fileno
2080
2309
2081
2310
parent_pipe.send(('data', getattr(client_object,
2082
2311
funcname)(*args,
2083
**kwargs)))
2312
**kwargs)))
2084
2313
2085
2314
if command == 'getattr':
2086
2315
attrname = request[1]
2087
if callable(client_object.__getattribute__(attrname)):
2088
parent_pipe.send(('function',))
2316
if isinstance(client_object.__getattribute__(attrname),
2317
collections.Callable):
2318
parent_pipe.send(('function', ))
2089
2319
else:
2090
parent_pipe.send(('data', client_object
2091
.__getattribute__(attrname)))
2320
parent_pipe.send((
2321
'data', client_object.__getattribute__(attrname)))
2092
2322
2093
2323
if command == 'setattr':
2094
2324
attrname = request[1]
2125
2355
# avoid excessive use of external libraries.
2126
2356
2127
2357
# New type for defining tokens, syntax, and semantics all-in-one
2128
Token = collections.namedtuple("Token",
2129
("regexp", # To match token; if
2130
# "value" is not None,
2131
# must have a "group"
2132
# containing digits
2133
"value", # datetime.timedelta or
2134
# None
2135
"followers")) # Tokens valid after
2136
# this token
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
2137
2363
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2138
2364
# the "duration" ABNF definition in RFC 3339, Appendix A.
2139
2365
token_end = Token(re.compile(r"$"), None, frozenset())
2140
2366
token_second = Token(re.compile(r"(\d+)S"),
2141
2367
datetime.timedelta(seconds=1),
2142
frozenset((token_end,)))
2368
frozenset((token_end, )))
2143
2369
token_minute = Token(re.compile(r"(\d+)M"),
2144
2370
datetime.timedelta(minutes=1),
2145
2371
frozenset((token_second, token_end)))
2161
2387
frozenset((token_month, token_end)))
2162
2388
token_week = Token(re.compile(r"(\d+)W"),
2163
2389
datetime.timedelta(weeks=1),
2164
frozenset((token_end,)))
2390
frozenset((token_end, )))
2165
2391
token_duration = Token(re.compile(r"P"), None,
2166
2392
frozenset((token_year, token_month,
2167
2393
token_day, token_time,
2168
token_week))),
2394
token_week)))
2169
2395
# Define starting values
2170
2396
value = datetime.timedelta() # Value so far
2171
2397
found_token = None
2172
followers = frozenset(token_duration,) # Following valid tokens
2398
followers = frozenset((token_duration, )) # Following valid tokens
2173
2399
s = duration # String left to parse
2174
2400
# Loop until end token is found
2175
2401
while found_token is not token_end:
2192
2418
break
2193
2419
else:
2194
2420
# No currently valid tokens were found
2195
raise ValueError("Invalid RFC 3339 duration")
2421
raise ValueError("Invalid RFC 3339 duration: {!r}"
2422
.format(duration))
2196
2423
# End token found
2197
2424
return value
2198
2425
2222
2449
timevalue = datetime.timedelta(0)
2223
2450
for s in interval.split():
2224
2451
try:
2225
suffix = unicode(s[-1])
2452
suffix = s[-1]
2226
2453
value = int(s[:-1])
2227
2454
if suffix == "d":
2228
2455
delta = datetime.timedelta(value)
2235
2462
elif suffix == "w":
2236
2463
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2237
2464
else:
2238
raise ValueError("Unknown suffix {0!r}"
2239
.format(suffix))
2240
except (ValueError, IndexError) as e:
2465
raise ValueError("Unknown suffix {!r}".format(suffix))
2466
except IndexError as e:
2241
2467
raise ValueError(*(e.args))
2242
2468
timevalue += delta
2243
2469
return timevalue
2259
2485
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2260
2486
if not stat.S_ISCHR(os.fstat(null).st_mode):
2261
2487
raise OSError(errno.ENODEV,
2262
"{0} not a character device"
2488
"{} not a character device"
2263
2489
.format(os.devnull))
2264
2490
os.dup2(null, sys.stdin.fileno())
2265
2491
os.dup2(null, sys.stdout.fileno())
2275
2501
2276
2502
parser = argparse.ArgumentParser()
2277
2503
parser.add_argument("-v", "--version", action="version",
2278
version = "%(prog)s {0}".format(version),
2504
version = "%(prog)s {}".format(version),
2279
2505
help="show version number and exit")
2280
2506
parser.add_argument("-i", "--interface", metavar="IF",
2281
2507
help="Bind to interface IF")
2287
2513
help="Run self-test")
2288
2514
parser.add_argument("--debug", action="store_true",
2289
2515
help="Debug mode; run in foreground and log"
2290
" to terminal")
2516
" to terminal", default=None)
2291
2517
parser.add_argument("--debuglevel", metavar="LEVEL",
2292
2518
help="Debug level for stdout output")
2293
2519
parser.add_argument("--priority", help="GnuTLS"
2300
2526
" files")
2301
2527
parser.add_argument("--no-dbus", action="store_false",
2302
2528
dest="use_dbus", help="Do not provide D-Bus"
2303
" system bus interface")
2529
" system bus interface", default=None)
2304
2530
parser.add_argument("--no-ipv6", action="store_false",
2305
dest="use_ipv6", help="Do not use IPv6")
2531
dest="use_ipv6", help="Do not use IPv6",
2532
default=None)
2306
2533
parser.add_argument("--no-restore", action="store_false",
2307
2534
dest="restore", help="Do not restore stored"
2308
" state")
2535
" state", default=None)
2309
2536
parser.add_argument("--socket", type=int,
2310
2537
help="Specify a file descriptor to a network"
2311
2538
" socket to use instead of creating one")
2312
2539
parser.add_argument("--statedir", metavar="DIR",
2313
2540
help="Directory to save/restore state in")
2314
2541
parser.add_argument("--foreground", action="store_true",
2315
help="Run in foreground")
2542
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)
2316
2546
2317
2547
options = parser.parse_args()
2318
2548
2319
2549
if options.check:
2320
2550
import doctest
2321
doctest.testmod()
2322
sys.exit()
2551
fail_count, test_count = doctest.testmod()
2552
sys.exit(os.EX_OK if fail_count == 0 else 1)
2323
2553
2324
2554
# Default values for config file for server-global settings
2325
2555
server_defaults = { "interface": "",
2327
2557
"port": "",
2328
2558
"debug": "False",
2329
2559
"priority":
2330
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2560
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2561
":+SIGN-DSA-SHA256",
2331
2562
"servicename": "Mandos",
2332
2563
"use_dbus": "True",
2333
2564
"use_ipv6": "True",
2336
2567
"socket": "",
2337
2568
"statedir": "/var/lib/mandos",
2338
2569
"foreground": "False",
2339
}
2570
"zeroconf": "True",
2571
}
2340
2572
2341
2573
# Parse config file for server-global settings
2342
2574
server_config = configparser.SafeConfigParser(server_defaults)
2343
2575
del server_defaults
2344
server_config.read(os.path.join(options.configdir,
2345
"mandos.conf"))
2576
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2346
2577
# Convert the SafeConfigParser object to a dict
2347
2578
server_settings = server_config.defaults()
2348
2579
# Use the appropriate methods on the non-string config options
2366
2597
# Override the settings from the config file with command line
2367
2598
# options, if set.
2368
2599
for option in ("interface", "address", "port", "debug",
2369
"priority", "servicename", "configdir",
2370
"use_dbus", "use_ipv6", "debuglevel", "restore",
2371
"statedir", "socket", "foreground"):
2600
"priority", "servicename", "configdir", "use_dbus",
2601
"use_ipv6", "debuglevel", "restore", "statedir",
2602
"socket", "foreground", "zeroconf"):
2372
2603
value = getattr(options, option)
2373
2604
if value is not None:
2374
2605
server_settings[option] = value
2375
2606
del options
2376
2607
# Force all strings to be unicode
2377
2608
for option in server_settings.keys():
2378
if type(server_settings[option]) is str:
2379
server_settings[option] = unicode(server_settings[option])
2609
if isinstance(server_settings[option], bytes):
2610
server_settings[option] = (server_settings[option]
2611
.decode("utf-8"))
2612
# Force all boolean options to be boolean
2613
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2614
"foreground", "zeroconf"):
2615
server_settings[option] = bool(server_settings[option])
2380
2616
# Debug implies foreground
2381
2617
if server_settings["debug"]:
2382
2618
server_settings["foreground"] = True
2384
2620
2385
2621
##################################################################
2386
2622
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
2387
2628
# For convenience
2388
2629
debug = server_settings["debug"]
2389
2630
debuglevel = server_settings["debuglevel"]
2392
2633
stored_state_path = os.path.join(server_settings["statedir"],
2393
2634
stored_state_file)
2394
2635
foreground = server_settings["foreground"]
2636
zeroconf = server_settings["zeroconf"]
2395
2637
2396
2638
if debug:
2397
2639
initlogger(debug, logging.DEBUG)
2403
2645
initlogger(debug, level)
2404
2646
2405
2647
if server_settings["servicename"] != "Mandos":
2406
syslogger.setFormatter(logging.Formatter
2407
('Mandos ({0}) [%(process)d]:'
2408
' %(levelname)s: %(message)s'
2409
.format(server_settings
2410
["servicename"])))
2648
syslogger.setFormatter(
2649
logging.Formatter('Mandos ({}) [%(process)d]:'
2650
' %(levelname)s: %(message)s'.format(
2651
server_settings["servicename"])))
2411
2652
2412
2653
# Parse config file with clients
2413
2654
client_config = configparser.SafeConfigParser(Client
2418
2659
global mandos_dbus_service
2419
2660
mandos_dbus_service = None
2420
2661
2421
tcp_server = MandosServer((server_settings["address"],
2422
server_settings["port"]),
2423
ClientHandler,
2424
interface=(server_settings["interface"]
2425
or None),
2426
use_ipv6=use_ipv6,
2427
gnutls_priority=
2428
server_settings["priority"],
2429
use_dbus=use_dbus,
2430
socketfd=(server_settings["socket"]
2431
or None))
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)
2432
2673
if not foreground:
2433
pidfilename = "/var/run/mandos.pid"
2674
pidfilename = "/run/mandos.pid"
2675
if not os.path.isdir("/run/."):
2676
pidfilename = "/var/run/mandos.pid"
2434
2677
pidfile = None
2435
2678
try:
2436
pidfile = open(pidfilename, "w")
2679
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2437
2680
except IOError as e:
2438
2681
logger.error("Could not open file %r", pidfilename,
2439
2682
exc_info=e)
2453
2696
os.setuid(uid)
2454
2697
except OSError as error:
2455
2698
if error.errno != errno.EPERM:
2456
raise error
2699
raise
2457
2700
2458
2701
if debug:
2459
2702
# Enable all possible GnuTLS debugging
2466
2709
def debug_gnutls(level, string):
2467
2710
logger.debug("GnuTLS: %s", string[:-1])
2468
2711
2469
(gnutls.library.functions
2470
.gnutls_global_set_log_function(debug_gnutls))
2712
gnutls.library.functions.gnutls_global_set_log_function(
2713
debug_gnutls)
2471
2714
2472
2715
# Redirect stdin so all checkers get /dev/null
2473
2716
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2493
2736
if use_dbus:
2494
2737
try:
2495
2738
bus_name = dbus.service.BusName("se.recompile.Mandos",
2496
bus, do_not_queue=True)
2497
old_bus_name = (dbus.service.BusName
2498
("se.bsnet.fukt.Mandos", bus,
2499
do_not_queue=True))
2500
except dbus.exceptions.NameExistsException as e:
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:
2501
2745
logger.error("Disabling D-Bus:", exc_info=e)
2502
2746
use_dbus = False
2503
2747
server_settings["use_dbus"] = False
2504
2748
tcp_server.use_dbus = False
2505
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2506
service = AvahiServiceToSyslog(name =
2507
server_settings["servicename"],
2508
servicetype = "_mandos._tcp",
2509
protocol = protocol, bus = bus)
2510
if server_settings["interface"]:
2511
service.interface = (if_nametoindex
2512
(str(server_settings["interface"])))
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"))
2513
2759
2514
2760
global multiprocessing_manager
2515
2761
multiprocessing_manager = multiprocessing.Manager()
2522
2768
old_client_settings = {}
2523
2769
clients_data = {}
2524
2770
2771
# This is used to redirect stdout and stderr for checker processes
2772
global wnull
2773
wnull = open(os.devnull, "w") # A writable /dev/null
2774
# Only used if server is running in foreground but not in debug
2775
# mode
2776
if debug or not foreground:
2777
wnull.close()
2778
2525
2779
# Get client data and settings from last running state.
2526
2780
if server_settings["restore"]:
2527
2781
try:
2528
2782
with open(stored_state_path, "rb") as stored_state:
2529
clients_data, old_client_settings = (pickle.load
2530
(stored_state))
2783
clients_data, old_client_settings = pickle.load(
2784
stored_state)
2531
2785
os.remove(stored_state_path)
2532
2786
except IOError as e:
2533
2787
if e.errno == errno.ENOENT:
2534
logger.warning("Could not load persistent state: {0}"
2535
.format(os.strerror(e.errno)))
2788
logger.warning("Could not load persistent state:"
2789
" {}".format(os.strerror(e.errno)))
2536
2790
else:
2537
2791
logger.critical("Could not load persistent state:",
2538
2792
exc_info=e)
2539
2793
raise
2540
2794
except EOFError as e:
2541
2795
logger.warning("Could not load persistent state: "
2542
"EOFError:", exc_info=e)
2796
"EOFError:",
2797
exc_info=e)
2543
2798
2544
2799
with PGPEngine() as pgp:
2545
for client_name, client in clients_data.iteritems():
2800
for client_name, client in clients_data.items():
2801
# Skip removed clients
2802
if client_name not in client_settings:
2803
continue
2804
2546
2805
# Decide which value to use after restoring saved state.
2547
2806
# We have three different values: Old config file,
2548
2807
# new config file, and saved state.
2553
2812
# For each value in new config, check if it
2554
2813
# differs from the old config value (Except for
2555
2814
# the "secret" attribute)
2556
if (name != "secret" and
2557
value != old_client_settings[client_name]
2558
[name]):
2815
if (name != "secret"
2816
and (value !=
2817
old_client_settings[client_name][name])):
2559
2818
client[name] = value
2560
2819
except KeyError:
2561
2820
pass
2562
2821
2563
2822
# Clients who has passed its expire date can still be
2564
# enabled if its last checker was successful. Clients
2823
# enabled if its last checker was successful. A Client
2565
2824
# whose checker succeeded before we stored its state is
2566
2825
# assumed to have successfully run all checkers during
2567
2826
# downtime.
2569
2828
if datetime.datetime.utcnow() >= client["expires"]:
2570
2829
if not client["last_checked_ok"]:
2571
2830
logger.warning(
2572
"disabling client {0} - Client never "
2573
"performed a successful checker"
2574
.format(client_name))
2831
"disabling client {} - Client never "
2832
"performed a successful checker".format(
2833
client_name))
2575
2834
client["enabled"] = False
2576
2835
elif client["last_checker_status"] != 0:
2577
2836
logger.warning(
2578
"disabling client {0} - Client "
2579
"last checker failed with error code {1}"
2580
.format(client_name,
2581
client["last_checker_status"]))
2837
"disabling client {} - Client last"
2838
" checker failed with error code"
2839
" {}".format(
2840
client_name,
2841
client["last_checker_status"]))
2582
2842
client["enabled"] = False
2583
2843
else:
2584
client["expires"] = (datetime.datetime
2585
.utcnow()
2586
+ client["timeout"])
2844
client["expires"] = (
2845
datetime.datetime.utcnow()
2846
+ client["timeout"])
2587
2847
logger.debug("Last checker succeeded,"
2588
" keeping {0} enabled"
2589
.format(client_name))
2848
" keeping {} enabled".format(
2849
client_name))
2590
2850
try:
2591
client["secret"] = (
2592
pgp.decrypt(client["encrypted_secret"],
2593
client_settings[client_name]
2594
["secret"]))
2851
client["secret"] = pgp.decrypt(
2852
client["encrypted_secret"],
2853
client_settings[client_name]["secret"])
2595
2854
except PGPError:
2596
2855
# If decryption fails, we use secret from new settings
2597
logger.debug("Failed to decrypt {0} old secret"
2598
.format(client_name))
2599
client["secret"] = (
2600
client_settings[client_name]["secret"])
2856
logger.debug("Failed to decrypt {} old secret".format(
2857
client_name))
2858
client["secret"] = (client_settings[client_name]
2859
["secret"])
2601
2860
2602
2861
# Add/remove clients based on new changes made to config
2603
2862
for client_name in (set(old_client_settings)
2608
2867
clients_data[client_name] = client_settings[client_name]
2609
2868
2610
2869
# Create all client objects
2611
for client_name, client in clients_data.iteritems():
2870
for client_name, client in clients_data.items():
2612
2871
tcp_server.clients[client_name] = client_class(
2613
name = client_name, settings = client)
2872
name = client_name,
2873
settings = client,
2874
server_settings = server_settings)
2614
2875
2615
2876
if not tcp_server.clients:
2616
2877
logger.warning("No clients defined")
2617
2878
2618
2879
if not foreground:
2619
2880
if pidfile is not None:
2881
pid = os.getpid()
2620
2882
try:
2621
2883
with pidfile:
2622
pid = os.getpid()
2623
pidfile.write(str(pid) + "\n".encode("utf-8"))
2884
print(pid, file=pidfile)
2624
2885
except IOError:
2625
2886
logger.error("Could not write to file %r with PID %d",
2626
2887
pidfilename, pid)
2631
2892
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2632
2893
2633
2894
if use_dbus:
2634
@alternate_dbus_interfaces({"se.recompile.Mandos":
2635
"se.bsnet.fukt.Mandos"})
2636
class MandosDBusService(DBusObjectWithProperties):
2895
2896
@alternate_dbus_interfaces(
2897
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2898
class MandosDBusService(DBusObjectWithObjectManager):
2637
2899
"""A D-Bus proxy object"""
2900
2638
2901
def __init__(self):
2639
2902
dbus.service.Object.__init__(self, bus, "/")
2903
2640
2904
_interface = "se.recompile.Mandos"
2641
2905
2642
@dbus_interface_annotations(_interface)
2643
def _foo(self):
2644
return { "org.freedesktop.DBus.Property"
2645
".EmitsChangedSignal":
2646
"false"}
2647
2648
2906
@dbus.service.signal(_interface, signature="o")
2649
2907
def ClientAdded(self, objpath):
2650
2908
"D-Bus signal"
2655
2913
"D-Bus signal"
2656
2914
pass
2657
2915
2916
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2917
"true"})
2658
2918
@dbus.service.signal(_interface, signature="os")
2659
2919
def ClientRemoved(self, objpath, name):
2660
2920
"D-Bus signal"
2661
2921
pass
2662
2922
2923
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2924
"true"})
2663
2925
@dbus.service.method(_interface, out_signature="ao")
2664
2926
def GetAllClients(self):
2665
2927
"D-Bus method"
2666
return dbus.Array(c.dbus_object_path
2667
for c in
2928
return dbus.Array(c.dbus_object_path for c in
2668
2929
tcp_server.clients.itervalues())
2669
2930
2931
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
2932
"true"})
2670
2933
@dbus.service.method(_interface,
2671
2934
out_signature="a{oa{sv}}")
2672
2935
def GetAllClientsWithProperties(self):
2673
2936
"D-Bus method"
2674
2937
return dbus.Dictionary(
2675
((c.dbus_object_path, c.GetAll(""))
2676
for c in tcp_server.clients.itervalues()),
2938
{ c.dbus_object_path: c.GetAll(
2939
"se.recompile.Mandos.Client")
2940
for c in tcp_server.clients.itervalues() },
2677
2941
signature="oa{sv}")
2678
2942
2679
2943
@dbus.service.method(_interface, in_signature="o")
2683
2947
if c.dbus_object_path == object_path:
2684
2948
del tcp_server.clients[c.name]
2685
2949
c.remove_from_connection()
2686
# Don't signal anything except ClientRemoved
2950
# Don't signal the disabling
2687
2951
c.disable(quiet=True)
2688
# Emit D-Bus signal
2689
self.ClientRemoved(object_path, c.name)
2952
# Emit D-Bus signal for removal
2953
self.client_removed_signal(c)
2690
2954
return
2691
2955
raise KeyError(object_path)
2692
2956
2693
2957
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)
2694
2994
2695
2995
mandos_dbus_service = MandosDBusService()
2696
2996
2697
2997
def cleanup():
2698
2998
"Cleanup function; run on exit"
2699
service.cleanup()
2999
if zeroconf:
3000
service.cleanup()
2700
3001
2701
3002
multiprocessing.active_children()
3003
wnull.close()
2702
3004
if not (tcp_server.clients or client_settings):
2703
3005
return
2704
3006
2715
3017
2716
3018
# A list of attributes that can not be pickled
2717
3019
# + secret.
2718
exclude = set(("bus", "changedstate", "secret",
2719
"checker"))
2720
for name, typ in (inspect.getmembers
2721
(dbus.service.Object)):
3020
exclude = { "bus", "changedstate", "secret",
3021
"checker", "server_settings" }
3022
for name, typ in inspect.getmembers(dbus.service
3023
.Object):
2722
3024
exclude.add(name)
2723
3025
2724
3026
client_dict["encrypted_secret"] = (client
2731
3033
del client_settings[client.name]["secret"]
2732
3034
2733
3035
try:
2734
with (tempfile.NamedTemporaryFile
2735
(mode='wb', suffix=".pickle", prefix='clients-',
2736
dir=os.path.dirname(stored_state_path),
2737
delete=False)) as stored_state:
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:
2738
3042
pickle.dump((clients, client_settings), stored_state)
2739
tempname=stored_state.name
3043
tempname = stored_state.name
2740
3044
os.rename(tempname, stored_state_path)
2741
3045
except (IOError, OSError) as e:
2742
3046
if not debug:
2745
3049
except NameError:
2746
3050
pass
2747
3051
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2748
logger.warning("Could not save persistent state: {0}"
3052
logger.warning("Could not save persistent state: {}"
2749
3053
.format(os.strerror(e.errno)))
2750
3054
else:
2751
3055
logger.warning("Could not save persistent state:",
2752
3056
exc_info=e)
2753
raise e
3057
raise
2754
3058
2755
3059
# Delete all clients, and settings from config
2756
3060
while tcp_server.clients:
2757
3061
name, client = tcp_server.clients.popitem()
2758
3062
if use_dbus:
2759
3063
client.remove_from_connection()
2760
# Don't signal anything except ClientRemoved
3064
# Don't signal the disabling
2761
3065
client.disable(quiet=True)
2762
if use_dbus:
2763
# Emit D-Bus signal
2764
mandos_dbus_service.ClientRemoved(client
2765
.dbus_object_path,
2766
client.name)
3066
# Emit D-Bus signal for removal
3067
mandos_dbus_service.client_removed_signal(client)
2767
3068
client_settings.clear()
2768
3069
2769
3070
atexit.register(cleanup)
2770
3071
2771
3072
for client in tcp_server.clients.itervalues():
2772
3073
if use_dbus:
2773
# Emit D-Bus signal
2774
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3074
# Emit D-Bus signal for adding
3075
mandos_dbus_service.client_added_signal(client)
2775
3076
# Need to initiate checking of clients
2776
3077
if client.enabled:
2777
3078
client.init_checker()
2780
3081
tcp_server.server_activate()
2781
3082
2782
3083
# Find out what port we got
2783
service.port = tcp_server.socket.getsockname()[1]
3084
if zeroconf:
3085
service.port = tcp_server.socket.getsockname()[1]
2784
3086
if use_ipv6:
2785
3087
logger.info("Now listening on address %r, port %d,"
2786
3088
" flowinfo %d, scope_id %d",
2792
3094
#service.interface = tcp_server.socket.getsockname()[3]
2793
3095
2794
3096
try:
2795
# From the Avahi example code
2796
try:
2797
service.activate()
2798
except dbus.exceptions.DBusException as error:
2799
logger.critical("D-Bus Exception", exc_info=error)
2800
cleanup()
2801
sys.exit(1)
2802
# End of Avahi example code
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
2803
3106
2804
3107
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2805
3108
lambda *args, **kwargs:
2820
3123
# Must run before the D-Bus bus name gets deregistered
2821
3124
cleanup()
2822
3125
3126
2823
3127
if __name__ == '__main__':
2824
3128
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0