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 624
- compare with another revision
- download diff
- download tarball
- view history from revision 624
- Committer: Teddy Hogeborn
- Date: 2013-10-13 15:43:42 UTC
- Revision ID: teddy@recompile.se-20131013154342-2ztabynqog6xuk0t
* initramfs-unpack: Bug fix: Made executable.
- files removed:
- debian/upstream
- plugin-helpers
- files modified:
- DBUS-API
added
removed
mandos
1
#!/usr/bin/python2.7
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 Björn Påhlsson
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
36
36
37
37
from future_builtins import *
38
38
39
try:
40
import SocketServer as socketserver
41
except ImportError:
42
import socketserver
39
import SocketServer as socketserver
43
40
import socket
44
41
import argparse
45
42
import datetime
50
47
import gnutls.library.functions
51
48
import gnutls.library.constants
52
49
import gnutls.library.types
53
try:
54
import ConfigParser as configparser
55
except ImportError:
56
import configparser
50
import ConfigParser as configparser
57
51
import sys
58
52
import re
59
53
import os
68
62
import struct
69
63
import fcntl
70
64
import functools
71
try:
72
import cPickle as pickle
73
except ImportError:
74
import pickle
65
import cPickle as pickle
75
66
import multiprocessing
76
67
import types
77
68
import binascii
78
69
import tempfile
79
70
import itertools
80
71
import collections
81
import codecs
82
72
83
73
import dbus
84
74
import dbus.service
85
try:
86
import gobject
87
except ImportError:
88
from gi.repository import GObject as gobject
75
import gobject
89
76
import avahi
90
77
from dbus.mainloop.glib import DBusGMainLoop
91
78
import ctypes
101
88
except ImportError:
102
89
SO_BINDTODEVICE = None
103
90
104
if sys.version_info.major == 2:
105
str = unicode
106
107
version = "1.6.9"
91
version = "1.6.0"
108
92
stored_state_file = "clients.pickle"
109
93
110
94
logger = logging.getLogger()
111
syslogger = None
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
112
98
113
99
try:
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
102
.if_nametoindex)
116
103
except (OSError, AttributeError):
117
118
104
def if_nametoindex(interface):
119
105
"Get an interface index the hard way, i.e. using fcntl()"
120
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
107
with contextlib.closing(socket.socket()) as s:
122
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
110
interface))
111
interface_index = struct.unpack(str("I"),
112
ifreq[16:20])[0]
125
113
return interface_index
126
114
127
115
128
116
def initlogger(debug, level=logging.WARNING):
129
117
"""init logger and add loglevel"""
130
118
131
global syslogger
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
135
119
syslogger.setFormatter(logging.Formatter
136
120
('Mandos [%(process)d]: %(levelname)s:'
137
121
' %(message)s'))
154
138
155
139
class PGPEngine(object):
156
140
"""A simple class for OpenPGP symmetric encryption & decryption"""
157
158
141
def __init__(self):
159
142
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
143
self.gnupgargs = ['--batch',
189
172
def password_encode(self, password):
190
173
# Passphrase can not be empty and can not contain newlines or
191
174
# NUL bytes. So we prefix it and hex encode it.
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
175
return b"mandos" + binascii.hexlify(password)
199
176
200
177
def encrypt(self, data, password):
201
178
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
180
) as passfile:
204
181
passfile.write(passphrase)
205
182
passfile.flush()
206
183
proc = subprocess.Popen(['gpg', '--symmetric',
217
194
218
195
def decrypt(self, data, password):
219
196
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
198
) as passfile:
222
199
passfile.write(passphrase)
223
200
passfile.flush()
224
201
proc = subprocess.Popen(['gpg', '--decrypt',
228
205
stdin = subprocess.PIPE,
229
206
stdout = subprocess.PIPE,
230
207
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
208
decrypted_plaintext, err = proc.communicate(input
209
= data)
232
210
if proc.returncode != 0:
233
211
raise PGPError(err)
234
212
return decrypted_plaintext
237
215
class AvahiError(Exception):
238
216
def __init__(self, value, *args, **kwargs):
239
217
self.value = value
240
return super(AvahiError, self).__init__(value, *args,
241
**kwargs)
242
218
super(AvahiError, self).__init__(value, *args, **kwargs)
219
def __unicode__(self):
220
return unicode(repr(self.value))
243
221
244
222
class AvahiServiceError(AvahiError):
245
223
pass
246
224
247
248
225
class AvahiGroupError(AvahiError):
249
226
pass
250
227
270
247
bus: dbus.SystemBus()
271
248
"""
272
249
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):
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):
284
254
self.interface = interface
285
255
self.name = name
286
256
self.type = servicetype
296
266
self.bus = bus
297
267
self.entry_group_state_changed_match = None
298
268
299
def rename(self, remove=True):
269
def rename(self):
300
270
"""Derived from the Avahi example code"""
301
271
if self.rename_count >= self.max_renames:
302
272
logger.critical("No suitable Zeroconf service name found"
303
273
" after %i retries, exiting.",
304
274
self.rename_count)
305
275
raise AvahiServiceError("Too many renames")
306
self.name = str(
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
276
self.name = unicode(self.server
277
.GetAlternativeServiceName(self.name))
309
278
logger.info("Changing Zeroconf service name to %r ...",
310
279
self.name)
311
if remove:
312
self.remove()
280
self.remove()
313
281
try:
314
282
self.add()
315
283
except dbus.exceptions.DBusException as error:
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
320
else:
321
logger.critical("D-Bus Exception", exc_info=error)
322
self.cleanup()
323
os._exit(1)
284
logger.critical("D-Bus Exception", exc_info=error)
285
self.cleanup()
286
os._exit(1)
287
self.rename_count += 1
324
288
325
289
def remove(self):
326
290
"""Derived from the Avahi example code"""
364
328
self.rename()
365
329
elif state == avahi.ENTRY_GROUP_FAILURE:
366
330
logger.critical("Avahi: Error in group state changed %s",
367
str(error))
368
raise AvahiGroupError("State changed: {!s}".format(error))
331
unicode(error))
332
raise AvahiGroupError("State changed: {0!s}"
333
.format(error))
369
334
370
335
def cleanup(self):
371
336
"""Derived from the Avahi example code"""
381
346
def server_state_changed(self, state, error=None):
382
347
"""Derived from the Avahi example code"""
383
348
logger.debug("Avahi server state change: %i", state)
384
bad_states = {
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
389
}
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" }
390
356
if state in bad_states:
391
357
if bad_states[state] is not None:
392
358
if error is None:
395
361
logger.error(bad_states[state] + ": %r", error)
396
362
self.cleanup()
397
363
elif state == avahi.SERVER_RUNNING:
398
try:
399
self.add()
400
except dbus.exceptions.DBusException as error:
401
if (error.get_dbus_name()
402
== "org.freedesktop.Avahi.CollisionError"):
403
logger.info("Local Zeroconf service name"
404
" collision.")
405
return self.rename(remove=False)
406
else:
407
logger.critical("D-Bus Exception", exc_info=error)
408
self.cleanup()
409
os._exit(1)
364
self.add()
410
365
else:
411
366
if error is None:
412
367
logger.debug("Unknown state: %r", state)
422
377
follow_name_owner_changes=True),
423
378
avahi.DBUS_INTERFACE_SERVER)
424
379
self.server.connect_to_signal("StateChanged",
425
self.server_state_changed)
380
self.server_state_changed)
426
381
self.server_state_changed(self.server.GetState())
427
382
428
383
429
384
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
385
def rename(self):
431
386
"""Add the new name to the syslog messages"""
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
435
.format(self.name)))
387
ret = AvahiService.rename(self)
388
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
391
.format(self.name)))
436
392
return ret
437
393
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()
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
447
401
448
402
class Client(object):
449
403
"""A representation of a client host served by this server.
476
430
last_checker_status: integer between 0 and 255 reflecting exit
477
431
status of last checker. -1 reflects crashed
478
432
checker, -2 means no checker completed yet.
479
last_checker_signal: The signal which killed the last checker, if
480
last_checker_status is -1
481
433
last_enabled: datetime.datetime(); (UTC) or None
482
434
name: string; from the config file, used in log messages and
483
435
D-Bus identifiers
496
448
"fingerprint", "host", "interval",
497
449
"last_approval_request", "last_checked_ok",
498
450
"last_enabled", "name", "timeout")
499
client_defaults = {
500
"timeout": "PT5M",
501
"extended_timeout": "PT15M",
502
"interval": "PT2M",
503
"checker": "fping -q -- %%(host)s",
504
"host": "",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
508
"enabled": "True",
509
}
451
client_defaults = { "timeout": "PT5M",
452
"extended_timeout": "PT15M",
453
"interval": "PT2M",
454
"checker": "fping -q -- %%(host)s",
455
"host": "",
456
"approval_delay": "PT0S",
457
"approval_duration": "PT1S",
458
"approved_by_default": "True",
459
"enabled": "True",
460
}
461
462
def timeout_milliseconds(self):
463
"Return the 'timeout' attribute in milliseconds"
464
return timedelta_to_milliseconds(self.timeout)
465
466
def extended_timeout_milliseconds(self):
467
"Return the 'extended_timeout' attribute in milliseconds"
468
return timedelta_to_milliseconds(self.extended_timeout)
469
470
def interval_milliseconds(self):
471
"Return the 'interval' attribute in milliseconds"
472
return timedelta_to_milliseconds(self.interval)
473
474
def approval_delay_milliseconds(self):
475
return timedelta_to_milliseconds(self.approval_delay)
510
476
511
477
@staticmethod
512
478
def config_parser(config):
528
494
client["enabled"] = config.getboolean(client_name,
529
495
"enabled")
530
496
531
# Uppercase and remove spaces from fingerprint for later
532
# comparison purposes with return value from the
533
# fingerprint() function
534
497
client["fingerprint"] = (section["fingerprint"].upper()
535
498
.replace(" ", ""))
536
499
if "secret" in section:
541
504
"rb") as secfile:
542
505
client["secret"] = secfile.read()
543
506
else:
544
raise TypeError("No secret or secfile for section {}"
507
raise TypeError("No secret or secfile for section {0}"
545
508
.format(section))
546
509
client["timeout"] = string_to_delta(section["timeout"])
547
510
client["extended_timeout"] = string_to_delta(
564
527
server_settings = {}
565
528
self.server_settings = server_settings
566
529
# adding all client settings
567
for setting, value in settings.items():
530
for setting, value in settings.iteritems():
568
531
setattr(self, setting, value)
569
532
570
533
if self.enabled:
578
541
self.expires = None
579
542
580
543
logger.debug("Creating client %r", self.name)
544
# Uppercase and remove spaces from fingerprint for later
545
# comparison purposes with return value from the fingerprint()
546
# function
581
547
logger.debug(" Fingerprint: %s", self.fingerprint)
582
548
self.created = settings.get("created",
583
549
datetime.datetime.utcnow())
590
556
self.current_checker_command = None
591
557
self.approved = None
592
558
self.approvals_pending = 0
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
559
self.changedstate = (multiprocessing_manager
560
.Condition(multiprocessing_manager
561
.Lock()))
562
self.client_structure = [attr for attr in
563
self.__dict__.iterkeys()
597
564
if not attr.startswith("_")]
598
565
self.client_structure.append("client_structure")
599
566
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
567
for name, t in inspect.getmembers(type(self),
568
lambda obj:
569
isinstance(obj,
570
property)):
602
571
if not name.startswith("_"):
603
572
self.client_structure.append(name)
604
573
646
615
# and every interval from then on.
647
616
if self.checker_initiator_tag is not None:
648
617
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
651
self.start_checker)
618
self.checker_initiator_tag = (gobject.timeout_add
619
(self.interval_milliseconds(),
620
self.start_checker))
652
621
# Schedule a disable() when 'timeout' has passed
653
622
if self.disable_initiator_tag is not None:
654
623
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
624
self.disable_initiator_tag = (gobject.timeout_add
625
(self.timeout_milliseconds(),
626
self.disable))
657
627
# Also start a new checker *right now*.
658
628
self.start_checker()
659
629
660
def checker_callback(self, source, condition, connection,
661
command):
630
def checker_callback(self, pid, condition, command):
662
631
"""The checker has completed, so take appropriate actions."""
663
632
self.checker_callback_tag = None
664
633
self.checker = None
665
# Read return code from connection (see call_pipe)
666
returncode = connection.recv()
667
connection.close()
668
669
if returncode >= 0:
670
self.last_checker_status = returncode
671
self.last_checker_signal = None
634
if os.WIFEXITED(condition):
635
self.last_checker_status = os.WEXITSTATUS(condition)
672
636
if self.last_checker_status == 0:
673
637
logger.info("Checker for %(name)s succeeded",
674
638
vars(self))
675
639
self.checked_ok()
676
640
else:
677
logger.info("Checker for %(name)s failed", vars(self))
641
logger.info("Checker for %(name)s failed",
642
vars(self))
678
643
else:
679
644
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
645
logger.warning("Checker for %(name)s crashed?",
682
646
vars(self))
683
return False
684
647
685
648
def checked_ok(self):
686
649
"""Assert that the client has been seen, alive and well."""
687
650
self.last_checked_ok = datetime.datetime.utcnow()
688
651
self.last_checker_status = 0
689
self.last_checker_signal = None
690
652
self.bump_timeout()
691
653
692
654
def bump_timeout(self, timeout=None):
697
659
gobject.source_remove(self.disable_initiator_tag)
698
660
self.disable_initiator_tag = None
699
661
if getattr(self, "enabled", False):
700
self.disable_initiator_tag = gobject.timeout_add(
701
int(timeout.total_seconds() * 1000), self.disable)
662
self.disable_initiator_tag = (gobject.timeout_add
663
(timedelta_to_milliseconds
664
(timeout), self.disable))
702
665
self.expires = datetime.datetime.utcnow() + timeout
703
666
704
667
def need_approval(self):
718
681
# than 'timeout' for the client to be disabled, which is as it
719
682
# should be.
720
683
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
684
# If a checker exists, make sure it is not a zombie
685
try:
686
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
687
except (AttributeError, OSError) as error:
688
if (isinstance(error, OSError)
689
and error.errno != errno.ECHILD):
690
raise error
691
else:
692
if pid:
693
logger.warning("Checker was a zombie")
694
gobject.source_remove(self.checker_callback_tag)
695
self.checker_callback(pid, status,
696
self.current_checker_command)
725
697
# Start a new checker if needed
726
698
if self.checker is None:
727
699
# Escape attributes for the shell
728
escaped_attrs = {
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
700
escaped_attrs = dict(
701
(attr, re.escape(unicode(getattr(self, attr))))
702
for attr in
703
self.runtime_expansions)
731
704
try:
732
705
command = self.checker_command % escaped_attrs
733
706
except TypeError as error:
734
707
logger.error('Could not format string "%s"',
735
self.checker_command,
708
self.checker_command, exc_info=error)
709
return True # Try again later
710
self.current_checker_command = command
711
try:
712
logger.info("Starting checker %r for %s",
713
command, self.name)
714
# We don't need to redirect stdout and stderr, since
715
# in normal mode, that is already done by daemon(),
716
# and in debug mode we don't want to. (Stdin is
717
# always replaced by /dev/null.)
718
# The exception is when not debugging but nevertheless
719
# running in the foreground; use the previously
720
# created wnull.
721
popen_args = {}
722
if (not self.server_settings["debug"]
723
and self.server_settings["foreground"]):
724
popen_args.update({"stdout": wnull,
725
"stderr": wnull })
726
self.checker = subprocess.Popen(command,
727
close_fds=True,
728
shell=True, cwd="/",
729
**popen_args)
730
except OSError as error:
731
logger.error("Failed to start subprocess",
736
732
exc_info=error)
737
return True # Try again later
738
self.current_checker_command = command
739
logger.info("Starting checker %r for %s", command,
740
self.name)
741
# We don't need to redirect stdout and stderr, since
742
# in normal mode, that is already done by daemon(),
743
# and in debug mode we don't want to. (Stdin is
744
# always replaced by /dev/null.)
745
# The exception is when not debugging but nevertheless
746
# running in the foreground; use the previously
747
# created wnull.
748
popen_args = { "close_fds": True,
749
"shell": True,
750
"cwd": "/" }
751
if (not self.server_settings["debug"]
752
and self.server_settings["foreground"]):
753
popen_args.update({"stdout": wnull,
754
"stderr": wnull })
755
pipe = multiprocessing.Pipe(duplex = False)
756
self.checker = multiprocessing.Process(
757
target = call_pipe,
758
args = (pipe[1], subprocess.call, command),
759
kwargs = popen_args)
760
self.checker.start()
761
self.checker_callback_tag = gobject.io_add_watch(
762
pipe[0].fileno(), gobject.IO_IN,
763
self.checker_callback, pipe[0], command)
733
return True
734
self.checker_callback_tag = (gobject.child_watch_add
735
(self.checker.pid,
736
self.checker_callback,
737
data=command))
738
# The checker may have completed before the gobject
739
# watch was added. Check for this.
740
try:
741
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
742
except OSError as error:
743
if error.errno == errno.ECHILD:
744
# This should never happen
745
logger.error("Child process vanished",
746
exc_info=error)
747
return True
748
raise
749
if pid:
750
gobject.source_remove(self.checker_callback_tag)
751
self.checker_callback(pid, status, command)
764
752
# Re-run this periodically if run by gobject.timeout_add
765
753
return True
766
754
772
760
if getattr(self, "checker", None) is None:
773
761
return
774
762
logger.debug("Stopping checker for %(name)s", vars(self))
775
self.checker.terminate()
763
try:
764
self.checker.terminate()
765
#time.sleep(0.5)
766
#if self.checker.poll() is None:
767
# self.checker.kill()
768
except OSError as error:
769
if error.errno != errno.ESRCH: # No such process
770
raise
776
771
self.checker = None
777
772
778
773
779
def dbus_service_property(dbus_interface,
780
signature="v",
781
access="readwrite",
782
byte_arrays=False):
774
def dbus_service_property(dbus_interface, signature="v",
775
access="readwrite", byte_arrays=False):
783
776
"""Decorators for marking methods of a DBusObjectWithProperties to
784
777
become properties on the D-Bus.
785
778
794
787
# "Set" method, so we fail early here:
795
788
if byte_arrays and signature != "ay":
796
789
raise ValueError("Byte arrays not supported for non-'ay'"
797
" signature {!r}".format(signature))
798
790
" signature {0!r}".format(signature))
799
791
def decorator(func):
800
792
func._dbus_is_property = True
801
793
func._dbus_interface = dbus_interface
806
798
func._dbus_name = func._dbus_name[:-14]
807
799
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
808
800
return func
809
810
801
return decorator
811
802
812
803
821
812
"org.freedesktop.DBus.Property.EmitsChangedSignal":
822
813
"false"}
823
814
"""
824
825
815
def decorator(func):
826
816
func._dbus_is_interface = True
827
817
func._dbus_interface = dbus_interface
828
818
func._dbus_name = dbus_interface
829
819
return func
830
831
820
return decorator
832
821
833
822
835
824
"""Decorator to annotate D-Bus methods, signals or properties
836
825
Usage:
837
826
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
841
827
@dbus_service_property("org.example.Interface", signature="b",
842
828
access="r")
829
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
830
"org.freedesktop.DBus.Property."
831
"EmitsChangedSignal": "false"})
843
832
def Property_dbus_property(self):
844
833
return dbus.Boolean(False)
845
834
"""
846
847
835
def decorator(func):
848
836
func._dbus_annotations = annotations
849
837
return func
850
851
838
return decorator
852
839
853
840
854
841
class DBusPropertyException(dbus.exceptions.DBusException):
855
842
"""A base class for D-Bus property-related exceptions
856
843
"""
857
pass
844
def __unicode__(self):
845
return unicode(str(self))
858
846
859
847
860
848
class DBusPropertyAccessException(DBusPropertyException):
884
872
If called like _is_dbus_thing("method") it returns a function
885
873
suitable for use as predicate to inspect.getmembers().
886
874
"""
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
875
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
876
False)
889
877
890
878
def _get_all_dbus_things(self, thing):
891
879
"""Returns a generator of (name, attribute) pairs
892
880
"""
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
881
return ((getattr(athing.__get__(self), "_dbus_name",
882
name),
894
883
athing.__get__(self))
895
884
for cls in self.__class__.__mro__
896
885
for name, athing in
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
886
inspect.getmembers(cls,
887
self._is_dbus_thing(thing)))
898
888
899
889
def _get_dbus_property(self, interface_name, property_name):
900
890
"""Returns a bound method if one exists which is a D-Bus
901
891
property with the specified name and interface.
902
892
"""
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
893
for cls in self.__class__.__mro__:
894
for name, value in (inspect.getmembers
895
(cls,
896
self._is_dbus_thing("property"))):
906
897
if (value._dbus_name == property_name
907
898
and value._dbus_interface == interface_name):
908
899
return value.__get__(self)
909
900
910
901
# No such property
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
902
raise DBusPropertyNotFound(self.dbus_object_path + ":"
903
+ interface_name + "."
904
+ property_name)
913
905
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
915
in_signature="ss",
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
916
907
out_signature="v")
917
908
def Get(self, interface_name, property_name):
918
909
"""Standard D-Bus property Get() method, see D-Bus standard.
936
927
# The byte_arrays option is not supported yet on
937
928
# signatures other than "ay".
938
929
if prop._dbus_signature != "ay":
939
raise ValueError("Byte arrays not supported for non-"
940
"'ay' signature {!r}"
941
.format(prop._dbus_signature))
930
raise ValueError
942
931
value = dbus.ByteArray(b''.join(chr(byte)
943
932
for byte in value))
944
933
prop(value)
945
934
946
@dbus.service.method(dbus.PROPERTIES_IFACE,
947
in_signature="s",
935
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
948
936
out_signature="a{sv}")
949
937
def GetAll(self, interface_name):
950
938
"""Standard D-Bus property GetAll() method, see D-Bus
965
953
if not hasattr(value, "variant_level"):
966
954
properties[name] = value
967
955
continue
968
properties[name] = type(value)(
969
value, variant_level = value.variant_level + 1)
956
properties[name] = type(value)(value, variant_level=
957
value.variant_level+1)
970
958
return dbus.Dictionary(properties, signature="sv")
971
959
972
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
973
def PropertiesChanged(self, interface_name, changed_properties,
974
invalidated_properties):
975
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
976
standard.
977
"""
978
pass
979
980
960
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
981
961
out_signature="s",
982
962
path_keyword='object_path',
990
970
connection)
991
971
try:
992
972
document = xml.dom.minidom.parseString(xmlstring)
993
994
973
def make_tag(document, name, prop):
995
974
e = document.createElement("property")
996
975
e.setAttribute("name", name)
997
976
e.setAttribute("type", prop._dbus_signature)
998
977
e.setAttribute("access", prop._dbus_access)
999
978
return e
1000
1001
979
for if_tag in document.getElementsByTagName("interface"):
1002
980
# Add property tags
1003
981
for tag in (make_tag(document, name, prop)
1015
993
if (name == tag.getAttribute("name")
1016
994
and prop._dbus_interface
1017
995
== if_tag.getAttribute("name")):
1018
annots.update(getattr(
1019
prop, "_dbus_annotations", {}))
1020
for name, value in annots.items():
996
annots.update(getattr
997
(prop,
998
"_dbus_annotations",
999
{}))
1000
for name, value in annots.iteritems():
1021
1001
ann_tag = document.createElement(
1022
1002
"annotation")
1023
1003
ann_tag.setAttribute("name", name)
1026
1006
# Add interface annotation tags
1027
1007
for annotation, value in dict(
1028
1008
itertools.chain.from_iterable(
1029
annotations().items()
1030
for name, annotations
1031
in self._get_all_dbus_things("interface")
1009
annotations().iteritems()
1010
for name, annotations in
1011
self._get_all_dbus_things("interface")
1032
1012
if name == if_tag.getAttribute("name")
1033
)).items():
1013
)).iteritems():
1034
1014
ann_tag = document.createElement("annotation")
1035
1015
ann_tag.setAttribute("name", annotation)
1036
1016
ann_tag.setAttribute("value", value)
1063
1043
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1064
1044
if dt is None:
1065
1045
return dbus.String("", variant_level = variant_level)
1066
return dbus.String(dt.isoformat(), variant_level=variant_level)
1046
return dbus.String(dt.isoformat(),
1047
variant_level=variant_level)
1067
1048
1068
1049
1069
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1089
1070
(from DBusObjectWithProperties) and interfaces (from the
1090
1071
dbus_interface_annotations decorator).
1091
1072
"""
1092
1093
1073
def wrapper(cls):
1094
1074
for orig_interface_name, alt_interface_name in (
1095
alt_interface_names.items()):
1075
alt_interface_names.iteritems()):
1096
1076
attr = {}
1097
1077
interface_names = set()
1098
1078
# Go though all attributes of the class
1100
1080
# Ignore non-D-Bus attributes, and D-Bus attributes
1101
1081
# with the wrong interface name
1102
1082
if (not hasattr(attribute, "_dbus_interface")
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1083
or not attribute._dbus_interface
1084
.startswith(orig_interface_name)):
1105
1085
continue
1106
1086
# Create an alternate D-Bus interface name based on
1107
1087
# the current name
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1088
alt_interface = (attribute._dbus_interface
1089
.replace(orig_interface_name,
1090
alt_interface_name))
1110
1091
interface_names.add(alt_interface)
1111
1092
# Is this a D-Bus signal?
1112
1093
if getattr(attribute, "_dbus_is_signal", False):
1113
if sys.version_info.major == 2:
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
1094
# Extract the original non-method undecorated
1095
# function by black magic
1096
nonmethod_func = (dict(
1117
1097
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1120
else:
1121
nonmethod_func = attribute
1098
attribute.__closure__))["func"]
1099
.cell_contents)
1122
1100
# Create a new, but exactly alike, function
1123
1101
# object, and decorate it to be a new D-Bus signal
1124
1102
# with the alternate D-Bus interface name
1125
if sys.version_info.major == 2:
1126
new_function = types.FunctionType(
1127
nonmethod_func.func_code,
1128
nonmethod_func.func_globals,
1129
nonmethod_func.func_name,
1130
nonmethod_func.func_defaults,
1131
nonmethod_func.func_closure)
1132
else:
1133
new_function = types.FunctionType(
1134
nonmethod_func.__code__,
1135
nonmethod_func.__globals__,
1136
nonmethod_func.__name__,
1137
nonmethod_func.__defaults__,
1138
nonmethod_func.__closure__)
1139
new_function = (dbus.service.signal(
1140
alt_interface,
1141
attribute._dbus_signature)(new_function))
1103
new_function = (dbus.service.signal
1104
(alt_interface,
1105
attribute._dbus_signature)
1106
(types.FunctionType(
1107
nonmethod_func.func_code,
1108
nonmethod_func.func_globals,
1109
nonmethod_func.func_name,
1110
nonmethod_func.func_defaults,
1111
nonmethod_func.func_closure)))
1142
1112
# Copy annotations, if any
1143
1113
try:
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1114
new_function._dbus_annotations = (
1115
dict(attribute._dbus_annotations))
1146
1116
except AttributeError:
1147
1117
pass
1148
1118
# Define a creator of a function to call both the
1153
1123
"""This function is a scope container to pass
1154
1124
func1 and func2 to the "call_both" function
1155
1125
outside of its arguments"""
1156
1157
1126
def call_both(*args, **kwargs):
1158
1127
"""This function will emit two D-Bus
1159
1128
signals by calling func1 and func2"""
1160
1129
func1(*args, **kwargs)
1161
1130
func2(*args, **kwargs)
1162
1163
1131
return call_both
1164
1132
# Create the "call_both" function and add it to
1165
1133
# the class
1170
1138
# object. Decorate it to be a new D-Bus method
1171
1139
# with the alternate D-Bus interface name. Add it
1172
1140
# to the class.
1173
attr[attrname] = (
1174
dbus.service.method(
1175
alt_interface,
1176
attribute._dbus_in_signature,
1177
attribute._dbus_out_signature)
1178
(types.FunctionType(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1141
attr[attrname] = (dbus.service.method
1142
(alt_interface,
1143
attribute._dbus_in_signature,
1144
attribute._dbus_out_signature)
1145
(types.FunctionType
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1183
1151
# Copy annotations, if any
1184
1152
try:
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1153
attr[attrname]._dbus_annotations = (
1154
dict(attribute._dbus_annotations))
1187
1155
except AttributeError:
1188
1156
pass
1189
1157
# Is this a D-Bus property?
1192
1160
# object, and decorate it to be a new D-Bus
1193
1161
# property with the alternate D-Bus interface
1194
1162
# name. Add it to the class.
1195
attr[attrname] = (dbus_service_property(
1196
alt_interface, attribute._dbus_signature,
1197
attribute._dbus_access,
1198
attribute._dbus_get_args_options
1199
["byte_arrays"])
1200
(types.FunctionType(
1201
attribute.func_code,
1202
attribute.func_globals,
1203
attribute.func_name,
1204
attribute.func_defaults,
1205
attribute.func_closure)))
1163
attr[attrname] = (dbus_service_property
1164
(alt_interface,
1165
attribute._dbus_signature,
1166
attribute._dbus_access,
1167
attribute
1168
._dbus_get_args_options
1169
["byte_arrays"])
1170
(types.FunctionType
1171
(attribute.func_code,
1172
attribute.func_globals,
1173
attribute.func_name,
1174
attribute.func_defaults,
1175
attribute.func_closure)))
1206
1176
# Copy annotations, if any
1207
1177
try:
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1178
attr[attrname]._dbus_annotations = (
1179
dict(attribute._dbus_annotations))
1210
1180
except AttributeError:
1211
1181
pass
1212
1182
# Is this a D-Bus interface?
1215
1185
# object. Decorate it to be a new D-Bus interface
1216
1186
# with the alternate D-Bus interface name. Add it
1217
1187
# to the class.
1218
attr[attrname] = (
1219
dbus_interface_annotations(alt_interface)
1220
(types.FunctionType(attribute.func_code,
1221
attribute.func_globals,
1222
attribute.func_name,
1223
attribute.func_defaults,
1224
attribute.func_closure)))
1188
attr[attrname] = (dbus_interface_annotations
1189
(alt_interface)
1190
(types.FunctionType
1191
(attribute.func_code,
1192
attribute.func_globals,
1193
attribute.func_name,
1194
attribute.func_defaults,
1195
attribute.func_closure)))
1225
1196
if deprecate:
1226
1197
# Deprecate all alternate interfaces
1227
iname="_AlternateDBusNames_interface_annotation{}"
1198
iname="_AlternateDBusNames_interface_annotation{0}"
1228
1199
for interface_name in interface_names:
1229
1230
1200
@dbus_interface_annotations(interface_name)
1231
1201
def func(self):
1232
1202
return { "org.freedesktop.DBus.Deprecated":
1233
"true" }
1203
"true" }
1234
1204
# Find an unused name
1235
1205
for aname in (iname.format(i)
1236
1206
for i in itertools.count()):
1240
1210
if interface_names:
1241
1211
# Replace the class with a new subclass of it with
1242
1212
# methods, signals, etc. as created above.
1243
cls = type(b"{}Alternate".format(cls.__name__),
1244
(cls, ), attr)
1213
cls = type(b"{0}Alternate".format(cls.__name__),
1214
(cls,), attr)
1245
1215
return cls
1246
1247
1216
return wrapper
1248
1217
1249
1218
1250
1219
@alternate_dbus_interfaces({"se.recompile.Mandos":
1251
"se.bsnet.fukt.Mandos"})
1220
"se.bsnet.fukt.Mandos"})
1252
1221
class ClientDBus(Client, DBusObjectWithProperties):
1253
1222
"""A Client class using D-Bus
1254
1223
1258
1227
"""
1259
1228
1260
1229
runtime_expansions = (Client.runtime_expansions
1261
+ ("dbus_object_path", ))
1262
1263
_interface = "se.recompile.Mandos.Client"
1230
+ ("dbus_object_path",))
1264
1231
1265
1232
# dbus.service.Object doesn't use super(), so we can't either.
1266
1233
1269
1236
Client.__init__(self, *args, **kwargs)
1270
1237
# Only now, when this client is initialized, can it show up on
1271
1238
# the D-Bus
1272
client_object_name = str(self.name).translate(
1239
client_object_name = unicode(self.name).translate(
1273
1240
{ord("."): ord("_"),
1274
1241
ord("-"): ord("_")})
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1242
self.dbus_object_path = (dbus.ObjectPath
1243
("/clients/" + client_object_name))
1277
1244
DBusObjectWithProperties.__init__(self, self.bus,
1278
1245
self.dbus_object_path)
1279
1246
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1282
variant_level=1,
1283
invalidate_only=False,
1284
_interface=_interface):
1247
def notifychangeproperty(transform_func,
1248
dbus_name, type_func=lambda x: x,
1249
variant_level=1):
1285
1250
""" Modify a variable so that it's a property which announces
1286
1251
its changes to DBus.
1287
1252
1292
1257
to the D-Bus. Default: no transform
1293
1258
variant_level: D-Bus variant level. Default: 1
1294
1259
"""
1295
attrname = "_{}".format(dbus_name)
1296
1260
attrname = "_{0}".format(dbus_name)
1297
1261
def setter(self, value):
1298
1262
if hasattr(self, "dbus_object_path"):
1299
1263
if (not hasattr(self, attrname) or
1300
1264
type_func(getattr(self, attrname, None))
1301
1265
!= type_func(value)):
1302
if invalidate_only:
1303
self.PropertiesChanged(
1304
_interface, dbus.Dictionary(),
1305
dbus.Array((dbus_name, )))
1306
else:
1307
dbus_value = transform_func(
1308
type_func(value),
1309
variant_level = variant_level)
1310
self.PropertyChanged(dbus.String(dbus_name),
1311
dbus_value)
1312
self.PropertiesChanged(
1313
_interface,
1314
dbus.Dictionary({ dbus.String(dbus_name):
1315
dbus_value }),
1316
dbus.Array())
1266
dbus_value = transform_func(type_func(value),
1267
variant_level
1268
=variant_level)
1269
self.PropertyChanged(dbus.String(dbus_name),
1270
dbus_value)
1317
1271
setattr(self, attrname, value)
1318
1272
1319
1273
return property(lambda self: getattr(self, attrname), setter)
1325
1279
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1326
1280
last_enabled = notifychangeproperty(datetime_to_dbus,
1327
1281
"LastEnabled")
1328
checker = notifychangeproperty(
1329
dbus.Boolean, "CheckerRunning",
1330
type_func = lambda checker: checker is not None)
1282
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1283
type_func = lambda checker:
1284
checker is not None)
1331
1285
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1332
1286
"LastCheckedOK")
1333
1287
last_checker_status = notifychangeproperty(dbus.Int16,
1336
1290
datetime_to_dbus, "LastApprovalRequest")
1337
1291
approved_by_default = notifychangeproperty(dbus.Boolean,
1338
1292
"ApprovedByDefault")
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1293
approval_delay = notifychangeproperty(dbus.UInt64,
1294
"ApprovalDelay",
1295
type_func =
1296
timedelta_to_milliseconds)
1342
1297
approval_duration = notifychangeproperty(
1343
1298
dbus.UInt64, "ApprovalDuration",
1344
type_func = lambda td: td.total_seconds() * 1000)
1299
type_func = timedelta_to_milliseconds)
1345
1300
host = notifychangeproperty(dbus.String, "Host")
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1301
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1302
type_func =
1303
timedelta_to_milliseconds)
1349
1304
extended_timeout = notifychangeproperty(
1350
1305
dbus.UInt64, "ExtendedTimeout",
1351
type_func = lambda td: td.total_seconds() * 1000)
1352
interval = notifychangeproperty(
1353
dbus.UInt64, "Interval",
1354
type_func = lambda td: td.total_seconds() * 1000)
1306
type_func = timedelta_to_milliseconds)
1307
interval = notifychangeproperty(dbus.UInt64,
1308
"Interval",
1309
type_func =
1310
timedelta_to_milliseconds)
1355
1311
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1358
1312
1359
1313
del notifychangeproperty
1360
1314
1367
1321
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1368
1322
Client.__del__(self, *args, **kwargs)
1369
1323
1370
def checker_callback(self, source, condition,
1371
connection, command, *args, **kwargs):
1372
ret = Client.checker_callback(self, source, condition,
1373
connection, command, *args,
1374
**kwargs)
1375
exitstatus = self.last_checker_status
1376
if exitstatus >= 0:
1324
def checker_callback(self, pid, condition, command,
1325
*args, **kwargs):
1326
self.checker_callback_tag = None
1327
self.checker = None
1328
if os.WIFEXITED(condition):
1329
exitstatus = os.WEXITSTATUS(condition)
1377
1330
# Emit D-Bus signal
1378
1331
self.CheckerCompleted(dbus.Int16(exitstatus),
1379
dbus.Int64(0),
1332
dbus.Int64(condition),
1380
1333
dbus.String(command))
1381
1334
else:
1382
1335
# Emit D-Bus signal
1383
1336
self.CheckerCompleted(dbus.Int16(-1),
1384
dbus.Int64(
1385
self.last_checker_signal),
1337
dbus.Int64(condition),
1386
1338
dbus.String(command))
1387
return ret
1339
1340
return Client.checker_callback(self, pid, condition, command,
1341
*args, **kwargs)
1388
1342
1389
1343
def start_checker(self, *args, **kwargs):
1390
old_checker_pid = getattr(self.checker, "pid", None)
1344
old_checker = self.checker
1345
if self.checker is not None:
1346
old_checker_pid = self.checker.pid
1347
else:
1348
old_checker_pid = None
1391
1349
r = Client.start_checker(self, *args, **kwargs)
1392
1350
# Only if new checker process was started
1393
1351
if (self.checker is not None
1402
1360
1403
1361
def approve(self, value=True):
1404
1362
self.approved = value
1405
gobject.timeout_add(int(self.approval_duration.total_seconds()
1406
* 1000), self._reset_approved)
1363
gobject.timeout_add(timedelta_to_milliseconds
1364
(self.approval_duration),
1365
self._reset_approved)
1407
1366
self.send_changedstate()
1408
1367
1409
1368
## D-Bus methods, signals & properties
1369
_interface = "se.recompile.Mandos.Client"
1410
1370
1411
1371
## Interfaces
1412
1372
1373
@dbus_interface_annotations(_interface)
1374
def _foo(self):
1375
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1376
"false"}
1377
1413
1378
## Signals
1414
1379
1415
1380
# CheckerCompleted - signal
1425
1390
pass
1426
1391
1427
1392
# PropertyChanged - signal
1428
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1429
1393
@dbus.service.signal(_interface, signature="sv")
1430
1394
def PropertyChanged(self, property, value):
1431
1395
"D-Bus signal"
1495
1459
return dbus.Boolean(bool(self.approvals_pending))
1496
1460
1497
1461
# ApprovedByDefault - property
1498
@dbus_service_property(_interface,
1499
signature="b",
1462
@dbus_service_property(_interface, signature="b",
1500
1463
access="readwrite")
1501
1464
def ApprovedByDefault_dbus_property(self, value=None):
1502
1465
if value is None: # get
1504
1467
self.approved_by_default = bool(value)
1505
1468
1506
1469
# ApprovalDelay - property
1507
@dbus_service_property(_interface,
1508
signature="t",
1470
@dbus_service_property(_interface, signature="t",
1509
1471
access="readwrite")
1510
1472
def ApprovalDelay_dbus_property(self, value=None):
1511
1473
if value is None: # get
1512
return dbus.UInt64(self.approval_delay.total_seconds()
1513
* 1000)
1474
return dbus.UInt64(self.approval_delay_milliseconds())
1514
1475
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1515
1476
1516
1477
# ApprovalDuration - property
1517
@dbus_service_property(_interface,
1518
signature="t",
1478
@dbus_service_property(_interface, signature="t",
1519
1479
access="readwrite")
1520
1480
def ApprovalDuration_dbus_property(self, value=None):
1521
1481
if value is None: # get
1522
return dbus.UInt64(self.approval_duration.total_seconds()
1523
* 1000)
1482
return dbus.UInt64(timedelta_to_milliseconds(
1483
self.approval_duration))
1524
1484
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1525
1485
1526
1486
# Name - property
1534
1494
return dbus.String(self.fingerprint)
1535
1495
1536
1496
# Host - property
1537
@dbus_service_property(_interface,
1538
signature="s",
1497
@dbus_service_property(_interface, signature="s",
1539
1498
access="readwrite")
1540
1499
def Host_dbus_property(self, value=None):
1541
1500
if value is None: # get
1542
1501
return dbus.String(self.host)
1543
self.host = str(value)
1502
self.host = unicode(value)
1544
1503
1545
1504
# Created - property
1546
1505
@dbus_service_property(_interface, signature="s", access="read")
1553
1512
return datetime_to_dbus(self.last_enabled)
1554
1513
1555
1514
# Enabled - property
1556
@dbus_service_property(_interface,
1557
signature="b",
1515
@dbus_service_property(_interface, signature="b",
1558
1516
access="readwrite")
1559
1517
def Enabled_dbus_property(self, value=None):
1560
1518
if value is None: # get
1565
1523
self.disable()
1566
1524
1567
1525
# LastCheckedOK - property
1568
@dbus_service_property(_interface,
1569
signature="s",
1526
@dbus_service_property(_interface, signature="s",
1570
1527
access="readwrite")
1571
1528
def LastCheckedOK_dbus_property(self, value=None):
1572
1529
if value is not None:
1575
1532
return datetime_to_dbus(self.last_checked_ok)
1576
1533
1577
1534
# LastCheckerStatus - property
1578
@dbus_service_property(_interface, signature="n", access="read")
1535
@dbus_service_property(_interface, signature="n",
1536
access="read")
1579
1537
def LastCheckerStatus_dbus_property(self):
1580
1538
return dbus.Int16(self.last_checker_status)
1581
1539
1590
1548
return datetime_to_dbus(self.last_approval_request)
1591
1549
1592
1550
# Timeout - property
1593
@dbus_service_property(_interface,
1594
signature="t",
1551
@dbus_service_property(_interface, signature="t",
1595
1552
access="readwrite")
1596
1553
def Timeout_dbus_property(self, value=None):
1597
1554
if value is None: # get
1598
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1555
return dbus.UInt64(self.timeout_milliseconds())
1599
1556
old_timeout = self.timeout
1600
1557
self.timeout = datetime.timedelta(0, 0, 0, value)
1601
1558
# Reschedule disabling
1610
1567
is None):
1611
1568
return
1612
1569
gobject.source_remove(self.disable_initiator_tag)
1613
self.disable_initiator_tag = gobject.timeout_add(
1614
int((self.expires - now).total_seconds() * 1000),
1615
self.disable)
1570
self.disable_initiator_tag = (
1571
gobject.timeout_add(
1572
timedelta_to_milliseconds(self.expires - now),
1573
self.disable))
1616
1574
1617
1575
# ExtendedTimeout - property
1618
@dbus_service_property(_interface,
1619
signature="t",
1576
@dbus_service_property(_interface, signature="t",
1620
1577
access="readwrite")
1621
1578
def ExtendedTimeout_dbus_property(self, value=None):
1622
1579
if value is None: # get
1623
return dbus.UInt64(self.extended_timeout.total_seconds()
1624
* 1000)
1580
return dbus.UInt64(self.extended_timeout_milliseconds())
1625
1581
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1626
1582
1627
1583
# Interval - property
1628
@dbus_service_property(_interface,
1629
signature="t",
1584
@dbus_service_property(_interface, signature="t",
1630
1585
access="readwrite")
1631
1586
def Interval_dbus_property(self, value=None):
1632
1587
if value is None: # get
1633
return dbus.UInt64(self.interval.total_seconds() * 1000)
1588
return dbus.UInt64(self.interval_milliseconds())
1634
1589
self.interval = datetime.timedelta(0, 0, 0, value)
1635
1590
if getattr(self, "checker_initiator_tag", None) is None:
1636
1591
return
1637
1592
if self.enabled:
1638
1593
# Reschedule checker run
1639
1594
gobject.source_remove(self.checker_initiator_tag)
1640
self.checker_initiator_tag = gobject.timeout_add(
1641
value, self.start_checker)
1642
self.start_checker() # Start one now, too
1595
self.checker_initiator_tag = (gobject.timeout_add
1596
(value, self.start_checker))
1597
self.start_checker() # Start one now, too
1643
1598
1644
1599
# Checker - property
1645
@dbus_service_property(_interface,
1646
signature="s",
1600
@dbus_service_property(_interface, signature="s",
1647
1601
access="readwrite")
1648
1602
def Checker_dbus_property(self, value=None):
1649
1603
if value is None: # get
1650
1604
return dbus.String(self.checker_command)
1651
self.checker_command = str(value)
1605
self.checker_command = unicode(value)
1652
1606
1653
1607
# CheckerRunning - property
1654
@dbus_service_property(_interface,
1655
signature="b",
1608
@dbus_service_property(_interface, signature="b",
1656
1609
access="readwrite")
1657
1610
def CheckerRunning_dbus_property(self, value=None):
1658
1611
if value is None: # get
1668
1621
return self.dbus_object_path # is already a dbus.ObjectPath
1669
1622
1670
1623
# Secret = property
1671
@dbus_service_property(_interface,
1672
signature="ay",
1673
access="write",
1674
byte_arrays=True)
1624
@dbus_service_property(_interface, signature="ay",
1625
access="write", byte_arrays=True)
1675
1626
def Secret_dbus_property(self, value):
1676
self.secret = bytes(value)
1627
self.secret = str(value)
1677
1628
1678
1629
del _interface
1679
1630
1683
1634
self._pipe = child_pipe
1684
1635
self._pipe.send(('init', fpr, address))
1685
1636
if not self._pipe.recv():
1686
raise KeyError(fpr)
1637
raise KeyError()
1687
1638
1688
1639
def __getattribute__(self, name):
1689
1640
if name == '_pipe':
1693
1644
if data[0] == 'data':
1694
1645
return data[1]
1695
1646
if data[0] == 'function':
1696
1697
1647
def func(*args, **kwargs):
1698
1648
self._pipe.send(('funcall', name, args, kwargs))
1699
1649
return self._pipe.recv()[1]
1700
1701
1650
return func
1702
1651
1703
1652
def __setattr__(self, name, value):
1715
1664
def handle(self):
1716
1665
with contextlib.closing(self.server.child_pipe) as child_pipe:
1717
1666
logger.info("TCP connection from: %s",
1718
str(self.client_address))
1667
unicode(self.client_address))
1719
1668
logger.debug("Pipe FD: %d",
1720
1669
self.server.child_pipe.fileno())
1721
1670
1722
session = gnutls.connection.ClientSession(
1723
self.request, gnutls.connection .X509Credentials())
1671
session = (gnutls.connection
1672
.ClientSession(self.request,
1673
gnutls.connection
1674
.X509Credentials()))
1724
1675
1725
1676
# Note: gnutls.connection.X509Credentials is really a
1726
1677
# generic GnuTLS certificate credentials object so long as
1735
1686
priority = self.server.gnutls_priority
1736
1687
if priority is None:
1737
1688
priority = "NORMAL"
1738
gnutls.library.functions.gnutls_priority_set_direct(
1739
session._c_object, priority, None)
1689
(gnutls.library.functions
1690
.gnutls_priority_set_direct(session._c_object,
1691
priority, None))
1740
1692
1741
1693
# Start communication using the Mandos protocol
1742
1694
# Get protocol number
1744
1696
logger.debug("Protocol version: %r", line)
1745
1697
try:
1746
1698
if int(line.strip().split()[0]) > 1:
1747
raise RuntimeError(line)
1699
raise RuntimeError
1748
1700
except (ValueError, IndexError, RuntimeError) as error:
1749
1701
logger.error("Unknown protocol version: %s", error)
1750
1702
return
1762
1714
approval_required = False
1763
1715
try:
1764
1716
try:
1765
fpr = self.fingerprint(
1766
self.peer_certificate(session))
1717
fpr = self.fingerprint(self.peer_certificate
1718
(session))
1767
1719
except (TypeError,
1768
1720
gnutls.errors.GNUTLSError) as error:
1769
1721
logger.warning("Bad certificate: %s", error)
1784
1736
while True:
1785
1737
if not client.enabled:
1786
1738
logger.info("Client %s is disabled",
1787
client.name)
1739
client.name)
1788
1740
if self.server.use_dbus:
1789
1741
# Emit D-Bus signal
1790
1742
client.Rejected("Disabled")
1799
1751
if self.server.use_dbus:
1800
1752
# Emit D-Bus signal
1801
1753
client.NeedApproval(
1802
client.approval_delay.total_seconds()
1803
* 1000, client.approved_by_default)
1754
client.approval_delay_milliseconds(),
1755
client.approved_by_default)
1804
1756
else:
1805
1757
logger.warning("Client %s was not approved",
1806
1758
client.name)
1812
1764
#wait until timeout or approved
1813
1765
time = datetime.datetime.now()
1814
1766
client.changedstate.acquire()
1815
client.changedstate.wait(delay.total_seconds())
1767
client.changedstate.wait(
1768
float(timedelta_to_milliseconds(delay)
1769
/ 1000))
1816
1770
client.changedstate.release()
1817
1771
time2 = datetime.datetime.now()
1818
1772
if (time2 - time) >= delay:
1837
1791
logger.warning("gnutls send failed",
1838
1792
exc_info=error)
1839
1793
return
1840
logger.debug("Sent: %d, remaining: %d", sent,
1841
len(client.secret) - (sent_size
1842
+ sent))
1794
logger.debug("Sent: %d, remaining: %d",
1795
sent, len(client.secret)
1796
- (sent_size + sent))
1843
1797
sent_size += sent
1844
1798
1845
1799
logger.info("Sending secret to %s", client.name)
1862
1816
def peer_certificate(session):
1863
1817
"Return the peer's OpenPGP certificate as a bytestring"
1864
1818
# If not an OpenPGP certificate...
1865
if (gnutls.library.functions.gnutls_certificate_type_get(
1866
session._c_object)
1819
if (gnutls.library.functions
1820
.gnutls_certificate_type_get(session._c_object)
1867
1821
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1868
1822
# ...do the normal thing
1869
1823
return session.peer_certificate
1883
1837
def fingerprint(openpgp):
1884
1838
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1885
1839
# New GnuTLS "datum" with the OpenPGP public key
1886
datum = gnutls.library.types.gnutls_datum_t(
1887
ctypes.cast(ctypes.c_char_p(openpgp),
1888
ctypes.POINTER(ctypes.c_ubyte)),
1889
ctypes.c_uint(len(openpgp)))
1840
datum = (gnutls.library.types
1841
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1842
ctypes.POINTER
1843
(ctypes.c_ubyte)),
1844
ctypes.c_uint(len(openpgp))))
1890
1845
# New empty GnuTLS certificate
1891
1846
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
1893
ctypes.byref(crt))
1847
(gnutls.library.functions
1848
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1894
1849
# Import the OpenPGP public key into the certificate
1895
gnutls.library.functions.gnutls_openpgp_crt_import(
1896
crt, ctypes.byref(datum),
1897
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1850
(gnutls.library.functions
1851
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1852
gnutls.library.constants
1853
.GNUTLS_OPENPGP_FMT_RAW))
1898
1854
# Verify the self signature in the key
1899
1855
crtverify = ctypes.c_uint()
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
1856
(gnutls.library.functions
1857
.gnutls_openpgp_crt_verify_self(crt, 0,
1858
ctypes.byref(crtverify)))
1902
1859
if crtverify.value != 0:
1903
1860
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
raise gnutls.errors.CertificateSecurityError(
1905
"Verify failed")
1861
raise (gnutls.errors.CertificateSecurityError
1862
("Verify failed"))
1906
1863
# New buffer for the fingerprint
1907
1864
buf = ctypes.create_string_buffer(20)
1908
1865
buf_len = ctypes.c_size_t()
1909
1866
# Get the fingerprint from the certificate into the buffer
1910
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1911
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1867
(gnutls.library.functions
1868
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1869
ctypes.byref(buf_len)))
1912
1870
# Deinit the certificate
1913
1871
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1914
1872
# Convert the buffer to a Python bytestring
1920
1878
1921
1879
class MultiprocessingMixIn(object):
1922
1880
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1923
1924
1881
def sub_process_main(self, request, address):
1925
1882
try:
1926
1883
self.finish_request(request, address)
1938
1895
1939
1896
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1940
1897
""" adds a pipe to the MixIn """
1941
1942
1898
def process_request(self, request, client_address):
1943
1899
"""Overrides and wraps the original process_request().
1944
1900
1953
1909
1954
1910
def add_pipe(self, parent_pipe, proc):
1955
1911
"""Dummy function; override as necessary"""
1956
raise NotImplementedError()
1912
raise NotImplementedError
1957
1913
1958
1914
1959
1915
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1965
1921
interface: None or a network interface name (string)
1966
1922
use_ipv6: Boolean; to use IPv6 or not
1967
1923
"""
1968
1969
1924
def __init__(self, server_address, RequestHandlerClass,
1970
interface=None,
1971
use_ipv6=True,
1972
socketfd=None):
1925
interface=None, use_ipv6=True, socketfd=None):
1973
1926
"""If socketfd is set, use that file descriptor instead of
1974
1927
creating a new one with socket.socket().
1975
1928
"""
2016
1969
self.interface)
2017
1970
else:
2018
1971
try:
2019
self.socket.setsockopt(
2020
socket.SOL_SOCKET, SO_BINDTODEVICE,
2021
(self.interface + "\0").encode("utf-8"))
1972
self.socket.setsockopt(socket.SOL_SOCKET,
1973
SO_BINDTODEVICE,
1974
str(self.interface + '\0'))
2022
1975
except socket.error as error:
2023
1976
if error.errno == errno.EPERM:
2024
1977
logger.error("No permission to bind to"
2042
1995
self.server_address = (any_address,
2043
1996
self.server_address[1])
2044
1997
elif not self.server_address[1]:
2045
self.server_address = (self.server_address[0], 0)
1998
self.server_address = (self.server_address[0],
1999
0)
2046
2000
# if self.interface:
2047
2001
# self.server_address = (self.server_address[0],
2048
2002
# 0, # port
2062
2016
2063
2017
Assumes a gobject.MainLoop event loop.
2064
2018
"""
2065
2066
2019
def __init__(self, server_address, RequestHandlerClass,
2067
interface=None,
2068
use_ipv6=True,
2069
clients=None,
2070
gnutls_priority=None,
2071
use_dbus=True,
2072
socketfd=None):
2020
interface=None, use_ipv6=True, clients=None,
2021
gnutls_priority=None, use_dbus=True, socketfd=None):
2073
2022
self.enabled = False
2074
2023
self.clients = clients
2075
2024
if self.clients is None:
2081
2030
interface = interface,
2082
2031
use_ipv6 = use_ipv6,
2083
2032
socketfd = socketfd)
2084
2085
2033
def server_activate(self):
2086
2034
if self.enabled:
2087
2035
return socketserver.TCPServer.server_activate(self)
2091
2039
2092
2040
def add_pipe(self, parent_pipe, proc):
2093
2041
# Call "handle_ipc" for both data and EOF events
2094
gobject.io_add_watch(
2095
parent_pipe.fileno(),
2096
gobject.IO_IN | gobject.IO_HUP,
2097
functools.partial(self.handle_ipc,
2098
parent_pipe = parent_pipe,
2099
proc = proc))
2042
gobject.io_add_watch(parent_pipe.fileno(),
2043
gobject.IO_IN | gobject.IO_HUP,
2044
functools.partial(self.handle_ipc,
2045
parent_pipe =
2046
parent_pipe,
2047
proc = proc))
2100
2048
2101
def handle_ipc(self, source, condition,
2102
parent_pipe=None,
2103
proc = None,
2104
client_object=None):
2049
def handle_ipc(self, source, condition, parent_pipe=None,
2050
proc = None, client_object=None):
2105
2051
# error, or the other end of multiprocessing.Pipe has closed
2106
2052
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2107
2053
# Wait for other process to exit
2130
2076
parent_pipe.send(False)
2131
2077
return False
2132
2078
2133
gobject.io_add_watch(
2134
parent_pipe.fileno(),
2135
gobject.IO_IN | gobject.IO_HUP,
2136
functools.partial(self.handle_ipc,
2137
parent_pipe = parent_pipe,
2138
proc = proc,
2139
client_object = client))
2079
gobject.io_add_watch(parent_pipe.fileno(),
2080
gobject.IO_IN | gobject.IO_HUP,
2081
functools.partial(self.handle_ipc,
2082
parent_pipe =
2083
parent_pipe,
2084
proc = proc,
2085
client_object =
2086
client))
2140
2087
parent_pipe.send(True)
2141
2088
# remove the old hook in favor of the new above hook on
2142
2089
# same fileno
2148
2095
2149
2096
parent_pipe.send(('data', getattr(client_object,
2150
2097
funcname)(*args,
2151
**kwargs)))
2098
**kwargs)))
2152
2099
2153
2100
if command == 'getattr':
2154
2101
attrname = request[1]
2155
if isinstance(client_object.__getattribute__(attrname),
2156
collections.Callable):
2157
parent_pipe.send(('function', ))
2102
if callable(client_object.__getattribute__(attrname)):
2103
parent_pipe.send(('function',))
2158
2104
else:
2159
parent_pipe.send((
2160
'data', client_object.__getattribute__(attrname)))
2105
parent_pipe.send(('data', client_object
2106
.__getattribute__(attrname)))
2161
2107
2162
2108
if command == 'setattr':
2163
2109
attrname = request[1]
2194
2140
# avoid excessive use of external libraries.
2195
2141
2196
2142
# New type for defining tokens, syntax, and semantics all-in-one
2197
Token = collections.namedtuple("Token", (
2198
"regexp", # To match token; if "value" is not None, must have
2199
# a "group" containing digits
2200
"value", # datetime.timedelta or None
2201
"followers")) # Tokens valid after this token
2143
Token = collections.namedtuple("Token",
2144
("regexp", # To match token; if
2145
# "value" is not None,
2146
# must have a "group"
2147
# containing digits
2148
"value", # datetime.timedelta or
2149
# None
2150
"followers")) # Tokens valid after
2151
# this token
2202
2152
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2203
2153
# the "duration" ABNF definition in RFC 3339, Appendix A.
2204
2154
token_end = Token(re.compile(r"$"), None, frozenset())
2205
2155
token_second = Token(re.compile(r"(\d+)S"),
2206
2156
datetime.timedelta(seconds=1),
2207
frozenset((token_end, )))
2157
frozenset((token_end,)))
2208
2158
token_minute = Token(re.compile(r"(\d+)M"),
2209
2159
datetime.timedelta(minutes=1),
2210
2160
frozenset((token_second, token_end)))
2226
2176
frozenset((token_month, token_end)))
2227
2177
token_week = Token(re.compile(r"(\d+)W"),
2228
2178
datetime.timedelta(weeks=1),
2229
frozenset((token_end, )))
2179
frozenset((token_end,)))
2230
2180
token_duration = Token(re.compile(r"P"), None,
2231
2181
frozenset((token_year, token_month,
2232
2182
token_day, token_time,
2233
token_week)))
2183
token_week))),
2234
2184
# Define starting values
2235
2185
value = datetime.timedelta() # Value so far
2236
2186
found_token = None
2237
followers = frozenset((token_duration, )) # Following valid tokens
2187
followers = frozenset(token_duration,) # Following valid tokens
2238
2188
s = duration # String left to parse
2239
2189
# Loop until end token is found
2240
2190
while found_token is not token_end:
2257
2207
break
2258
2208
else:
2259
2209
# No currently valid tokens were found
2260
raise ValueError("Invalid RFC 3339 duration: {!r}"
2261
.format(duration))
2210
raise ValueError("Invalid RFC 3339 duration")
2262
2211
# End token found
2263
2212
return value
2264
2213
2288
2237
timevalue = datetime.timedelta(0)
2289
2238
for s in interval.split():
2290
2239
try:
2291
suffix = s[-1]
2240
suffix = unicode(s[-1])
2292
2241
value = int(s[:-1])
2293
2242
if suffix == "d":
2294
2243
delta = datetime.timedelta(value)
2301
2250
elif suffix == "w":
2302
2251
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2303
2252
else:
2304
raise ValueError("Unknown suffix {!r}".format(suffix))
2305
except IndexError as e:
2253
raise ValueError("Unknown suffix {0!r}"
2254
.format(suffix))
2255
except (ValueError, IndexError) as e:
2306
2256
raise ValueError(*(e.args))
2307
2257
timevalue += delta
2308
2258
return timevalue
2324
2274
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2325
2275
if not stat.S_ISCHR(os.fstat(null).st_mode):
2326
2276
raise OSError(errno.ENODEV,
2327
"{} not a character device"
2277
"{0} not a character device"
2328
2278
.format(os.devnull))
2329
2279
os.dup2(null, sys.stdin.fileno())
2330
2280
os.dup2(null, sys.stdout.fileno())
2340
2290
2341
2291
parser = argparse.ArgumentParser()
2342
2292
parser.add_argument("-v", "--version", action="version",
2343
version = "%(prog)s {}".format(version),
2293
version = "%(prog)s {0}".format(version),
2344
2294
help="show version number and exit")
2345
2295
parser.add_argument("-i", "--interface", metavar="IF",
2346
2296
help="Bind to interface IF")
2379
2329
help="Directory to save/restore state in")
2380
2330
parser.add_argument("--foreground", action="store_true",
2381
2331
help="Run in foreground", default=None)
2382
parser.add_argument("--no-zeroconf", action="store_false",
2383
dest="zeroconf", help="Do not use Zeroconf",
2384
default=None)
2385
2332
2386
2333
options = parser.parse_args()
2387
2334
2388
2335
if options.check:
2389
2336
import doctest
2390
fail_count, test_count = doctest.testmod()
2391
sys.exit(os.EX_OK if fail_count == 0 else 1)
2337
doctest.testmod()
2338
sys.exit()
2392
2339
2393
2340
# Default values for config file for server-global settings
2394
2341
server_defaults = { "interface": "",
2396
2343
"port": "",
2397
2344
"debug": "False",
2398
2345
"priority":
2399
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2400
":+SIGN-DSA-SHA256",
2346
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
2401
2347
"servicename": "Mandos",
2402
2348
"use_dbus": "True",
2403
2349
"use_ipv6": "True",
2406
2352
"socket": "",
2407
2353
"statedir": "/var/lib/mandos",
2408
2354
"foreground": "False",
2409
"zeroconf": "True",
2410
}
2355
}
2411
2356
2412
2357
# Parse config file for server-global settings
2413
2358
server_config = configparser.SafeConfigParser(server_defaults)
2414
2359
del server_defaults
2415
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2360
server_config.read(os.path.join(options.configdir,
2361
"mandos.conf"))
2416
2362
# Convert the SafeConfigParser object to a dict
2417
2363
server_settings = server_config.defaults()
2418
2364
# Use the appropriate methods on the non-string config options
2436
2382
# Override the settings from the config file with command line
2437
2383
# options, if set.
2438
2384
for option in ("interface", "address", "port", "debug",
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2385
"priority", "servicename", "configdir",
2386
"use_dbus", "use_ipv6", "debuglevel", "restore",
2387
"statedir", "socket", "foreground"):
2442
2388
value = getattr(options, option)
2443
2389
if value is not None:
2444
2390
server_settings[option] = value
2445
2391
del options
2446
2392
# Force all strings to be unicode
2447
2393
for option in server_settings.keys():
2448
if isinstance(server_settings[option], bytes):
2449
server_settings[option] = (server_settings[option]
2450
.decode("utf-8"))
2394
if type(server_settings[option]) is str:
2395
server_settings[option] = unicode(server_settings[option])
2451
2396
# Force all boolean options to be boolean
2452
2397
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2453
"foreground", "zeroconf"):
2398
"foreground"):
2454
2399
server_settings[option] = bool(server_settings[option])
2455
2400
# Debug implies foreground
2456
2401
if server_settings["debug"]:
2459
2404
2460
2405
##################################################################
2461
2406
2462
if (not server_settings["zeroconf"]
2463
and not (server_settings["port"]
2464
or server_settings["socket"] != "")):
2465
parser.error("Needs port or socket to work without Zeroconf")
2466
2467
2407
# For convenience
2468
2408
debug = server_settings["debug"]
2469
2409
debuglevel = server_settings["debuglevel"]
2472
2412
stored_state_path = os.path.join(server_settings["statedir"],
2473
2413
stored_state_file)
2474
2414
foreground = server_settings["foreground"]
2475
zeroconf = server_settings["zeroconf"]
2476
2415
2477
2416
if debug:
2478
2417
initlogger(debug, logging.DEBUG)
2484
2423
initlogger(debug, level)
2485
2424
2486
2425
if server_settings["servicename"] != "Mandos":
2487
syslogger.setFormatter(
2488
logging.Formatter('Mandos ({}) [%(process)d]:'
2489
' %(levelname)s: %(message)s'.format(
2490
server_settings["servicename"])))
2426
syslogger.setFormatter(logging.Formatter
2427
('Mandos ({0}) [%(process)d]:'
2428
' %(levelname)s: %(message)s'
2429
.format(server_settings
2430
["servicename"])))
2491
2431
2492
2432
# Parse config file with clients
2493
2433
client_config = configparser.SafeConfigParser(Client
2498
2438
global mandos_dbus_service
2499
2439
mandos_dbus_service = None
2500
2440
2501
socketfd = None
2502
if server_settings["socket"] != "":
2503
socketfd = server_settings["socket"]
2504
tcp_server = MandosServer(
2505
(server_settings["address"], server_settings["port"]),
2506
ClientHandler,
2507
interface=(server_settings["interface"] or None),
2508
use_ipv6=use_ipv6,
2509
gnutls_priority=server_settings["priority"],
2510
use_dbus=use_dbus,
2511
socketfd=socketfd)
2441
tcp_server = MandosServer((server_settings["address"],
2442
server_settings["port"]),
2443
ClientHandler,
2444
interface=(server_settings["interface"]
2445
or None),
2446
use_ipv6=use_ipv6,
2447
gnutls_priority=
2448
server_settings["priority"],
2449
use_dbus=use_dbus,
2450
socketfd=(server_settings["socket"]
2451
or None))
2512
2452
if not foreground:
2513
pidfilename = "/run/mandos.pid"
2514
if not os.path.isdir("/run/."):
2515
pidfilename = "/var/run/mandos.pid"
2453
pidfilename = "/var/run/mandos.pid"
2516
2454
pidfile = None
2517
2455
try:
2518
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2456
pidfile = open(pidfilename, "w")
2519
2457
except IOError as e:
2520
2458
logger.error("Could not open file %r", pidfilename,
2521
2459
exc_info=e)
2535
2473
os.setuid(uid)
2536
2474
except OSError as error:
2537
2475
if error.errno != errno.EPERM:
2538
raise
2476
raise error
2539
2477
2540
2478
if debug:
2541
2479
# Enable all possible GnuTLS debugging
2548
2486
def debug_gnutls(level, string):
2549
2487
logger.debug("GnuTLS: %s", string[:-1])
2550
2488
2551
gnutls.library.functions.gnutls_global_set_log_function(
2552
debug_gnutls)
2489
(gnutls.library.functions
2490
.gnutls_global_set_log_function(debug_gnutls))
2553
2491
2554
2492
# Redirect stdin so all checkers get /dev/null
2555
2493
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2575
2513
if use_dbus:
2576
2514
try:
2577
2515
bus_name = dbus.service.BusName("se.recompile.Mandos",
2578
bus,
2579
do_not_queue=True)
2580
old_bus_name = dbus.service.BusName(
2581
"se.bsnet.fukt.Mandos", bus,
2582
do_not_queue=True)
2583
except dbus.exceptions.DBusException as e:
2516
bus, do_not_queue=True)
2517
old_bus_name = (dbus.service.BusName
2518
("se.bsnet.fukt.Mandos", bus,
2519
do_not_queue=True))
2520
except dbus.exceptions.NameExistsException as e:
2584
2521
logger.error("Disabling D-Bus:", exc_info=e)
2585
2522
use_dbus = False
2586
2523
server_settings["use_dbus"] = False
2587
2524
tcp_server.use_dbus = False
2588
if zeroconf:
2589
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2590
service = AvahiServiceToSyslog(
2591
name = server_settings["servicename"],
2592
servicetype = "_mandos._tcp",
2593
protocol = protocol,
2594
bus = bus)
2595
if server_settings["interface"]:
2596
service.interface = if_nametoindex(
2597
server_settings["interface"].encode("utf-8"))
2525
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2526
service = AvahiServiceToSyslog(name =
2527
server_settings["servicename"],
2528
servicetype = "_mandos._tcp",
2529
protocol = protocol, bus = bus)
2530
if server_settings["interface"]:
2531
service.interface = (if_nametoindex
2532
(str(server_settings["interface"])))
2598
2533
2599
2534
global multiprocessing_manager
2600
2535
multiprocessing_manager = multiprocessing.Manager()
2619
2554
if server_settings["restore"]:
2620
2555
try:
2621
2556
with open(stored_state_path, "rb") as stored_state:
2622
clients_data, old_client_settings = pickle.load(
2623
stored_state)
2557
clients_data, old_client_settings = (pickle.load
2558
(stored_state))
2624
2559
os.remove(stored_state_path)
2625
2560
except IOError as e:
2626
2561
if e.errno == errno.ENOENT:
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
2562
logger.warning("Could not load persistent state: {0}"
2563
.format(os.strerror(e.errno)))
2629
2564
else:
2630
2565
logger.critical("Could not load persistent state:",
2631
2566
exc_info=e)
2632
2567
raise
2633
2568
except EOFError as e:
2634
2569
logger.warning("Could not load persistent state: "
2635
"EOFError:",
2636
exc_info=e)
2570
"EOFError:", exc_info=e)
2637
2571
2638
2572
with PGPEngine() as pgp:
2639
for client_name, client in clients_data.items():
2573
for client_name, client in clients_data.iteritems():
2640
2574
# Skip removed clients
2641
2575
if client_name not in client_settings:
2642
2576
continue
2651
2585
# For each value in new config, check if it
2652
2586
# differs from the old config value (Except for
2653
2587
# the "secret" attribute)
2654
if (name != "secret"
2655
and (value !=
2656
old_client_settings[client_name][name])):
2588
if (name != "secret" and
2589
value != old_client_settings[client_name]
2590
[name]):
2657
2591
client[name] = value
2658
2592
except KeyError:
2659
2593
pass
2660
2594
2661
2595
# Clients who has passed its expire date can still be
2662
# enabled if its last checker was successful. A Client
2596
# enabled if its last checker was successful. Clients
2663
2597
# whose checker succeeded before we stored its state is
2664
2598
# assumed to have successfully run all checkers during
2665
2599
# downtime.
2667
2601
if datetime.datetime.utcnow() >= client["expires"]:
2668
2602
if not client["last_checked_ok"]:
2669
2603
logger.warning(
2670
"disabling client {} - Client never "
2671
"performed a successful checker".format(
2672
client_name))
2604
"disabling client {0} - Client never "
2605
"performed a successful checker"
2606
.format(client_name))
2673
2607
client["enabled"] = False
2674
2608
elif client["last_checker_status"] != 0:
2675
2609
logger.warning(
2676
"disabling client {} - Client last"
2677
" checker failed with error code"
2678
" {}".format(
2679
client_name,
2680
client["last_checker_status"]))
2610
"disabling client {0} - Client "
2611
"last checker failed with error code {1}"
2612
.format(client_name,
2613
client["last_checker_status"]))
2681
2614
client["enabled"] = False
2682
2615
else:
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2616
client["expires"] = (datetime.datetime
2617
.utcnow()
2618
+ client["timeout"])
2686
2619
logger.debug("Last checker succeeded,"
2687
" keeping {} enabled".format(
2688
client_name))
2620
" keeping {0} enabled"
2621
.format(client_name))
2689
2622
try:
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2623
client["secret"] = (
2624
pgp.decrypt(client["encrypted_secret"],
2625
client_settings[client_name]
2626
["secret"]))
2693
2627
except PGPError:
2694
2628
# If decryption fails, we use secret from new settings
2695
logger.debug("Failed to decrypt {} old secret".format(
2696
client_name))
2697
client["secret"] = (client_settings[client_name]
2698
["secret"])
2629
logger.debug("Failed to decrypt {0} old secret"
2630
.format(client_name))
2631
client["secret"] = (
2632
client_settings[client_name]["secret"])
2699
2633
2700
2634
# Add/remove clients based on new changes made to config
2701
2635
for client_name in (set(old_client_settings)
2706
2640
clients_data[client_name] = client_settings[client_name]
2707
2641
2708
2642
# Create all client objects
2709
for client_name, client in clients_data.items():
2643
for client_name, client in clients_data.iteritems():
2710
2644
tcp_server.clients[client_name] = client_class(
2711
name = client_name,
2712
settings = client,
2645
name = client_name, settings = client,
2713
2646
server_settings = server_settings)
2714
2647
2715
2648
if not tcp_server.clients:
2717
2650
2718
2651
if not foreground:
2719
2652
if pidfile is not None:
2720
pid = os.getpid()
2721
2653
try:
2722
2654
with pidfile:
2723
print(pid, file=pidfile)
2655
pid = os.getpid()
2656
pidfile.write(str(pid) + "\n".encode("utf-8"))
2724
2657
except IOError:
2725
2658
logger.error("Could not write to file %r with PID %d",
2726
2659
pidfilename, pid)
2731
2664
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2732
2665
2733
2666
if use_dbus:
2734
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2667
@alternate_dbus_interfaces({"se.recompile.Mandos":
2668
"se.bsnet.fukt.Mandos"})
2737
2669
class MandosDBusService(DBusObjectWithProperties):
2738
2670
"""A D-Bus proxy object"""
2739
2740
2671
def __init__(self):
2741
2672
dbus.service.Object.__init__(self, bus, "/")
2742
2743
2673
_interface = "se.recompile.Mandos"
2744
2674
2745
2675
@dbus_interface_annotations(_interface)
2746
2676
def _foo(self):
2747
return {
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2749
"false" }
2677
return { "org.freedesktop.DBus.Property"
2678
".EmitsChangedSignal":
2679
"false"}
2750
2680
2751
2681
@dbus.service.signal(_interface, signature="o")
2752
2682
def ClientAdded(self, objpath):
2766
2696
@dbus.service.method(_interface, out_signature="ao")
2767
2697
def GetAllClients(self):
2768
2698
"D-Bus method"
2769
return dbus.Array(c.dbus_object_path for c in
2699
return dbus.Array(c.dbus_object_path
2700
for c in
2770
2701
tcp_server.clients.itervalues())
2771
2702
2772
2703
@dbus.service.method(_interface,
2774
2705
def GetAllClientsWithProperties(self):
2775
2706
"D-Bus method"
2776
2707
return dbus.Dictionary(
2777
{ c.dbus_object_path: c.GetAll("")
2778
for c in tcp_server.clients.itervalues() },
2708
((c.dbus_object_path, c.GetAll(""))
2709
for c in tcp_server.clients.itervalues()),
2779
2710
signature="oa{sv}")
2780
2711
2781
2712
@dbus.service.method(_interface, in_signature="o")
2798
2729
2799
2730
def cleanup():
2800
2731
"Cleanup function; run on exit"
2801
if zeroconf:
2802
service.cleanup()
2732
service.cleanup()
2803
2733
2804
2734
multiprocessing.active_children()
2805
2735
wnull.close()
2819
2749
2820
2750
# A list of attributes that can not be pickled
2821
2751
# + secret.
2822
exclude = { "bus", "changedstate", "secret",
2823
"checker", "server_settings" }
2824
for name, typ in inspect.getmembers(dbus.service
2825
.Object):
2752
exclude = set(("bus", "changedstate", "secret",
2753
"checker", "server_settings"))
2754
for name, typ in (inspect.getmembers
2755
(dbus.service.Object)):
2826
2756
exclude.add(name)
2827
2757
2828
2758
client_dict["encrypted_secret"] = (client
2835
2765
del client_settings[client.name]["secret"]
2836
2766
2837
2767
try:
2838
with tempfile.NamedTemporaryFile(
2839
mode='wb',
2840
suffix=".pickle",
2841
prefix='clients-',
2842
dir=os.path.dirname(stored_state_path),
2843
delete=False) as stored_state:
2768
with (tempfile.NamedTemporaryFile
2769
(mode='wb', suffix=".pickle", prefix='clients-',
2770
dir=os.path.dirname(stored_state_path),
2771
delete=False)) as stored_state:
2844
2772
pickle.dump((clients, client_settings), stored_state)
2845
tempname = stored_state.name
2773
tempname=stored_state.name
2846
2774
os.rename(tempname, stored_state_path)
2847
2775
except (IOError, OSError) as e:
2848
2776
if not debug:
2851
2779
except NameError:
2852
2780
pass
2853
2781
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2854
logger.warning("Could not save persistent state: {}"
2782
logger.warning("Could not save persistent state: {0}"
2855
2783
.format(os.strerror(e.errno)))
2856
2784
else:
2857
2785
logger.warning("Could not save persistent state:",
2858
2786
exc_info=e)
2859
raise
2787
raise e
2860
2788
2861
2789
# Delete all clients, and settings from config
2862
2790
while tcp_server.clients:
2867
2795
client.disable(quiet=True)
2868
2796
if use_dbus:
2869
2797
# Emit D-Bus signal
2870
mandos_dbus_service.ClientRemoved(
2871
client.dbus_object_path, client.name)
2798
mandos_dbus_service.ClientRemoved(client
2799
.dbus_object_path,
2800
client.name)
2872
2801
client_settings.clear()
2873
2802
2874
2803
atexit.register(cleanup)
2885
2814
tcp_server.server_activate()
2886
2815
2887
2816
# Find out what port we got
2888
if zeroconf:
2889
service.port = tcp_server.socket.getsockname()[1]
2817
service.port = tcp_server.socket.getsockname()[1]
2890
2818
if use_ipv6:
2891
2819
logger.info("Now listening on address %r, port %d,"
2892
2820
" flowinfo %d, scope_id %d",
2898
2826
#service.interface = tcp_server.socket.getsockname()[3]
2899
2827
2900
2828
try:
2901
if zeroconf:
2902
# From the Avahi example code
2903
try:
2904
service.activate()
2905
except dbus.exceptions.DBusException as error:
2906
logger.critical("D-Bus Exception", exc_info=error)
2907
cleanup()
2908
sys.exit(1)
2909
# End of Avahi example code
2829
# From the Avahi example code
2830
try:
2831
service.activate()
2832
except dbus.exceptions.DBusException as error:
2833
logger.critical("D-Bus Exception", exc_info=error)
2834
cleanup()
2835
sys.exit(1)
2836
# End of Avahi example code
2910
2837
2911
2838
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2912
2839
lambda *args, **kwargs:
2927
2854
# Must run before the D-Bus bus name gets deregistered
2928
2855
cleanup()
2929
2856
2930
2931
2857
if __name__ == '__main__':
2932
2858
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0