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 502
- compare with another revision
- download diff
- download tarball
- view history from revision 502
- Committer: Teddy Hogeborn
- Date: 2011-09-26 19:36:18 UTC
- mfrom: (24.1.184 mandos)
- Revision ID: teddy@fukt.bsnet.se-20110926193618-vtj5c9hena1maixx
Merge from Björn
- files removed:
- debian/source/local-options
- network-hooks.d
- files modified:
- DBUS-API
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 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
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@recompile.se>.
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
34
from __future__ import (division, absolute_import, print_function,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
import types
66
import binascii
67
import tempfile
68
import itertools
69
65
70
66
import dbus
71
67
import dbus.service
76
72
import ctypes.util
77
73
import xml.dom.minidom
78
74
import inspect
79
import GnuPGInterface
80
75
81
76
try:
82
77
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
81
except ImportError:
87
82
SO_BINDTODEVICE = None
88
83
89
version = "1.5.3"
90
stored_state_file = "clients.pickle"
91
92
logger = logging.getLogger()
84
85
version = "1.3.1"
86
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
93
89
syslogger = (logging.handlers.SysLogHandler
94
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
91
address = str("/dev/log")))
96
97
try:
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
101
except (OSError, AttributeError):
102
def if_nametoindex(interface):
103
"Get an interface index the hard way, i.e. using fcntl()"
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
with contextlib.closing(socket.socket()) as s:
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
111
return interface_index
112
113
114
def initlogger(debug, level=logging.WARNING):
115
"""init logger and add loglevel"""
116
117
syslogger.setFormatter(logging.Formatter
118
('Mandos [%(process)d]: %(levelname)s:'
119
' %(message)s'))
120
logger.addHandler(syslogger)
121
122
if debug:
123
console = logging.StreamHandler()
124
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
125
' [%(process)d]:'
126
' %(levelname)s:'
127
' %(message)s'))
128
logger.addHandler(console)
129
logger.setLevel(level)
130
131
132
class PGPError(Exception):
133
"""Exception if encryption/decryption fails"""
134
pass
135
136
137
class PGPEngine(object):
138
"""A simple class for OpenPGP symmetric encryption & decryption"""
139
def __init__(self):
140
self.gnupg = GnuPGInterface.GnuPG()
141
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.gnupg.options.meta_interactive = False
144
self.gnupg.options.homedir = self.tempdir
145
self.gnupg.options.extra_args.extend(['--force-mdc',
146
'--quiet',
147
'--no-use-agent'])
148
149
def __enter__(self):
150
return self
151
152
def __exit__ (self, exc_type, exc_value, traceback):
153
self._cleanup()
154
return False
155
156
def __del__(self):
157
self._cleanup()
158
159
def _cleanup(self):
160
if self.tempdir is not None:
161
# Delete contents of tempdir
162
for root, dirs, files in os.walk(self.tempdir,
163
topdown = False):
164
for filename in files:
165
os.remove(os.path.join(root, filename))
166
for dirname in dirs:
167
os.rmdir(os.path.join(root, dirname))
168
# Remove tempdir
169
os.rmdir(self.tempdir)
170
self.tempdir = None
171
172
def password_encode(self, password):
173
# Passphrase can not be empty and can not contain newlines or
174
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
176
177
def encrypt(self, data, password):
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
180
try:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
185
f.write(data)
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
188
proc.wait()
189
except IOError as e:
190
raise PGPError(e)
191
self.gnupg.passphrase = None
192
return ciphertext
193
194
def decrypt(self, data, password):
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
197
try:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
202
f.write(data)
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
205
proc.wait()
206
except IOError as e:
207
raise PGPError(e)
208
self.gnupg.passphrase = None
209
return decrypted_plaintext
210
211
92
syslogger.setFormatter(logging.Formatter
93
('Mandos [%(process)d]: %(levelname)s:'
94
' %(message)s'))
95
logger.addHandler(syslogger)
96
97
console = logging.StreamHandler()
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
' %(levelname)s:'
100
' %(message)s'))
101
logger.addHandler(console)
212
102
213
103
class AvahiError(Exception):
214
104
def __init__(self, value, *args, **kwargs):
269
159
" after %i retries, exiting.",
270
160
self.rename_count)
271
161
raise AvahiServiceError("Too many renames")
272
self.name = unicode(self.server
273
.GetAlternativeServiceName(self.name))
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
274
163
logger.info("Changing Zeroconf service name to %r ...",
275
164
self.name)
165
syslogger.setFormatter(logging.Formatter
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
168
% self.name))
276
169
self.remove()
277
170
try:
278
171
self.add()
279
172
except dbus.exceptions.DBusException as error:
280
logger.critical("D-Bus Exception", exc_info=error)
173
logger.critical("DBusException: %s", error)
281
174
self.cleanup()
282
175
os._exit(1)
283
176
self.rename_count += 1
298
191
avahi.DBUS_INTERFACE_ENTRY_GROUP)
299
192
self.entry_group_state_changed_match = (
300
193
self.group.connect_to_signal(
301
'StateChanged', self.entry_group_state_changed))
194
'StateChanged', self .entry_group_state_changed))
302
195
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
303
196
self.name, self.type)
304
197
self.group.AddService(
322
215
elif state == avahi.ENTRY_GROUP_FAILURE:
323
216
logger.critical("Avahi: Error in group state changed %s",
324
217
unicode(error))
325
raise AvahiGroupError("State changed: {0!s}"
326
.format(error))
218
raise AvahiGroupError("State changed: %s"
219
% unicode(error))
327
220
def cleanup(self):
328
221
"""Derived from the Avahi example code"""
329
222
if self.group is not None:
330
223
try:
331
224
self.group.Free()
332
225
except (dbus.exceptions.UnknownMethodException,
333
dbus.exceptions.DBusException):
226
dbus.exceptions.DBusException) as e:
334
227
pass
335
228
self.group = None
336
229
self.remove()
370
263
self.server_state_changed)
371
264
self.server_state_changed(self.server.GetState())
372
265
373
class AvahiServiceToSyslog(AvahiService):
374
def rename(self):
375
"""Add the new name to the syslog messages"""
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos ({0}) [%(process)d]:'
379
' %(levelname)s: %(message)s'
380
.format(self.name)))
381
return ret
382
266
383
def timedelta_to_milliseconds(td):
267
def _timedelta_to_milliseconds(td):
384
268
"Convert a datetime.timedelta() to milliseconds"
385
269
return ((td.days * 24 * 60 * 60 * 1000)
386
270
+ (td.seconds * 1000)
390
274
"""A representation of a client host served by this server.
391
275
392
276
Attributes:
393
approved: bool(); 'None' if not yet approved/disapproved
277
_approved: bool(); 'None' if not yet approved/disapproved
394
278
approval_delay: datetime.timedelta(); Time to wait for approval
395
279
approval_duration: datetime.timedelta(); Duration of one approval
396
280
checker: subprocess.Popen(); a running checker process used
403
287
instance %(name)s can be used in the command.
404
288
checker_initiator_tag: a gobject event source tag, or None
405
289
created: datetime.datetime(); (UTC) object creation
406
client_structure: Object describing what attributes a client has
407
and is used for storing the client at exit
408
290
current_checker_command: string; current running checker_command
291
disable_hook: If set, called by disable() as disable_hook(self)
409
292
disable_initiator_tag: a gobject event source tag, or None
410
293
enabled: bool()
411
294
fingerprint: string (40 or 32 hexadecimal digits); used to
414
297
interval: datetime.timedelta(); How often to start a new checker
415
298
last_approval_request: datetime.datetime(); (UTC) or None
416
299
last_checked_ok: datetime.datetime(); (UTC) or None
417
last_checker_status: integer between 0 and 255 reflecting exit
418
status of last checker. -1 reflects crashed
419
checker, -2 means no checker completed yet.
420
last_enabled: datetime.datetime(); (UTC) or None
300
last_enabled: datetime.datetime(); (UTC)
421
301
name: string; from the config file, used in log messages and
422
302
D-Bus identifiers
423
303
secret: bytestring; sent verbatim (over TLS) to client
424
304
timeout: datetime.timedelta(); How long from last_checked_ok
425
305
until this client is disabled
426
extended_timeout: extra long timeout when secret has been sent
306
extended_timeout: extra long timeout when password has been sent
427
307
runtime_expansions: Allowed attributes for runtime expansion.
428
308
expires: datetime.datetime(); time (UTC) when a client will be
429
309
disabled, or None
433
313
"created", "enabled", "fingerprint",
434
314
"host", "interval", "last_checked_ok",
435
315
"last_enabled", "name", "timeout")
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
438
"interval": "2m",
439
"checker": "fping -q -- %%(host)s",
440
"host": "",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
443
"approved_by_default": "True",
444
"enabled": "True",
445
}
446
316
447
317
def timeout_milliseconds(self):
448
318
"Return the 'timeout' attribute in milliseconds"
449
return timedelta_to_milliseconds(self.timeout)
450
319
return _timedelta_to_milliseconds(self.timeout)
320
451
321
def extended_timeout_milliseconds(self):
452
322
"Return the 'extended_timeout' attribute in milliseconds"
453
return timedelta_to_milliseconds(self.extended_timeout)
323
return _timedelta_to_milliseconds(self.extended_timeout)
454
324
455
325
def interval_milliseconds(self):
456
326
"Return the 'interval' attribute in milliseconds"
457
return timedelta_to_milliseconds(self.interval)
458
327
return _timedelta_to_milliseconds(self.interval)
328
459
329
def approval_delay_milliseconds(self):
460
return timedelta_to_milliseconds(self.approval_delay)
461
462
@staticmethod
463
def config_parser(config):
464
"""Construct a new dict of client settings of this form:
465
{ client_name: {setting_name: value, ...}, ...}
466
with exceptions for any special settings as defined above.
467
NOTE: Must be a pure function. Must return the same result
468
value given the same arguments.
469
"""
470
settings = {}
471
for client_name in config.sections():
472
section = dict(config.items(client_name))
473
client = settings[client_name] = {}
474
475
client["host"] = section["host"]
476
# Reformat values from string types to Python types
477
client["approved_by_default"] = config.getboolean(
478
client_name, "approved_by_default")
479
client["enabled"] = config.getboolean(client_name,
480
"enabled")
481
482
client["fingerprint"] = (section["fingerprint"].upper()
483
.replace(" ", ""))
484
if "secret" in section:
485
client["secret"] = section["secret"].decode("base64")
486
elif "secfile" in section:
487
with open(os.path.expanduser(os.path.expandvars
488
(section["secfile"])),
489
"rb") as secfile:
490
client["secret"] = secfile.read()
491
else:
492
raise TypeError("No secret or secfile for section {0}"
493
.format(section))
494
client["timeout"] = string_to_delta(section["timeout"])
495
client["extended_timeout"] = string_to_delta(
496
section["extended_timeout"])
497
client["interval"] = string_to_delta(section["interval"])
498
client["approval_delay"] = string_to_delta(
499
section["approval_delay"])
500
client["approval_duration"] = string_to_delta(
501
section["approval_duration"])
502
client["checker_command"] = section["checker"]
503
client["last_approval_request"] = None
504
client["last_checked_ok"] = None
505
client["last_checker_status"] = -2
506
507
return settings
508
509
510
def __init__(self, settings, name = None):
330
return _timedelta_to_milliseconds(self.approval_delay)
331
332
def __init__(self, name = None, disable_hook=None, config=None):
511
333
"""Note: the 'checker' key in 'config' sets the
512
334
'checker_command' attribute and *not* the 'checker'
513
335
attribute."""
514
336
self.name = name
515
# adding all client settings
516
for setting, value in settings.iteritems():
517
setattr(self, setting, value)
518
519
if self.enabled:
520
if not hasattr(self, "last_enabled"):
521
self.last_enabled = datetime.datetime.utcnow()
522
if not hasattr(self, "expires"):
523
self.expires = (datetime.datetime.utcnow()
524
+ self.timeout)
525
else:
526
self.last_enabled = None
527
self.expires = None
528
337
if config is None:
338
config = {}
529
339
logger.debug("Creating client %r", self.name)
530
340
# Uppercase and remove spaces from fingerprint for later
531
341
# comparison purposes with return value from the fingerprint()
532
342
# function
343
self.fingerprint = (config["fingerprint"].upper()
344
.replace(" ", ""))
533
345
logger.debug(" Fingerprint: %s", self.fingerprint)
534
self.created = settings.get("created",
535
datetime.datetime.utcnow())
536
537
# attributes specific for this server instance
346
if "secret" in config:
347
self.secret = config["secret"].decode("base64")
348
elif "secfile" in config:
349
with open(os.path.expanduser(os.path.expandvars
350
(config["secfile"])),
351
"rb") as secfile:
352
self.secret = secfile.read()
353
else:
354
raise TypeError("No secret or secfile for client %s"
355
% self.name)
356
self.host = config.get("host", "")
357
self.created = datetime.datetime.utcnow()
358
self.enabled = False
359
self.last_approval_request = None
360
self.last_enabled = None
361
self.last_checked_ok = None
362
self.timeout = string_to_delta(config["timeout"])
363
self.extended_timeout = string_to_delta(config["extended_timeout"])
364
self.interval = string_to_delta(config["interval"])
365
self.disable_hook = disable_hook
538
366
self.checker = None
539
367
self.checker_initiator_tag = None
540
368
self.disable_initiator_tag = None
369
self.expires = None
541
370
self.checker_callback_tag = None
371
self.checker_command = config["checker"]
542
372
self.current_checker_command = None
543
self.approved = None
373
self.last_connect = None
374
self._approved = None
375
self.approved_by_default = config.get("approved_by_default",
376
True)
544
377
self.approvals_pending = 0
545
self.changedstate = (multiprocessing_manager
546
.Condition(multiprocessing_manager
547
.Lock()))
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
550
if not attr.startswith("_")]
551
self.client_structure.append("client_structure")
552
553
for name, t in inspect.getmembers(type(self),
554
lambda obj:
555
isinstance(obj,
556
property)):
557
if not name.startswith("_"):
558
self.client_structure.append(name)
378
self.approval_delay = string_to_delta(
379
config["approval_delay"])
380
self.approval_duration = string_to_delta(
381
config["approval_duration"])
382
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
559
383
560
# Send notice to process children that client state has changed
561
384
def send_changedstate(self):
562
with self.changedstate:
563
self.changedstate.notify_all()
564
385
self.changedstate.acquire()
386
self.changedstate.notify_all()
387
self.changedstate.release()
388
565
389
def enable(self):
566
390
"""Start this client's checker and timeout hooks"""
567
391
if getattr(self, "enabled", False):
568
392
# Already enabled
569
393
return
570
394
self.send_changedstate()
395
# Schedule a new checker to be started an 'interval' from now,
396
# and every interval from then on.
397
self.checker_initiator_tag = (gobject.timeout_add
398
(self.interval_milliseconds(),
399
self.start_checker))
400
# Schedule a disable() when 'timeout' has passed
571
401
self.expires = datetime.datetime.utcnow() + self.timeout
402
self.disable_initiator_tag = (gobject.timeout_add
403
(self.timeout_milliseconds(),
404
self.disable))
572
405
self.enabled = True
573
406
self.last_enabled = datetime.datetime.utcnow()
574
self.init_checker()
407
# Also start a new checker *right now*.
408
self.start_checker()
575
409
576
410
def disable(self, quiet=True):
577
411
"""Disable this client."""
589
423
gobject.source_remove(self.checker_initiator_tag)
590
424
self.checker_initiator_tag = None
591
425
self.stop_checker()
426
if self.disable_hook:
427
self.disable_hook(self)
592
428
self.enabled = False
593
429
# Do not run this again if called by a gobject.timeout_add
594
430
return False
595
431
596
432
def __del__(self):
433
self.disable_hook = None
597
434
self.disable()
598
435
599
def init_checker(self):
600
# Schedule a new checker to be started an 'interval' from now,
601
# and every interval from then on.
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
604
self.start_checker))
605
# Schedule a disable() when 'timeout' has passed
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
608
self.disable))
609
# Also start a new checker *right now*.
610
self.start_checker()
611
612
436
def checker_callback(self, pid, condition, command):
613
437
"""The checker has completed, so take appropriate actions."""
614
438
self.checker_callback_tag = None
615
439
self.checker = None
616
440
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
618
if self.last_checker_status == 0:
441
exitstatus = os.WEXITSTATUS(condition)
442
if exitstatus == 0:
619
443
logger.info("Checker for %(name)s succeeded",
620
444
vars(self))
621
445
self.checked_ok()
623
447
logger.info("Checker for %(name)s failed",
624
448
vars(self))
625
449
else:
626
self.last_checker_status = -1
627
450
logger.warning("Checker for %(name)s crashed?",
628
451
vars(self))
629
452
630
def checked_ok(self):
631
"""Assert that the client has been seen, alive and well."""
632
self.last_checked_ok = datetime.datetime.utcnow()
633
self.last_checker_status = 0
634
self.bump_timeout()
635
636
def bump_timeout(self, timeout=None):
637
"""Bump up the timeout for this client."""
453
def checked_ok(self, timeout=None):
454
"""Bump up the timeout for this client.
455
456
This should only be called when the client has been seen,
457
alive and well.
458
"""
638
459
if timeout is None:
639
460
timeout = self.timeout
640
if self.disable_initiator_tag is not None:
641
gobject.source_remove(self.disable_initiator_tag)
642
if getattr(self, "enabled", False):
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
646
self.expires = datetime.datetime.utcnow() + timeout
461
self.last_checked_ok = datetime.datetime.utcnow()
462
gobject.source_remove(self.disable_initiator_tag)
463
self.expires = datetime.datetime.utcnow() + timeout
464
self.disable_initiator_tag = (gobject.timeout_add
465
(_timedelta_to_milliseconds(timeout),
466
self.disable))
647
467
648
468
def need_approval(self):
649
469
self.last_approval_request = datetime.datetime.utcnow()
689
509
'replace')))
690
510
for attr in
691
511
self.runtime_expansions)
692
512
693
513
try:
694
514
command = self.checker_command % escaped_attrs
695
515
except TypeError as error:
696
logger.error('Could not format string "%s"',
697
self.checker_command, exc_info=error)
516
logger.error('Could not format string "%s":'
517
' %s', self.checker_command, error)
698
518
return True # Try again later
699
519
self.current_checker_command = command
700
520
try:
718
538
gobject.source_remove(self.checker_callback_tag)
719
539
self.checker_callback(pid, status, command)
720
540
except OSError as error:
721
logger.error("Failed to start subprocess",
722
exc_info=error)
541
logger.error("Failed to start subprocess: %s",
542
error)
723
543
# Re-run this periodically if run by gobject.timeout_add
724
544
return True
725
545
732
552
return
733
553
logger.debug("Stopping checker for %(name)s", vars(self))
734
554
try:
735
self.checker.terminate()
555
os.kill(self.checker.pid, signal.SIGTERM)
736
556
#time.sleep(0.5)
737
557
#if self.checker.poll() is None:
738
# self.checker.kill()
558
# os.kill(self.checker.pid, signal.SIGKILL)
739
559
except OSError as error:
740
560
if error.errno != errno.ESRCH: # No such process
741
561
raise
742
562
self.checker = None
743
563
744
745
564
def dbus_service_property(dbus_interface, signature="v",
746
565
access="readwrite", byte_arrays=False):
747
566
"""Decorators for marking methods of a DBusObjectWithProperties to
758
577
# "Set" method, so we fail early here:
759
578
if byte_arrays and signature != "ay":
760
579
raise ValueError("Byte arrays not supported for non-'ay'"
761
" signature {0!r}".format(signature))
580
" signature %r" % signature)
762
581
def decorator(func):
763
582
func._dbus_is_property = True
764
583
func._dbus_interface = dbus_interface
772
591
return decorator
773
592
774
593
775
def dbus_interface_annotations(dbus_interface):
776
"""Decorator for marking functions returning interface annotations.
777
778
Usage:
779
780
@dbus_interface_annotations("org.example.Interface")
781
def _foo(self): # Function name does not matter
782
return {"org.freedesktop.DBus.Deprecated": "true",
783
"org.freedesktop.DBus.Property.EmitsChangedSignal":
784
"false"}
785
"""
786
def decorator(func):
787
func._dbus_is_interface = True
788
func._dbus_interface = dbus_interface
789
func._dbus_name = dbus_interface
790
return func
791
return decorator
792
793
794
def dbus_annotations(annotations):
795
"""Decorator to annotate D-Bus methods, signals or properties
796
Usage:
797
798
@dbus_service_property("org.example.Interface", signature="b",
799
access="r")
800
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
"org.freedesktop.DBus.Property."
802
"EmitsChangedSignal": "false"})
803
def Property_dbus_property(self):
804
return dbus.Boolean(False)
805
"""
806
def decorator(func):
807
func._dbus_annotations = annotations
808
return func
809
return decorator
810
811
812
594
class DBusPropertyException(dbus.exceptions.DBusException):
813
595
"""A base class for D-Bus property-related exceptions
814
596
"""
830
612
831
613
class DBusObjectWithProperties(dbus.service.Object):
832
614
"""A D-Bus object with properties.
833
615
834
616
Classes inheriting from this can use the dbus_service_property
835
617
decorator to expose methods as D-Bus properties. It exposes the
836
618
standard Get(), Set(), and GetAll() methods on the D-Bus.
837
619
"""
838
620
839
621
@staticmethod
840
def _is_dbus_thing(thing):
841
"""Returns a function testing if an attribute is a D-Bus thing
842
843
If called like _is_dbus_thing("method") it returns a function
844
suitable for use as predicate to inspect.getmembers().
845
"""
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
847
False)
622
def _is_dbus_property(obj):
623
return getattr(obj, "_dbus_is_property", False)
848
624
849
def _get_all_dbus_things(self, thing):
625
def _get_all_dbus_properties(self):
850
626
"""Returns a generator of (name, attribute) pairs
851
627
"""
852
return ((getattr(athing.__get__(self), "_dbus_name",
853
name),
854
athing.__get__(self))
855
for cls in self.__class__.__mro__
856
for name, athing in
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
628
return ((prop._dbus_name, prop)
629
for name, prop in
630
inspect.getmembers(self, self._is_dbus_property))
859
631
860
632
def _get_dbus_property(self, interface_name, property_name):
861
633
"""Returns a bound method if one exists which is a D-Bus
862
634
property with the specified name and interface.
863
635
"""
864
for cls in self.__class__.__mro__:
865
for name, value in (inspect.getmembers
866
(cls,
867
self._is_dbus_thing("property"))):
868
if (value._dbus_name == property_name
869
and value._dbus_interface == interface_name):
870
return value.__get__(self)
871
636
for name in (property_name,
637
property_name + "_dbus_property"):
638
prop = getattr(self, name, None)
639
if (prop is None
640
or not self._is_dbus_property(prop)
641
or prop._dbus_name != property_name
642
or (interface_name and prop._dbus_interface
643
and interface_name != prop._dbus_interface)):
644
continue
645
return prop
872
646
# No such property
873
647
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
648
+ interface_name + "."
899
673
# signatures other than "ay".
900
674
if prop._dbus_signature != "ay":
901
675
raise ValueError
902
value = dbus.ByteArray(b''.join(chr(byte)
903
for byte in value))
676
value = dbus.ByteArray(''.join(unichr(byte)
677
for byte in value))
904
678
prop(value)
905
679
906
680
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
908
682
def GetAll(self, interface_name):
909
683
"""Standard D-Bus property GetAll() method, see D-Bus
910
684
standard.
911
685
912
686
Note: Will not include properties with access="write".
913
687
"""
914
properties = {}
915
for name, prop in self._get_all_dbus_things("property"):
688
all = {}
689
for name, prop in self._get_all_dbus_properties():
916
690
if (interface_name
917
691
and interface_name != prop._dbus_interface):
918
692
# Interface non-empty but did not match
922
696
continue
923
697
value = prop()
924
698
if not hasattr(value, "variant_level"):
925
properties[name] = value
699
all[name] = value
926
700
continue
927
properties[name] = type(value)(value, variant_level=
928
value.variant_level+1)
929
return dbus.Dictionary(properties, signature="sv")
701
all[name] = type(value)(value, variant_level=
702
value.variant_level+1)
703
return dbus.Dictionary(all, signature="sv")
930
704
931
705
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
932
706
out_signature="s",
933
707
path_keyword='object_path',
934
708
connection_keyword='connection')
935
709
def Introspect(self, object_path, connection):
936
"""Overloading of standard D-Bus method.
937
938
Inserts property tags and interface annotation tags.
710
"""Standard D-Bus method, overloaded to insert property tags.
939
711
"""
940
712
xmlstring = dbus.service.Object.Introspect(self, object_path,
941
713
connection)
948
720
e.setAttribute("access", prop._dbus_access)
949
721
return e
950
722
for if_tag in document.getElementsByTagName("interface"):
951
# Add property tags
952
723
for tag in (make_tag(document, name, prop)
953
724
for name, prop
954
in self._get_all_dbus_things("property")
725
in self._get_all_dbus_properties()
955
726
if prop._dbus_interface
956
727
== if_tag.getAttribute("name")):
957
728
if_tag.appendChild(tag)
958
# Add annotation tags
959
for typ in ("method", "signal", "property"):
960
for tag in if_tag.getElementsByTagName(typ):
961
annots = dict()
962
for name, prop in (self.
963
_get_all_dbus_things(typ)):
964
if (name == tag.getAttribute("name")
965
and prop._dbus_interface
966
== if_tag.getAttribute("name")):
967
annots.update(getattr
968
(prop,
969
"_dbus_annotations",
970
{}))
971
for name, value in annots.iteritems():
972
ann_tag = document.createElement(
973
"annotation")
974
ann_tag.setAttribute("name", name)
975
ann_tag.setAttribute("value", value)
976
tag.appendChild(ann_tag)
977
# Add interface annotation tags
978
for annotation, value in dict(
979
itertools.chain(
980
*(annotations().iteritems()
981
for name, annotations in
982
self._get_all_dbus_things("interface")
983
if name == if_tag.getAttribute("name")
984
))).iteritems():
985
ann_tag = document.createElement("annotation")
986
ann_tag.setAttribute("name", annotation)
987
ann_tag.setAttribute("value", value)
988
if_tag.appendChild(ann_tag)
989
729
# Add the names to the return values for the
990
730
# "org.freedesktop.DBus.Properties" methods
991
731
if (if_tag.getAttribute("name")
1006
746
except (AttributeError, xml.dom.DOMException,
1007
747
xml.parsers.expat.ExpatError) as error:
1008
748
logger.error("Failed to override Introspection method",
1009
exc_info=error)
749
error)
1010
750
return xmlstring
1011
751
1012
752
1017
757
return dbus.String(dt.isoformat(),
1018
758
variant_level=variant_level)
1019
759
1020
1021
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1022
.__metaclass__):
1023
"""Applied to an empty subclass of a D-Bus object, this metaclass
1024
will add additional D-Bus attributes matching a certain pattern.
1025
"""
1026
def __new__(mcs, name, bases, attr):
1027
# Go through all the base classes which could have D-Bus
1028
# methods, signals, or properties in them
1029
old_interface_names = []
1030
for base in (b for b in bases
1031
if issubclass(b, dbus.service.Object)):
1032
# Go though all attributes of the base class
1033
for attrname, attribute in inspect.getmembers(base):
1034
# Ignore non-D-Bus attributes, and D-Bus attributes
1035
# with the wrong interface name
1036
if (not hasattr(attribute, "_dbus_interface")
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1039
continue
1040
# Create an alternate D-Bus interface name based on
1041
# the current name
1042
alt_interface = (attribute._dbus_interface
1043
.replace("se.recompile.Mandos",
1044
"se.bsnet.fukt.Mandos"))
1045
if alt_interface != attribute._dbus_interface:
1046
old_interface_names.append(alt_interface)
1047
# Is this a D-Bus signal?
1048
if getattr(attribute, "_dbus_is_signal", False):
1049
# Extract the original non-method function by
1050
# black magic
1051
nonmethod_func = (dict(
1052
zip(attribute.func_code.co_freevars,
1053
attribute.__closure__))["func"]
1054
.cell_contents)
1055
# Create a new, but exactly alike, function
1056
# object, and decorate it to be a new D-Bus signal
1057
# with the alternate D-Bus interface name
1058
new_function = (dbus.service.signal
1059
(alt_interface,
1060
attribute._dbus_signature)
1061
(types.FunctionType(
1062
nonmethod_func.func_code,
1063
nonmethod_func.func_globals,
1064
nonmethod_func.func_name,
1065
nonmethod_func.func_defaults,
1066
nonmethod_func.func_closure)))
1067
# Copy annotations, if any
1068
try:
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1071
except AttributeError:
1072
pass
1073
# Define a creator of a function to call both the
1074
# old and new functions, so both the old and new
1075
# signals gets sent when the function is called
1076
def fixscope(func1, func2):
1077
"""This function is a scope container to pass
1078
func1 and func2 to the "call_both" function
1079
outside of its arguments"""
1080
def call_both(*args, **kwargs):
1081
"""This function will emit two D-Bus
1082
signals by calling func1 and func2"""
1083
func1(*args, **kwargs)
1084
func2(*args, **kwargs)
1085
return call_both
1086
# Create the "call_both" function and add it to
1087
# the class
1088
attr[attrname] = fixscope(attribute,
1089
new_function)
1090
# Is this a D-Bus method?
1091
elif getattr(attribute, "_dbus_is_method", False):
1092
# Create a new, but exactly alike, function
1093
# object. Decorate it to be a new D-Bus method
1094
# with the alternate D-Bus interface name. Add it
1095
# to the class.
1096
attr[attrname] = (dbus.service.method
1097
(alt_interface,
1098
attribute._dbus_in_signature,
1099
attribute._dbus_out_signature)
1100
(types.FunctionType
1101
(attribute.func_code,
1102
attribute.func_globals,
1103
attribute.func_name,
1104
attribute.func_defaults,
1105
attribute.func_closure)))
1106
# Copy annotations, if any
1107
try:
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1110
except AttributeError:
1111
pass
1112
# Is this a D-Bus property?
1113
elif getattr(attribute, "_dbus_is_property", False):
1114
# Create a new, but exactly alike, function
1115
# object, and decorate it to be a new D-Bus
1116
# property with the alternate D-Bus interface
1117
# name. Add it to the class.
1118
attr[attrname] = (dbus_service_property
1119
(alt_interface,
1120
attribute._dbus_signature,
1121
attribute._dbus_access,
1122
attribute
1123
._dbus_get_args_options
1124
["byte_arrays"])
1125
(types.FunctionType
1126
(attribute.func_code,
1127
attribute.func_globals,
1128
attribute.func_name,
1129
attribute.func_defaults,
1130
attribute.func_closure)))
1131
# Copy annotations, if any
1132
try:
1133
attr[attrname]._dbus_annotations = (
1134
dict(attribute._dbus_annotations))
1135
except AttributeError:
1136
pass
1137
# Is this a D-Bus interface?
1138
elif getattr(attribute, "_dbus_is_interface", False):
1139
# Create a new, but exactly alike, function
1140
# object. Decorate it to be a new D-Bus interface
1141
# with the alternate D-Bus interface name. Add it
1142
# to the class.
1143
attr[attrname] = (dbus_interface_annotations
1144
(alt_interface)
1145
(types.FunctionType
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1155
def func(self):
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1159
itertools.count()):
1160
if aname not in attr:
1161
attr[aname] = func
1162
break
1163
return type.__new__(mcs, name, bases, attr)
1164
1165
1166
760
class ClientDBus(Client, DBusObjectWithProperties):
1167
761
"""A Client class using D-Bus
1168
762
1177
771
# dbus.service.Object doesn't use super(), so we can't either.
1178
772
1179
773
def __init__(self, bus = None, *args, **kwargs):
774
self._approvals_pending = 0
1180
775
self.bus = bus
1181
776
Client.__init__(self, *args, **kwargs)
1182
777
# Only now, when this client is initialized, can it show up on
1192
787
def notifychangeproperty(transform_func,
1193
788
dbus_name, type_func=lambda x: x,
1194
789
variant_level=1):
1195
""" Modify a variable so that it's a property which announces
1196
its changes to DBus.
1197
1198
transform_fun: Function that takes a value and a variant_level
1199
and transforms it to a D-Bus type.
1200
dbus_name: D-Bus name of the variable
790
""" Modify a variable so that its a property that announce its
791
changes to DBus.
792
transform_fun: Function that takes a value and transform it to
793
DBus type.
794
dbus_name: DBus name of the variable
1201
795
type_func: Function that transform the value before sending it
1202
to the D-Bus. Default: no transform
1203
variant_level: D-Bus variant level. Default: 1
796
to DBus
797
variant_level: DBus variant level. default: 1
1204
798
"""
1205
attrname = "_{0}".format(dbus_name)
799
real_value = [None,]
1206
800
def setter(self, value):
801
old_value = real_value[0]
802
real_value[0] = value
1207
803
if hasattr(self, "dbus_object_path"):
1208
if (not hasattr(self, attrname) or
1209
type_func(getattr(self, attrname, None))
1210
!= type_func(value)):
1211
dbus_value = transform_func(type_func(value),
1212
variant_level
1213
=variant_level)
804
if type_func(old_value) != type_func(real_value[0]):
805
dbus_value = transform_func(type_func(real_value[0]),
806
variant_level)
1214
807
self.PropertyChanged(dbus.String(dbus_name),
1215
808
dbus_value)
1216
setattr(self, attrname, value)
1217
1218
return property(lambda self: getattr(self, attrname), setter)
1219
1220
809
810
return property(lambda self: real_value[0], setter)
811
812
1221
813
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1222
814
approvals_pending = notifychangeproperty(dbus.Boolean,
1223
815
"ApprovalPending",
1226
818
last_enabled = notifychangeproperty(datetime_to_dbus,
1227
819
"LastEnabled")
1228
820
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1229
type_func = lambda checker:
1230
checker is not None)
821
type_func = lambda checker: checker is not None)
1231
822
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1232
823
"LastCheckedOK")
1233
last_checker_status = notifychangeproperty(dbus.Int16,
1234
"LastCheckerStatus")
1235
last_approval_request = notifychangeproperty(
1236
datetime_to_dbus, "LastApprovalRequest")
824
last_approval_request = notifychangeproperty(datetime_to_dbus,
825
"LastApprovalRequest")
1237
826
approved_by_default = notifychangeproperty(dbus.Boolean,
1238
827
"ApprovedByDefault")
1239
approval_delay = notifychangeproperty(dbus.UInt64,
1240
"ApprovalDelay",
1241
type_func =
1242
timedelta_to_milliseconds)
1243
approval_duration = notifychangeproperty(
1244
dbus.UInt64, "ApprovalDuration",
1245
type_func = timedelta_to_milliseconds)
828
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
829
type_func = _timedelta_to_milliseconds)
830
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
831
type_func = _timedelta_to_milliseconds)
1246
832
host = notifychangeproperty(dbus.String, "Host")
1247
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1248
type_func =
1249
timedelta_to_milliseconds)
1250
extended_timeout = notifychangeproperty(
1251
dbus.UInt64, "ExtendedTimeout",
1252
type_func = timedelta_to_milliseconds)
1253
interval = notifychangeproperty(dbus.UInt64,
1254
"Interval",
1255
type_func =
1256
timedelta_to_milliseconds)
833
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
834
type_func = _timedelta_to_milliseconds)
835
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
836
type_func = _timedelta_to_milliseconds)
837
interval = notifychangeproperty(dbus.UInt16, "Interval",
838
type_func = _timedelta_to_milliseconds)
1257
839
checker_command = notifychangeproperty(dbus.String, "Checker")
1258
840
1259
841
del notifychangeproperty
1285
867
1286
868
return Client.checker_callback(self, pid, condition, command,
1287
869
*args, **kwargs)
1288
870
1289
871
def start_checker(self, *args, **kwargs):
1290
872
old_checker = self.checker
1291
873
if self.checker is not None:
1301
883
return r
1302
884
1303
885
def _reset_approved(self):
1304
self.approved = None
886
self._approved = None
1305
887
return False
1306
888
1307
889
def approve(self, value=True):
1308
890
self.send_changedstate()
1309
self.approved = value
1310
gobject.timeout_add(timedelta_to_milliseconds
891
self._approved = value
892
gobject.timeout_add(_timedelta_to_milliseconds
1311
893
(self.approval_duration),
1312
894
self._reset_approved)
1313
895
1314
896
1315
897
## D-Bus methods, signals & properties
1316
_interface = "se.recompile.Mandos.Client"
1317
1318
## Interfaces
1319
1320
@dbus_interface_annotations(_interface)
1321
def _foo(self):
1322
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
"false"}
898
_interface = "se.bsnet.fukt.Mandos.Client"
1324
899
1325
900
## Signals
1326
901
1426
1001
access="readwrite")
1427
1002
def ApprovalDuration_dbus_property(self, value=None):
1428
1003
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1004
return dbus.UInt64(_timedelta_to_milliseconds(
1430
1005
self.approval_duration))
1431
1006
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1432
1007
1446
1021
def Host_dbus_property(self, value=None):
1447
1022
if value is None: # get
1448
1023
return dbus.String(self.host)
1449
self.host = unicode(value)
1024
self.host = value
1450
1025
1451
1026
# Created - property
1452
1027
@dbus_service_property(_interface, signature="s", access="read")
1453
1028
def Created_dbus_property(self):
1454
return datetime_to_dbus(self.created)
1029
return dbus.String(datetime_to_dbus(self.created))
1455
1030
1456
1031
# LastEnabled - property
1457
1032
@dbus_service_property(_interface, signature="s", access="read")
1478
1053
return
1479
1054
return datetime_to_dbus(self.last_checked_ok)
1480
1055
1481
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
1483
access="read")
1484
def LastCheckerStatus_dbus_property(self):
1485
return dbus.Int16(self.last_checker_status)
1486
1487
1056
# Expires - property
1488
1057
@dbus_service_property(_interface, signature="s", access="read")
1489
1058
def Expires_dbus_property(self):
1501
1070
if value is None: # get
1502
1071
return dbus.UInt64(self.timeout_milliseconds())
1503
1072
self.timeout = datetime.timedelta(0, 0, 0, value)
1073
if getattr(self, "disable_initiator_tag", None) is None:
1074
return
1504
1075
# Reschedule timeout
1505
if self.enabled:
1506
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1510
# The timeout has passed
1511
self.disable()
1512
else:
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1515
time_to_die))
1516
if (getattr(self, "disable_initiator_tag", None)
1517
is None):
1518
return
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
1521
(time_to_die,
1522
self.disable))
1523
1076
gobject.source_remove(self.disable_initiator_tag)
1077
self.disable_initiator_tag = None
1078
self.expires = None
1079
time_to_die = (self.
1080
_timedelta_to_milliseconds((self
1081
.last_checked_ok
1082
+ self.timeout)
1083
- datetime.datetime
1084
.utcnow()))
1085
if time_to_die <= 0:
1086
# The timeout has passed
1087
self.disable()
1088
else:
1089
self.expires = (datetime.datetime.utcnow()
1090
+ datetime.timedelta(milliseconds = time_to_die))
1091
self.disable_initiator_tag = (gobject.timeout_add
1092
(time_to_die, self.disable))
1093
1524
1094
# ExtendedTimeout - property
1525
1095
@dbus_service_property(_interface, signature="t",
1526
1096
access="readwrite")
1528
1098
if value is None: # get
1529
1099
return dbus.UInt64(self.extended_timeout_milliseconds())
1530
1100
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1531
1101
1532
1102
# Interval - property
1533
1103
@dbus_service_property(_interface, signature="t",
1534
1104
access="readwrite")
1538
1108
self.interval = datetime.timedelta(0, 0, 0, value)
1539
1109
if getattr(self, "checker_initiator_tag", None) is None:
1540
1110
return
1541
if self.enabled:
1542
# Reschedule checker run
1543
gobject.source_remove(self.checker_initiator_tag)
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
1547
1111
# Reschedule checker run
1112
gobject.source_remove(self.checker_initiator_tag)
1113
self.checker_initiator_tag = (gobject.timeout_add
1114
(value, self.start_checker))
1115
self.start_checker() # Start one now, too
1116
1548
1117
# Checker - property
1549
1118
@dbus_service_property(_interface, signature="s",
1550
1119
access="readwrite")
1551
1120
def Checker_dbus_property(self, value=None):
1552
1121
if value is None: # get
1553
1122
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
1123
self.checker_command = value
1555
1124
1556
1125
# CheckerRunning - property
1557
1126
@dbus_service_property(_interface, signature="b",
1584
1153
self._pipe.send(('init', fpr, address))
1585
1154
if not self._pipe.recv():
1586
1155
raise KeyError()
1587
1156
1588
1157
def __getattribute__(self, name):
1589
if name == '_pipe':
1158
if(name == '_pipe'):
1590
1159
return super(ProxyClient, self).__getattribute__(name)
1591
1160
self._pipe.send(('getattr', name))
1592
1161
data = self._pipe.recv()
1597
1166
self._pipe.send(('funcall', name, args, kwargs))
1598
1167
return self._pipe.recv()[1]
1599
1168
return func
1600
1169
1601
1170
def __setattr__(self, name, value):
1602
if name == '_pipe':
1171
if(name == '_pipe'):
1603
1172
return super(ProxyClient, self).__setattr__(name, value)
1604
1173
self._pipe.send(('setattr', name, value))
1605
1174
1606
1175
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1609
1610
1611
1176
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1177
"""A class to handle client connections.
1613
1178
1620
1185
unicode(self.client_address))
1621
1186
logger.debug("Pipe FD: %d",
1622
1187
self.server.child_pipe.fileno())
1623
1188
1624
1189
session = (gnutls.connection
1625
1190
.ClientSession(self.request,
1626
1191
gnutls.connection
1627
1192
.X509Credentials()))
1628
1193
1629
1194
# Note: gnutls.connection.X509Credentials is really a
1630
1195
# generic GnuTLS certificate credentials object so long as
1631
1196
# no X.509 keys are added to it. Therefore, we can use it
1632
1197
# here despite using OpenPGP certificates.
1633
1198
1634
1199
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
1200
# "+AES-256-CBC", "+SHA1",
1636
1201
# "+COMP-NULL", "+CTYPE-OPENPGP",
1642
1207
(gnutls.library.functions
1643
1208
.gnutls_priority_set_direct(session._c_object,
1644
1209
priority, None))
1645
1210
1646
1211
# Start communication using the Mandos protocol
1647
1212
# Get protocol number
1648
1213
line = self.request.makefile().readline()
1653
1218
except (ValueError, IndexError, RuntimeError) as error:
1654
1219
logger.error("Unknown protocol version: %s", error)
1655
1220
return
1656
1221
1657
1222
# Start GnuTLS connection
1658
1223
try:
1659
1224
session.handshake()
1663
1228
# established. Just abandon the request.
1664
1229
return
1665
1230
logger.debug("Handshake succeeded")
1666
1231
1667
1232
approval_required = False
1668
1233
try:
1669
1234
try:
1674
1239
logger.warning("Bad certificate: %s", error)
1675
1240
return
1676
1241
logger.debug("Fingerprint: %s", fpr)
1677
1242
1678
1243
try:
1679
1244
client = ProxyClient(child_pipe, fpr,
1680
1245
self.client_address)
1692
1257
client.name)
1693
1258
if self.server.use_dbus:
1694
1259
# Emit D-Bus signal
1695
client.Rejected("Disabled")
1260
client.Rejected("Disabled")
1696
1261
return
1697
1262
1698
if client.approved or not client.approval_delay:
1263
if client._approved or not client.approval_delay:
1699
1264
#We are approved or approval is disabled
1700
1265
break
1701
elif client.approved is None:
1266
elif client._approved is None:
1702
1267
logger.info("Client %s needs approval",
1703
1268
client.name)
1704
1269
if self.server.use_dbus:
1715
1280
return
1716
1281
1717
1282
#wait until timeout or approved
1283
#x = float(client._timedelta_to_milliseconds(delay))
1718
1284
time = datetime.datetime.now()
1719
1285
client.changedstate.acquire()
1720
(client.changedstate.wait
1721
(float(client.timedelta_to_milliseconds(delay)
1722
/ 1000)))
1286
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1723
1287
client.changedstate.release()
1724
1288
time2 = datetime.datetime.now()
1725
1289
if (time2 - time) >= delay:
1747
1311
sent, len(client.secret)
1748
1312
- (sent_size + sent))
1749
1313
sent_size += sent
1750
1314
1751
1315
logger.info("Sending secret to %s", client.name)
1752
# bump the timeout using extended_timeout
1753
client.bump_timeout(client.extended_timeout)
1316
# bump the timeout as if seen
1317
client.checked_ok(client.extended_timeout)
1754
1318
if self.server.use_dbus:
1755
1319
# Emit D-Bus signal
1756
1320
client.GotSecret()
1823
1387
# Convert the buffer to a Python bytestring
1824
1388
fpr = ctypes.string_at(buf, buf_len.value)
1825
1389
# Convert the bytestring to hexadecimal notation
1826
hex_fpr = binascii.hexlify(fpr).upper()
1390
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1827
1391
return hex_fpr
1828
1392
1829
1393
1832
1396
def sub_process_main(self, request, address):
1833
1397
try:
1834
1398
self.finish_request(request, address)
1835
except Exception:
1399
except:
1836
1400
self.handle_error(request, address)
1837
1401
self.close_request(request)
1838
1402
1839
1403
def process_request(self, request, address):
1840
1404
"""Start a new process to process the request."""
1841
proc = multiprocessing.Process(target = self.sub_process_main,
1842
args = (request,
1843
address))
1844
proc.start()
1845
return proc
1846
1405
multiprocessing.Process(target = self.sub_process_main,
1406
args = (request, address)).start()
1847
1407
1848
1408
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1849
1409
""" adds a pipe to the MixIn """
1853
1413
This function creates a new pipe in self.pipe
1854
1414
"""
1855
1415
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1856
1857
proc = MultiprocessingMixIn.process_request(self, request,
1858
client_address)
1416
1417
super(MultiprocessingMixInWithPipe,
1418
self).process_request(request, client_address)
1859
1419
self.child_pipe.close()
1860
self.add_pipe(parent_pipe, proc)
1861
1862
def add_pipe(self, parent_pipe, proc):
1420
self.add_pipe(parent_pipe)
1421
1422
def add_pipe(self, parent_pipe):
1863
1423
"""Dummy function; override as necessary"""
1864
1424
raise NotImplementedError
1865
1425
1866
1867
1426
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1868
1427
socketserver.TCPServer, object):
1869
1428
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1943
1502
self.enabled = False
1944
1503
self.clients = clients
1945
1504
if self.clients is None:
1946
self.clients = {}
1505
self.clients = set()
1947
1506
self.use_dbus = use_dbus
1948
1507
self.gnutls_priority = gnutls_priority
1949
1508
IPv6_TCPServer.__init__(self, server_address,
1953
1512
def server_activate(self):
1954
1513
if self.enabled:
1955
1514
return socketserver.TCPServer.server_activate(self)
1956
1957
1515
def enable(self):
1958
1516
self.enabled = True
1959
1960
def add_pipe(self, parent_pipe, proc):
1517
def add_pipe(self, parent_pipe):
1961
1518
# Call "handle_ipc" for both data and EOF events
1962
1519
gobject.io_add_watch(parent_pipe.fileno(),
1963
1520
gobject.IO_IN | gobject.IO_HUP,
1964
1521
functools.partial(self.handle_ipc,
1965
parent_pipe =
1966
parent_pipe,
1967
proc = proc))
1968
1522
parent_pipe = parent_pipe))
1523
1969
1524
def handle_ipc(self, source, condition, parent_pipe=None,
1970
proc = None, client_object=None):
1525
client_object=None):
1971
1526
condition_names = {
1972
1527
gobject.IO_IN: "IN", # There is data to read.
1973
1528
gobject.IO_OUT: "OUT", # Data can be written (without
1982
1537
for cond, name in
1983
1538
condition_names.iteritems()
1984
1539
if cond & condition)
1985
# error, or the other end of multiprocessing.Pipe has closed
1540
# error or the other end of multiprocessing.Pipe has closed
1986
1541
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1987
# Wait for other process to exit
1988
proc.join()
1989
1542
return False
1990
1543
1991
1544
# Read a request from the child
1996
1549
fpr = request[1]
1997
1550
address = request[2]
1998
1551
1999
for c in self.clients.itervalues():
1552
for c in self.clients:
2000
1553
if c.fingerprint == fpr:
2001
1554
client = c
2002
1555
break
2005
1558
"dress: %s", fpr, address)
2006
1559
if self.use_dbus:
2007
1560
# Emit D-Bus signal
2008
mandos_dbus_service.ClientNotFound(fpr,
2009
address[0])
1561
mandos_dbus_service.ClientNotFound(fpr, address[0])
2010
1562
parent_pipe.send(False)
2011
1563
return False
2012
1564
2013
1565
gobject.io_add_watch(parent_pipe.fileno(),
2014
1566
gobject.IO_IN | gobject.IO_HUP,
2015
1567
functools.partial(self.handle_ipc,
2016
parent_pipe =
2017
parent_pipe,
2018
proc = proc,
2019
client_object =
2020
client))
1568
parent_pipe = parent_pipe,
1569
client_object = client))
2021
1570
parent_pipe.send(True)
2022
# remove the old hook in favor of the new above hook on
2023
# same fileno
1571
# remove the old hook in favor of the new above hook on same fileno
2024
1572
return False
2025
1573
if command == 'funcall':
2026
1574
funcname = request[1]
2027
1575
args = request[2]
2028
1576
kwargs = request[3]
2029
1577
2030
parent_pipe.send(('data', getattr(client_object,
2031
funcname)(*args,
2032
**kwargs)))
2033
1578
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1579
2034
1580
if command == 'getattr':
2035
1581
attrname = request[1]
2036
1582
if callable(client_object.__getattribute__(attrname)):
2037
1583
parent_pipe.send(('function',))
2038
1584
else:
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
1585
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2041
1586
2042
1587
if command == 'setattr':
2043
1588
attrname = request[1]
2044
1589
value = request[2]
2045
1590
setattr(client_object, attrname, value)
2046
1591
2047
1592
return True
2048
1593
2049
1594
2079
1624
elif suffix == "w":
2080
1625
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2081
1626
else:
2082
raise ValueError("Unknown suffix {0!r}"
2083
.format(suffix))
1627
raise ValueError("Unknown suffix %r" % suffix)
2084
1628
except (ValueError, IndexError) as e:
2085
1629
raise ValueError(*(e.args))
2086
1630
timevalue += delta
2087
1631
return timevalue
2088
1632
2089
1633
1634
def if_nametoindex(interface):
1635
"""Call the C function if_nametoindex(), or equivalent
1636
1637
Note: This function cannot accept a unicode string."""
1638
global if_nametoindex
1639
try:
1640
if_nametoindex = (ctypes.cdll.LoadLibrary
1641
(ctypes.util.find_library("c"))
1642
.if_nametoindex)
1643
except (OSError, AttributeError):
1644
logger.warning("Doing if_nametoindex the hard way")
1645
def if_nametoindex(interface):
1646
"Get an interface index the hard way, i.e. using fcntl()"
1647
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1648
with contextlib.closing(socket.socket()) as s:
1649
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1650
struct.pack(str("16s16x"),
1651
interface))
1652
interface_index = struct.unpack(str("I"),
1653
ifreq[16:20])[0]
1654
return interface_index
1655
return if_nametoindex(interface)
1656
1657
2090
1658
def daemon(nochdir = False, noclose = False):
2091
1659
"""See daemon(3). Standard BSD Unix function.
2092
1660
2100
1668
sys.exit()
2101
1669
if not noclose:
2102
1670
# Close all standard open file descriptors
2103
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1671
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2104
1672
if not stat.S_ISCHR(os.fstat(null).st_mode):
2105
1673
raise OSError(errno.ENODEV,
2106
"{0} not a character device"
2107
.format(os.devnull))
1674
"%s not a character device"
1675
% os.path.devnull)
2108
1676
os.dup2(null, sys.stdin.fileno())
2109
1677
os.dup2(null, sys.stdout.fileno())
2110
1678
os.dup2(null, sys.stderr.fileno())
2119
1687
2120
1688
parser = argparse.ArgumentParser()
2121
1689
parser.add_argument("-v", "--version", action="version",
2122
version = "%(prog)s {0}".format(version),
1690
version = "%%(prog)s %s" % version,
2123
1691
help="show version number and exit")
2124
1692
parser.add_argument("-i", "--interface", metavar="IF",
2125
1693
help="Bind to interface IF")
2147
1715
" system bus interface")
2148
1716
parser.add_argument("--no-ipv6", action="store_false",
2149
1717
dest="use_ipv6", help="Do not use IPv6")
2150
parser.add_argument("--no-restore", action="store_false",
2151
dest="restore", help="Do not restore stored"
2152
" state")
2153
parser.add_argument("--statedir", metavar="DIR",
2154
help="Directory to save/restore state in")
2155
2156
1718
options = parser.parse_args()
2157
1719
2158
1720
if options.check:
2171
1733
"use_dbus": "True",
2172
1734
"use_ipv6": "True",
2173
1735
"debuglevel": "",
2174
"restore": "True",
2175
"statedir": "/var/lib/mandos"
2176
1736
}
2177
1737
2178
1738
# Parse config file for server-global settings
2195
1755
# options, if set.
2196
1756
for option in ("interface", "address", "port", "debug",
2197
1757
"priority", "servicename", "configdir",
2198
"use_dbus", "use_ipv6", "debuglevel", "restore",
2199
"statedir"):
1758
"use_dbus", "use_ipv6", "debuglevel"):
2200
1759
value = getattr(options, option)
2201
1760
if value is not None:
2202
1761
server_settings[option] = value
2214
1773
debuglevel = server_settings["debuglevel"]
2215
1774
use_dbus = server_settings["use_dbus"]
2216
1775
use_ipv6 = server_settings["use_ipv6"]
2217
stored_state_path = os.path.join(server_settings["statedir"],
2218
stored_state_file)
2219
2220
if debug:
2221
initlogger(debug, logging.DEBUG)
2222
else:
2223
if not debuglevel:
2224
initlogger(debug)
2225
else:
2226
level = getattr(logging, debuglevel.upper())
2227
initlogger(debug, level)
2228
1776
2229
1777
if server_settings["servicename"] != "Mandos":
2230
1778
syslogger.setFormatter(logging.Formatter
2231
('Mandos ({0}) [%(process)d]:'
2232
' %(levelname)s: %(message)s'
2233
.format(server_settings
2234
["servicename"])))
1779
('Mandos (%s) [%%(process)d]:'
1780
' %%(levelname)s: %%(message)s'
1781
% server_settings["servicename"]))
2235
1782
2236
1783
# Parse config file with clients
2237
client_config = configparser.SafeConfigParser(Client
2238
.client_defaults)
1784
client_defaults = { "timeout": "5m",
1785
"extended_timeout": "15m",
1786
"interval": "2m",
1787
"checker": "fping -q -- %%(host)s",
1788
"host": "",
1789
"approval_delay": "0s",
1790
"approval_duration": "1s",
1791
}
1792
client_config = configparser.SafeConfigParser(client_defaults)
2239
1793
client_config.read(os.path.join(server_settings["configdir"],
2240
1794
"clients.conf"))
2241
1795
2258
1812
except IOError:
2259
1813
logger.error("Could not open file %r", pidfilename)
2260
1814
2261
for name in ("_mandos", "mandos", "nobody"):
1815
try:
1816
uid = pwd.getpwnam("_mandos").pw_uid
1817
gid = pwd.getpwnam("_mandos").pw_gid
1818
except KeyError:
2262
1819
try:
2263
uid = pwd.getpwnam(name).pw_uid
2264
gid = pwd.getpwnam(name).pw_gid
2265
break
1820
uid = pwd.getpwnam("mandos").pw_uid
1821
gid = pwd.getpwnam("mandos").pw_gid
2266
1822
except KeyError:
2267
continue
2268
else:
2269
uid = 65534
2270
gid = 65534
1823
try:
1824
uid = pwd.getpwnam("nobody").pw_uid
1825
gid = pwd.getpwnam("nobody").pw_gid
1826
except KeyError:
1827
uid = 65534
1828
gid = 65534
2271
1829
try:
2272
1830
os.setgid(gid)
2273
1831
os.setuid(uid)
2275
1833
if error[0] != errno.EPERM:
2276
1834
raise error
2277
1835
1836
if not debug and not debuglevel:
1837
syslogger.setLevel(logging.WARNING)
1838
console.setLevel(logging.WARNING)
1839
if debuglevel:
1840
level = getattr(logging, debuglevel.upper())
1841
syslogger.setLevel(level)
1842
console.setLevel(level)
1843
2278
1844
if debug:
2279
1845
# Enable all possible GnuTLS debugging
2280
1846
2290
1856
.gnutls_global_set_log_function(debug_gnutls))
2291
1857
2292
1858
# Redirect stdin so all checkers get /dev/null
2293
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1859
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2294
1860
os.dup2(null, sys.stdin.fileno())
2295
1861
if null > 2:
2296
1862
os.close(null)
1863
else:
1864
# No console logging
1865
logger.removeHandler(console)
2297
1866
2298
1867
# Need to fork before connecting to D-Bus
2299
1868
if not debug:
2300
1869
# Close all input and output, do double fork, etc.
2301
1870
daemon()
2302
1871
2303
gobject.threads_init()
2304
2305
1872
global main_loop
2306
1873
# From the Avahi example code
2307
DBusGMainLoop(set_as_default=True)
1874
DBusGMainLoop(set_as_default=True )
2308
1875
main_loop = gobject.MainLoop()
2309
1876
bus = dbus.SystemBus()
2310
1877
# End of Avahi example code
2311
1878
if use_dbus:
2312
1879
try:
2313
bus_name = dbus.service.BusName("se.recompile.Mandos",
1880
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2314
1881
bus, do_not_queue=True)
2315
old_bus_name = (dbus.service.BusName
2316
("se.bsnet.fukt.Mandos", bus,
2317
do_not_queue=True))
2318
1882
except dbus.exceptions.NameExistsException as e:
2319
1883
logger.error(unicode(e) + ", disabling D-Bus")
2320
1884
use_dbus = False
2321
1885
server_settings["use_dbus"] = False
2322
1886
tcp_server.use_dbus = False
2323
1887
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2324
service = AvahiServiceToSyslog(name =
2325
server_settings["servicename"],
2326
servicetype = "_mandos._tcp",
2327
protocol = protocol, bus = bus)
1888
service = AvahiService(name = server_settings["servicename"],
1889
servicetype = "_mandos._tcp",
1890
protocol = protocol, bus = bus)
2328
1891
if server_settings["interface"]:
2329
1892
service.interface = (if_nametoindex
2330
1893
(str(server_settings["interface"])))
2334
1897
2335
1898
client_class = Client
2336
1899
if use_dbus:
2337
client_class = functools.partial(ClientDBusTransitional,
2338
bus = bus)
2339
2340
client_settings = Client.config_parser(client_config)
2341
old_client_settings = {}
2342
clients_data = {}
2343
2344
# Get client data and settings from last running state.
2345
if server_settings["restore"]:
2346
try:
2347
with open(stored_state_path, "rb") as stored_state:
2348
clients_data, old_client_settings = (pickle.load
2349
(stored_state))
2350
os.remove(stored_state_path)
2351
except IOError as e:
2352
logger.warning("Could not load persistent state: {0}"
2353
.format(e))
2354
if e.errno != errno.ENOENT:
2355
raise
2356
except EOFError as e:
2357
logger.warning("Could not load persistent state: "
2358
"EOFError: {0}".format(e))
2359
2360
with PGPEngine() as pgp:
2361
for client_name, client in clients_data.iteritems():
2362
# Decide which value to use after restoring saved state.
2363
# We have three different values: Old config file,
2364
# new config file, and saved state.
2365
# New config value takes precedence if it differs from old
2366
# config value, otherwise use saved state.
2367
for name, value in client_settings[client_name].items():
2368
try:
2369
# For each value in new config, check if it
2370
# differs from the old config value (Except for
2371
# the "secret" attribute)
2372
if (name != "secret" and
2373
value != old_client_settings[client_name]
2374
[name]):
2375
client[name] = value
2376
except KeyError:
2377
pass
2378
2379
# Clients who has passed its expire date can still be
2380
# enabled if its last checker was successful. Clients
2381
# whose checker succeeded before we stored its state is
2382
# assumed to have successfully run all checkers during
2383
# downtime.
2384
if client["enabled"]:
2385
if datetime.datetime.utcnow() >= client["expires"]:
2386
if not client["last_checked_ok"]:
2387
logger.warning(
2388
"disabling client {0} - Client never "
2389
"performed a successful checker"
2390
.format(client_name))
2391
client["enabled"] = False
2392
elif client["last_checker_status"] != 0:
2393
logger.warning(
2394
"disabling client {0} - Client "
2395
"last checker failed with error code {1}"
2396
.format(client_name,
2397
client["last_checker_status"]))
2398
client["enabled"] = False
2399
else:
2400
client["expires"] = (datetime.datetime
2401
.utcnow()
2402
+ client["timeout"])
2403
logger.debug("Last checker succeeded,"
2404
" keeping {0} enabled"
2405
.format(client_name))
1900
client_class = functools.partial(ClientDBus, bus = bus)
1901
def client_config_items(config, section):
1902
special_settings = {
1903
"approved_by_default":
1904
lambda: config.getboolean(section,
1905
"approved_by_default"),
1906
}
1907
for name, value in config.items(section):
2406
1908
try:
2407
client["secret"] = (
2408
pgp.decrypt(client["encrypted_secret"],
2409
client_settings[client_name]
2410
["secret"]))
2411
except PGPError:
2412
# If decryption fails, we use secret from new settings
2413
logger.debug("Failed to decrypt {0} old secret"
2414
.format(client_name))
2415
client["secret"] = (
2416
client_settings[client_name]["secret"])
2417
2418
2419
# Add/remove clients based on new changes made to config
2420
for client_name in (set(old_client_settings)
2421
- set(client_settings)):
2422
del clients_data[client_name]
2423
for client_name in (set(client_settings)
2424
- set(old_client_settings)):
2425
clients_data[client_name] = client_settings[client_name]
2426
2427
# Create all client objects
2428
for client_name, client in clients_data.iteritems():
2429
tcp_server.clients[client_name] = client_class(
2430
name = client_name, settings = client)
2431
1909
yield (name, special_settings[name]())
1910
except KeyError:
1911
yield (name, value)
1912
1913
tcp_server.clients.update(set(
1914
client_class(name = section,
1915
config= dict(client_config_items(
1916
client_config, section)))
1917
for section in client_config.sections()))
2432
1918
if not tcp_server.clients:
2433
1919
logger.warning("No clients defined")
2434
1920
2445
1931
# "pidfile" was never created
2446
1932
pass
2447
1933
del pidfilename
1934
2448
1935
signal.signal(signal.SIGINT, signal.SIG_IGN)
2449
1936
2450
1937
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2451
1938
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2452
1939
2453
1940
if use_dbus:
2454
class MandosDBusService(DBusObjectWithProperties):
1941
class MandosDBusService(dbus.service.Object):
2455
1942
"""A D-Bus proxy object"""
2456
1943
def __init__(self):
2457
1944
dbus.service.Object.__init__(self, bus, "/")
2458
_interface = "se.recompile.Mandos"
2459
2460
@dbus_interface_annotations(_interface)
2461
def _foo(self):
2462
return { "org.freedesktop.DBus.Property"
2463
".EmitsChangedSignal":
2464
"false"}
1945
_interface = "se.bsnet.fukt.Mandos"
2465
1946
2466
1947
@dbus.service.signal(_interface, signature="o")
2467
1948
def ClientAdded(self, objpath):
2482
1963
def GetAllClients(self):
2483
1964
"D-Bus method"
2484
1965
return dbus.Array(c.dbus_object_path
2485
for c in
2486
tcp_server.clients.itervalues())
1966
for c in tcp_server.clients)
2487
1967
2488
1968
@dbus.service.method(_interface,
2489
1969
out_signature="a{oa{sv}}")
2491
1971
"D-Bus method"
2492
1972
return dbus.Dictionary(
2493
1973
((c.dbus_object_path, c.GetAll(""))
2494
for c in tcp_server.clients.itervalues()),
1974
for c in tcp_server.clients),
2495
1975
signature="oa{sv}")
2496
1976
2497
1977
@dbus.service.method(_interface, in_signature="o")
2498
1978
def RemoveClient(self, object_path):
2499
1979
"D-Bus method"
2500
for c in tcp_server.clients.itervalues():
1980
for c in tcp_server.clients:
2501
1981
if c.dbus_object_path == object_path:
2502
del tcp_server.clients[c.name]
1982
tcp_server.clients.remove(c)
2503
1983
c.remove_from_connection()
2504
1984
# Don't signal anything except ClientRemoved
2505
1985
c.disable(quiet=True)
2510
1990
2511
1991
del _interface
2512
1992
2513
class MandosDBusServiceTransitional(MandosDBusService):
2514
__metaclass__ = AlternateDBusNamesMetaclass
2515
mandos_dbus_service = MandosDBusServiceTransitional()
1993
mandos_dbus_service = MandosDBusService()
2516
1994
2517
1995
def cleanup():
2518
1996
"Cleanup function; run on exit"
2519
1997
service.cleanup()
2520
1998
2521
multiprocessing.active_children()
2522
if not (tcp_server.clients or client_settings):
2523
return
2524
2525
# Store client before exiting. Secrets are encrypted with key
2526
# based on what config file has. If config file is
2527
# removed/edited, old secret will thus be unrecovable.
2528
clients = {}
2529
with PGPEngine() as pgp:
2530
for client in tcp_server.clients.itervalues():
2531
key = client_settings[client.name]["secret"]
2532
client.encrypted_secret = pgp.encrypt(client.secret,
2533
key)
2534
client_dict = {}
2535
2536
# A list of attributes that can not be pickled
2537
# + secret.
2538
exclude = set(("bus", "changedstate", "secret",
2539
"checker"))
2540
for name, typ in (inspect.getmembers
2541
(dbus.service.Object)):
2542
exclude.add(name)
2543
2544
client_dict["encrypted_secret"] = (client
2545
.encrypted_secret)
2546
for attr in client.client_structure:
2547
if attr not in exclude:
2548
client_dict[attr] = getattr(client, attr)
2549
2550
clients[client.name] = client_dict
2551
del client_settings[client.name]["secret"]
2552
2553
try:
2554
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2555
prefix="clients-",
2556
dir=os.path.dirname
2557
(stored_state_path))
2558
with os.fdopen(tempfd, "wb") as stored_state:
2559
pickle.dump((clients, client_settings), stored_state)
2560
os.rename(tempname, stored_state_path)
2561
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2563
.format(e))
2564
if not debug:
2565
try:
2566
os.remove(tempname)
2567
except NameError:
2568
pass
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
2570
errno.EEXIST)):
2571
raise e
2572
2573
# Delete all clients, and settings from config
2574
1999
while tcp_server.clients:
2575
name, client = tcp_server.clients.popitem()
2000
client = tcp_server.clients.pop()
2576
2001
if use_dbus:
2577
2002
client.remove_from_connection()
2003
client.disable_hook = None
2578
2004
# Don't signal anything except ClientRemoved
2579
2005
client.disable(quiet=True)
2580
2006
if use_dbus:
2581
2007
# Emit D-Bus signal
2582
mandos_dbus_service.ClientRemoved(client
2583
.dbus_object_path,
2008
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2584
2009
client.name)
2585
client_settings.clear()
2586
2010
2587
2011
atexit.register(cleanup)
2588
2012
2589
for client in tcp_server.clients.itervalues():
2013
for client in tcp_server.clients:
2590
2014
if use_dbus:
2591
2015
# Emit D-Bus signal
2592
2016
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2593
# Need to initiate checking of clients
2594
if client.enabled:
2595
client.init_checker()
2017
client.enable()
2596
2018
2597
2019
tcp_server.enable()
2598
2020
tcp_server.server_activate()
2601
2023
service.port = tcp_server.socket.getsockname()[1]
2602
2024
if use_ipv6:
2603
2025
logger.info("Now listening on address %r, port %d,"
2604
" flowinfo %d, scope_id %d",
2605
*tcp_server.socket.getsockname())
2026
" flowinfo %d, scope_id %d"
2027
% tcp_server.socket.getsockname())
2606
2028
else: # IPv4
2607
logger.info("Now listening on address %r, port %d",
2608
*tcp_server.socket.getsockname())
2029
logger.info("Now listening on address %r, port %d"
2030
% tcp_server.socket.getsockname())
2609
2031
2610
2032
#service.interface = tcp_server.socket.getsockname()[3]
2611
2033
2614
2036
try:
2615
2037
service.activate()
2616
2038
except dbus.exceptions.DBusException as error:
2617
logger.critical("D-Bus Exception", exc_info=error)
2039
logger.critical("DBusException: %s", error)
2618
2040
cleanup()
2619
2041
sys.exit(1)
2620
2042
# End of Avahi example code
2627
2049
logger.debug("Starting main loop")
2628
2050
main_loop.run()
2629
2051
except AvahiError as error:
2630
logger.critical("Avahi Error", exc_info=error)
2052
logger.critical("AvahiError: %s", error)
2631
2053
cleanup()
2632
2054
sys.exit(1)
2633
2055
except KeyboardInterrupt:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0