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 708
- compare with another revision
- download diff
- download tarball
- view history from revision 708
- Committer: Teddy Hogeborn
- Date: 2014-06-22 02:19:30 UTC
- Revision ID: teddy@recompile.se-20140622021930-icl7h4cm97blhjml
mandos-keygen: Generate "checker" option to use SSH fingerprints.
To turn this off, use a new "--no-ssh" option to mandos-keygen.
* INSTALL (Mandos Server, Mandos Client): Document new suggested
installation of SSH.
* Makefile (confdir/clients.conf): Use new "--no-ssh" option to
"mandos-keygen".
* debian/control (mandos/Depends): Changed to "fping | ssh-client".
(mandos-client/Recommends): New; set to "ssh".
* intro.xml (FREQUENTLY ASKED QUESTIONS): Rename and rewrite section
called "Faking ping
replies?" to address new
default behavior.
* mandos-clients.conf.xml (OPTIONS/checker): Briefly discuss new
behavior of
mandos-keygen.
* mandos-keygen: Bug fix: Suppress failure output of "shred" to remove
"sec*", since no such files may exist.
(password mode): Scan for SSH key fingerprints and output as new
"checker" and "ssh_fingerprint" options, unless new
"--no-ssh" option is given.
* mandos-keygen.xml (SYNOPSIS/--force): Bug fix: Document short form.
(OPTIONS/--no-ssh): New.
(SEE ALSO): Add reference "ssh-keyscan(1)".
* plugins.d/mandos-client.xml (SECURITY): Briefly mention the
possibility of using SSH key
fingerprints for checking.
To turn this off, use a new "--no-ssh" option to mandos-keygen.
* INSTALL (Mandos Server, Mandos Client): Document new suggested
installation of SSH.
* Makefile (confdir/clients.conf): Use new "--no-ssh" option to
"mandos-keygen".
* debian/control (mandos/Depends): Changed to "fping | ssh-client".
(mandos-client/Recommends): New; set to "ssh".
* intro.xml (FREQUENTLY ASKED QUESTIONS): Rename and rewrite section
called "Faking ping
replies?" to address new
default behavior.
* mandos-clients.conf.xml (OPTIONS/checker): Briefly discuss new
behavior of
mandos-keygen.
* mandos-keygen: Bug fix: Suppress failure output of "shred" to remove
"sec*", since no such files may exist.
(password mode): Scan for SSH key fingerprints and output as new
"checker" and "ssh_fingerprint" options, unless new
"--no-ssh" option is given.
* mandos-keygen.xml (SYNOPSIS/--force): Bug fix: Document short form.
(OPTIONS/--no-ssh): New.
(SEE ALSO): Add reference "ssh-keyscan(1)".
* plugins.d/mandos-client.xml (SECURITY): Briefly mention the
possibility of using SSH key
fingerprints for checking.
- files removed:
- plugin-helpers
- files modified:
- DBUS-API
added
removed
mandos
1
#!/usr/bin/python2.7
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 Björn Påhlsson
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
36
36
37
37
from future_builtins import *
38
38
39
try:
40
import SocketServer as socketserver
41
except ImportError:
42
import socketserver
39
import SocketServer as socketserver
43
40
import socket
44
41
import argparse
45
42
import datetime
50
47
import gnutls.library.functions
51
48
import gnutls.library.constants
52
49
import gnutls.library.types
53
try:
54
import ConfigParser as configparser
55
except ImportError:
56
import configparser
50
import ConfigParser as configparser
57
51
import sys
58
52
import re
59
53
import os
68
62
import struct
69
63
import fcntl
70
64
import functools
71
try:
72
import cPickle as pickle
73
except ImportError:
74
import pickle
65
import cPickle as pickle
75
66
import multiprocessing
76
67
import types
77
68
import binascii
78
69
import tempfile
79
70
import itertools
80
71
import collections
81
import codecs
82
72
83
73
import dbus
84
74
import dbus.service
85
try:
86
import gobject
87
except ImportError:
88
from gi.repository import GObject as gobject
75
import gobject
89
76
import avahi
90
77
from dbus.mainloop.glib import DBusGMainLoop
91
78
import ctypes
101
88
except ImportError:
102
89
SO_BINDTODEVICE = None
103
90
104
if sys.version_info.major == 2:
105
str = unicode
106
107
version = "1.6.9"
91
version = "1.6.5"
108
92
stored_state_file = "clients.pickle"
109
93
110
94
logger = logging.getLogger()
111
95
syslogger = None
112
96
113
97
try:
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
116
101
except (OSError, AttributeError):
117
118
102
def if_nametoindex(interface):
119
103
"Get an interface index the hard way, i.e. using fcntl()"
120
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
121
105
with contextlib.closing(socket.socket()) as s:
122
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
125
111
return interface_index
126
112
127
113
129
115
"""init logger and add loglevel"""
130
116
131
117
global syslogger
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
118
syslogger = (logging.handlers.SysLogHandler
119
(facility =
120
logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = str("/dev/log")))
135
122
syslogger.setFormatter(logging.Formatter
136
123
('Mandos [%(process)d]: %(levelname)s:'
137
124
' %(message)s'))
154
141
155
142
class PGPEngine(object):
156
143
"""A simple class for OpenPGP symmetric encryption & decryption"""
157
158
144
def __init__(self):
159
145
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
146
self.gnupgargs = ['--batch',
199
185
200
186
def encrypt(self, data, password):
201
187
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
188
with tempfile.NamedTemporaryFile(dir=self.tempdir
189
) as passfile:
204
190
passfile.write(passphrase)
205
191
passfile.flush()
206
192
proc = subprocess.Popen(['gpg', '--symmetric',
217
203
218
204
def decrypt(self, data, password):
219
205
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
206
with tempfile.NamedTemporaryFile(dir = self.tempdir
207
) as passfile:
222
208
passfile.write(passphrase)
223
209
passfile.flush()
224
210
proc = subprocess.Popen(['gpg', '--decrypt',
228
214
stdin = subprocess.PIPE,
229
215
stdout = subprocess.PIPE,
230
216
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
217
decrypted_plaintext, err = proc.communicate(input
218
= data)
232
219
if proc.returncode != 0:
233
220
raise PGPError(err)
234
221
return decrypted_plaintext
237
224
class AvahiError(Exception):
238
225
def __init__(self, value, *args, **kwargs):
239
226
self.value = value
240
return super(AvahiError, self).__init__(value, *args,
241
**kwargs)
242
227
super(AvahiError, self).__init__(value, *args, **kwargs)
228
def __unicode__(self):
229
return unicode(repr(self.value))
243
230
244
231
class AvahiServiceError(AvahiError):
245
232
pass
246
233
247
248
234
class AvahiGroupError(AvahiError):
249
235
pass
250
236
270
256
bus: dbus.SystemBus()
271
257
"""
272
258
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):
259
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
servicetype = None, port = None, TXT = None,
261
domain = "", host = "", max_renames = 32768,
262
protocol = avahi.PROTO_UNSPEC, bus = None):
284
263
self.interface = interface
285
264
self.name = name
286
265
self.type = servicetype
296
275
self.bus = bus
297
276
self.entry_group_state_changed_match = None
298
277
299
def rename(self, remove=True):
278
def rename(self):
300
279
"""Derived from the Avahi example code"""
301
280
if self.rename_count >= self.max_renames:
302
281
logger.critical("No suitable Zeroconf service name found"
303
282
" after %i retries, exiting.",
304
283
self.rename_count)
305
284
raise AvahiServiceError("Too many renames")
306
self.name = str(
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
285
self.name = unicode(self.server
286
.GetAlternativeServiceName(self.name))
309
287
logger.info("Changing Zeroconf service name to %r ...",
310
288
self.name)
311
if remove:
312
self.remove()
289
self.remove()
313
290
try:
314
291
self.add()
315
292
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)
293
logger.critical("D-Bus Exception", exc_info=error)
294
self.cleanup()
295
os._exit(1)
296
self.rename_count += 1
324
297
325
298
def remove(self):
326
299
"""Derived from the Avahi example code"""
364
337
self.rename()
365
338
elif state == avahi.ENTRY_GROUP_FAILURE:
366
339
logger.critical("Avahi: Error in group state changed %s",
367
str(error))
368
raise AvahiGroupError("State changed: {!s}".format(error))
340
unicode(error))
341
raise AvahiGroupError("State changed: {0!s}"
342
.format(error))
369
343
370
344
def cleanup(self):
371
345
"""Derived from the Avahi example code"""
381
355
def server_state_changed(self, state, error=None):
382
356
"""Derived from the Avahi example code"""
383
357
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
}
358
bad_states = { avahi.SERVER_INVALID:
359
"Zeroconf server invalid",
360
avahi.SERVER_REGISTERING: None,
361
avahi.SERVER_COLLISION:
362
"Zeroconf server name collision",
363
avahi.SERVER_FAILURE:
364
"Zeroconf server failure" }
390
365
if state in bad_states:
391
366
if bad_states[state] is not None:
392
367
if error is None:
395
370
logger.error(bad_states[state] + ": %r", error)
396
371
self.cleanup()
397
372
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)
373
self.add()
410
374
else:
411
375
if error is None:
412
376
logger.debug("Unknown state: %r", state)
422
386
follow_name_owner_changes=True),
423
387
avahi.DBUS_INTERFACE_SERVER)
424
388
self.server.connect_to_signal("StateChanged",
425
self.server_state_changed)
389
self.server_state_changed)
426
390
self.server_state_changed(self.server.GetState())
427
391
428
392
429
393
class AvahiServiceToSyslog(AvahiService):
430
def rename(self, *args, **kwargs):
394
def rename(self):
431
395
"""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)))
396
ret = AvahiService.rename(self)
397
syslogger.setFormatter(logging.Formatter
398
('Mandos ({0}) [%(process)d]:'
399
' %(levelname)s: %(message)s'
400
.format(self.name)))
436
401
return ret
437
402
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()
403
404
def timedelta_to_milliseconds(td):
405
"Convert a datetime.timedelta() to milliseconds"
406
return ((td.days * 24 * 60 * 60 * 1000)
407
+ (td.seconds * 1000)
408
+ (td.microseconds // 1000))
409
447
410
448
411
class Client(object):
449
412
"""A representation of a client host served by this server.
476
439
last_checker_status: integer between 0 and 255 reflecting exit
477
440
status of last checker. -1 reflects crashed
478
441
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
442
last_enabled: datetime.datetime(); (UTC) or None
482
443
name: string; from the config file, used in log messages and
483
444
D-Bus identifiers
496
457
"fingerprint", "host", "interval",
497
458
"last_approval_request", "last_checked_ok",
498
459
"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
}
460
client_defaults = { "timeout": "PT5M",
461
"extended_timeout": "PT15M",
462
"interval": "PT2M",
463
"checker": "fping -q -- %%(host)s",
464
"host": "",
465
"approval_delay": "PT0S",
466
"approval_duration": "PT1S",
467
"approved_by_default": "True",
468
"enabled": "True",
469
}
470
471
def timeout_milliseconds(self):
472
"Return the 'timeout' attribute in milliseconds"
473
return timedelta_to_milliseconds(self.timeout)
474
475
def extended_timeout_milliseconds(self):
476
"Return the 'extended_timeout' attribute in milliseconds"
477
return timedelta_to_milliseconds(self.extended_timeout)
478
479
def interval_milliseconds(self):
480
"Return the 'interval' attribute in milliseconds"
481
return timedelta_to_milliseconds(self.interval)
482
483
def approval_delay_milliseconds(self):
484
return timedelta_to_milliseconds(self.approval_delay)
510
485
511
486
@staticmethod
512
487
def config_parser(config):
528
503
client["enabled"] = config.getboolean(client_name,
529
504
"enabled")
530
505
531
# Uppercase and remove spaces from fingerprint for later
532
# comparison purposes with return value from the
533
# fingerprint() function
534
506
client["fingerprint"] = (section["fingerprint"].upper()
535
507
.replace(" ", ""))
536
508
if "secret" in section:
541
513
"rb") as secfile:
542
514
client["secret"] = secfile.read()
543
515
else:
544
raise TypeError("No secret or secfile for section {}"
516
raise TypeError("No secret or secfile for section {0}"
545
517
.format(section))
546
518
client["timeout"] = string_to_delta(section["timeout"])
547
519
client["extended_timeout"] = string_to_delta(
564
536
server_settings = {}
565
537
self.server_settings = server_settings
566
538
# adding all client settings
567
for setting, value in settings.items():
539
for setting, value in settings.iteritems():
568
540
setattr(self, setting, value)
569
541
570
542
if self.enabled:
578
550
self.expires = None
579
551
580
552
logger.debug("Creating client %r", self.name)
553
# Uppercase and remove spaces from fingerprint for later
554
# comparison purposes with return value from the fingerprint()
555
# function
581
556
logger.debug(" Fingerprint: %s", self.fingerprint)
582
557
self.created = settings.get("created",
583
558
datetime.datetime.utcnow())
590
565
self.current_checker_command = None
591
566
self.approved = None
592
567
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()
568
self.changedstate = (multiprocessing_manager
569
.Condition(multiprocessing_manager
570
.Lock()))
571
self.client_structure = [attr for attr in
572
self.__dict__.iterkeys()
597
573
if not attr.startswith("_")]
598
574
self.client_structure.append("client_structure")
599
575
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
576
for name, t in inspect.getmembers(type(self),
577
lambda obj:
578
isinstance(obj,
579
property)):
602
580
if not name.startswith("_"):
603
581
self.client_structure.append(name)
604
582
646
624
# and every interval from then on.
647
625
if self.checker_initiator_tag is not None:
648
626
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)
627
self.checker_initiator_tag = (gobject.timeout_add
628
(self.interval_milliseconds(),
629
self.start_checker))
652
630
# Schedule a disable() when 'timeout' has passed
653
631
if self.disable_initiator_tag is not None:
654
632
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
633
self.disable_initiator_tag = (gobject.timeout_add
634
(self.timeout_milliseconds(),
635
self.disable))
657
636
# Also start a new checker *right now*.
658
637
self.start_checker()
659
638
660
def checker_callback(self, source, condition, connection,
661
command):
639
def checker_callback(self, pid, condition, command):
662
640
"""The checker has completed, so take appropriate actions."""
663
641
self.checker_callback_tag = None
664
642
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
643
if os.WIFEXITED(condition):
644
self.last_checker_status = os.WEXITSTATUS(condition)
672
645
if self.last_checker_status == 0:
673
646
logger.info("Checker for %(name)s succeeded",
674
647
vars(self))
675
648
self.checked_ok()
676
649
else:
677
logger.info("Checker for %(name)s failed", vars(self))
650
logger.info("Checker for %(name)s failed",
651
vars(self))
678
652
else:
679
653
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
654
logger.warning("Checker for %(name)s crashed?",
682
655
vars(self))
683
return False
684
656
685
657
def checked_ok(self):
686
658
"""Assert that the client has been seen, alive and well."""
687
659
self.last_checked_ok = datetime.datetime.utcnow()
688
660
self.last_checker_status = 0
689
self.last_checker_signal = None
690
661
self.bump_timeout()
691
662
692
663
def bump_timeout(self, timeout=None):
697
668
gobject.source_remove(self.disable_initiator_tag)
698
669
self.disable_initiator_tag = None
699
670
if getattr(self, "enabled", False):
700
self.disable_initiator_tag = gobject.timeout_add(
701
int(timeout.total_seconds() * 1000), self.disable)
671
self.disable_initiator_tag = (gobject.timeout_add
672
(timedelta_to_milliseconds
673
(timeout), self.disable))
702
674
self.expires = datetime.datetime.utcnow() + timeout
703
675
704
676
def need_approval(self):
718
690
# than 'timeout' for the client to be disabled, which is as it
719
691
# should be.
720
692
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
# If a checker exists, make sure it is not a zombie
694
try:
695
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
696
except AttributeError:
697
pass
698
except OSError as error:
699
if error.errno != errno.ECHILD:
700
raise
701
else:
702
if pid:
703
logger.warning("Checker was a zombie")
704
gobject.source_remove(self.checker_callback_tag)
705
self.checker_callback(pid, status,
706
self.current_checker_command)
725
707
# Start a new checker if needed
726
708
if self.checker is None:
727
709
# Escape attributes for the shell
728
escaped_attrs = {
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
710
escaped_attrs = dict(
711
(attr, re.escape(unicode(getattr(self, attr))))
712
for attr in
713
self.runtime_expansions)
731
714
try:
732
715
command = self.checker_command % escaped_attrs
733
716
except TypeError as error:
734
717
logger.error('Could not format string "%s"',
735
self.checker_command,
718
self.checker_command, exc_info=error)
719
return True # Try again later
720
self.current_checker_command = command
721
try:
722
logger.info("Starting checker %r for %s",
723
command, self.name)
724
# We don't need to redirect stdout and stderr, since
725
# in normal mode, that is already done by daemon(),
726
# and in debug mode we don't want to. (Stdin is
727
# always replaced by /dev/null.)
728
# The exception is when not debugging but nevertheless
729
# running in the foreground; use the previously
730
# created wnull.
731
popen_args = {}
732
if (not self.server_settings["debug"]
733
and self.server_settings["foreground"]):
734
popen_args.update({"stdout": wnull,
735
"stderr": wnull })
736
self.checker = subprocess.Popen(command,
737
close_fds=True,
738
shell=True, cwd="/",
739
**popen_args)
740
except OSError as error:
741
logger.error("Failed to start subprocess",
736
742
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)
743
return True
744
self.checker_callback_tag = (gobject.child_watch_add
745
(self.checker.pid,
746
self.checker_callback,
747
data=command))
748
# The checker may have completed before the gobject
749
# watch was added. Check for this.
750
try:
751
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
752
except OSError as error:
753
if error.errno == errno.ECHILD:
754
# This should never happen
755
logger.error("Child process vanished",
756
exc_info=error)
757
return True
758
raise
759
if pid:
760
gobject.source_remove(self.checker_callback_tag)
761
self.checker_callback(pid, status, command)
764
762
# Re-run this periodically if run by gobject.timeout_add
765
763
return True
766
764
772
770
if getattr(self, "checker", None) is None:
773
771
return
774
772
logger.debug("Stopping checker for %(name)s", vars(self))
775
self.checker.terminate()
773
try:
774
self.checker.terminate()
775
#time.sleep(0.5)
776
#if self.checker.poll() is None:
777
# self.checker.kill()
778
except OSError as error:
779
if error.errno != errno.ESRCH: # No such process
780
raise
776
781
self.checker = None
777
782
778
783
779
def dbus_service_property(dbus_interface,
780
signature="v",
781
access="readwrite",
782
byte_arrays=False):
784
def dbus_service_property(dbus_interface, signature="v",
785
access="readwrite", byte_arrays=False):
783
786
"""Decorators for marking methods of a DBusObjectWithProperties to
784
787
become properties on the D-Bus.
785
788
794
797
# "Set" method, so we fail early here:
795
798
if byte_arrays and signature != "ay":
796
799
raise ValueError("Byte arrays not supported for non-'ay'"
797
" signature {!r}".format(signature))
798
800
" signature {0!r}".format(signature))
799
801
def decorator(func):
800
802
func._dbus_is_property = True
801
803
func._dbus_interface = dbus_interface
806
808
func._dbus_name = func._dbus_name[:-14]
807
809
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
808
810
return func
809
810
811
return decorator
811
812
812
813
821
822
"org.freedesktop.DBus.Property.EmitsChangedSignal":
822
823
"false"}
823
824
"""
824
825
825
def decorator(func):
826
826
func._dbus_is_interface = True
827
827
func._dbus_interface = dbus_interface
828
828
func._dbus_name = dbus_interface
829
829
return func
830
831
830
return decorator
832
831
833
832
835
834
"""Decorator to annotate D-Bus methods, signals or properties
836
835
Usage:
837
836
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
841
837
@dbus_service_property("org.example.Interface", signature="b",
842
838
access="r")
839
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
840
"org.freedesktop.DBus.Property."
841
"EmitsChangedSignal": "false"})
843
842
def Property_dbus_property(self):
844
843
return dbus.Boolean(False)
845
844
"""
846
847
845
def decorator(func):
848
846
func._dbus_annotations = annotations
849
847
return func
850
851
848
return decorator
852
849
853
850
854
851
class DBusPropertyException(dbus.exceptions.DBusException):
855
852
"""A base class for D-Bus property-related exceptions
856
853
"""
857
pass
854
def __unicode__(self):
855
return unicode(str(self))
858
856
859
857
860
858
class DBusPropertyAccessException(DBusPropertyException):
884
882
If called like _is_dbus_thing("method") it returns a function
885
883
suitable for use as predicate to inspect.getmembers().
886
884
"""
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
886
False)
889
887
890
888
def _get_all_dbus_things(self, thing):
891
889
"""Returns a generator of (name, attribute) pairs
892
890
"""
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
891
return ((getattr(athing.__get__(self), "_dbus_name",
892
name),
894
893
athing.__get__(self))
895
894
for cls in self.__class__.__mro__
896
895
for name, athing in
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
896
inspect.getmembers(cls,
897
self._is_dbus_thing(thing)))
898
898
899
899
def _get_dbus_property(self, interface_name, property_name):
900
900
"""Returns a bound method if one exists which is a D-Bus
901
901
property with the specified name and interface.
902
902
"""
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
903
for cls in self.__class__.__mro__:
904
for name, value in (inspect.getmembers
905
(cls,
906
self._is_dbus_thing("property"))):
906
907
if (value._dbus_name == property_name
907
908
and value._dbus_interface == interface_name):
908
909
return value.__get__(self)
909
910
910
911
# No such property
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
912
raise DBusPropertyNotFound(self.dbus_object_path + ":"
913
+ interface_name + "."
914
+ property_name)
913
915
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
915
in_signature="ss",
916
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
916
917
out_signature="v")
917
918
def Get(self, interface_name, property_name):
918
919
"""Standard D-Bus property Get() method, see D-Bus standard.
937
938
# signatures other than "ay".
938
939
if prop._dbus_signature != "ay":
939
940
raise ValueError("Byte arrays not supported for non-"
940
"'ay' signature {!r}"
941
"'ay' signature {0!r}"
941
942
.format(prop._dbus_signature))
942
943
value = dbus.ByteArray(b''.join(chr(byte)
943
944
for byte in value))
944
945
prop(value)
945
946
946
@dbus.service.method(dbus.PROPERTIES_IFACE,
947
in_signature="s",
947
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
948
948
out_signature="a{sv}")
949
949
def GetAll(self, interface_name):
950
950
"""Standard D-Bus property GetAll() method, see D-Bus
965
965
if not hasattr(value, "variant_level"):
966
966
properties[name] = value
967
967
continue
968
properties[name] = type(value)(
969
value, variant_level = value.variant_level + 1)
968
properties[name] = type(value)(value, variant_level=
969
value.variant_level+1)
970
970
return dbus.Dictionary(properties, signature="sv")
971
971
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
972
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
981
973
out_signature="s",
982
974
path_keyword='object_path',
990
982
connection)
991
983
try:
992
984
document = xml.dom.minidom.parseString(xmlstring)
993
994
985
def make_tag(document, name, prop):
995
986
e = document.createElement("property")
996
987
e.setAttribute("name", name)
997
988
e.setAttribute("type", prop._dbus_signature)
998
989
e.setAttribute("access", prop._dbus_access)
999
990
return e
1000
1001
991
for if_tag in document.getElementsByTagName("interface"):
1002
992
# Add property tags
1003
993
for tag in (make_tag(document, name, prop)
1015
1005
if (name == tag.getAttribute("name")
1016
1006
and prop._dbus_interface
1017
1007
== if_tag.getAttribute("name")):
1018
annots.update(getattr(
1019
prop, "_dbus_annotations", {}))
1020
for name, value in annots.items():
1008
annots.update(getattr
1009
(prop,
1010
"_dbus_annotations",
1011
{}))
1012
for name, value in annots.iteritems():
1021
1013
ann_tag = document.createElement(
1022
1014
"annotation")
1023
1015
ann_tag.setAttribute("name", name)
1026
1018
# Add interface annotation tags
1027
1019
for annotation, value in dict(
1028
1020
itertools.chain.from_iterable(
1029
annotations().items()
1030
for name, annotations
1031
in self._get_all_dbus_things("interface")
1021
annotations().iteritems()
1022
for name, annotations in
1023
self._get_all_dbus_things("interface")
1032
1024
if name == if_tag.getAttribute("name")
1033
)).items():
1025
)).iteritems():
1034
1026
ann_tag = document.createElement("annotation")
1035
1027
ann_tag.setAttribute("name", annotation)
1036
1028
ann_tag.setAttribute("value", value)
1063
1055
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1064
1056
if dt is None:
1065
1057
return dbus.String("", variant_level = variant_level)
1066
return dbus.String(dt.isoformat(), variant_level=variant_level)
1058
return dbus.String(dt.isoformat(),
1059
variant_level=variant_level)
1067
1060
1068
1061
1069
1062
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1089
1082
(from DBusObjectWithProperties) and interfaces (from the
1090
1083
dbus_interface_annotations decorator).
1091
1084
"""
1092
1093
1085
def wrapper(cls):
1094
1086
for orig_interface_name, alt_interface_name in (
1095
alt_interface_names.items()):
1087
alt_interface_names.iteritems()):
1096
1088
attr = {}
1097
1089
interface_names = set()
1098
1090
# Go though all attributes of the class
1100
1092
# Ignore non-D-Bus attributes, and D-Bus attributes
1101
1093
# with the wrong interface name
1102
1094
if (not hasattr(attribute, "_dbus_interface")
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1095
or not attribute._dbus_interface
1096
.startswith(orig_interface_name)):
1105
1097
continue
1106
1098
# Create an alternate D-Bus interface name based on
1107
1099
# the current name
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1100
alt_interface = (attribute._dbus_interface
1101
.replace(orig_interface_name,
1102
alt_interface_name))
1110
1103
interface_names.add(alt_interface)
1111
1104
# Is this a D-Bus signal?
1112
1105
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(
1106
# Extract the original non-method undecorated
1107
# function by black magic
1108
nonmethod_func = (dict(
1117
1109
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1120
else:
1121
nonmethod_func = attribute
1110
attribute.__closure__))["func"]
1111
.cell_contents)
1122
1112
# Create a new, but exactly alike, function
1123
1113
# object, and decorate it to be a new D-Bus signal
1124
1114
# 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))
1115
new_function = (dbus.service.signal
1116
(alt_interface,
1117
attribute._dbus_signature)
1118
(types.FunctionType(
1119
nonmethod_func.func_code,
1120
nonmethod_func.func_globals,
1121
nonmethod_func.func_name,
1122
nonmethod_func.func_defaults,
1123
nonmethod_func.func_closure)))
1142
1124
# Copy annotations, if any
1143
1125
try:
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1126
new_function._dbus_annotations = (
1127
dict(attribute._dbus_annotations))
1146
1128
except AttributeError:
1147
1129
pass
1148
1130
# Define a creator of a function to call both the
1153
1135
"""This function is a scope container to pass
1154
1136
func1 and func2 to the "call_both" function
1155
1137
outside of its arguments"""
1156
1157
1138
def call_both(*args, **kwargs):
1158
1139
"""This function will emit two D-Bus
1159
1140
signals by calling func1 and func2"""
1160
1141
func1(*args, **kwargs)
1161
1142
func2(*args, **kwargs)
1162
1163
1143
return call_both
1164
1144
# Create the "call_both" function and add it to
1165
1145
# the class
1170
1150
# object. Decorate it to be a new D-Bus method
1171
1151
# with the alternate D-Bus interface name. Add it
1172
1152
# 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)))
1153
attr[attrname] = (dbus.service.method
1154
(alt_interface,
1155
attribute._dbus_in_signature,
1156
attribute._dbus_out_signature)
1157
(types.FunctionType
1158
(attribute.func_code,
1159
attribute.func_globals,
1160
attribute.func_name,
1161
attribute.func_defaults,
1162
attribute.func_closure)))
1183
1163
# Copy annotations, if any
1184
1164
try:
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1187
1167
except AttributeError:
1188
1168
pass
1189
1169
# Is this a D-Bus property?
1192
1172
# object, and decorate it to be a new D-Bus
1193
1173
# property with the alternate D-Bus interface
1194
1174
# 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)))
1175
attr[attrname] = (dbus_service_property
1176
(alt_interface,
1177
attribute._dbus_signature,
1178
attribute._dbus_access,
1179
attribute
1180
._dbus_get_args_options
1181
["byte_arrays"])
1182
(types.FunctionType
1183
(attribute.func_code,
1184
attribute.func_globals,
1185
attribute.func_name,
1186
attribute.func_defaults,
1187
attribute.func_closure)))
1206
1188
# Copy annotations, if any
1207
1189
try:
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1190
attr[attrname]._dbus_annotations = (
1191
dict(attribute._dbus_annotations))
1210
1192
except AttributeError:
1211
1193
pass
1212
1194
# Is this a D-Bus interface?
1215
1197
# object. Decorate it to be a new D-Bus interface
1216
1198
# with the alternate D-Bus interface name. Add it
1217
1199
# 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)))
1200
attr[attrname] = (dbus_interface_annotations
1201
(alt_interface)
1202
(types.FunctionType
1203
(attribute.func_code,
1204
attribute.func_globals,
1205
attribute.func_name,
1206
attribute.func_defaults,
1207
attribute.func_closure)))
1225
1208
if deprecate:
1226
1209
# Deprecate all alternate interfaces
1227
iname="_AlternateDBusNames_interface_annotation{}"
1210
iname="_AlternateDBusNames_interface_annotation{0}"
1228
1211
for interface_name in interface_names:
1229
1230
1212
@dbus_interface_annotations(interface_name)
1231
1213
def func(self):
1232
1214
return { "org.freedesktop.DBus.Deprecated":
1233
"true" }
1215
"true" }
1234
1216
# Find an unused name
1235
1217
for aname in (iname.format(i)
1236
1218
for i in itertools.count()):
1240
1222
if interface_names:
1241
1223
# Replace the class with a new subclass of it with
1242
1224
# methods, signals, etc. as created above.
1243
cls = type(b"{}Alternate".format(cls.__name__),
1244
(cls, ), attr)
1225
cls = type(b"{0}Alternate".format(cls.__name__),
1226
(cls,), attr)
1245
1227
return cls
1246
1247
1228
return wrapper
1248
1229
1249
1230
1250
1231
@alternate_dbus_interfaces({"se.recompile.Mandos":
1251
"se.bsnet.fukt.Mandos"})
1232
"se.bsnet.fukt.Mandos"})
1252
1233
class ClientDBus(Client, DBusObjectWithProperties):
1253
1234
"""A Client class using D-Bus
1254
1235
1258
1239
"""
1259
1240
1260
1241
runtime_expansions = (Client.runtime_expansions
1261
+ ("dbus_object_path", ))
1262
1263
_interface = "se.recompile.Mandos.Client"
1242
+ ("dbus_object_path",))
1264
1243
1265
1244
# dbus.service.Object doesn't use super(), so we can't either.
1266
1245
1269
1248
Client.__init__(self, *args, **kwargs)
1270
1249
# Only now, when this client is initialized, can it show up on
1271
1250
# the D-Bus
1272
client_object_name = str(self.name).translate(
1251
client_object_name = unicode(self.name).translate(
1273
1252
{ord("."): ord("_"),
1274
1253
ord("-"): ord("_")})
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1254
self.dbus_object_path = (dbus.ObjectPath
1255
("/clients/" + client_object_name))
1277
1256
DBusObjectWithProperties.__init__(self, self.bus,
1278
1257
self.dbus_object_path)
1279
1258
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1282
variant_level=1,
1283
invalidate_only=False,
1284
_interface=_interface):
1259
def notifychangeproperty(transform_func,
1260
dbus_name, type_func=lambda x: x,
1261
variant_level=1):
1285
1262
""" Modify a variable so that it's a property which announces
1286
1263
its changes to DBus.
1287
1264
1292
1269
to the D-Bus. Default: no transform
1293
1270
variant_level: D-Bus variant level. Default: 1
1294
1271
"""
1295
attrname = "_{}".format(dbus_name)
1296
1272
attrname = "_{0}".format(dbus_name)
1297
1273
def setter(self, value):
1298
1274
if hasattr(self, "dbus_object_path"):
1299
1275
if (not hasattr(self, attrname) or
1300
1276
type_func(getattr(self, attrname, None))
1301
1277
!= 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())
1278
dbus_value = transform_func(type_func(value),
1279
variant_level
1280
=variant_level)
1281
self.PropertyChanged(dbus.String(dbus_name),
1282
dbus_value)
1317
1283
setattr(self, attrname, value)
1318
1284
1319
1285
return property(lambda self: getattr(self, attrname), setter)
1325
1291
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1326
1292
last_enabled = notifychangeproperty(datetime_to_dbus,
1327
1293
"LastEnabled")
1328
checker = notifychangeproperty(
1329
dbus.Boolean, "CheckerRunning",
1330
type_func = lambda checker: checker is not None)
1294
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1295
type_func = lambda checker:
1296
checker is not None)
1331
1297
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1332
1298
"LastCheckedOK")
1333
1299
last_checker_status = notifychangeproperty(dbus.Int16,
1336
1302
datetime_to_dbus, "LastApprovalRequest")
1337
1303
approved_by_default = notifychangeproperty(dbus.Boolean,
1338
1304
"ApprovedByDefault")
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1305
approval_delay = notifychangeproperty(dbus.UInt64,
1306
"ApprovalDelay",
1307
type_func =
1308
timedelta_to_milliseconds)
1342
1309
approval_duration = notifychangeproperty(
1343
1310
dbus.UInt64, "ApprovalDuration",
1344
type_func = lambda td: td.total_seconds() * 1000)
1311
type_func = timedelta_to_milliseconds)
1345
1312
host = notifychangeproperty(dbus.String, "Host")
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1313
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1314
type_func =
1315
timedelta_to_milliseconds)
1349
1316
extended_timeout = notifychangeproperty(
1350
1317
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)
1318
type_func = timedelta_to_milliseconds)
1319
interval = notifychangeproperty(dbus.UInt64,
1320
"Interval",
1321
type_func =
1322
timedelta_to_milliseconds)
1355
1323
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1358
1324
1359
1325
del notifychangeproperty
1360
1326
1367
1333
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1368
1334
Client.__del__(self, *args, **kwargs)
1369
1335
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:
1336
def checker_callback(self, pid, condition, command,
1337
*args, **kwargs):
1338
self.checker_callback_tag = None
1339
self.checker = None
1340
if os.WIFEXITED(condition):
1341
exitstatus = os.WEXITSTATUS(condition)
1377
1342
# Emit D-Bus signal
1378
1343
self.CheckerCompleted(dbus.Int16(exitstatus),
1379
dbus.Int64(0),
1344
dbus.Int64(condition),
1380
1345
dbus.String(command))
1381
1346
else:
1382
1347
# Emit D-Bus signal
1383
1348
self.CheckerCompleted(dbus.Int16(-1),
1384
dbus.Int64(
1385
self.last_checker_signal),
1349
dbus.Int64(condition),
1386
1350
dbus.String(command))
1387
return ret
1351
1352
return Client.checker_callback(self, pid, condition, command,
1353
*args, **kwargs)
1388
1354
1389
1355
def start_checker(self, *args, **kwargs):
1390
1356
old_checker_pid = getattr(self.checker, "pid", None)
1402
1368
1403
1369
def approve(self, value=True):
1404
1370
self.approved = value
1405
gobject.timeout_add(int(self.approval_duration.total_seconds()
1406
* 1000), self._reset_approved)
1371
gobject.timeout_add(timedelta_to_milliseconds
1372
(self.approval_duration),
1373
self._reset_approved)
1407
1374
self.send_changedstate()
1408
1375
1409
1376
## D-Bus methods, signals & properties
1377
_interface = "se.recompile.Mandos.Client"
1410
1378
1411
1379
## Interfaces
1412
1380
1381
@dbus_interface_annotations(_interface)
1382
def _foo(self):
1383
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1384
"false"}
1385
1413
1386
## Signals
1414
1387
1415
1388
# CheckerCompleted - signal
1425
1398
pass
1426
1399
1427
1400
# PropertyChanged - signal
1428
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1429
1401
@dbus.service.signal(_interface, signature="sv")
1430
1402
def PropertyChanged(self, property, value):
1431
1403
"D-Bus signal"
1495
1467
return dbus.Boolean(bool(self.approvals_pending))
1496
1468
1497
1469
# ApprovedByDefault - property
1498
@dbus_service_property(_interface,
1499
signature="b",
1470
@dbus_service_property(_interface, signature="b",
1500
1471
access="readwrite")
1501
1472
def ApprovedByDefault_dbus_property(self, value=None):
1502
1473
if value is None: # get
1504
1475
self.approved_by_default = bool(value)
1505
1476
1506
1477
# ApprovalDelay - property
1507
@dbus_service_property(_interface,
1508
signature="t",
1478
@dbus_service_property(_interface, signature="t",
1509
1479
access="readwrite")
1510
1480
def ApprovalDelay_dbus_property(self, value=None):
1511
1481
if value is None: # get
1512
return dbus.UInt64(self.approval_delay.total_seconds()
1513
* 1000)
1482
return dbus.UInt64(self.approval_delay_milliseconds())
1514
1483
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1515
1484
1516
1485
# ApprovalDuration - property
1517
@dbus_service_property(_interface,
1518
signature="t",
1486
@dbus_service_property(_interface, signature="t",
1519
1487
access="readwrite")
1520
1488
def ApprovalDuration_dbus_property(self, value=None):
1521
1489
if value is None: # get
1522
return dbus.UInt64(self.approval_duration.total_seconds()
1523
* 1000)
1490
return dbus.UInt64(timedelta_to_milliseconds(
1491
self.approval_duration))
1524
1492
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1525
1493
1526
1494
# Name - property
1534
1502
return dbus.String(self.fingerprint)
1535
1503
1536
1504
# Host - property
1537
@dbus_service_property(_interface,
1538
signature="s",
1505
@dbus_service_property(_interface, signature="s",
1539
1506
access="readwrite")
1540
1507
def Host_dbus_property(self, value=None):
1541
1508
if value is None: # get
1542
1509
return dbus.String(self.host)
1543
self.host = str(value)
1510
self.host = unicode(value)
1544
1511
1545
1512
# Created - property
1546
1513
@dbus_service_property(_interface, signature="s", access="read")
1553
1520
return datetime_to_dbus(self.last_enabled)
1554
1521
1555
1522
# Enabled - property
1556
@dbus_service_property(_interface,
1557
signature="b",
1523
@dbus_service_property(_interface, signature="b",
1558
1524
access="readwrite")
1559
1525
def Enabled_dbus_property(self, value=None):
1560
1526
if value is None: # get
1565
1531
self.disable()
1566
1532
1567
1533
# LastCheckedOK - property
1568
@dbus_service_property(_interface,
1569
signature="s",
1534
@dbus_service_property(_interface, signature="s",
1570
1535
access="readwrite")
1571
1536
def LastCheckedOK_dbus_property(self, value=None):
1572
1537
if value is not None:
1575
1540
return datetime_to_dbus(self.last_checked_ok)
1576
1541
1577
1542
# LastCheckerStatus - property
1578
@dbus_service_property(_interface, signature="n", access="read")
1543
@dbus_service_property(_interface, signature="n",
1544
access="read")
1579
1545
def LastCheckerStatus_dbus_property(self):
1580
1546
return dbus.Int16(self.last_checker_status)
1581
1547
1590
1556
return datetime_to_dbus(self.last_approval_request)
1591
1557
1592
1558
# Timeout - property
1593
@dbus_service_property(_interface,
1594
signature="t",
1559
@dbus_service_property(_interface, signature="t",
1595
1560
access="readwrite")
1596
1561
def Timeout_dbus_property(self, value=None):
1597
1562
if value is None: # get
1598
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1563
return dbus.UInt64(self.timeout_milliseconds())
1599
1564
old_timeout = self.timeout
1600
1565
self.timeout = datetime.timedelta(0, 0, 0, value)
1601
1566
# Reschedule disabling
1610
1575
is None):
1611
1576
return
1612
1577
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)
1578
self.disable_initiator_tag = (
1579
gobject.timeout_add(
1580
timedelta_to_milliseconds(self.expires - now),
1581
self.disable))
1616
1582
1617
1583
# ExtendedTimeout - property
1618
@dbus_service_property(_interface,
1619
signature="t",
1584
@dbus_service_property(_interface, signature="t",
1620
1585
access="readwrite")
1621
1586
def ExtendedTimeout_dbus_property(self, value=None):
1622
1587
if value is None: # get
1623
return dbus.UInt64(self.extended_timeout.total_seconds()
1624
* 1000)
1588
return dbus.UInt64(self.extended_timeout_milliseconds())
1625
1589
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1626
1590
1627
1591
# Interval - property
1628
@dbus_service_property(_interface,
1629
signature="t",
1592
@dbus_service_property(_interface, signature="t",
1630
1593
access="readwrite")
1631
1594
def Interval_dbus_property(self, value=None):
1632
1595
if value is None: # get
1633
return dbus.UInt64(self.interval.total_seconds() * 1000)
1596
return dbus.UInt64(self.interval_milliseconds())
1634
1597
self.interval = datetime.timedelta(0, 0, 0, value)
1635
1598
if getattr(self, "checker_initiator_tag", None) is None:
1636
1599
return
1637
1600
if self.enabled:
1638
1601
# Reschedule checker run
1639
1602
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
1603
self.checker_initiator_tag = (gobject.timeout_add
1604
(value, self.start_checker))
1605
self.start_checker() # Start one now, too
1643
1606
1644
1607
# Checker - property
1645
@dbus_service_property(_interface,
1646
signature="s",
1608
@dbus_service_property(_interface, signature="s",
1647
1609
access="readwrite")
1648
1610
def Checker_dbus_property(self, value=None):
1649
1611
if value is None: # get
1650
1612
return dbus.String(self.checker_command)
1651
self.checker_command = str(value)
1613
self.checker_command = unicode(value)
1652
1614
1653
1615
# CheckerRunning - property
1654
@dbus_service_property(_interface,
1655
signature="b",
1616
@dbus_service_property(_interface, signature="b",
1656
1617
access="readwrite")
1657
1618
def CheckerRunning_dbus_property(self, value=None):
1658
1619
if value is None: # get
1668
1629
return self.dbus_object_path # is already a dbus.ObjectPath
1669
1630
1670
1631
# Secret = property
1671
@dbus_service_property(_interface,
1672
signature="ay",
1673
access="write",
1674
byte_arrays=True)
1632
@dbus_service_property(_interface, signature="ay",
1633
access="write", byte_arrays=True)
1675
1634
def Secret_dbus_property(self, value):
1676
self.secret = bytes(value)
1635
self.secret = str(value)
1677
1636
1678
1637
del _interface
1679
1638
1683
1642
self._pipe = child_pipe
1684
1643
self._pipe.send(('init', fpr, address))
1685
1644
if not self._pipe.recv():
1686
raise KeyError(fpr)
1645
raise KeyError()
1687
1646
1688
1647
def __getattribute__(self, name):
1689
1648
if name == '_pipe':
1693
1652
if data[0] == 'data':
1694
1653
return data[1]
1695
1654
if data[0] == 'function':
1696
1697
1655
def func(*args, **kwargs):
1698
1656
self._pipe.send(('funcall', name, args, kwargs))
1699
1657
return self._pipe.recv()[1]
1700
1701
1658
return func
1702
1659
1703
1660
def __setattr__(self, name, value):
1715
1672
def handle(self):
1716
1673
with contextlib.closing(self.server.child_pipe) as child_pipe:
1717
1674
logger.info("TCP connection from: %s",
1718
str(self.client_address))
1675
unicode(self.client_address))
1719
1676
logger.debug("Pipe FD: %d",
1720
1677
self.server.child_pipe.fileno())
1721
1678
1722
session = gnutls.connection.ClientSession(
1723
self.request, gnutls.connection .X509Credentials())
1679
session = (gnutls.connection
1680
.ClientSession(self.request,
1681
gnutls.connection
1682
.X509Credentials()))
1724
1683
1725
1684
# Note: gnutls.connection.X509Credentials is really a
1726
1685
# generic GnuTLS certificate credentials object so long as
1735
1694
priority = self.server.gnutls_priority
1736
1695
if priority is None:
1737
1696
priority = "NORMAL"
1738
gnutls.library.functions.gnutls_priority_set_direct(
1739
session._c_object, priority, None)
1697
(gnutls.library.functions
1698
.gnutls_priority_set_direct(session._c_object,
1699
priority, None))
1740
1700
1741
1701
# Start communication using the Mandos protocol
1742
1702
# Get protocol number
1762
1722
approval_required = False
1763
1723
try:
1764
1724
try:
1765
fpr = self.fingerprint(
1766
self.peer_certificate(session))
1725
fpr = self.fingerprint(self.peer_certificate
1726
(session))
1767
1727
except (TypeError,
1768
1728
gnutls.errors.GNUTLSError) as error:
1769
1729
logger.warning("Bad certificate: %s", error)
1784
1744
while True:
1785
1745
if not client.enabled:
1786
1746
logger.info("Client %s is disabled",
1787
client.name)
1747
client.name)
1788
1748
if self.server.use_dbus:
1789
1749
# Emit D-Bus signal
1790
1750
client.Rejected("Disabled")
1799
1759
if self.server.use_dbus:
1800
1760
# Emit D-Bus signal
1801
1761
client.NeedApproval(
1802
client.approval_delay.total_seconds()
1803
* 1000, client.approved_by_default)
1762
client.approval_delay_milliseconds(),
1763
client.approved_by_default)
1804
1764
else:
1805
1765
logger.warning("Client %s was not approved",
1806
1766
client.name)
1812
1772
#wait until timeout or approved
1813
1773
time = datetime.datetime.now()
1814
1774
client.changedstate.acquire()
1815
client.changedstate.wait(delay.total_seconds())
1775
client.changedstate.wait(
1776
float(timedelta_to_milliseconds(delay)
1777
/ 1000))
1816
1778
client.changedstate.release()
1817
1779
time2 = datetime.datetime.now()
1818
1780
if (time2 - time) >= delay:
1837
1799
logger.warning("gnutls send failed",
1838
1800
exc_info=error)
1839
1801
return
1840
logger.debug("Sent: %d, remaining: %d", sent,
1841
len(client.secret) - (sent_size
1842
+ sent))
1802
logger.debug("Sent: %d, remaining: %d",
1803
sent, len(client.secret)
1804
- (sent_size + sent))
1843
1805
sent_size += sent
1844
1806
1845
1807
logger.info("Sending secret to %s", client.name)
1862
1824
def peer_certificate(session):
1863
1825
"Return the peer's OpenPGP certificate as a bytestring"
1864
1826
# If not an OpenPGP certificate...
1865
if (gnutls.library.functions.gnutls_certificate_type_get(
1866
session._c_object)
1827
if (gnutls.library.functions
1828
.gnutls_certificate_type_get(session._c_object)
1867
1829
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1868
1830
# ...do the normal thing
1869
1831
return session.peer_certificate
1883
1845
def fingerprint(openpgp):
1884
1846
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1885
1847
# 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)))
1848
datum = (gnutls.library.types
1849
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1850
ctypes.POINTER
1851
(ctypes.c_ubyte)),
1852
ctypes.c_uint(len(openpgp))))
1890
1853
# New empty GnuTLS certificate
1891
1854
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
1893
ctypes.byref(crt))
1855
(gnutls.library.functions
1856
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1894
1857
# 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)
1858
(gnutls.library.functions
1859
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1860
gnutls.library.constants
1861
.GNUTLS_OPENPGP_FMT_RAW))
1898
1862
# Verify the self signature in the key
1899
1863
crtverify = ctypes.c_uint()
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
1864
(gnutls.library.functions
1865
.gnutls_openpgp_crt_verify_self(crt, 0,
1866
ctypes.byref(crtverify)))
1902
1867
if crtverify.value != 0:
1903
1868
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
raise gnutls.errors.CertificateSecurityError(
1905
"Verify failed")
1869
raise (gnutls.errors.CertificateSecurityError
1870
("Verify failed"))
1906
1871
# New buffer for the fingerprint
1907
1872
buf = ctypes.create_string_buffer(20)
1908
1873
buf_len = ctypes.c_size_t()
1909
1874
# 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))
1875
(gnutls.library.functions
1876
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1877
ctypes.byref(buf_len)))
1912
1878
# Deinit the certificate
1913
1879
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1914
1880
# Convert the buffer to a Python bytestring
1920
1886
1921
1887
class MultiprocessingMixIn(object):
1922
1888
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1923
1924
1889
def sub_process_main(self, request, address):
1925
1890
try:
1926
1891
self.finish_request(request, address)
1938
1903
1939
1904
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1940
1905
""" adds a pipe to the MixIn """
1941
1942
1906
def process_request(self, request, client_address):
1943
1907
"""Overrides and wraps the original process_request().
1944
1908
1965
1929
interface: None or a network interface name (string)
1966
1930
use_ipv6: Boolean; to use IPv6 or not
1967
1931
"""
1968
1969
1932
def __init__(self, server_address, RequestHandlerClass,
1970
interface=None,
1971
use_ipv6=True,
1972
socketfd=None):
1933
interface=None, use_ipv6=True, socketfd=None):
1973
1934
"""If socketfd is set, use that file descriptor instead of
1974
1935
creating a new one with socket.socket().
1975
1936
"""
2016
1977
self.interface)
2017
1978
else:
2018
1979
try:
2019
self.socket.setsockopt(
2020
socket.SOL_SOCKET, SO_BINDTODEVICE,
2021
(self.interface + "\0").encode("utf-8"))
1980
self.socket.setsockopt(socket.SOL_SOCKET,
1981
SO_BINDTODEVICE,
1982
str(self.interface + '\0'))
2022
1983
except socket.error as error:
2023
1984
if error.errno == errno.EPERM:
2024
1985
logger.error("No permission to bind to"
2042
2003
self.server_address = (any_address,
2043
2004
self.server_address[1])
2044
2005
elif not self.server_address[1]:
2045
self.server_address = (self.server_address[0], 0)
2006
self.server_address = (self.server_address[0],
2007
0)
2046
2008
# if self.interface:
2047
2009
# self.server_address = (self.server_address[0],
2048
2010
# 0, # port
2062
2024
2063
2025
Assumes a gobject.MainLoop event loop.
2064
2026
"""
2065
2066
2027
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):
2028
interface=None, use_ipv6=True, clients=None,
2029
gnutls_priority=None, use_dbus=True, socketfd=None):
2073
2030
self.enabled = False
2074
2031
self.clients = clients
2075
2032
if self.clients is None:
2081
2038
interface = interface,
2082
2039
use_ipv6 = use_ipv6,
2083
2040
socketfd = socketfd)
2084
2085
2041
def server_activate(self):
2086
2042
if self.enabled:
2087
2043
return socketserver.TCPServer.server_activate(self)
2091
2047
2092
2048
def add_pipe(self, parent_pipe, proc):
2093
2049
# 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))
2050
gobject.io_add_watch(parent_pipe.fileno(),
2051
gobject.IO_IN | gobject.IO_HUP,
2052
functools.partial(self.handle_ipc,
2053
parent_pipe =
2054
parent_pipe,
2055
proc = proc))
2100
2056
2101
def handle_ipc(self, source, condition,
2102
parent_pipe=None,
2103
proc = None,
2104
client_object=None):
2057
def handle_ipc(self, source, condition, parent_pipe=None,
2058
proc = None, client_object=None):
2105
2059
# error, or the other end of multiprocessing.Pipe has closed
2106
2060
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2107
2061
# Wait for other process to exit
2130
2084
parent_pipe.send(False)
2131
2085
return False
2132
2086
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))
2087
gobject.io_add_watch(parent_pipe.fileno(),
2088
gobject.IO_IN | gobject.IO_HUP,
2089
functools.partial(self.handle_ipc,
2090
parent_pipe =
2091
parent_pipe,
2092
proc = proc,
2093
client_object =
2094
client))
2140
2095
parent_pipe.send(True)
2141
2096
# remove the old hook in favor of the new above hook on
2142
2097
# same fileno
2148
2103
2149
2104
parent_pipe.send(('data', getattr(client_object,
2150
2105
funcname)(*args,
2151
**kwargs)))
2106
**kwargs)))
2152
2107
2153
2108
if command == 'getattr':
2154
2109
attrname = request[1]
2155
if isinstance(client_object.__getattribute__(attrname),
2156
collections.Callable):
2157
parent_pipe.send(('function', ))
2110
if callable(client_object.__getattribute__(attrname)):
2111
parent_pipe.send(('function',))
2158
2112
else:
2159
parent_pipe.send((
2160
'data', client_object.__getattribute__(attrname)))
2113
parent_pipe.send(('data', client_object
2114
.__getattribute__(attrname)))
2161
2115
2162
2116
if command == 'setattr':
2163
2117
attrname = request[1]
2194
2148
# avoid excessive use of external libraries.
2195
2149
2196
2150
# 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
2151
Token = collections.namedtuple("Token",
2152
("regexp", # To match token; if
2153
# "value" is not None,
2154
# must have a "group"
2155
# containing digits
2156
"value", # datetime.timedelta or
2157
# None
2158
"followers")) # Tokens valid after
2159
# this token
2202
2160
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2203
2161
# the "duration" ABNF definition in RFC 3339, Appendix A.
2204
2162
token_end = Token(re.compile(r"$"), None, frozenset())
2205
2163
token_second = Token(re.compile(r"(\d+)S"),
2206
2164
datetime.timedelta(seconds=1),
2207
frozenset((token_end, )))
2165
frozenset((token_end,)))
2208
2166
token_minute = Token(re.compile(r"(\d+)M"),
2209
2167
datetime.timedelta(minutes=1),
2210
2168
frozenset((token_second, token_end)))
2226
2184
frozenset((token_month, token_end)))
2227
2185
token_week = Token(re.compile(r"(\d+)W"),
2228
2186
datetime.timedelta(weeks=1),
2229
frozenset((token_end, )))
2187
frozenset((token_end,)))
2230
2188
token_duration = Token(re.compile(r"P"), None,
2231
2189
frozenset((token_year, token_month,
2232
2190
token_day, token_time,
2233
token_week)))
2191
token_week))),
2234
2192
# Define starting values
2235
2193
value = datetime.timedelta() # Value so far
2236
2194
found_token = None
2237
followers = frozenset((token_duration, )) # Following valid tokens
2195
followers = frozenset(token_duration,) # Following valid tokens
2238
2196
s = duration # String left to parse
2239
2197
# Loop until end token is found
2240
2198
while found_token is not token_end:
2257
2215
break
2258
2216
else:
2259
2217
# No currently valid tokens were found
2260
raise ValueError("Invalid RFC 3339 duration: {!r}"
2261
.format(duration))
2218
raise ValueError("Invalid RFC 3339 duration")
2262
2219
# End token found
2263
2220
return value
2264
2221
2288
2245
timevalue = datetime.timedelta(0)
2289
2246
for s in interval.split():
2290
2247
try:
2291
suffix = s[-1]
2248
suffix = unicode(s[-1])
2292
2249
value = int(s[:-1])
2293
2250
if suffix == "d":
2294
2251
delta = datetime.timedelta(value)
2301
2258
elif suffix == "w":
2302
2259
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2303
2260
else:
2304
raise ValueError("Unknown suffix {!r}".format(suffix))
2261
raise ValueError("Unknown suffix {0!r}"
2262
.format(suffix))
2305
2263
except IndexError as e:
2306
2264
raise ValueError(*(e.args))
2307
2265
timevalue += delta
2324
2282
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2325
2283
if not stat.S_ISCHR(os.fstat(null).st_mode):
2326
2284
raise OSError(errno.ENODEV,
2327
"{} not a character device"
2285
"{0} not a character device"
2328
2286
.format(os.devnull))
2329
2287
os.dup2(null, sys.stdin.fileno())
2330
2288
os.dup2(null, sys.stdout.fileno())
2340
2298
2341
2299
parser = argparse.ArgumentParser()
2342
2300
parser.add_argument("-v", "--version", action="version",
2343
version = "%(prog)s {}".format(version),
2301
version = "%(prog)s {0}".format(version),
2344
2302
help="show version number and exit")
2345
2303
parser.add_argument("-i", "--interface", metavar="IF",
2346
2304
help="Bind to interface IF")
2396
2354
"port": "",
2397
2355
"debug": "False",
2398
2356
"priority":
2399
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2400
":+SIGN-DSA-SHA256",
2357
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2401
2358
"servicename": "Mandos",
2402
2359
"use_dbus": "True",
2403
2360
"use_ipv6": "True",
2407
2364
"statedir": "/var/lib/mandos",
2408
2365
"foreground": "False",
2409
2366
"zeroconf": "True",
2410
}
2367
}
2411
2368
2412
2369
# Parse config file for server-global settings
2413
2370
server_config = configparser.SafeConfigParser(server_defaults)
2414
2371
del server_defaults
2415
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2372
server_config.read(os.path.join(options.configdir,
2373
"mandos.conf"))
2416
2374
# Convert the SafeConfigParser object to a dict
2417
2375
server_settings = server_config.defaults()
2418
2376
# Use the appropriate methods on the non-string config options
2436
2394
# Override the settings from the config file with command line
2437
2395
# options, if set.
2438
2396
for option in ("interface", "address", "port", "debug",
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2397
"priority", "servicename", "configdir",
2398
"use_dbus", "use_ipv6", "debuglevel", "restore",
2399
"statedir", "socket", "foreground", "zeroconf"):
2442
2400
value = getattr(options, option)
2443
2401
if value is not None:
2444
2402
server_settings[option] = value
2445
2403
del options
2446
2404
# Force all strings to be unicode
2447
2405
for option in server_settings.keys():
2448
if isinstance(server_settings[option], bytes):
2449
server_settings[option] = (server_settings[option]
2450
.decode("utf-8"))
2406
if type(server_settings[option]) is str:
2407
server_settings[option] = unicode(server_settings[option])
2451
2408
# Force all boolean options to be boolean
2452
2409
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2453
2410
"foreground", "zeroconf"):
2459
2416
2460
2417
##################################################################
2461
2418
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")
2419
if (not server_settings["zeroconf"] and
2420
not (server_settings["port"]
2421
or server_settings["socket"] != "")):
2422
parser.error("Needs port or socket to work without"
2423
" Zeroconf")
2466
2424
2467
2425
# For convenience
2468
2426
debug = server_settings["debug"]
2484
2442
initlogger(debug, level)
2485
2443
2486
2444
if server_settings["servicename"] != "Mandos":
2487
syslogger.setFormatter(
2488
logging.Formatter('Mandos ({}) [%(process)d]:'
2489
' %(levelname)s: %(message)s'.format(
2490
server_settings["servicename"])))
2445
syslogger.setFormatter(logging.Formatter
2446
('Mandos ({0}) [%(process)d]:'
2447
' %(levelname)s: %(message)s'
2448
.format(server_settings
2449
["servicename"])))
2491
2450
2492
2451
# Parse config file with clients
2493
2452
client_config = configparser.SafeConfigParser(Client
2501
2460
socketfd = None
2502
2461
if server_settings["socket"] != "":
2503
2462
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)
2463
tcp_server = MandosServer((server_settings["address"],
2464
server_settings["port"]),
2465
ClientHandler,
2466
interface=(server_settings["interface"]
2467
or None),
2468
use_ipv6=use_ipv6,
2469
gnutls_priority=
2470
server_settings["priority"],
2471
use_dbus=use_dbus,
2472
socketfd=socketfd)
2512
2473
if not foreground:
2513
2474
pidfilename = "/run/mandos.pid"
2514
2475
if not os.path.isdir("/run/."):
2515
2476
pidfilename = "/var/run/mandos.pid"
2516
2477
pidfile = None
2517
2478
try:
2518
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2479
pidfile = open(pidfilename, "w")
2519
2480
except IOError as e:
2520
2481
logger.error("Could not open file %r", pidfilename,
2521
2482
exc_info=e)
2548
2509
def debug_gnutls(level, string):
2549
2510
logger.debug("GnuTLS: %s", string[:-1])
2550
2511
2551
gnutls.library.functions.gnutls_global_set_log_function(
2552
debug_gnutls)
2512
(gnutls.library.functions
2513
.gnutls_global_set_log_function(debug_gnutls))
2553
2514
2554
2515
# Redirect stdin so all checkers get /dev/null
2555
2516
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2575
2536
if use_dbus:
2576
2537
try:
2577
2538
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:
2539
bus, do_not_queue=True)
2540
old_bus_name = (dbus.service.BusName
2541
("se.bsnet.fukt.Mandos", bus,
2542
do_not_queue=True))
2543
except dbus.exceptions.NameExistsException as e:
2584
2544
logger.error("Disabling D-Bus:", exc_info=e)
2585
2545
use_dbus = False
2586
2546
server_settings["use_dbus"] = False
2587
2547
tcp_server.use_dbus = False
2588
2548
if zeroconf:
2589
2549
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)
2550
service = AvahiServiceToSyslog(name =
2551
server_settings["servicename"],
2552
servicetype = "_mandos._tcp",
2553
protocol = protocol, bus = bus)
2595
2554
if server_settings["interface"]:
2596
service.interface = if_nametoindex(
2597
server_settings["interface"].encode("utf-8"))
2555
service.interface = (if_nametoindex
2556
(str(server_settings["interface"])))
2598
2557
2599
2558
global multiprocessing_manager
2600
2559
multiprocessing_manager = multiprocessing.Manager()
2619
2578
if server_settings["restore"]:
2620
2579
try:
2621
2580
with open(stored_state_path, "rb") as stored_state:
2622
clients_data, old_client_settings = pickle.load(
2623
stored_state)
2581
clients_data, old_client_settings = (pickle.load
2582
(stored_state))
2624
2583
os.remove(stored_state_path)
2625
2584
except IOError as e:
2626
2585
if e.errno == errno.ENOENT:
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
2586
logger.warning("Could not load persistent state: {0}"
2587
.format(os.strerror(e.errno)))
2629
2588
else:
2630
2589
logger.critical("Could not load persistent state:",
2631
2590
exc_info=e)
2632
2591
raise
2633
2592
except EOFError as e:
2634
2593
logger.warning("Could not load persistent state: "
2635
"EOFError:",
2636
exc_info=e)
2594
"EOFError:", exc_info=e)
2637
2595
2638
2596
with PGPEngine() as pgp:
2639
for client_name, client in clients_data.items():
2597
for client_name, client in clients_data.iteritems():
2640
2598
# Skip removed clients
2641
2599
if client_name not in client_settings:
2642
2600
continue
2651
2609
# For each value in new config, check if it
2652
2610
# differs from the old config value (Except for
2653
2611
# the "secret" attribute)
2654
if (name != "secret"
2655
and (value !=
2656
old_client_settings[client_name][name])):
2612
if (name != "secret" and
2613
value != old_client_settings[client_name]
2614
[name]):
2657
2615
client[name] = value
2658
2616
except KeyError:
2659
2617
pass
2660
2618
2661
2619
# Clients who has passed its expire date can still be
2662
# enabled if its last checker was successful. A Client
2620
# enabled if its last checker was successful. Clients
2663
2621
# whose checker succeeded before we stored its state is
2664
2622
# assumed to have successfully run all checkers during
2665
2623
# downtime.
2667
2625
if datetime.datetime.utcnow() >= client["expires"]:
2668
2626
if not client["last_checked_ok"]:
2669
2627
logger.warning(
2670
"disabling client {} - Client never "
2671
"performed a successful checker".format(
2672
client_name))
2628
"disabling client {0} - Client never "
2629
"performed a successful checker"
2630
.format(client_name))
2673
2631
client["enabled"] = False
2674
2632
elif client["last_checker_status"] != 0:
2675
2633
logger.warning(
2676
"disabling client {} - Client last"
2677
" checker failed with error code"
2678
" {}".format(
2679
client_name,
2680
client["last_checker_status"]))
2634
"disabling client {0} - Client "
2635
"last checker failed with error code {1}"
2636
.format(client_name,
2637
client["last_checker_status"]))
2681
2638
client["enabled"] = False
2682
2639
else:
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2640
client["expires"] = (datetime.datetime
2641
.utcnow()
2642
+ client["timeout"])
2686
2643
logger.debug("Last checker succeeded,"
2687
" keeping {} enabled".format(
2688
client_name))
2644
" keeping {0} enabled"
2645
.format(client_name))
2689
2646
try:
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2647
client["secret"] = (
2648
pgp.decrypt(client["encrypted_secret"],
2649
client_settings[client_name]
2650
["secret"]))
2693
2651
except PGPError:
2694
2652
# 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"])
2653
logger.debug("Failed to decrypt {0} old secret"
2654
.format(client_name))
2655
client["secret"] = (
2656
client_settings[client_name]["secret"])
2699
2657
2700
2658
# Add/remove clients based on new changes made to config
2701
2659
for client_name in (set(old_client_settings)
2706
2664
clients_data[client_name] = client_settings[client_name]
2707
2665
2708
2666
# Create all client objects
2709
for client_name, client in clients_data.items():
2667
for client_name, client in clients_data.iteritems():
2710
2668
tcp_server.clients[client_name] = client_class(
2711
name = client_name,
2712
settings = client,
2669
name = client_name, settings = client,
2713
2670
server_settings = server_settings)
2714
2671
2715
2672
if not tcp_server.clients:
2717
2674
2718
2675
if not foreground:
2719
2676
if pidfile is not None:
2720
pid = os.getpid()
2721
2677
try:
2722
2678
with pidfile:
2723
print(pid, file=pidfile)
2679
pid = os.getpid()
2680
pidfile.write(str(pid) + "\n".encode("utf-8"))
2724
2681
except IOError:
2725
2682
logger.error("Could not write to file %r with PID %d",
2726
2683
pidfilename, pid)
2731
2688
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2732
2689
2733
2690
if use_dbus:
2734
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2691
@alternate_dbus_interfaces({"se.recompile.Mandos":
2692
"se.bsnet.fukt.Mandos"})
2737
2693
class MandosDBusService(DBusObjectWithProperties):
2738
2694
"""A D-Bus proxy object"""
2739
2740
2695
def __init__(self):
2741
2696
dbus.service.Object.__init__(self, bus, "/")
2742
2743
2697
_interface = "se.recompile.Mandos"
2744
2698
2745
2699
@dbus_interface_annotations(_interface)
2746
2700
def _foo(self):
2747
return {
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2749
"false" }
2701
return { "org.freedesktop.DBus.Property"
2702
".EmitsChangedSignal":
2703
"false"}
2750
2704
2751
2705
@dbus.service.signal(_interface, signature="o")
2752
2706
def ClientAdded(self, objpath):
2766
2720
@dbus.service.method(_interface, out_signature="ao")
2767
2721
def GetAllClients(self):
2768
2722
"D-Bus method"
2769
return dbus.Array(c.dbus_object_path for c in
2723
return dbus.Array(c.dbus_object_path
2724
for c in
2770
2725
tcp_server.clients.itervalues())
2771
2726
2772
2727
@dbus.service.method(_interface,
2774
2729
def GetAllClientsWithProperties(self):
2775
2730
"D-Bus method"
2776
2731
return dbus.Dictionary(
2777
{ c.dbus_object_path: c.GetAll("")
2778
for c in tcp_server.clients.itervalues() },
2732
((c.dbus_object_path, c.GetAll(""))
2733
for c in tcp_server.clients.itervalues()),
2779
2734
signature="oa{sv}")
2780
2735
2781
2736
@dbus.service.method(_interface, in_signature="o")
2819
2774
2820
2775
# A list of attributes that can not be pickled
2821
2776
# + secret.
2822
exclude = { "bus", "changedstate", "secret",
2823
"checker", "server_settings" }
2824
for name, typ in inspect.getmembers(dbus.service
2825
.Object):
2777
exclude = set(("bus", "changedstate", "secret",
2778
"checker", "server_settings"))
2779
for name, typ in (inspect.getmembers
2780
(dbus.service.Object)):
2826
2781
exclude.add(name)
2827
2782
2828
2783
client_dict["encrypted_secret"] = (client
2835
2790
del client_settings[client.name]["secret"]
2836
2791
2837
2792
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:
2793
with (tempfile.NamedTemporaryFile
2794
(mode='wb', suffix=".pickle", prefix='clients-',
2795
dir=os.path.dirname(stored_state_path),
2796
delete=False)) as stored_state:
2844
2797
pickle.dump((clients, client_settings), stored_state)
2845
tempname = stored_state.name
2798
tempname=stored_state.name
2846
2799
os.rename(tempname, stored_state_path)
2847
2800
except (IOError, OSError) as e:
2848
2801
if not debug:
2851
2804
except NameError:
2852
2805
pass
2853
2806
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2854
logger.warning("Could not save persistent state: {}"
2807
logger.warning("Could not save persistent state: {0}"
2855
2808
.format(os.strerror(e.errno)))
2856
2809
else:
2857
2810
logger.warning("Could not save persistent state:",
2867
2820
client.disable(quiet=True)
2868
2821
if use_dbus:
2869
2822
# Emit D-Bus signal
2870
mandos_dbus_service.ClientRemoved(
2871
client.dbus_object_path, client.name)
2823
mandos_dbus_service.ClientRemoved(client
2824
.dbus_object_path,
2825
client.name)
2872
2826
client_settings.clear()
2873
2827
2874
2828
atexit.register(cleanup)
2927
2881
# Must run before the D-Bus bus name gets deregistered
2928
2882
cleanup()
2929
2883
2930
2931
2884
if __name__ == '__main__':
2932
2885
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0