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 585
- compare with another revision
- download diff
- download tarball
- view history from revision 585
- Committer: Teddy Hogeborn
- Date: 2012-05-17 01:55:58 UTC
- Revision ID: teddy@recompile.se-20120517015558-5703p8nkquc2rhgd
* .bzrignore (statedir): Added.
- files added:
- debian/source/local-options
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@fukt.bsnet.se>.
31
# Contact the authors at <mandos@recompile.se>.
32
32
#
33
33
34
34
from __future__ import (division, absolute_import, print_function,
35
35
unicode_literals)
36
36
37
from future_builtins import *
38
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
63
65
import cPickle as pickle
64
66
import multiprocessing
65
67
import types
68
import binascii
69
import tempfile
70
import itertools
66
71
67
72
import dbus
68
73
import dbus.service
73
78
import ctypes.util
74
79
import xml.dom.minidom
75
80
import inspect
81
import GnuPGInterface
76
82
77
83
try:
78
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
88
except ImportError:
83
89
SO_BINDTODEVICE = None
84
90
85
86
version = "1.3.1"
87
88
#logger = logging.getLogger('mandos')
89
logger = logging.Logger('mandos')
91
version = "1.5.3"
92
stored_state_file = "clients.pickle"
93
94
logger = logging.getLogger()
90
95
syslogger = (logging.handlers.SysLogHandler
91
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
92
97
address = str("/dev/log")))
93
syslogger.setFormatter(logging.Formatter
94
('Mandos [%(process)d]: %(levelname)s:'
95
' %(message)s'))
96
logger.addHandler(syslogger)
97
98
console = logging.StreamHandler()
99
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
' %(levelname)s:'
101
' %(message)s'))
102
logger.addHandler(console)
98
99
try:
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
102
.if_nametoindex)
103
except (OSError, AttributeError):
104
def if_nametoindex(interface):
105
"Get an interface index the hard way, i.e. using fcntl()"
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
with contextlib.closing(socket.socket()) as s:
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
110
interface))
111
interface_index = struct.unpack(str("I"),
112
ifreq[16:20])[0]
113
return interface_index
114
115
116
def initlogger(debug, level=logging.WARNING):
117
"""init logger and add loglevel"""
118
119
syslogger.setFormatter(logging.Formatter
120
('Mandos [%(process)d]: %(levelname)s:'
121
' %(message)s'))
122
logger.addHandler(syslogger)
123
124
if debug:
125
console = logging.StreamHandler()
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
' [%(process)d]:'
128
' %(levelname)s:'
129
' %(message)s'))
130
logger.addHandler(console)
131
logger.setLevel(level)
132
133
134
class PGPError(Exception):
135
"""Exception if encryption/decryption fails"""
136
pass
137
138
139
class PGPEngine(object):
140
"""A simple class for OpenPGP symmetric encryption & decryption"""
141
def __init__(self):
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
144
self.gnupg = GnuPGInterface.GnuPG()
145
self.gnupg.options.meta_interactive = False
146
self.gnupg.options.homedir = self.tempdir
147
self.gnupg.options.extra_args.extend(['--force-mdc',
148
'--quiet',
149
'--no-use-agent'])
150
151
def __enter__(self):
152
return self
153
154
def __exit__ (self, exc_type, exc_value, traceback):
155
self._cleanup()
156
return False
157
158
def __del__(self):
159
self._cleanup()
160
161
def _cleanup(self):
162
if self.tempdir is not None:
163
# Delete contents of tempdir
164
for root, dirs, files in os.walk(self.tempdir,
165
topdown = False):
166
for filename in files:
167
os.remove(os.path.join(root, filename))
168
for dirname in dirs:
169
os.rmdir(os.path.join(root, dirname))
170
# Remove tempdir
171
os.rmdir(self.tempdir)
172
self.tempdir = None
173
174
def password_encode(self, password):
175
# Passphrase can not be empty and can not contain newlines or
176
# NUL bytes. So we prefix it and hex encode it.
177
return b"mandos" + binascii.hexlify(password)
178
179
def encrypt(self, data, password):
180
self.gnupg.passphrase = self.password_encode(password)
181
with open(os.devnull, "w") as devnull:
182
try:
183
proc = self.gnupg.run(['--symmetric'],
184
create_fhs=['stdin', 'stdout'],
185
attach_fhs={'stderr': devnull})
186
with contextlib.closing(proc.handles['stdin']) as f:
187
f.write(data)
188
with contextlib.closing(proc.handles['stdout']) as f:
189
ciphertext = f.read()
190
proc.wait()
191
except IOError as e:
192
raise PGPError(e)
193
self.gnupg.passphrase = None
194
return ciphertext
195
196
def decrypt(self, data, password):
197
self.gnupg.passphrase = self.password_encode(password)
198
with open(os.devnull, "w") as devnull:
199
try:
200
proc = self.gnupg.run(['--decrypt'],
201
create_fhs=['stdin', 'stdout'],
202
attach_fhs={'stderr': devnull})
203
with contextlib.closing(proc.handles['stdin']) as f:
204
f.write(data)
205
with contextlib.closing(proc.handles['stdout']) as f:
206
decrypted_plaintext = f.read()
207
proc.wait()
208
except IOError as e:
209
raise PGPError(e)
210
self.gnupg.passphrase = None
211
return decrypted_plaintext
212
103
213
104
214
class AvahiError(Exception):
105
215
def __init__(self, value, *args, **kwargs):
135
245
server: D-Bus Server
136
246
bus: dbus.SystemBus()
137
247
"""
248
138
249
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
139
250
servicetype = None, port = None, TXT = None,
140
251
domain = "", host = "", max_renames = 32768,
153
264
self.server = None
154
265
self.bus = bus
155
266
self.entry_group_state_changed_match = None
267
156
268
def rename(self):
157
269
"""Derived from the Avahi example code"""
158
270
if self.rename_count >= self.max_renames:
160
272
" after %i retries, exiting.",
161
273
self.rename_count)
162
274
raise AvahiServiceError("Too many renames")
163
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
275
self.name = unicode(self.server
276
.GetAlternativeServiceName(self.name))
164
277
logger.info("Changing Zeroconf service name to %r ...",
165
278
self.name)
166
syslogger.setFormatter(logging.Formatter
167
('Mandos (%s) [%%(process)d]:'
168
' %%(levelname)s: %%(message)s'
169
% self.name))
170
279
self.remove()
171
280
try:
172
281
self.add()
173
282
except dbus.exceptions.DBusException as error:
174
logger.critical("DBusException: %s", error)
283
logger.critical("D-Bus Exception", exc_info=error)
175
284
self.cleanup()
176
285
os._exit(1)
177
286
self.rename_count += 1
287
178
288
def remove(self):
179
289
"""Derived from the Avahi example code"""
180
290
if self.entry_group_state_changed_match is not None:
182
292
self.entry_group_state_changed_match = None
183
293
if self.group is not None:
184
294
self.group.Reset()
295
185
296
def add(self):
186
297
"""Derived from the Avahi example code"""
187
298
self.remove()
192
303
avahi.DBUS_INTERFACE_ENTRY_GROUP)
193
304
self.entry_group_state_changed_match = (
194
305
self.group.connect_to_signal(
195
'StateChanged', self .entry_group_state_changed))
306
'StateChanged', self.entry_group_state_changed))
196
307
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
197
308
self.name, self.type)
198
309
self.group.AddService(
204
315
dbus.UInt16(self.port),
205
316
avahi.string_array_to_txt_array(self.TXT))
206
317
self.group.Commit()
318
207
319
def entry_group_state_changed(self, state, error):
208
320
"""Derived from the Avahi example code"""
209
321
logger.debug("Avahi entry group state change: %i", state)
216
328
elif state == avahi.ENTRY_GROUP_FAILURE:
217
329
logger.critical("Avahi: Error in group state changed %s",
218
330
unicode(error))
219
raise AvahiGroupError("State changed: %s"
220
% unicode(error))
331
raise AvahiGroupError("State changed: {0!s}"
332
.format(error))
333
221
334
def cleanup(self):
222
335
"""Derived from the Avahi example code"""
223
336
if self.group is not None:
224
337
try:
225
338
self.group.Free()
226
339
except (dbus.exceptions.UnknownMethodException,
227
dbus.exceptions.DBusException) as e:
340
dbus.exceptions.DBusException):
228
341
pass
229
342
self.group = None
230
343
self.remove()
344
231
345
def server_state_changed(self, state, error=None):
232
346
"""Derived from the Avahi example code"""
233
347
logger.debug("Avahi server state change: %i", state)
252
366
logger.debug("Unknown state: %r", state)
253
367
else:
254
368
logger.debug("Unknown state: %r: %r", state, error)
369
255
370
def activate(self):
256
371
"""Derived from the Avahi example code"""
257
372
if self.server is None:
265
380
self.server_state_changed(self.server.GetState())
266
381
267
382
268
def _timedelta_to_milliseconds(td):
383
class AvahiServiceToSyslog(AvahiService):
384
def rename(self):
385
"""Add the new name to the syslog messages"""
386
ret = AvahiService.rename(self)
387
syslogger.setFormatter(logging.Formatter
388
('Mandos ({0}) [%(process)d]:'
389
' %(levelname)s: %(message)s'
390
.format(self.name)))
391
return ret
392
393
394
def timedelta_to_milliseconds(td):
269
395
"Convert a datetime.timedelta() to milliseconds"
270
396
return ((td.days * 24 * 60 * 60 * 1000)
271
397
+ (td.seconds * 1000)
272
398
+ (td.microseconds // 1000))
273
399
400
274
401
class Client(object):
275
402
"""A representation of a client host served by this server.
276
403
277
404
Attributes:
278
_approved: bool(); 'None' if not yet approved/disapproved
405
approved: bool(); 'None' if not yet approved/disapproved
279
406
approval_delay: datetime.timedelta(); Time to wait for approval
280
407
approval_duration: datetime.timedelta(); Duration of one approval
281
408
checker: subprocess.Popen(); a running checker process used
288
415
instance %(name)s can be used in the command.
289
416
checker_initiator_tag: a gobject event source tag, or None
290
417
created: datetime.datetime(); (UTC) object creation
418
client_structure: Object describing what attributes a client has
419
and is used for storing the client at exit
291
420
current_checker_command: string; current running checker_command
292
disable_hook: If set, called by disable() as disable_hook(self)
293
421
disable_initiator_tag: a gobject event source tag, or None
294
422
enabled: bool()
295
423
fingerprint: string (40 or 32 hexadecimal digits); used to
298
426
interval: datetime.timedelta(); How often to start a new checker
299
427
last_approval_request: datetime.datetime(); (UTC) or None
300
428
last_checked_ok: datetime.datetime(); (UTC) or None
301
last_enabled: datetime.datetime(); (UTC)
429
last_checker_status: integer between 0 and 255 reflecting exit
430
status of last checker. -1 reflects crashed
431
checker, -2 means no checker completed yet.
432
last_enabled: datetime.datetime(); (UTC) or None
302
433
name: string; from the config file, used in log messages and
303
434
D-Bus identifiers
304
435
secret: bytestring; sent verbatim (over TLS) to client
305
436
timeout: datetime.timedelta(); How long from last_checked_ok
306
437
until this client is disabled
307
extended_timeout: extra long timeout when password has been sent
438
extended_timeout: extra long timeout when secret has been sent
308
439
runtime_expansions: Allowed attributes for runtime expansion.
309
440
expires: datetime.datetime(); time (UTC) when a client will be
310
441
disabled, or None
311
442
"""
312
443
313
444
runtime_expansions = ("approval_delay", "approval_duration",
314
"created", "enabled", "fingerprint",
315
"host", "interval", "last_checked_ok",
445
"created", "enabled", "expires",
446
"fingerprint", "host", "interval",
447
"last_approval_request", "last_checked_ok",
316
448
"last_enabled", "name", "timeout")
449
client_defaults = { "timeout": "5m",
450
"extended_timeout": "15m",
451
"interval": "2m",
452
"checker": "fping -q -- %%(host)s",
453
"host": "",
454
"approval_delay": "0s",
455
"approval_duration": "1s",
456
"approved_by_default": "True",
457
"enabled": "True",
458
}
317
459
318
460
def timeout_milliseconds(self):
319
461
"Return the 'timeout' attribute in milliseconds"
320
return _timedelta_to_milliseconds(self.timeout)
462
return timedelta_to_milliseconds(self.timeout)
321
463
322
464
def extended_timeout_milliseconds(self):
323
465
"Return the 'extended_timeout' attribute in milliseconds"
324
return _timedelta_to_milliseconds(self.extended_timeout)
466
return timedelta_to_milliseconds(self.extended_timeout)
325
467
326
468
def interval_milliseconds(self):
327
469
"Return the 'interval' attribute in milliseconds"
328
return _timedelta_to_milliseconds(self.interval)
470
return timedelta_to_milliseconds(self.interval)
329
471
330
472
def approval_delay_milliseconds(self):
331
return _timedelta_to_milliseconds(self.approval_delay)
332
333
def __init__(self, name = None, disable_hook=None, config=None):
334
"""Note: the 'checker' key in 'config' sets the
335
'checker_command' attribute and *not* the 'checker'
336
attribute."""
473
return timedelta_to_milliseconds(self.approval_delay)
474
475
@staticmethod
476
def config_parser(config):
477
"""Construct a new dict of client settings of this form:
478
{ client_name: {setting_name: value, ...}, ...}
479
with exceptions for any special settings as defined above.
480
NOTE: Must be a pure function. Must return the same result
481
value given the same arguments.
482
"""
483
settings = {}
484
for client_name in config.sections():
485
section = dict(config.items(client_name))
486
client = settings[client_name] = {}
487
488
client["host"] = section["host"]
489
# Reformat values from string types to Python types
490
client["approved_by_default"] = config.getboolean(
491
client_name, "approved_by_default")
492
client["enabled"] = config.getboolean(client_name,
493
"enabled")
494
495
client["fingerprint"] = (section["fingerprint"].upper()
496
.replace(" ", ""))
497
if "secret" in section:
498
client["secret"] = section["secret"].decode("base64")
499
elif "secfile" in section:
500
with open(os.path.expanduser(os.path.expandvars
501
(section["secfile"])),
502
"rb") as secfile:
503
client["secret"] = secfile.read()
504
else:
505
raise TypeError("No secret or secfile for section {0}"
506
.format(section))
507
client["timeout"] = string_to_delta(section["timeout"])
508
client["extended_timeout"] = string_to_delta(
509
section["extended_timeout"])
510
client["interval"] = string_to_delta(section["interval"])
511
client["approval_delay"] = string_to_delta(
512
section["approval_delay"])
513
client["approval_duration"] = string_to_delta(
514
section["approval_duration"])
515
client["checker_command"] = section["checker"]
516
client["last_approval_request"] = None
517
client["last_checked_ok"] = None
518
client["last_checker_status"] = -2
519
520
return settings
521
522
def __init__(self, settings, name = None):
337
523
self.name = name
338
if config is None:
339
config = {}
524
# adding all client settings
525
for setting, value in settings.iteritems():
526
setattr(self, setting, value)
527
528
if self.enabled:
529
if not hasattr(self, "last_enabled"):
530
self.last_enabled = datetime.datetime.utcnow()
531
if not hasattr(self, "expires"):
532
self.expires = (datetime.datetime.utcnow()
533
+ self.timeout)
534
else:
535
self.last_enabled = None
536
self.expires = None
537
340
538
logger.debug("Creating client %r", self.name)
341
539
# Uppercase and remove spaces from fingerprint for later
342
540
# comparison purposes with return value from the fingerprint()
343
541
# function
344
self.fingerprint = (config["fingerprint"].upper()
345
.replace(" ", ""))
346
542
logger.debug(" Fingerprint: %s", self.fingerprint)
347
if "secret" in config:
348
self.secret = config["secret"].decode("base64")
349
elif "secfile" in config:
350
with open(os.path.expanduser(os.path.expandvars
351
(config["secfile"])),
352
"rb") as secfile:
353
self.secret = secfile.read()
354
else:
355
raise TypeError("No secret or secfile for client %s"
356
% self.name)
357
self.host = config.get("host", "")
358
self.created = datetime.datetime.utcnow()
359
self.enabled = False
360
self.last_approval_request = None
361
self.last_enabled = None
362
self.last_checked_ok = None
363
self.timeout = string_to_delta(config["timeout"])
364
self.extended_timeout = string_to_delta(config["extended_timeout"])
365
self.interval = string_to_delta(config["interval"])
366
self.disable_hook = disable_hook
543
self.created = settings.get("created",
544
datetime.datetime.utcnow())
545
546
# attributes specific for this server instance
367
547
self.checker = None
368
548
self.checker_initiator_tag = None
369
549
self.disable_initiator_tag = None
370
self.expires = None
371
550
self.checker_callback_tag = None
372
self.checker_command = config["checker"]
373
551
self.current_checker_command = None
374
self.last_connect = None
375
self._approved = None
376
self.approved_by_default = config.get("approved_by_default",
377
True)
552
self.approved = None
378
553
self.approvals_pending = 0
379
self.approval_delay = string_to_delta(
380
config["approval_delay"])
381
self.approval_duration = string_to_delta(
382
config["approval_duration"])
383
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
554
self.changedstate = (multiprocessing_manager
555
.Condition(multiprocessing_manager
556
.Lock()))
557
self.client_structure = [attr for attr in
558
self.__dict__.iterkeys()
559
if not attr.startswith("_")]
560
self.client_structure.append("client_structure")
561
562
for name, t in inspect.getmembers(type(self),
563
lambda obj:
564
isinstance(obj,
565
property)):
566
if not name.startswith("_"):
567
self.client_structure.append(name)
384
568
569
# Send notice to process children that client state has changed
385
570
def send_changedstate(self):
386
self.changedstate.acquire()
387
self.changedstate.notify_all()
388
self.changedstate.release()
389
571
with self.changedstate:
572
self.changedstate.notify_all()
573
390
574
def enable(self):
391
575
"""Start this client's checker and timeout hooks"""
392
576
if getattr(self, "enabled", False):
393
577
# Already enabled
394
578
return
579
self.expires = datetime.datetime.utcnow() + self.timeout
580
self.enabled = True
581
self.last_enabled = datetime.datetime.utcnow()
582
self.init_checker()
395
583
self.send_changedstate()
584
585
def disable(self, quiet=True):
586
"""Disable this client."""
587
if not getattr(self, "enabled", False):
588
return False
589
if not quiet:
590
logger.info("Disabling client %s", self.name)
591
if getattr(self, "disable_initiator_tag", None) is not None:
592
gobject.source_remove(self.disable_initiator_tag)
593
self.disable_initiator_tag = None
594
self.expires = None
595
if getattr(self, "checker_initiator_tag", None) is not None:
596
gobject.source_remove(self.checker_initiator_tag)
597
self.checker_initiator_tag = None
598
self.stop_checker()
599
self.enabled = False
600
if not quiet:
601
self.send_changedstate()
602
# Do not run this again if called by a gobject.timeout_add
603
return False
604
605
def __del__(self):
606
self.disable()
607
608
def init_checker(self):
396
609
# Schedule a new checker to be started an 'interval' from now,
397
610
# and every interval from then on.
611
if self.checker_initiator_tag is not None:
612
gobject.source_remove(self.checker_initiator_tag)
398
613
self.checker_initiator_tag = (gobject.timeout_add
399
614
(self.interval_milliseconds(),
400
615
self.start_checker))
401
616
# Schedule a disable() when 'timeout' has passed
402
self.expires = datetime.datetime.utcnow() + self.timeout
617
if self.disable_initiator_tag is not None:
618
gobject.source_remove(self.disable_initiator_tag)
403
619
self.disable_initiator_tag = (gobject.timeout_add
404
620
(self.timeout_milliseconds(),
405
621
self.disable))
406
self.enabled = True
407
self.last_enabled = datetime.datetime.utcnow()
408
622
# Also start a new checker *right now*.
409
623
self.start_checker()
410
624
411
def disable(self, quiet=True):
412
"""Disable this client."""
413
if not getattr(self, "enabled", False):
414
return False
415
if not quiet:
416
self.send_changedstate()
417
if not quiet:
418
logger.info("Disabling client %s", self.name)
419
if getattr(self, "disable_initiator_tag", False):
420
gobject.source_remove(self.disable_initiator_tag)
421
self.disable_initiator_tag = None
422
self.expires = None
423
if getattr(self, "checker_initiator_tag", False):
424
gobject.source_remove(self.checker_initiator_tag)
425
self.checker_initiator_tag = None
426
self.stop_checker()
427
if self.disable_hook:
428
self.disable_hook(self)
429
self.enabled = False
430
# Do not run this again if called by a gobject.timeout_add
431
return False
432
433
def __del__(self):
434
self.disable_hook = None
435
self.disable()
436
437
625
def checker_callback(self, pid, condition, command):
438
626
"""The checker has completed, so take appropriate actions."""
439
627
self.checker_callback_tag = None
440
628
self.checker = None
441
629
if os.WIFEXITED(condition):
442
exitstatus = os.WEXITSTATUS(condition)
443
if exitstatus == 0:
630
self.last_checker_status = os.WEXITSTATUS(condition)
631
if self.last_checker_status == 0:
444
632
logger.info("Checker for %(name)s succeeded",
445
633
vars(self))
446
634
self.checked_ok()
448
636
logger.info("Checker for %(name)s failed",
449
637
vars(self))
450
638
else:
639
self.last_checker_status = -1
451
640
logger.warning("Checker for %(name)s crashed?",
452
641
vars(self))
453
642
454
def checked_ok(self, timeout=None):
455
"""Bump up the timeout for this client.
456
457
This should only be called when the client has been seen,
458
alive and well.
459
"""
643
def checked_ok(self):
644
"""Assert that the client has been seen, alive and well."""
645
self.last_checked_ok = datetime.datetime.utcnow()
646
self.last_checker_status = 0
647
self.bump_timeout()
648
649
def bump_timeout(self, timeout=None):
650
"""Bump up the timeout for this client."""
460
651
if timeout is None:
461
652
timeout = self.timeout
462
self.last_checked_ok = datetime.datetime.utcnow()
463
gobject.source_remove(self.disable_initiator_tag)
464
self.expires = datetime.datetime.utcnow() + timeout
465
self.disable_initiator_tag = (gobject.timeout_add
466
(_timedelta_to_milliseconds(timeout),
467
self.disable))
653
if self.disable_initiator_tag is not None:
654
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = None
656
if getattr(self, "enabled", False):
657
self.disable_initiator_tag = (gobject.timeout_add
658
(timedelta_to_milliseconds
659
(timeout), self.disable))
660
self.expires = datetime.datetime.utcnow() + timeout
468
661
469
662
def need_approval(self):
470
663
self.last_approval_request = datetime.datetime.utcnow()
475
668
If a checker already exists, leave it running and do
476
669
nothing."""
477
670
# The reason for not killing a running checker is that if we
478
# did that, then if a checker (for some reason) started
479
# running slowly and taking more than 'interval' time, the
480
# client would inevitably timeout, since no checker would get
481
# a chance to run to completion. If we instead leave running
671
# did that, and if a checker (for some reason) started running
672
# slowly and taking more than 'interval' time, then the client
673
# would inevitably timeout, since no checker would get a
674
# chance to run to completion. If we instead leave running
482
675
# checkers alone, the checker would have to take more time
483
676
# than 'timeout' for the client to be disabled, which is as it
484
677
# should be.
498
691
self.current_checker_command)
499
692
# Start a new checker if needed
500
693
if self.checker is None:
694
# Escape attributes for the shell
695
escaped_attrs = dict(
696
(attr, re.escape(unicode(getattr(self, attr))))
697
for attr in
698
self.runtime_expansions)
501
699
try:
502
# In case checker_command has exactly one % operator
503
command = self.checker_command % self.host
504
except TypeError:
505
# Escape attributes for the shell
506
escaped_attrs = dict(
507
(attr,
508
re.escape(unicode(str(getattr(self, attr, "")),
509
errors=
510
'replace')))
511
for attr in
512
self.runtime_expansions)
513
514
try:
515
command = self.checker_command % escaped_attrs
516
except TypeError as error:
517
logger.error('Could not format string "%s":'
518
' %s', self.checker_command, error)
519
return True # Try again later
700
command = self.checker_command % escaped_attrs
701
except TypeError as error:
702
logger.error('Could not format string "%s"',
703
self.checker_command, exc_info=error)
704
return True # Try again later
520
705
self.current_checker_command = command
521
706
try:
522
707
logger.info("Starting checker %r for %s",
528
713
self.checker = subprocess.Popen(command,
529
714
close_fds=True,
530
715
shell=True, cwd="/")
531
self.checker_callback_tag = (gobject.child_watch_add
532
(self.checker.pid,
533
self.checker_callback,
534
data=command))
535
# The checker may have completed before the gobject
536
# watch was added. Check for this.
537
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
538
if pid:
539
gobject.source_remove(self.checker_callback_tag)
540
self.checker_callback(pid, status, command)
541
716
except OSError as error:
542
logger.error("Failed to start subprocess: %s",
543
error)
717
logger.error("Failed to start subprocess",
718
exc_info=error)
719
self.checker_callback_tag = (gobject.child_watch_add
720
(self.checker.pid,
721
self.checker_callback,
722
data=command))
723
# The checker may have completed before the gobject
724
# watch was added. Check for this.
725
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
726
if pid:
727
gobject.source_remove(self.checker_callback_tag)
728
self.checker_callback(pid, status, command)
544
729
# Re-run this periodically if run by gobject.timeout_add
545
730
return True
546
731
553
738
return
554
739
logger.debug("Stopping checker for %(name)s", vars(self))
555
740
try:
556
os.kill(self.checker.pid, signal.SIGTERM)
741
self.checker.terminate()
557
742
#time.sleep(0.5)
558
743
#if self.checker.poll() is None:
559
# os.kill(self.checker.pid, signal.SIGKILL)
744
# self.checker.kill()
560
745
except OSError as error:
561
746
if error.errno != errno.ESRCH: # No such process
562
747
raise
579
764
# "Set" method, so we fail early here:
580
765
if byte_arrays and signature != "ay":
581
766
raise ValueError("Byte arrays not supported for non-'ay'"
582
" signature %r" % signature)
767
" signature {0!r}".format(signature))
583
768
def decorator(func):
584
769
func._dbus_is_property = True
585
770
func._dbus_interface = dbus_interface
593
778
return decorator
594
779
595
780
781
def dbus_interface_annotations(dbus_interface):
782
"""Decorator for marking functions returning interface annotations
783
784
Usage:
785
786
@dbus_interface_annotations("org.example.Interface")
787
def _foo(self): # Function name does not matter
788
return {"org.freedesktop.DBus.Deprecated": "true",
789
"org.freedesktop.DBus.Property.EmitsChangedSignal":
790
"false"}
791
"""
792
def decorator(func):
793
func._dbus_is_interface = True
794
func._dbus_interface = dbus_interface
795
func._dbus_name = dbus_interface
796
return func
797
return decorator
798
799
800
def dbus_annotations(annotations):
801
"""Decorator to annotate D-Bus methods, signals or properties
802
Usage:
803
804
@dbus_service_property("org.example.Interface", signature="b",
805
access="r")
806
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
807
"org.freedesktop.DBus.Property."
808
"EmitsChangedSignal": "false"})
809
def Property_dbus_property(self):
810
return dbus.Boolean(False)
811
"""
812
def decorator(func):
813
func._dbus_annotations = annotations
814
return func
815
return decorator
816
817
596
818
class DBusPropertyException(dbus.exceptions.DBusException):
597
819
"""A base class for D-Bus property-related exceptions
598
820
"""
621
843
"""
622
844
623
845
@staticmethod
624
def _is_dbus_property(obj):
625
return getattr(obj, "_dbus_is_property", False)
846
def _is_dbus_thing(thing):
847
"""Returns a function testing if an attribute is a D-Bus thing
848
849
If called like _is_dbus_thing("method") it returns a function
850
suitable for use as predicate to inspect.getmembers().
851
"""
852
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
853
False)
626
854
627
def _get_all_dbus_properties(self):
855
def _get_all_dbus_things(self, thing):
628
856
"""Returns a generator of (name, attribute) pairs
629
857
"""
630
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
858
return ((getattr(athing.__get__(self), "_dbus_name",
859
name),
860
athing.__get__(self))
631
861
for cls in self.__class__.__mro__
632
for name, prop in inspect.getmembers(cls, self._is_dbus_property))
862
for name, athing in
863
inspect.getmembers(cls,
864
self._is_dbus_thing(thing)))
633
865
634
866
def _get_dbus_property(self, interface_name, property_name):
635
867
"""Returns a bound method if one exists which is a D-Bus
636
868
property with the specified name and interface.
637
869
"""
638
870
for cls in self.__class__.__mro__:
639
for name, value in inspect.getmembers(cls, self._is_dbus_property):
640
if value._dbus_name == property_name and value._dbus_interface == interface_name:
871
for name, value in (inspect.getmembers
872
(cls,
873
self._is_dbus_thing("property"))):
874
if (value._dbus_name == property_name
875
and value._dbus_interface == interface_name):
641
876
return value.__get__(self)
642
877
643
878
# No such property
644
879
raise DBusPropertyNotFound(self.dbus_object_path + ":"
645
880
+ interface_name + "."
646
881
+ property_name)
647
648
882
649
883
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
650
884
out_signature="v")
671
905
# signatures other than "ay".
672
906
if prop._dbus_signature != "ay":
673
907
raise ValueError
674
value = dbus.ByteArray(''.join(unichr(byte)
675
for byte in value))
908
value = dbus.ByteArray(b''.join(chr(byte)
909
for byte in value))
676
910
prop(value)
677
911
678
912
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
683
917
684
918
Note: Will not include properties with access="write".
685
919
"""
686
all = {}
687
for name, prop in self._get_all_dbus_properties():
920
properties = {}
921
for name, prop in self._get_all_dbus_things("property"):
688
922
if (interface_name
689
923
and interface_name != prop._dbus_interface):
690
924
# Interface non-empty but did not match
694
928
continue
695
929
value = prop()
696
930
if not hasattr(value, "variant_level"):
697
all[name] = value
931
properties[name] = value
698
932
continue
699
all[name] = type(value)(value, variant_level=
700
value.variant_level+1)
701
return dbus.Dictionary(all, signature="sv")
933
properties[name] = type(value)(value, variant_level=
934
value.variant_level+1)
935
return dbus.Dictionary(properties, signature="sv")
702
936
703
937
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
704
938
out_signature="s",
705
939
path_keyword='object_path',
706
940
connection_keyword='connection')
707
941
def Introspect(self, object_path, connection):
708
"""Standard D-Bus method, overloaded to insert property tags.
942
"""Overloading of standard D-Bus method.
943
944
Inserts property tags and interface annotation tags.
709
945
"""
710
946
xmlstring = dbus.service.Object.Introspect(self, object_path,
711
947
connection)
718
954
e.setAttribute("access", prop._dbus_access)
719
955
return e
720
956
for if_tag in document.getElementsByTagName("interface"):
957
# Add property tags
721
958
for tag in (make_tag(document, name, prop)
722
959
for name, prop
723
in self._get_all_dbus_properties()
960
in self._get_all_dbus_things("property")
724
961
if prop._dbus_interface
725
962
== if_tag.getAttribute("name")):
726
963
if_tag.appendChild(tag)
964
# Add annotation tags
965
for typ in ("method", "signal", "property"):
966
for tag in if_tag.getElementsByTagName(typ):
967
annots = dict()
968
for name, prop in (self.
969
_get_all_dbus_things(typ)):
970
if (name == tag.getAttribute("name")
971
and prop._dbus_interface
972
== if_tag.getAttribute("name")):
973
annots.update(getattr
974
(prop,
975
"_dbus_annotations",
976
{}))
977
for name, value in annots.iteritems():
978
ann_tag = document.createElement(
979
"annotation")
980
ann_tag.setAttribute("name", name)
981
ann_tag.setAttribute("value", value)
982
tag.appendChild(ann_tag)
983
# Add interface annotation tags
984
for annotation, value in dict(
985
itertools.chain.from_iterable(
986
annotations().iteritems()
987
for name, annotations in
988
self._get_all_dbus_things("interface")
989
if name == if_tag.getAttribute("name")
990
)).iteritems():
991
ann_tag = document.createElement("annotation")
992
ann_tag.setAttribute("name", annotation)
993
ann_tag.setAttribute("value", value)
994
if_tag.appendChild(ann_tag)
727
995
# Add the names to the return values for the
728
996
# "org.freedesktop.DBus.Properties" methods
729
997
if (if_tag.getAttribute("name")
744
1012
except (AttributeError, xml.dom.DOMException,
745
1013
xml.parsers.expat.ExpatError) as error:
746
1014
logger.error("Failed to override Introspection method",
747
error)
1015
exc_info=error)
748
1016
return xmlstring
749
1017
750
1018
755
1023
return dbus.String(dt.isoformat(),
756
1024
variant_level=variant_level)
757
1025
758
class transitional_dbus_metaclass(DBusObjectWithProperties.__metaclass__):
759
def __new__(mcs, name, bases, attr):
760
for attrname, old_dbusobj in inspect.getmembers(bases[0]):
761
new_interface = getattr(old_dbusobj, "_dbus_interface", "").replace("se.bsnet.fukt.", "se.recompile.")
762
if (getattr(old_dbusobj, "_dbus_is_signal", False)
763
and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
764
unwrappedfunc = dict(zip(old_dbusobj.func_code.co_freevars,
765
old_dbusobj.__closure__))["func"].cell_contents
766
newfunc = types.FunctionType(unwrappedfunc.func_code,
767
unwrappedfunc.func_globals,
768
unwrappedfunc.func_name,
769
unwrappedfunc.func_defaults,
770
unwrappedfunc.func_closure)
771
new_dbusfunc = dbus.service.signal(
772
new_interface, old_dbusobj._dbus_signature)(newfunc)
773
attr["_transitional_" + attrname] = new_dbusfunc
774
775
def fixscope(func1, func2):
776
def newcall(*args, **kwargs):
777
func1(*args, **kwargs)
778
func2(*args, **kwargs)
779
return newcall
780
781
attr[attrname] = fixscope(old_dbusobj, new_dbusfunc)
782
783
elif (getattr(old_dbusobj, "_dbus_is_method", False)
784
and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
785
new_dbusfunc = (dbus.service.method
786
(new_interface,
787
old_dbusobj._dbus_in_signature,
788
old_dbusobj._dbus_out_signature)
789
(types.FunctionType
790
(old_dbusobj.func_code,
791
old_dbusobj.func_globals,
792
old_dbusobj.func_name,
793
old_dbusobj.func_defaults,
794
old_dbusobj.func_closure)))
795
796
attr[attrname] = new_dbusfunc
797
elif (getattr(old_dbusobj, "_dbus_is_property", False)
798
and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
799
new_dbusfunc = (dbus_service_property
800
(new_interface,
801
old_dbusobj._dbus_signature,
802
old_dbusobj._dbus_access,
803
old_dbusobj._dbus_get_args_options["byte_arrays"])
804
(types.FunctionType
805
(old_dbusobj.func_code,
806
old_dbusobj.func_globals,
807
old_dbusobj.func_name,
808
old_dbusobj.func_defaults,
809
old_dbusobj.func_closure)))
810
811
attr[attrname] = new_dbusfunc
812
return type.__new__(mcs, name, bases, attr)
813
1026
1027
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1028
"""A class decorator; applied to a subclass of
1029
dbus.service.Object, it will add alternate D-Bus attributes with
1030
interface names according to the "alt_interface_names" mapping.
1031
Usage:
1032
1033
@alternate_dbus_names({"org.example.Interface":
1034
"net.example.AlternateInterface"})
1035
class SampleDBusObject(dbus.service.Object):
1036
@dbus.service.method("org.example.Interface")
1037
def SampleDBusMethod():
1038
pass
1039
1040
The above "SampleDBusMethod" on "SampleDBusObject" will be
1041
reachable via two interfaces: "org.example.Interface" and
1042
"net.example.AlternateInterface", the latter of which will have
1043
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1044
"true", unless "deprecate" is passed with a False value.
1045
1046
This works for methods and signals, and also for D-Bus properties
1047
(from DBusObjectWithProperties) and interfaces (from the
1048
dbus_interface_annotations decorator).
1049
"""
1050
def wrapper(cls):
1051
for orig_interface_name, alt_interface_name in (
1052
alt_interface_names.iteritems()):
1053
attr = {}
1054
interface_names = set()
1055
# Go though all attributes of the class
1056
for attrname, attribute in inspect.getmembers(cls):
1057
# Ignore non-D-Bus attributes, and D-Bus attributes
1058
# with the wrong interface name
1059
if (not hasattr(attribute, "_dbus_interface")
1060
or not attribute._dbus_interface
1061
.startswith(orig_interface_name)):
1062
continue
1063
# Create an alternate D-Bus interface name based on
1064
# the current name
1065
alt_interface = (attribute._dbus_interface
1066
.replace(orig_interface_name,
1067
alt_interface_name))
1068
interface_names.add(alt_interface)
1069
# Is this a D-Bus signal?
1070
if getattr(attribute, "_dbus_is_signal", False):
1071
# Extract the original non-method function by
1072
# black magic
1073
nonmethod_func = (dict(
1074
zip(attribute.func_code.co_freevars,
1075
attribute.__closure__))["func"]
1076
.cell_contents)
1077
# Create a new, but exactly alike, function
1078
# object, and decorate it to be a new D-Bus signal
1079
# with the alternate D-Bus interface name
1080
new_function = (dbus.service.signal
1081
(alt_interface,
1082
attribute._dbus_signature)
1083
(types.FunctionType(
1084
nonmethod_func.func_code,
1085
nonmethod_func.func_globals,
1086
nonmethod_func.func_name,
1087
nonmethod_func.func_defaults,
1088
nonmethod_func.func_closure)))
1089
# Copy annotations, if any
1090
try:
1091
new_function._dbus_annotations = (
1092
dict(attribute._dbus_annotations))
1093
except AttributeError:
1094
pass
1095
# Define a creator of a function to call both the
1096
# original and alternate functions, so both the
1097
# original and alternate signals gets sent when
1098
# the function is called
1099
def fixscope(func1, func2):
1100
"""This function is a scope container to pass
1101
func1 and func2 to the "call_both" function
1102
outside of its arguments"""
1103
def call_both(*args, **kwargs):
1104
"""This function will emit two D-Bus
1105
signals by calling func1 and func2"""
1106
func1(*args, **kwargs)
1107
func2(*args, **kwargs)
1108
return call_both
1109
# Create the "call_both" function and add it to
1110
# the class
1111
attr[attrname] = fixscope(attribute, new_function)
1112
# Is this a D-Bus method?
1113
elif getattr(attribute, "_dbus_is_method", False):
1114
# Create a new, but exactly alike, function
1115
# object. Decorate it to be a new D-Bus method
1116
# with the alternate D-Bus interface name. Add it
1117
# to the class.
1118
attr[attrname] = (dbus.service.method
1119
(alt_interface,
1120
attribute._dbus_in_signature,
1121
attribute._dbus_out_signature)
1122
(types.FunctionType
1123
(attribute.func_code,
1124
attribute.func_globals,
1125
attribute.func_name,
1126
attribute.func_defaults,
1127
attribute.func_closure)))
1128
# Copy annotations, if any
1129
try:
1130
attr[attrname]._dbus_annotations = (
1131
dict(attribute._dbus_annotations))
1132
except AttributeError:
1133
pass
1134
# Is this a D-Bus property?
1135
elif getattr(attribute, "_dbus_is_property", False):
1136
# Create a new, but exactly alike, function
1137
# object, and decorate it to be a new D-Bus
1138
# property with the alternate D-Bus interface
1139
# name. Add it to the class.
1140
attr[attrname] = (dbus_service_property
1141
(alt_interface,
1142
attribute._dbus_signature,
1143
attribute._dbus_access,
1144
attribute
1145
._dbus_get_args_options
1146
["byte_arrays"])
1147
(types.FunctionType
1148
(attribute.func_code,
1149
attribute.func_globals,
1150
attribute.func_name,
1151
attribute.func_defaults,
1152
attribute.func_closure)))
1153
# Copy annotations, if any
1154
try:
1155
attr[attrname]._dbus_annotations = (
1156
dict(attribute._dbus_annotations))
1157
except AttributeError:
1158
pass
1159
# Is this a D-Bus interface?
1160
elif getattr(attribute, "_dbus_is_interface", False):
1161
# Create a new, but exactly alike, function
1162
# object. Decorate it to be a new D-Bus interface
1163
# with the alternate D-Bus interface name. Add it
1164
# to the class.
1165
attr[attrname] = (dbus_interface_annotations
1166
(alt_interface)
1167
(types.FunctionType
1168
(attribute.func_code,
1169
attribute.func_globals,
1170
attribute.func_name,
1171
attribute.func_defaults,
1172
attribute.func_closure)))
1173
if deprecate:
1174
# Deprecate all alternate interfaces
1175
iname="_AlternateDBusNames_interface_annotation{0}"
1176
for interface_name in interface_names:
1177
@dbus_interface_annotations(interface_name)
1178
def func(self):
1179
return { "org.freedesktop.DBus.Deprecated":
1180
"true" }
1181
# Find an unused name
1182
for aname in (iname.format(i)
1183
for i in itertools.count()):
1184
if aname not in attr:
1185
attr[aname] = func
1186
break
1187
if interface_names:
1188
# Replace the class with a new subclass of it with
1189
# methods, signals, etc. as created above.
1190
cls = type(b"{0}Alternate".format(cls.__name__),
1191
(cls,), attr)
1192
return cls
1193
return wrapper
1194
1195
1196
@alternate_dbus_interfaces({"se.recompile.Mandos":
1197
"se.bsnet.fukt.Mandos"})
814
1198
class ClientDBus(Client, DBusObjectWithProperties):
815
1199
"""A Client class using D-Bus
816
1200
825
1209
# dbus.service.Object doesn't use super(), so we can't either.
826
1210
827
1211
def __init__(self, bus = None, *args, **kwargs):
828
self._approvals_pending = 0
829
1212
self.bus = bus
830
1213
Client.__init__(self, *args, **kwargs)
831
1214
# Only now, when this client is initialized, can it show up on
837
1220
("/clients/" + client_object_name))
838
1221
DBusObjectWithProperties.__init__(self, self.bus,
839
1222
self.dbus_object_path)
840
1223
841
1224
def notifychangeproperty(transform_func,
842
1225
dbus_name, type_func=lambda x: x,
843
1226
variant_level=1):
844
""" Modify a variable so that its a property that announce its
845
changes to DBus.
846
transform_fun: Function that takes a value and transform it to
847
DBus type.
848
dbus_name: DBus name of the variable
1227
""" Modify a variable so that it's a property which announces
1228
its changes to DBus.
1229
1230
transform_fun: Function that takes a value and a variant_level
1231
and transforms it to a D-Bus type.
1232
dbus_name: D-Bus name of the variable
849
1233
type_func: Function that transform the value before sending it
850
to DBus
851
variant_level: DBus variant level. default: 1
1234
to the D-Bus. Default: no transform
1235
variant_level: D-Bus variant level. Default: 1
852
1236
"""
853
real_value = [None,]
1237
attrname = "_{0}".format(dbus_name)
854
1238
def setter(self, value):
855
old_value = real_value[0]
856
real_value[0] = value
857
1239
if hasattr(self, "dbus_object_path"):
858
if type_func(old_value) != type_func(real_value[0]):
859
dbus_value = transform_func(type_func(real_value[0]),
860
variant_level)
1240
if (not hasattr(self, attrname) or
1241
type_func(getattr(self, attrname, None))
1242
!= type_func(value)):
1243
dbus_value = transform_func(type_func(value),
1244
variant_level
1245
=variant_level)
861
1246
self.PropertyChanged(dbus.String(dbus_name),
862
1247
dbus_value)
1248
setattr(self, attrname, value)
863
1249
864
return property(lambda self: real_value[0], setter)
865
1250
return property(lambda self: getattr(self, attrname), setter)
866
1251
867
1252
expires = notifychangeproperty(datetime_to_dbus, "Expires")
868
1253
approvals_pending = notifychangeproperty(dbus.Boolean,
872
1257
last_enabled = notifychangeproperty(datetime_to_dbus,
873
1258
"LastEnabled")
874
1259
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
875
type_func = lambda checker: checker is not None)
1260
type_func = lambda checker:
1261
checker is not None)
876
1262
last_checked_ok = notifychangeproperty(datetime_to_dbus,
877
1263
"LastCheckedOK")
878
last_approval_request = notifychangeproperty(datetime_to_dbus,
879
"LastApprovalRequest")
1264
last_checker_status = notifychangeproperty(dbus.Int16,
1265
"LastCheckerStatus")
1266
last_approval_request = notifychangeproperty(
1267
datetime_to_dbus, "LastApprovalRequest")
880
1268
approved_by_default = notifychangeproperty(dbus.Boolean,
881
1269
"ApprovedByDefault")
882
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
883
type_func = _timedelta_to_milliseconds)
884
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
885
type_func = _timedelta_to_milliseconds)
1270
approval_delay = notifychangeproperty(dbus.UInt64,
1271
"ApprovalDelay",
1272
type_func =
1273
timedelta_to_milliseconds)
1274
approval_duration = notifychangeproperty(
1275
dbus.UInt64, "ApprovalDuration",
1276
type_func = timedelta_to_milliseconds)
886
1277
host = notifychangeproperty(dbus.String, "Host")
887
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
888
type_func = _timedelta_to_milliseconds)
889
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
890
type_func = _timedelta_to_milliseconds)
891
interval = notifychangeproperty(dbus.UInt16, "Interval",
892
type_func = _timedelta_to_milliseconds)
1278
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1279
type_func =
1280
timedelta_to_milliseconds)
1281
extended_timeout = notifychangeproperty(
1282
dbus.UInt64, "ExtendedTimeout",
1283
type_func = timedelta_to_milliseconds)
1284
interval = notifychangeproperty(dbus.UInt64,
1285
"Interval",
1286
type_func =
1287
timedelta_to_milliseconds)
893
1288
checker_command = notifychangeproperty(dbus.String, "Checker")
894
1289
895
1290
del notifychangeproperty
937
1332
return r
938
1333
939
1334
def _reset_approved(self):
940
self._approved = None
1335
self.approved = None
941
1336
return False
942
1337
943
1338
def approve(self, value=True):
944
self.send_changedstate()
945
self._approved = value
946
gobject.timeout_add(_timedelta_to_milliseconds
1339
self.approved = value
1340
gobject.timeout_add(timedelta_to_milliseconds
947
1341
(self.approval_duration),
948
1342
self._reset_approved)
949
1343
self.send_changedstate()
950
1344
951
1345
## D-Bus methods, signals & properties
952
_interface = "se.bsnet.fukt.Mandos.Client"
953
1346
_interface = "se.recompile.Mandos.Client"
1347
1348
## Interfaces
1349
1350
@dbus_interface_annotations(_interface)
1351
def _foo(self):
1352
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1353
"false"}
1354
954
1355
## Signals
955
1356
956
1357
# CheckerCompleted - signal
1055
1456
access="readwrite")
1056
1457
def ApprovalDuration_dbus_property(self, value=None):
1057
1458
if value is None: # get
1058
return dbus.UInt64(_timedelta_to_milliseconds(
1459
return dbus.UInt64(timedelta_to_milliseconds(
1059
1460
self.approval_duration))
1060
1461
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1061
1462
1075
1476
def Host_dbus_property(self, value=None):
1076
1477
if value is None: # get
1077
1478
return dbus.String(self.host)
1078
self.host = value
1479
self.host = unicode(value)
1079
1480
1080
1481
# Created - property
1081
1482
@dbus_service_property(_interface, signature="s", access="read")
1082
1483
def Created_dbus_property(self):
1083
return dbus.String(datetime_to_dbus(self.created))
1484
return datetime_to_dbus(self.created)
1084
1485
1085
1486
# LastEnabled - property
1086
1487
@dbus_service_property(_interface, signature="s", access="read")
1107
1508
return
1108
1509
return datetime_to_dbus(self.last_checked_ok)
1109
1510
1511
# LastCheckerStatus - property
1512
@dbus_service_property(_interface, signature="n",
1513
access="read")
1514
def LastCheckerStatus_dbus_property(self):
1515
return dbus.Int16(self.last_checker_status)
1516
1110
1517
# Expires - property
1111
1518
@dbus_service_property(_interface, signature="s", access="read")
1112
1519
def Expires_dbus_property(self):
1123
1530
def Timeout_dbus_property(self, value=None):
1124
1531
if value is None: # get
1125
1532
return dbus.UInt64(self.timeout_milliseconds())
1533
old_timeout = self.timeout
1126
1534
self.timeout = datetime.timedelta(0, 0, 0, value)
1127
if getattr(self, "disable_initiator_tag", None) is None:
1128
return
1129
# Reschedule timeout
1130
gobject.source_remove(self.disable_initiator_tag)
1131
self.disable_initiator_tag = None
1132
self.expires = None
1133
time_to_die = (self.
1134
_timedelta_to_milliseconds((self
1135
.last_checked_ok
1136
+ self.timeout)
1137
- datetime.datetime
1138
.utcnow()))
1139
if time_to_die <= 0:
1140
# The timeout has passed
1141
self.disable()
1142
else:
1143
self.expires = (datetime.datetime.utcnow()
1144
+ datetime.timedelta(milliseconds = time_to_die))
1145
self.disable_initiator_tag = (gobject.timeout_add
1146
(time_to_die, self.disable))
1535
# Reschedule disabling
1536
if self.enabled:
1537
now = datetime.datetime.utcnow()
1538
self.expires += self.timeout - old_timeout
1539
if self.expires <= now:
1540
# The timeout has passed
1541
self.disable()
1542
else:
1543
if (getattr(self, "disable_initiator_tag", None)
1544
is None):
1545
return
1546
gobject.source_remove(self.disable_initiator_tag)
1547
self.disable_initiator_tag = (
1548
gobject.timeout_add(
1549
timedelta_to_milliseconds(self.expires - now),
1550
self.disable))
1147
1551
1148
1552
# ExtendedTimeout - property
1149
1553
@dbus_service_property(_interface, signature="t",
1162
1566
self.interval = datetime.timedelta(0, 0, 0, value)
1163
1567
if getattr(self, "checker_initiator_tag", None) is None:
1164
1568
return
1165
# Reschedule checker run
1166
gobject.source_remove(self.checker_initiator_tag)
1167
self.checker_initiator_tag = (gobject.timeout_add
1168
(value, self.start_checker))
1169
self.start_checker() # Start one now, too
1569
if self.enabled:
1570
# Reschedule checker run
1571
gobject.source_remove(self.checker_initiator_tag)
1572
self.checker_initiator_tag = (gobject.timeout_add
1573
(value, self.start_checker))
1574
self.start_checker() # Start one now, too
1170
1575
1171
1576
# Checker - property
1172
1577
@dbus_service_property(_interface, signature="s",
1174
1579
def Checker_dbus_property(self, value=None):
1175
1580
if value is None: # get
1176
1581
return dbus.String(self.checker_command)
1177
self.checker_command = value
1582
self.checker_command = unicode(value)
1178
1583
1179
1584
# CheckerRunning - property
1180
1585
@dbus_service_property(_interface, signature="b",
1209
1614
raise KeyError()
1210
1615
1211
1616
def __getattribute__(self, name):
1212
if(name == '_pipe'):
1617
if name == '_pipe':
1213
1618
return super(ProxyClient, self).__getattribute__(name)
1214
1619
self._pipe.send(('getattr', name))
1215
1620
data = self._pipe.recv()
1222
1627
return func
1223
1628
1224
1629
def __setattr__(self, name, value):
1225
if(name == '_pipe'):
1630
if name == '_pipe':
1226
1631
return super(ProxyClient, self).__setattr__(name, value)
1227
1632
self._pipe.send(('setattr', name, value))
1228
1633
1229
class ClientDBusTransitional(ClientDBus):
1230
__metaclass__ = transitional_dbus_metaclass
1231
1634
1232
1635
class ClientHandler(socketserver.BaseRequestHandler, object):
1233
1636
"""A class to handle client connections.
1313
1716
client.name)
1314
1717
if self.server.use_dbus:
1315
1718
# Emit D-Bus signal
1316
client.Rejected("Disabled")
1719
client.Rejected("Disabled")
1317
1720
return
1318
1721
1319
if client._approved or not client.approval_delay:
1722
if client.approved or not client.approval_delay:
1320
1723
#We are approved or approval is disabled
1321
1724
break
1322
elif client._approved is None:
1725
elif client.approved is None:
1323
1726
logger.info("Client %s needs approval",
1324
1727
client.name)
1325
1728
if self.server.use_dbus:
1336
1739
return
1337
1740
1338
1741
#wait until timeout or approved
1339
#x = float(client._timedelta_to_milliseconds(delay))
1340
1742
time = datetime.datetime.now()
1341
1743
client.changedstate.acquire()
1342
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1744
client.changedstate.wait(
1745
float(timedelta_to_milliseconds(delay)
1746
/ 1000))
1343
1747
client.changedstate.release()
1344
1748
time2 = datetime.datetime.now()
1345
1749
if (time2 - time) >= delay:
1361
1765
try:
1362
1766
sent = session.send(client.secret[sent_size:])
1363
1767
except gnutls.errors.GNUTLSError as error:
1364
logger.warning("gnutls send failed")
1768
logger.warning("gnutls send failed",
1769
exc_info=error)
1365
1770
return
1366
1771
logger.debug("Sent: %d, remaining: %d",
1367
1772
sent, len(client.secret)
1369
1774
sent_size += sent
1370
1775
1371
1776
logger.info("Sending secret to %s", client.name)
1372
# bump the timeout as if seen
1373
client.checked_ok(client.extended_timeout)
1777
# bump the timeout using extended_timeout
1778
client.bump_timeout(client.extended_timeout)
1374
1779
if self.server.use_dbus:
1375
1780
# Emit D-Bus signal
1376
1781
client.GotSecret()
1381
1786
try:
1382
1787
session.bye()
1383
1788
except gnutls.errors.GNUTLSError as error:
1384
logger.warning("GnuTLS bye failed")
1789
logger.warning("GnuTLS bye failed",
1790
exc_info=error)
1385
1791
1386
1792
@staticmethod
1387
1793
def peer_certificate(session):
1443
1849
# Convert the buffer to a Python bytestring
1444
1850
fpr = ctypes.string_at(buf, buf_len.value)
1445
1851
# Convert the bytestring to hexadecimal notation
1446
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1852
hex_fpr = binascii.hexlify(fpr).upper()
1447
1853
return hex_fpr
1448
1854
1449
1855
1452
1858
def sub_process_main(self, request, address):
1453
1859
try:
1454
1860
self.finish_request(request, address)
1455
except:
1861
except Exception:
1456
1862
self.handle_error(request, address)
1457
1863
self.close_request(request)
1458
1864
1459
1865
def process_request(self, request, address):
1460
1866
"""Start a new process to process the request."""
1461
multiprocessing.Process(target = self.sub_process_main,
1462
args = (request, address)).start()
1867
proc = multiprocessing.Process(target = self.sub_process_main,
1868
args = (request, address))
1869
proc.start()
1870
return proc
1463
1871
1464
1872
1465
1873
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1471
1879
"""
1472
1880
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1473
1881
1474
super(MultiprocessingMixInWithPipe,
1475
self).process_request(request, client_address)
1882
proc = MultiprocessingMixIn.process_request(self, request,
1883
client_address)
1476
1884
self.child_pipe.close()
1477
self.add_pipe(parent_pipe)
1885
self.add_pipe(parent_pipe, proc)
1478
1886
1479
def add_pipe(self, parent_pipe):
1887
def add_pipe(self, parent_pipe, proc):
1480
1888
"""Dummy function; override as necessary"""
1481
1889
raise NotImplementedError
1482
1890
1513
1921
str(self.interface
1514
1922
+ '\0'))
1515
1923
except socket.error as error:
1516
if error[0] == errno.EPERM:
1924
if error.errno == errno.EPERM:
1517
1925
logger.error("No permission to"
1518
1926
" bind to interface %s",
1519
1927
self.interface)
1520
elif error[0] == errno.ENOPROTOOPT:
1928
elif error.errno == errno.ENOPROTOOPT:
1521
1929
logger.error("SO_BINDTODEVICE not available;"
1522
1930
" cannot bind to interface %s",
1523
1931
self.interface)
1932
elif error.errno == errno.ENODEV:
1933
logger.error("Interface %s does not"
1934
" exist, cannot bind",
1935
self.interface)
1524
1936
else:
1525
1937
raise
1526
1938
# Only bind(2) the socket if we really need to.
1560
1972
self.enabled = False
1561
1973
self.clients = clients
1562
1974
if self.clients is None:
1563
self.clients = set()
1975
self.clients = {}
1564
1976
self.use_dbus = use_dbus
1565
1977
self.gnutls_priority = gnutls_priority
1566
1978
IPv6_TCPServer.__init__(self, server_address,
1570
1982
def server_activate(self):
1571
1983
if self.enabled:
1572
1984
return socketserver.TCPServer.server_activate(self)
1985
1573
1986
def enable(self):
1574
1987
self.enabled = True
1575
def add_pipe(self, parent_pipe):
1988
1989
def add_pipe(self, parent_pipe, proc):
1576
1990
# Call "handle_ipc" for both data and EOF events
1577
1991
gobject.io_add_watch(parent_pipe.fileno(),
1578
1992
gobject.IO_IN | gobject.IO_HUP,
1579
1993
functools.partial(self.handle_ipc,
1580
parent_pipe = parent_pipe))
1581
1994
parent_pipe =
1995
parent_pipe,
1996
proc = proc))
1997
1582
1998
def handle_ipc(self, source, condition, parent_pipe=None,
1583
client_object=None):
1584
condition_names = {
1585
gobject.IO_IN: "IN", # There is data to read.
1586
gobject.IO_OUT: "OUT", # Data can be written (without
1587
# blocking).
1588
gobject.IO_PRI: "PRI", # There is urgent data to read.
1589
gobject.IO_ERR: "ERR", # Error condition.
1590
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1591
# broken, usually for pipes and
1592
# sockets).
1593
}
1594
conditions_string = ' | '.join(name
1595
for cond, name in
1596
condition_names.iteritems()
1597
if cond & condition)
1598
# error or the other end of multiprocessing.Pipe has closed
1599
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1999
proc = None, client_object=None):
2000
# error, or the other end of multiprocessing.Pipe has closed
2001
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2002
# Wait for other process to exit
2003
proc.join()
1600
2004
return False
1601
2005
1602
2006
# Read a request from the child
1607
2011
fpr = request[1]
1608
2012
address = request[2]
1609
2013
1610
for c in self.clients:
2014
for c in self.clients.itervalues():
1611
2015
if c.fingerprint == fpr:
1612
2016
client = c
1613
2017
break
1616
2020
"dress: %s", fpr, address)
1617
2021
if self.use_dbus:
1618
2022
# Emit D-Bus signal
1619
mandos_dbus_service.ClientNotFound(fpr, address[0])
2023
mandos_dbus_service.ClientNotFound(fpr,
2024
address[0])
1620
2025
parent_pipe.send(False)
1621
2026
return False
1622
2027
1623
2028
gobject.io_add_watch(parent_pipe.fileno(),
1624
2029
gobject.IO_IN | gobject.IO_HUP,
1625
2030
functools.partial(self.handle_ipc,
1626
parent_pipe = parent_pipe,
1627
client_object = client))
2031
parent_pipe =
2032
parent_pipe,
2033
proc = proc,
2034
client_object =
2035
client))
1628
2036
parent_pipe.send(True)
1629
# remove the old hook in favor of the new above hook on same fileno
2037
# remove the old hook in favor of the new above hook on
2038
# same fileno
1630
2039
return False
1631
2040
if command == 'funcall':
1632
2041
funcname = request[1]
1633
2042
args = request[2]
1634
2043
kwargs = request[3]
1635
2044
1636
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
2045
parent_pipe.send(('data', getattr(client_object,
2046
funcname)(*args,
2047
**kwargs)))
1637
2048
1638
2049
if command == 'getattr':
1639
2050
attrname = request[1]
1640
2051
if callable(client_object.__getattribute__(attrname)):
1641
2052
parent_pipe.send(('function',))
1642
2053
else:
1643
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2054
parent_pipe.send(('data', client_object
2055
.__getattribute__(attrname)))
1644
2056
1645
2057
if command == 'setattr':
1646
2058
attrname = request[1]
1682
2094
elif suffix == "w":
1683
2095
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1684
2096
else:
1685
raise ValueError("Unknown suffix %r" % suffix)
2097
raise ValueError("Unknown suffix {0!r}"
2098
.format(suffix))
1686
2099
except (ValueError, IndexError) as e:
1687
2100
raise ValueError(*(e.args))
1688
2101
timevalue += delta
1689
2102
return timevalue
1690
2103
1691
2104
1692
def if_nametoindex(interface):
1693
"""Call the C function if_nametoindex(), or equivalent
1694
1695
Note: This function cannot accept a unicode string."""
1696
global if_nametoindex
1697
try:
1698
if_nametoindex = (ctypes.cdll.LoadLibrary
1699
(ctypes.util.find_library("c"))
1700
.if_nametoindex)
1701
except (OSError, AttributeError):
1702
logger.warning("Doing if_nametoindex the hard way")
1703
def if_nametoindex(interface):
1704
"Get an interface index the hard way, i.e. using fcntl()"
1705
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1706
with contextlib.closing(socket.socket()) as s:
1707
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1708
struct.pack(str("16s16x"),
1709
interface))
1710
interface_index = struct.unpack(str("I"),
1711
ifreq[16:20])[0]
1712
return interface_index
1713
return if_nametoindex(interface)
1714
1715
1716
2105
def daemon(nochdir = False, noclose = False):
1717
2106
"""See daemon(3). Standard BSD Unix function.
1718
2107
1726
2115
sys.exit()
1727
2116
if not noclose:
1728
2117
# Close all standard open file descriptors
1729
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2118
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1730
2119
if not stat.S_ISCHR(os.fstat(null).st_mode):
1731
2120
raise OSError(errno.ENODEV,
1732
"%s not a character device"
1733
% os.path.devnull)
2121
"{0} not a character device"
2122
.format(os.devnull))
1734
2123
os.dup2(null, sys.stdin.fileno())
1735
2124
os.dup2(null, sys.stdout.fileno())
1736
2125
os.dup2(null, sys.stderr.fileno())
1745
2134
1746
2135
parser = argparse.ArgumentParser()
1747
2136
parser.add_argument("-v", "--version", action="version",
1748
version = "%%(prog)s %s" % version,
2137
version = "%(prog)s {0}".format(version),
1749
2138
help="show version number and exit")
1750
2139
parser.add_argument("-i", "--interface", metavar="IF",
1751
2140
help="Bind to interface IF")
1773
2162
" system bus interface")
1774
2163
parser.add_argument("--no-ipv6", action="store_false",
1775
2164
dest="use_ipv6", help="Do not use IPv6")
2165
parser.add_argument("--no-restore", action="store_false",
2166
dest="restore", help="Do not restore stored"
2167
" state")
2168
parser.add_argument("--statedir", metavar="DIR",
2169
help="Directory to save/restore state in")
2170
1776
2171
options = parser.parse_args()
1777
2172
1778
2173
if options.check:
1791
2186
"use_dbus": "True",
1792
2187
"use_ipv6": "True",
1793
2188
"debuglevel": "",
2189
"restore": "True",
2190
"statedir": "/var/lib/mandos"
1794
2191
}
1795
2192
1796
2193
# Parse config file for server-global settings
1813
2210
# options, if set.
1814
2211
for option in ("interface", "address", "port", "debug",
1815
2212
"priority", "servicename", "configdir",
1816
"use_dbus", "use_ipv6", "debuglevel"):
2213
"use_dbus", "use_ipv6", "debuglevel", "restore",
2214
"statedir"):
1817
2215
value = getattr(options, option)
1818
2216
if value is not None:
1819
2217
server_settings[option] = value
1831
2229
debuglevel = server_settings["debuglevel"]
1832
2230
use_dbus = server_settings["use_dbus"]
1833
2231
use_ipv6 = server_settings["use_ipv6"]
2232
stored_state_path = os.path.join(server_settings["statedir"],
2233
stored_state_file)
2234
2235
if debug:
2236
initlogger(debug, logging.DEBUG)
2237
else:
2238
if not debuglevel:
2239
initlogger(debug)
2240
else:
2241
level = getattr(logging, debuglevel.upper())
2242
initlogger(debug, level)
1834
2243
1835
2244
if server_settings["servicename"] != "Mandos":
1836
2245
syslogger.setFormatter(logging.Formatter
1837
('Mandos (%s) [%%(process)d]:'
1838
' %%(levelname)s: %%(message)s'
1839
% server_settings["servicename"]))
2246
('Mandos ({0}) [%(process)d]:'
2247
' %(levelname)s: %(message)s'
2248
.format(server_settings
2249
["servicename"])))
1840
2250
1841
2251
# Parse config file with clients
1842
client_defaults = { "timeout": "5m",
1843
"extended_timeout": "15m",
1844
"interval": "2m",
1845
"checker": "fping -q -- %%(host)s",
1846
"host": "",
1847
"approval_delay": "0s",
1848
"approval_duration": "1s",
1849
}
1850
client_config = configparser.SafeConfigParser(client_defaults)
2252
client_config = configparser.SafeConfigParser(Client
2253
.client_defaults)
1851
2254
client_config.read(os.path.join(server_settings["configdir"],
1852
2255
"clients.conf"))
1853
2256
1867
2270
pidfilename = "/var/run/mandos.pid"
1868
2271
try:
1869
2272
pidfile = open(pidfilename, "w")
1870
except IOError:
1871
logger.error("Could not open file %r", pidfilename)
2273
except IOError as e:
2274
logger.error("Could not open file %r", pidfilename,
2275
exc_info=e)
1872
2276
1873
try:
1874
uid = pwd.getpwnam("_mandos").pw_uid
1875
gid = pwd.getpwnam("_mandos").pw_gid
1876
except KeyError:
2277
for name in ("_mandos", "mandos", "nobody"):
1877
2278
try:
1878
uid = pwd.getpwnam("mandos").pw_uid
1879
gid = pwd.getpwnam("mandos").pw_gid
2279
uid = pwd.getpwnam(name).pw_uid
2280
gid = pwd.getpwnam(name).pw_gid
2281
break
1880
2282
except KeyError:
1881
try:
1882
uid = pwd.getpwnam("nobody").pw_uid
1883
gid = pwd.getpwnam("nobody").pw_gid
1884
except KeyError:
1885
uid = 65534
1886
gid = 65534
2283
continue
2284
else:
2285
uid = 65534
2286
gid = 65534
1887
2287
try:
1888
2288
os.setgid(gid)
1889
2289
os.setuid(uid)
1890
2290
except OSError as error:
1891
if error[0] != errno.EPERM:
2291
if error.errno != errno.EPERM:
1892
2292
raise error
1893
2293
1894
if not debug and not debuglevel:
1895
syslogger.setLevel(logging.WARNING)
1896
console.setLevel(logging.WARNING)
1897
if debuglevel:
1898
level = getattr(logging, debuglevel.upper())
1899
syslogger.setLevel(level)
1900
console.setLevel(level)
1901
1902
2294
if debug:
1903
2295
# Enable all possible GnuTLS debugging
1904
2296
1914
2306
.gnutls_global_set_log_function(debug_gnutls))
1915
2307
1916
2308
# Redirect stdin so all checkers get /dev/null
1917
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2309
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1918
2310
os.dup2(null, sys.stdin.fileno())
1919
2311
if null > 2:
1920
2312
os.close(null)
1921
else:
1922
# No console logging
1923
logger.removeHandler(console)
1924
2313
1925
2314
# Need to fork before connecting to D-Bus
1926
2315
if not debug:
1927
2316
# Close all input and output, do double fork, etc.
1928
2317
daemon()
1929
2318
2319
gobject.threads_init()
2320
1930
2321
global main_loop
1931
2322
# From the Avahi example code
1932
DBusGMainLoop(set_as_default=True )
2323
DBusGMainLoop(set_as_default=True)
1933
2324
main_loop = gobject.MainLoop()
1934
2325
bus = dbus.SystemBus()
1935
2326
# End of Avahi example code
1936
2327
if use_dbus:
1937
2328
try:
1938
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1939
bus, do_not_queue=True)
1940
bus_name2 = dbus.service.BusName("se.recompile.Mandos",
1941
bus, do_not_queue=True)
2329
bus_name = dbus.service.BusName("se.recompile.Mandos",
2330
bus, do_not_queue=True)
2331
old_bus_name = (dbus.service.BusName
2332
("se.bsnet.fukt.Mandos", bus,
2333
do_not_queue=True))
1942
2334
except dbus.exceptions.NameExistsException as e:
1943
logger.error(unicode(e) + ", disabling D-Bus")
2335
logger.error("Disabling D-Bus:", exc_info=e)
1944
2336
use_dbus = False
1945
2337
server_settings["use_dbus"] = False
1946
2338
tcp_server.use_dbus = False
1947
2339
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1948
service = AvahiService(name = server_settings["servicename"],
1949
servicetype = "_mandos._tcp",
1950
protocol = protocol, bus = bus)
2340
service = AvahiServiceToSyslog(name =
2341
server_settings["servicename"],
2342
servicetype = "_mandos._tcp",
2343
protocol = protocol, bus = bus)
1951
2344
if server_settings["interface"]:
1952
2345
service.interface = (if_nametoindex
1953
2346
(str(server_settings["interface"])))
1957
2350
1958
2351
client_class = Client
1959
2352
if use_dbus:
1960
client_class = functools.partial(ClientDBusTransitional, bus = bus)
1961
def client_config_items(config, section):
1962
special_settings = {
1963
"approved_by_default":
1964
lambda: config.getboolean(section,
1965
"approved_by_default"),
1966
}
1967
for name, value in config.items(section):
2353
client_class = functools.partial(ClientDBus, bus = bus)
2354
2355
client_settings = Client.config_parser(client_config)
2356
old_client_settings = {}
2357
clients_data = {}
2358
2359
# Get client data and settings from last running state.
2360
if server_settings["restore"]:
2361
try:
2362
with open(stored_state_path, "rb") as stored_state:
2363
clients_data, old_client_settings = (pickle.load
2364
(stored_state))
2365
os.remove(stored_state_path)
2366
except IOError as e:
2367
if e.errno == errno.ENOENT:
2368
logger.warning("Could not load persistent state: {0}"
2369
.format(os.strerror(e.errno)))
2370
else:
2371
logger.critical("Could not load persistent state:",
2372
exc_info=e)
2373
raise
2374
except EOFError as e:
2375
logger.warning("Could not load persistent state: "
2376
"EOFError:", exc_info=e)
2377
2378
with PGPEngine() as pgp:
2379
for client_name, client in clients_data.iteritems():
2380
# Decide which value to use after restoring saved state.
2381
# We have three different values: Old config file,
2382
# new config file, and saved state.
2383
# New config value takes precedence if it differs from old
2384
# config value, otherwise use saved state.
2385
for name, value in client_settings[client_name].items():
2386
try:
2387
# For each value in new config, check if it
2388
# differs from the old config value (Except for
2389
# the "secret" attribute)
2390
if (name != "secret" and
2391
value != old_client_settings[client_name]
2392
[name]):
2393
client[name] = value
2394
except KeyError:
2395
pass
2396
2397
# Clients who has passed its expire date can still be
2398
# enabled if its last checker was successful. Clients
2399
# whose checker succeeded before we stored its state is
2400
# assumed to have successfully run all checkers during
2401
# downtime.
2402
if client["enabled"]:
2403
if datetime.datetime.utcnow() >= client["expires"]:
2404
if not client["last_checked_ok"]:
2405
logger.warning(
2406
"disabling client {0} - Client never "
2407
"performed a successful checker"
2408
.format(client_name))
2409
client["enabled"] = False
2410
elif client["last_checker_status"] != 0:
2411
logger.warning(
2412
"disabling client {0} - Client "
2413
"last checker failed with error code {1}"
2414
.format(client_name,
2415
client["last_checker_status"]))
2416
client["enabled"] = False
2417
else:
2418
client["expires"] = (datetime.datetime
2419
.utcnow()
2420
+ client["timeout"])
2421
logger.debug("Last checker succeeded,"
2422
" keeping {0} enabled"
2423
.format(client_name))
1968
2424
try:
1969
yield (name, special_settings[name]())
1970
except KeyError:
1971
yield (name, value)
1972
1973
tcp_server.clients.update(set(
1974
client_class(name = section,
1975
config= dict(client_config_items(
1976
client_config, section)))
1977
for section in client_config.sections()))
2425
client["secret"] = (
2426
pgp.decrypt(client["encrypted_secret"],
2427
client_settings[client_name]
2428
["secret"]))
2429
except PGPError:
2430
# If decryption fails, we use secret from new settings
2431
logger.debug("Failed to decrypt {0} old secret"
2432
.format(client_name))
2433
client["secret"] = (
2434
client_settings[client_name]["secret"])
2435
2436
# Add/remove clients based on new changes made to config
2437
for client_name in (set(old_client_settings)
2438
- set(client_settings)):
2439
del clients_data[client_name]
2440
for client_name in (set(client_settings)
2441
- set(old_client_settings)):
2442
clients_data[client_name] = client_settings[client_name]
2443
2444
# Create all client objects
2445
for client_name, client in clients_data.iteritems():
2446
tcp_server.clients[client_name] = client_class(
2447
name = client_name, settings = client)
2448
1978
2449
if not tcp_server.clients:
1979
2450
logger.warning("No clients defined")
1980
2451
1981
2452
if not debug:
1982
2453
try:
1983
2454
with pidfile:
1991
2462
# "pidfile" was never created
1992
2463
pass
1993
2464
del pidfilename
1994
1995
signal.signal(signal.SIGINT, signal.SIG_IGN)
1996
2465
1997
2466
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1998
2467
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1999
2468
2000
2469
if use_dbus:
2001
class MandosDBusService(dbus.service.Object):
2470
@alternate_dbus_interfaces({"se.recompile.Mandos":
2471
"se.bsnet.fukt.Mandos"})
2472
class MandosDBusService(DBusObjectWithProperties):
2002
2473
"""A D-Bus proxy object"""
2003
2474
def __init__(self):
2004
2475
dbus.service.Object.__init__(self, bus, "/")
2005
_interface = "se.bsnet.fukt.Mandos"
2476
_interface = "se.recompile.Mandos"
2477
2478
@dbus_interface_annotations(_interface)
2479
def _foo(self):
2480
return { "org.freedesktop.DBus.Property"
2481
".EmitsChangedSignal":
2482
"false"}
2006
2483
2007
2484
@dbus.service.signal(_interface, signature="o")
2008
2485
def ClientAdded(self, objpath):
2023
2500
def GetAllClients(self):
2024
2501
"D-Bus method"
2025
2502
return dbus.Array(c.dbus_object_path
2026
for c in tcp_server.clients)
2503
for c in
2504
tcp_server.clients.itervalues())
2027
2505
2028
2506
@dbus.service.method(_interface,
2029
2507
out_signature="a{oa{sv}}")
2031
2509
"D-Bus method"
2032
2510
return dbus.Dictionary(
2033
2511
((c.dbus_object_path, c.GetAll(""))
2034
for c in tcp_server.clients),
2512
for c in tcp_server.clients.itervalues()),
2035
2513
signature="oa{sv}")
2036
2514
2037
2515
@dbus.service.method(_interface, in_signature="o")
2038
2516
def RemoveClient(self, object_path):
2039
2517
"D-Bus method"
2040
for c in tcp_server.clients:
2518
for c in tcp_server.clients.itervalues():
2041
2519
if c.dbus_object_path == object_path:
2042
tcp_server.clients.remove(c)
2520
del tcp_server.clients[c.name]
2043
2521
c.remove_from_connection()
2044
2522
# Don't signal anything except ClientRemoved
2045
2523
c.disable(quiet=True)
2050
2528
2051
2529
del _interface
2052
2530
2053
class MandosDBusServiceTransitional(MandosDBusService):
2054
__metaclass__ = transitional_dbus_metaclass
2055
mandos_dbus_service = MandosDBusServiceTransitional()
2531
mandos_dbus_service = MandosDBusService()
2056
2532
2057
2533
def cleanup():
2058
2534
"Cleanup function; run on exit"
2059
2535
service.cleanup()
2060
2536
2537
multiprocessing.active_children()
2538
if not (tcp_server.clients or client_settings):
2539
return
2540
2541
# Store client before exiting. Secrets are encrypted with key
2542
# based on what config file has. If config file is
2543
# removed/edited, old secret will thus be unrecovable.
2544
clients = {}
2545
with PGPEngine() as pgp:
2546
for client in tcp_server.clients.itervalues():
2547
key = client_settings[client.name]["secret"]
2548
client.encrypted_secret = pgp.encrypt(client.secret,
2549
key)
2550
client_dict = {}
2551
2552
# A list of attributes that can not be pickled
2553
# + secret.
2554
exclude = set(("bus", "changedstate", "secret",
2555
"checker"))
2556
for name, typ in (inspect.getmembers
2557
(dbus.service.Object)):
2558
exclude.add(name)
2559
2560
client_dict["encrypted_secret"] = (client
2561
.encrypted_secret)
2562
for attr in client.client_structure:
2563
if attr not in exclude:
2564
client_dict[attr] = getattr(client, attr)
2565
2566
clients[client.name] = client_dict
2567
del client_settings[client.name]["secret"]
2568
2569
try:
2570
with (tempfile.NamedTemporaryFile
2571
(mode='wb', suffix=".pickle", prefix='clients-',
2572
dir=os.path.dirname(stored_state_path),
2573
delete=False)) as stored_state:
2574
pickle.dump((clients, client_settings), stored_state)
2575
tempname=stored_state.name
2576
os.rename(tempname, stored_state_path)
2577
except (IOError, OSError) as e:
2578
if not debug:
2579
try:
2580
os.remove(tempname)
2581
except NameError:
2582
pass
2583
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2584
logger.warning("Could not save persistent state: {0}"
2585
.format(os.strerror(e.errno)))
2586
else:
2587
logger.warning("Could not save persistent state:",
2588
exc_info=e)
2589
raise e
2590
2591
# Delete all clients, and settings from config
2061
2592
while tcp_server.clients:
2062
client = tcp_server.clients.pop()
2593
name, client = tcp_server.clients.popitem()
2063
2594
if use_dbus:
2064
2595
client.remove_from_connection()
2065
client.disable_hook = None
2066
2596
# Don't signal anything except ClientRemoved
2067
2597
client.disable(quiet=True)
2068
2598
if use_dbus:
2069
2599
# Emit D-Bus signal
2070
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2600
mandos_dbus_service.ClientRemoved(client
2601
.dbus_object_path,
2071
2602
client.name)
2603
client_settings.clear()
2072
2604
2073
2605
atexit.register(cleanup)
2074
2606
2075
for client in tcp_server.clients:
2607
for client in tcp_server.clients.itervalues():
2076
2608
if use_dbus:
2077
2609
# Emit D-Bus signal
2078
2610
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2079
client.enable()
2611
# Need to initiate checking of clients
2612
if client.enabled:
2613
client.init_checker()
2080
2614
2081
2615
tcp_server.enable()
2082
2616
tcp_server.server_activate()
2085
2619
service.port = tcp_server.socket.getsockname()[1]
2086
2620
if use_ipv6:
2087
2621
logger.info("Now listening on address %r, port %d,"
2088
" flowinfo %d, scope_id %d"
2089
% tcp_server.socket.getsockname())
2622
" flowinfo %d, scope_id %d",
2623
*tcp_server.socket.getsockname())
2090
2624
else: # IPv4
2091
logger.info("Now listening on address %r, port %d"
2092
% tcp_server.socket.getsockname())
2625
logger.info("Now listening on address %r, port %d",
2626
*tcp_server.socket.getsockname())
2093
2627
2094
2628
#service.interface = tcp_server.socket.getsockname()[3]
2095
2629
2098
2632
try:
2099
2633
service.activate()
2100
2634
except dbus.exceptions.DBusException as error:
2101
logger.critical("DBusException: %s", error)
2635
logger.critical("D-Bus Exception", exc_info=error)
2102
2636
cleanup()
2103
2637
sys.exit(1)
2104
2638
# End of Avahi example code
2111
2645
logger.debug("Starting main loop")
2112
2646
main_loop.run()
2113
2647
except AvahiError as error:
2114
logger.critical("AvahiError: %s", error)
2648
logger.critical("Avahi Error", exc_info=error)
2115
2649
cleanup()
2116
2650
sys.exit(1)
2117
2651
except KeyboardInterrupt:
2122
2656
# Must run before the D-Bus bus name gets deregistered
2123
2657
cleanup()
2124
2658
2125
2126
2659
if __name__ == '__main__':
2127
2660
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0