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 633
- compare with another revision
- download diff
- download tarball
- view history from revision 633
- Committer: Teddy Hogeborn
- Date: 2013-10-22 19:46:35 UTC
- Revision ID: teddy@recompile.se-20131022194635-ll6jyg1snrxwe94o
* TODO
- files added:
- debian/mandos-client.examples
- 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-2013 Teddy Hogeborn
15
# Copyright © 2008-2013 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
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
65
67
import types
66
68
import binascii
67
69
import tempfile
70
import itertools
71
import collections
68
72
69
73
import dbus
70
74
import dbus.service
75
79
import ctypes.util
76
80
import xml.dom.minidom
77
81
import inspect
78
import GnuPGInterface
79
82
80
83
try:
81
84
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
88
except ImportError:
86
89
SO_BINDTODEVICE = None
87
90
88
89
version = "1.4.1"
91
version = "1.6.1"
90
92
stored_state_file = "clients.pickle"
91
93
92
94
logger = logging.getLogger()
111
113
return interface_index
112
114
113
115
114
def initlogger(level=logging.WARNING):
116
def initlogger(debug, level=logging.WARNING):
115
117
"""init logger and add loglevel"""
116
118
117
119
syslogger.setFormatter(logging.Formatter
119
121
' %(message)s'))
120
122
logger.addHandler(syslogger)
121
123
122
console = logging.StreamHandler()
123
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
124
' [%(process)d]:'
125
' %(levelname)s:'
126
' %(message)s'))
127
logger.addHandler(console)
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)
128
131
logger.setLevel(level)
129
132
130
133
131
class CryptoError(Exception):
134
class PGPError(Exception):
135
"""Exception if encryption/decryption fails"""
132
136
pass
133
137
134
138
135
class Crypto(object):
139
class PGPEngine(object):
136
140
"""A simple class for OpenPGP symmetric encryption & decryption"""
137
141
def __init__(self):
138
self.gnupg = GnuPGInterface.GnuPG()
139
142
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
140
self.gnupg = GnuPGInterface.GnuPG()
141
self.gnupg.options.meta_interactive = False
142
self.gnupg.options.homedir = self.tempdir
143
self.gnupg.options.extra_args.extend(['--force-mdc',
144
'--quiet'])
143
self.gnupgargs = ['--batch',
144
'--home', self.tempdir,
145
'--force-mdc',
146
'--quiet',
147
'--no-use-agent']
145
148
146
149
def __enter__(self):
147
150
return self
148
151
149
def __exit__ (self, exc_type, exc_value, traceback):
152
def __exit__(self, exc_type, exc_value, traceback):
150
153
self._cleanup()
151
154
return False
152
155
169
172
def password_encode(self, password):
170
173
# Passphrase can not be empty and can not contain newlines or
171
174
# NUL bytes. So we prefix it and hex encode it.
172
return b"mandos" + binascii.hexlify(password)
175
encoded = b"mandos" + binascii.hexlify(password)
176
if len(encoded) > 2048:
177
# GnuPG can't handle long passwords, so encode differently
178
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
179
.replace(b"\n", b"\\n")
180
.replace(b"\0", b"\\x00"))
181
return encoded
173
182
174
183
def encrypt(self, data, password):
175
self.gnupg.passphrase = self.password_encode(password)
176
with open(os.devnull) as devnull:
177
try:
178
proc = self.gnupg.run(['--symmetric'],
179
create_fhs=['stdin', 'stdout'],
180
attach_fhs={'stderr': devnull})
181
with contextlib.closing(proc.handles['stdin']) as f:
182
f.write(data)
183
with contextlib.closing(proc.handles['stdout']) as f:
184
ciphertext = f.read()
185
proc.wait()
186
except IOError as e:
187
raise CryptoError(e)
188
self.gnupg.passphrase = None
184
passphrase = self.password_encode(password)
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
186
) as passfile:
187
passfile.write(passphrase)
188
passfile.flush()
189
proc = subprocess.Popen(['gpg', '--symmetric',
190
'--passphrase-file',
191
passfile.name]
192
+ self.gnupgargs,
193
stdin = subprocess.PIPE,
194
stdout = subprocess.PIPE,
195
stderr = subprocess.PIPE)
196
ciphertext, err = proc.communicate(input = data)
197
if proc.returncode != 0:
198
raise PGPError(err)
189
199
return ciphertext
190
200
191
201
def decrypt(self, data, password):
192
self.gnupg.passphrase = self.password_encode(password)
193
with open(os.devnull) as devnull:
194
try:
195
proc = self.gnupg.run(['--decrypt'],
196
create_fhs=['stdin', 'stdout'],
197
attach_fhs={'stderr': devnull})
198
with contextlib.closing(proc.handles['stdin'] ) as f:
199
f.write(data)
200
with contextlib.closing(proc.handles['stdout']) as f:
201
decrypted_plaintext = f.read()
202
proc.wait()
203
except IOError as e:
204
raise CryptoError(e)
205
self.gnupg.passphrase = None
202
passphrase = self.password_encode(password)
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
204
) as passfile:
205
passfile.write(passphrase)
206
passfile.flush()
207
proc = subprocess.Popen(['gpg', '--decrypt',
208
'--passphrase-file',
209
passfile.name]
210
+ self.gnupgargs,
211
stdin = subprocess.PIPE,
212
stdout = subprocess.PIPE,
213
stderr = subprocess.PIPE)
214
decrypted_plaintext, err = proc.communicate(input
215
= data)
216
if proc.returncode != 0:
217
raise PGPError(err)
206
218
return decrypted_plaintext
207
219
208
220
209
210
221
class AvahiError(Exception):
211
222
def __init__(self, value, *args, **kwargs):
212
223
self.value = value
229
240
Used to optionally bind to the specified interface.
230
241
name: string; Example: 'Mandos'
231
242
type: string; Example: '_mandos._tcp'.
232
See <http://www.dns-sd.org/ServiceTypes.html>
243
See <https://www.iana.org/assignments/service-names-port-numbers>
233
244
port: integer; what port to announce
234
245
TXT: list of strings; TXT record for the service
235
246
domain: string; Domain to publish on, default to .local if empty.
241
252
server: D-Bus Server
242
253
bus: dbus.SystemBus()
243
254
"""
255
244
256
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
245
257
servicetype = None, port = None, TXT = None,
246
258
domain = "", host = "", max_renames = 32768,
259
271
self.server = None
260
272
self.bus = bus
261
273
self.entry_group_state_changed_match = None
274
262
275
def rename(self):
263
276
"""Derived from the Avahi example code"""
264
277
if self.rename_count >= self.max_renames:
274
287
try:
275
288
self.add()
276
289
except dbus.exceptions.DBusException as error:
277
logger.critical("DBusException: %s", error)
290
logger.critical("D-Bus Exception", exc_info=error)
278
291
self.cleanup()
279
292
os._exit(1)
280
293
self.rename_count += 1
294
281
295
def remove(self):
282
296
"""Derived from the Avahi example code"""
283
297
if self.entry_group_state_changed_match is not None:
285
299
self.entry_group_state_changed_match = None
286
300
if self.group is not None:
287
301
self.group.Reset()
302
288
303
def add(self):
289
304
"""Derived from the Avahi example code"""
290
305
self.remove()
307
322
dbus.UInt16(self.port),
308
323
avahi.string_array_to_txt_array(self.TXT))
309
324
self.group.Commit()
325
310
326
def entry_group_state_changed(self, state, error):
311
327
"""Derived from the Avahi example code"""
312
328
logger.debug("Avahi entry group state change: %i", state)
319
335
elif state == avahi.ENTRY_GROUP_FAILURE:
320
336
logger.critical("Avahi: Error in group state changed %s",
321
337
unicode(error))
322
raise AvahiGroupError("State changed: %s"
323
% unicode(error))
338
raise AvahiGroupError("State changed: {0!s}"
339
.format(error))
340
324
341
def cleanup(self):
325
342
"""Derived from the Avahi example code"""
326
343
if self.group is not None:
331
348
pass
332
349
self.group = None
333
350
self.remove()
351
334
352
def server_state_changed(self, state, error=None):
335
353
"""Derived from the Avahi example code"""
336
354
logger.debug("Avahi server state change: %i", state)
355
373
logger.debug("Unknown state: %r", state)
356
374
else:
357
375
logger.debug("Unknown state: %r: %r", state, error)
376
358
377
def activate(self):
359
378
"""Derived from the Avahi example code"""
360
379
if self.server is None:
367
386
self.server_state_changed)
368
387
self.server_state_changed(self.server.GetState())
369
388
389
370
390
class AvahiServiceToSyslog(AvahiService):
371
391
def rename(self):
372
392
"""Add the new name to the syslog messages"""
373
393
ret = AvahiService.rename(self)
374
394
syslogger.setFormatter(logging.Formatter
375
('Mandos (%s) [%%(process)d]:'
376
' %%(levelname)s: %%(message)s'
377
% self.name))
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
397
.format(self.name)))
378
398
return ret
379
399
380
def _timedelta_to_milliseconds(td):
400
401
def timedelta_to_milliseconds(td):
381
402
"Convert a datetime.timedelta() to milliseconds"
382
403
return ((td.days * 24 * 60 * 60 * 1000)
383
404
+ (td.seconds * 1000)
384
405
+ (td.microseconds // 1000))
385
406
407
386
408
class Client(object):
387
409
"""A representation of a client host served by this server.
388
410
389
411
Attributes:
390
_approved: bool(); 'None' if not yet approved/disapproved
412
approved: bool(); 'None' if not yet approved/disapproved
391
413
approval_delay: datetime.timedelta(); Time to wait for approval
392
414
approval_duration: datetime.timedelta(); Duration of one approval
393
415
checker: subprocess.Popen(); a running checker process used
411
433
interval: datetime.timedelta(); How often to start a new checker
412
434
last_approval_request: datetime.datetime(); (UTC) or None
413
435
last_checked_ok: datetime.datetime(); (UTC) or None
414
415
436
last_checker_status: integer between 0 and 255 reflecting exit
416
437
status of last checker. -1 reflects crashed
417
checker, or None.
418
last_enabled: datetime.datetime(); (UTC)
438
checker, -2 means no checker completed yet.
439
last_enabled: datetime.datetime(); (UTC) or None
419
440
name: string; from the config file, used in log messages and
420
441
D-Bus identifiers
421
442
secret: bytestring; sent verbatim (over TLS) to client
422
443
timeout: datetime.timedelta(); How long from last_checked_ok
423
444
until this client is disabled
424
extended_timeout: extra long timeout when password has been sent
445
extended_timeout: extra long timeout when secret has been sent
425
446
runtime_expansions: Allowed attributes for runtime expansion.
426
447
expires: datetime.datetime(); time (UTC) when a client will be
427
448
disabled, or None
449
server_settings: The server_settings dict from main()
428
450
"""
429
451
430
452
runtime_expansions = ("approval_delay", "approval_duration",
431
"created", "enabled", "fingerprint",
432
"host", "interval", "last_checked_ok",
453
"created", "enabled", "expires",
454
"fingerprint", "host", "interval",
455
"last_approval_request", "last_checked_ok",
433
456
"last_enabled", "name", "timeout")
457
client_defaults = { "timeout": "PT5M",
458
"extended_timeout": "PT15M",
459
"interval": "PT2M",
460
"checker": "fping -q -- %%(host)s",
461
"host": "",
462
"approval_delay": "PT0S",
463
"approval_duration": "PT1S",
464
"approved_by_default": "True",
465
"enabled": "True",
466
}
434
467
435
468
def timeout_milliseconds(self):
436
469
"Return the 'timeout' attribute in milliseconds"
437
return _timedelta_to_milliseconds(self.timeout)
470
return timedelta_to_milliseconds(self.timeout)
438
471
439
472
def extended_timeout_milliseconds(self):
440
473
"Return the 'extended_timeout' attribute in milliseconds"
441
return _timedelta_to_milliseconds(self.extended_timeout)
474
return timedelta_to_milliseconds(self.extended_timeout)
442
475
443
476
def interval_milliseconds(self):
444
477
"Return the 'interval' attribute in milliseconds"
445
return _timedelta_to_milliseconds(self.interval)
478
return timedelta_to_milliseconds(self.interval)
446
479
447
480
def approval_delay_milliseconds(self):
448
return _timedelta_to_milliseconds(self.approval_delay)
449
450
def __init__(self, name = None, config=None):
451
"""Note: the 'checker' key in 'config' sets the
452
'checker_command' attribute and *not* the 'checker'
453
attribute."""
481
return timedelta_to_milliseconds(self.approval_delay)
482
483
@staticmethod
484
def config_parser(config):
485
"""Construct a new dict of client settings of this form:
486
{ client_name: {setting_name: value, ...}, ...}
487
with exceptions for any special settings as defined above.
488
NOTE: Must be a pure function. Must return the same result
489
value given the same arguments.
490
"""
491
settings = {}
492
for client_name in config.sections():
493
section = dict(config.items(client_name))
494
client = settings[client_name] = {}
495
496
client["host"] = section["host"]
497
# Reformat values from string types to Python types
498
client["approved_by_default"] = config.getboolean(
499
client_name, "approved_by_default")
500
client["enabled"] = config.getboolean(client_name,
501
"enabled")
502
503
client["fingerprint"] = (section["fingerprint"].upper()
504
.replace(" ", ""))
505
if "secret" in section:
506
client["secret"] = section["secret"].decode("base64")
507
elif "secfile" in section:
508
with open(os.path.expanduser(os.path.expandvars
509
(section["secfile"])),
510
"rb") as secfile:
511
client["secret"] = secfile.read()
512
else:
513
raise TypeError("No secret or secfile for section {0}"
514
.format(section))
515
client["timeout"] = string_to_delta(section["timeout"])
516
client["extended_timeout"] = string_to_delta(
517
section["extended_timeout"])
518
client["interval"] = string_to_delta(section["interval"])
519
client["approval_delay"] = string_to_delta(
520
section["approval_delay"])
521
client["approval_duration"] = string_to_delta(
522
section["approval_duration"])
523
client["checker_command"] = section["checker"]
524
client["last_approval_request"] = None
525
client["last_checked_ok"] = None
526
client["last_checker_status"] = -2
527
528
return settings
529
530
def __init__(self, settings, name = None, server_settings=None):
454
531
self.name = name
455
if config is None:
456
config = {}
532
if server_settings is None:
533
server_settings = {}
534
self.server_settings = server_settings
535
# adding all client settings
536
for setting, value in settings.iteritems():
537
setattr(self, setting, value)
538
539
if self.enabled:
540
if not hasattr(self, "last_enabled"):
541
self.last_enabled = datetime.datetime.utcnow()
542
if not hasattr(self, "expires"):
543
self.expires = (datetime.datetime.utcnow()
544
+ self.timeout)
545
else:
546
self.last_enabled = None
547
self.expires = None
548
457
549
logger.debug("Creating client %r", self.name)
458
550
# Uppercase and remove spaces from fingerprint for later
459
551
# comparison purposes with return value from the fingerprint()
460
552
# function
461
self.fingerprint = (config["fingerprint"].upper()
462
.replace(" ", ""))
463
553
logger.debug(" Fingerprint: %s", self.fingerprint)
464
if "secret" in config:
465
self.secret = config["secret"].decode("base64")
466
elif "secfile" in config:
467
with open(os.path.expanduser(os.path.expandvars
468
(config["secfile"])),
469
"rb") as secfile:
470
self.secret = secfile.read()
471
else:
472
raise TypeError("No secret or secfile for client %s"
473
% self.name)
474
self.host = config.get("host", "")
475
self.created = datetime.datetime.utcnow()
476
self.enabled = True
477
self.last_approval_request = None
478
self.last_enabled = datetime.datetime.utcnow()
479
self.last_checked_ok = None
480
self.last_checker_status = None
481
self.timeout = string_to_delta(config["timeout"])
482
self.extended_timeout = string_to_delta(config
483
["extended_timeout"])
484
self.interval = string_to_delta(config["interval"])
554
self.created = settings.get("created",
555
datetime.datetime.utcnow())
556
557
# attributes specific for this server instance
485
558
self.checker = None
486
559
self.checker_initiator_tag = None
487
560
self.disable_initiator_tag = None
488
self.expires = datetime.datetime.utcnow() + self.timeout
489
561
self.checker_callback_tag = None
490
self.checker_command = config["checker"]
491
562
self.current_checker_command = None
492
self._approved = None
493
self.approved_by_default = config.get("approved_by_default",
494
True)
563
self.approved = None
495
564
self.approvals_pending = 0
496
self.approval_delay = string_to_delta(
497
config["approval_delay"])
498
self.approval_duration = string_to_delta(
499
config["approval_duration"])
500
565
self.changedstate = (multiprocessing_manager
501
566
.Condition(multiprocessing_manager
502
567
.Lock()))
522
587
if getattr(self, "enabled", False):
523
588
# Already enabled
524
589
return
525
self.send_changedstate()
526
590
self.expires = datetime.datetime.utcnow() + self.timeout
527
591
self.enabled = True
528
592
self.last_enabled = datetime.datetime.utcnow()
529
593
self.init_checker()
594
self.send_changedstate()
530
595
531
596
def disable(self, quiet=True):
532
597
"""Disable this client."""
533
598
if not getattr(self, "enabled", False):
534
599
return False
535
600
if not quiet:
536
self.send_changedstate()
537
if not quiet:
538
601
logger.info("Disabling client %s", self.name)
539
if getattr(self, "disable_initiator_tag", False):
602
if getattr(self, "disable_initiator_tag", None) is not None:
540
603
gobject.source_remove(self.disable_initiator_tag)
541
604
self.disable_initiator_tag = None
542
605
self.expires = None
543
if getattr(self, "checker_initiator_tag", False):
606
if getattr(self, "checker_initiator_tag", None) is not None:
544
607
gobject.source_remove(self.checker_initiator_tag)
545
608
self.checker_initiator_tag = None
546
609
self.stop_checker()
547
610
self.enabled = False
611
if not quiet:
612
self.send_changedstate()
548
613
# Do not run this again if called by a gobject.timeout_add
549
614
return False
550
615
554
619
def init_checker(self):
555
620
# Schedule a new checker to be started an 'interval' from now,
556
621
# and every interval from then on.
622
if self.checker_initiator_tag is not None:
623
gobject.source_remove(self.checker_initiator_tag)
557
624
self.checker_initiator_tag = (gobject.timeout_add
558
625
(self.interval_milliseconds(),
559
626
self.start_checker))
560
627
# Schedule a disable() when 'timeout' has passed
628
if self.disable_initiator_tag is not None:
629
gobject.source_remove(self.disable_initiator_tag)
561
630
self.disable_initiator_tag = (gobject.timeout_add
562
631
(self.timeout_milliseconds(),
563
632
self.disable))
569
638
self.checker_callback_tag = None
570
639
self.checker = None
571
640
if os.WIFEXITED(condition):
572
self.last_checker_status = os.WEXITSTATUS(condition)
641
self.last_checker_status = os.WEXITSTATUS(condition)
573
642
if self.last_checker_status == 0:
574
643
logger.info("Checker for %(name)s succeeded",
575
644
vars(self))
582
651
logger.warning("Checker for %(name)s crashed?",
583
652
vars(self))
584
653
585
def checked_ok(self, timeout=None):
586
"""Bump up the timeout for this client.
587
588
This should only be called when the client has been seen,
589
alive and well.
590
"""
654
def checked_ok(self):
655
"""Assert that the client has been seen, alive and well."""
656
self.last_checked_ok = datetime.datetime.utcnow()
657
self.last_checker_status = 0
658
self.bump_timeout()
659
660
def bump_timeout(self, timeout=None):
661
"""Bump up the timeout for this client."""
591
662
if timeout is None:
592
663
timeout = self.timeout
593
self.last_checked_ok = datetime.datetime.utcnow()
594
664
if self.disable_initiator_tag is not None:
595
665
gobject.source_remove(self.disable_initiator_tag)
666
self.disable_initiator_tag = None
596
667
if getattr(self, "enabled", False):
597
668
self.disable_initiator_tag = (gobject.timeout_add
598
(_timedelta_to_milliseconds
669
(timedelta_to_milliseconds
599
670
(timeout), self.disable))
600
671
self.expires = datetime.datetime.utcnow() + timeout
601
672
608
679
If a checker already exists, leave it running and do
609
680
nothing."""
610
681
# The reason for not killing a running checker is that if we
611
# did that, then if a checker (for some reason) started
612
# running slowly and taking more than 'interval' time, the
613
# client would inevitably timeout, since no checker would get
614
# a chance to run to completion. If we instead leave running
682
# did that, and if a checker (for some reason) started running
683
# slowly and taking more than 'interval' time, then the client
684
# would inevitably timeout, since no checker would get a
685
# chance to run to completion. If we instead leave running
615
686
# checkers alone, the checker would have to take more time
616
687
# than 'timeout' for the client to be disabled, which is as it
617
688
# should be.
631
702
self.current_checker_command)
632
703
# Start a new checker if needed
633
704
if self.checker is None:
705
# Escape attributes for the shell
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
708
for attr in
709
self.runtime_expansions)
634
710
try:
635
# In case checker_command has exactly one % operator
636
command = self.checker_command % self.host
637
except TypeError:
638
# Escape attributes for the shell
639
escaped_attrs = dict(
640
(attr,
641
re.escape(unicode(str(getattr(self, attr, "")),
642
errors=
643
'replace')))
644
for attr in
645
self.runtime_expansions)
646
647
try:
648
command = self.checker_command % escaped_attrs
649
except TypeError as error:
650
logger.error('Could not format string "%s":'
651
' %s', self.checker_command, error)
652
return True # Try again later
711
command = self.checker_command % escaped_attrs
712
except TypeError as error:
713
logger.error('Could not format string "%s"',
714
self.checker_command, exc_info=error)
715
return True # Try again later
653
716
self.current_checker_command = command
654
717
try:
655
718
logger.info("Starting checker %r for %s",
658
721
# in normal mode, that is already done by daemon(),
659
722
# and in debug mode we don't want to. (Stdin is
660
723
# always replaced by /dev/null.)
724
# The exception is when not debugging but nevertheless
725
# running in the foreground; use the previously
726
# created wnull.
727
popen_args = {}
728
if (not self.server_settings["debug"]
729
and self.server_settings["foreground"]):
730
popen_args.update({"stdout": wnull,
731
"stderr": wnull })
661
732
self.checker = subprocess.Popen(command,
662
733
close_fds=True,
663
shell=True, cwd="/")
664
self.checker_callback_tag = (gobject.child_watch_add
665
(self.checker.pid,
666
self.checker_callback,
667
data=command))
668
# The checker may have completed before the gobject
669
# watch was added. Check for this.
734
shell=True, cwd="/",
735
**popen_args)
736
except OSError as error:
737
logger.error("Failed to start subprocess",
738
exc_info=error)
739
return True
740
self.checker_callback_tag = (gobject.child_watch_add
741
(self.checker.pid,
742
self.checker_callback,
743
data=command))
744
# The checker may have completed before the gobject
745
# watch was added. Check for this.
746
try:
670
747
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
if pid:
672
gobject.source_remove(self.checker_callback_tag)
673
self.checker_callback(pid, status, command)
674
748
except OSError as error:
675
logger.error("Failed to start subprocess: %s",
676
error)
749
if error.errno == errno.ECHILD:
750
# This should never happen
751
logger.error("Child process vanished",
752
exc_info=error)
753
return True
754
raise
755
if pid:
756
gobject.source_remove(self.checker_callback_tag)
757
self.checker_callback(pid, status, command)
677
758
# Re-run this periodically if run by gobject.timeout_add
678
759
return True
679
760
686
767
return
687
768
logger.debug("Stopping checker for %(name)s", vars(self))
688
769
try:
689
os.kill(self.checker.pid, signal.SIGTERM)
770
self.checker.terminate()
690
771
#time.sleep(0.5)
691
772
#if self.checker.poll() is None:
692
# os.kill(self.checker.pid, signal.SIGKILL)
773
# self.checker.kill()
693
774
except OSError as error:
694
775
if error.errno != errno.ESRCH: # No such process
695
776
raise
712
793
# "Set" method, so we fail early here:
713
794
if byte_arrays and signature != "ay":
714
795
raise ValueError("Byte arrays not supported for non-'ay'"
715
" signature %r" % signature)
796
" signature {0!r}".format(signature))
716
797
def decorator(func):
717
798
func._dbus_is_property = True
718
799
func._dbus_interface = dbus_interface
726
807
return decorator
727
808
728
809
810
def dbus_interface_annotations(dbus_interface):
811
"""Decorator for marking functions returning interface annotations
812
813
Usage:
814
815
@dbus_interface_annotations("org.example.Interface")
816
def _foo(self): # Function name does not matter
817
return {"org.freedesktop.DBus.Deprecated": "true",
818
"org.freedesktop.DBus.Property.EmitsChangedSignal":
819
"false"}
820
"""
821
def decorator(func):
822
func._dbus_is_interface = True
823
func._dbus_interface = dbus_interface
824
func._dbus_name = dbus_interface
825
return func
826
return decorator
827
828
829
def dbus_annotations(annotations):
830
"""Decorator to annotate D-Bus methods, signals or properties
831
Usage:
832
833
@dbus_service_property("org.example.Interface", signature="b",
834
access="r")
835
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
836
"org.freedesktop.DBus.Property."
837
"EmitsChangedSignal": "false"})
838
def Property_dbus_property(self):
839
return dbus.Boolean(False)
840
"""
841
def decorator(func):
842
func._dbus_annotations = annotations
843
return func
844
return decorator
845
846
729
847
class DBusPropertyException(dbus.exceptions.DBusException):
730
848
"""A base class for D-Bus property-related exceptions
731
849
"""
754
872
"""
755
873
756
874
@staticmethod
757
def _is_dbus_property(obj):
758
return getattr(obj, "_dbus_is_property", False)
875
def _is_dbus_thing(thing):
876
"""Returns a function testing if an attribute is a D-Bus thing
877
878
If called like _is_dbus_thing("method") it returns a function
879
suitable for use as predicate to inspect.getmembers().
880
"""
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
882
False)
759
883
760
def _get_all_dbus_properties(self):
884
def _get_all_dbus_things(self, thing):
761
885
"""Returns a generator of (name, attribute) pairs
762
886
"""
763
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
887
return ((getattr(athing.__get__(self), "_dbus_name",
888
name),
889
athing.__get__(self))
764
890
for cls in self.__class__.__mro__
765
for name, prop in
766
inspect.getmembers(cls, self._is_dbus_property))
891
for name, athing in
892
inspect.getmembers(cls,
893
self._is_dbus_thing(thing)))
767
894
768
895
def _get_dbus_property(self, interface_name, property_name):
769
896
"""Returns a bound method if one exists which is a D-Bus
771
898
"""
772
899
for cls in self.__class__.__mro__:
773
900
for name, value in (inspect.getmembers
774
(cls, self._is_dbus_property)):
901
(cls,
902
self._is_dbus_thing("property"))):
775
903
if (value._dbus_name == property_name
776
904
and value._dbus_interface == interface_name):
777
905
return value.__get__(self)
806
934
# signatures other than "ay".
807
935
if prop._dbus_signature != "ay":
808
936
raise ValueError
809
value = dbus.ByteArray(''.join(unichr(byte)
810
for byte in value))
937
value = dbus.ByteArray(b''.join(chr(byte)
938
for byte in value))
811
939
prop(value)
812
940
813
941
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
819
947
Note: Will not include properties with access="write".
820
948
"""
821
949
properties = {}
822
for name, prop in self._get_all_dbus_properties():
950
for name, prop in self._get_all_dbus_things("property"):
823
951
if (interface_name
824
952
and interface_name != prop._dbus_interface):
825
953
# Interface non-empty but did not match
840
968
path_keyword='object_path',
841
969
connection_keyword='connection')
842
970
def Introspect(self, object_path, connection):
843
"""Standard D-Bus method, overloaded to insert property tags.
971
"""Overloading of standard D-Bus method.
972
973
Inserts property tags and interface annotation tags.
844
974
"""
845
975
xmlstring = dbus.service.Object.Introspect(self, object_path,
846
976
connection)
853
983
e.setAttribute("access", prop._dbus_access)
854
984
return e
855
985
for if_tag in document.getElementsByTagName("interface"):
986
# Add property tags
856
987
for tag in (make_tag(document, name, prop)
857
988
for name, prop
858
in self._get_all_dbus_properties()
989
in self._get_all_dbus_things("property")
859
990
if prop._dbus_interface
860
991
== if_tag.getAttribute("name")):
861
992
if_tag.appendChild(tag)
993
# Add annotation tags
994
for typ in ("method", "signal", "property"):
995
for tag in if_tag.getElementsByTagName(typ):
996
annots = dict()
997
for name, prop in (self.
998
_get_all_dbus_things(typ)):
999
if (name == tag.getAttribute("name")
1000
and prop._dbus_interface
1001
== if_tag.getAttribute("name")):
1002
annots.update(getattr
1003
(prop,
1004
"_dbus_annotations",
1005
{}))
1006
for name, value in annots.iteritems():
1007
ann_tag = document.createElement(
1008
"annotation")
1009
ann_tag.setAttribute("name", name)
1010
ann_tag.setAttribute("value", value)
1011
tag.appendChild(ann_tag)
1012
# Add interface annotation tags
1013
for annotation, value in dict(
1014
itertools.chain.from_iterable(
1015
annotations().iteritems()
1016
for name, annotations in
1017
self._get_all_dbus_things("interface")
1018
if name == if_tag.getAttribute("name")
1019
)).iteritems():
1020
ann_tag = document.createElement("annotation")
1021
ann_tag.setAttribute("name", annotation)
1022
ann_tag.setAttribute("value", value)
1023
if_tag.appendChild(ann_tag)
862
1024
# Add the names to the return values for the
863
1025
# "org.freedesktop.DBus.Properties" methods
864
1026
if (if_tag.getAttribute("name")
879
1041
except (AttributeError, xml.dom.DOMException,
880
1042
xml.parsers.expat.ExpatError) as error:
881
1043
logger.error("Failed to override Introspection method",
882
error)
1044
exc_info=error)
883
1045
return xmlstring
884
1046
885
1047
886
def datetime_to_dbus (dt, variant_level=0):
1048
def datetime_to_dbus(dt, variant_level=0):
887
1049
"""Convert a UTC datetime.datetime() to a D-Bus type."""
888
1050
if dt is None:
889
1051
return dbus.String("", variant_level = variant_level)
891
1053
variant_level=variant_level)
892
1054
893
1055
894
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
895
.__metaclass__):
896
"""Applied to an empty subclass of a D-Bus object, this metaclass
897
will add additional D-Bus attributes matching a certain pattern.
1056
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1057
"""A class decorator; applied to a subclass of
1058
dbus.service.Object, it will add alternate D-Bus attributes with
1059
interface names according to the "alt_interface_names" mapping.
1060
Usage:
1061
1062
@alternate_dbus_interfaces({"org.example.Interface":
1063
"net.example.AlternateInterface"})
1064
class SampleDBusObject(dbus.service.Object):
1065
@dbus.service.method("org.example.Interface")
1066
def SampleDBusMethod():
1067
pass
1068
1069
The above "SampleDBusMethod" on "SampleDBusObject" will be
1070
reachable via two interfaces: "org.example.Interface" and
1071
"net.example.AlternateInterface", the latter of which will have
1072
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1073
"true", unless "deprecate" is passed with a False value.
1074
1075
This works for methods and signals, and also for D-Bus properties
1076
(from DBusObjectWithProperties) and interfaces (from the
1077
dbus_interface_annotations decorator).
898
1078
"""
899
def __new__(mcs, name, bases, attr):
900
# Go through all the base classes which could have D-Bus
901
# methods, signals, or properties in them
902
for base in (b for b in bases
903
if issubclass(b, dbus.service.Object)):
904
# Go though all attributes of the base class
905
for attrname, attribute in inspect.getmembers(base):
1079
def wrapper(cls):
1080
for orig_interface_name, alt_interface_name in (
1081
alt_interface_names.iteritems()):
1082
attr = {}
1083
interface_names = set()
1084
# Go though all attributes of the class
1085
for attrname, attribute in inspect.getmembers(cls):
906
1086
# Ignore non-D-Bus attributes, and D-Bus attributes
907
1087
# with the wrong interface name
908
1088
if (not hasattr(attribute, "_dbus_interface")
909
1089
or not attribute._dbus_interface
910
.startswith("se.recompile.Mandos")):
1090
.startswith(orig_interface_name)):
911
1091
continue
912
1092
# Create an alternate D-Bus interface name based on
913
1093
# the current name
914
1094
alt_interface = (attribute._dbus_interface
915
.replace("se.recompile.Mandos",
916
"se.bsnet.fukt.Mandos"))
1095
.replace(orig_interface_name,
1096
alt_interface_name))
1097
interface_names.add(alt_interface)
917
1098
# Is this a D-Bus signal?
918
1099
if getattr(attribute, "_dbus_is_signal", False):
919
# Extract the original non-method function by
920
# black magic
1100
# Extract the original non-method undecorated
1101
# function by black magic
921
1102
nonmethod_func = (dict(
922
1103
zip(attribute.func_code.co_freevars,
923
1104
attribute.__closure__))["func"]
934
1115
nonmethod_func.func_name,
935
1116
nonmethod_func.func_defaults,
936
1117
nonmethod_func.func_closure)))
1118
# Copy annotations, if any
1119
try:
1120
new_function._dbus_annotations = (
1121
dict(attribute._dbus_annotations))
1122
except AttributeError:
1123
pass
937
1124
# Define a creator of a function to call both the
938
# old and new functions, so both the old and new
939
# signals gets sent when the function is called
1125
# original and alternate functions, so both the
1126
# original and alternate signals gets sent when
1127
# the function is called
940
1128
def fixscope(func1, func2):
941
1129
"""This function is a scope container to pass
942
1130
func1 and func2 to the "call_both" function
949
1137
return call_both
950
1138
# Create the "call_both" function and add it to
951
1139
# the class
952
attr[attrname] = fixscope(attribute,
953
new_function)
1140
attr[attrname] = fixscope(attribute, new_function)
954
1141
# Is this a D-Bus method?
955
1142
elif getattr(attribute, "_dbus_is_method", False):
956
1143
# Create a new, but exactly alike, function
967
1154
attribute.func_name,
968
1155
attribute.func_defaults,
969
1156
attribute.func_closure)))
1157
# Copy annotations, if any
1158
try:
1159
attr[attrname]._dbus_annotations = (
1160
dict(attribute._dbus_annotations))
1161
except AttributeError:
1162
pass
970
1163
# Is this a D-Bus property?
971
1164
elif getattr(attribute, "_dbus_is_property", False):
972
1165
# Create a new, but exactly alike, function
986
1179
attribute.func_name,
987
1180
attribute.func_defaults,
988
1181
attribute.func_closure)))
989
return type.__new__(mcs, name, bases, attr)
990
991
1182
# Copy annotations, if any
1183
try:
1184
attr[attrname]._dbus_annotations = (
1185
dict(attribute._dbus_annotations))
1186
except AttributeError:
1187
pass
1188
# Is this a D-Bus interface?
1189
elif getattr(attribute, "_dbus_is_interface", False):
1190
# Create a new, but exactly alike, function
1191
# object. Decorate it to be a new D-Bus interface
1192
# with the alternate D-Bus interface name. Add it
1193
# to the class.
1194
attr[attrname] = (dbus_interface_annotations
1195
(alt_interface)
1196
(types.FunctionType
1197
(attribute.func_code,
1198
attribute.func_globals,
1199
attribute.func_name,
1200
attribute.func_defaults,
1201
attribute.func_closure)))
1202
if deprecate:
1203
# Deprecate all alternate interfaces
1204
iname="_AlternateDBusNames_interface_annotation{0}"
1205
for interface_name in interface_names:
1206
@dbus_interface_annotations(interface_name)
1207
def func(self):
1208
return { "org.freedesktop.DBus.Deprecated":
1209
"true" }
1210
# Find an unused name
1211
for aname in (iname.format(i)
1212
for i in itertools.count()):
1213
if aname not in attr:
1214
attr[aname] = func
1215
break
1216
if interface_names:
1217
# Replace the class with a new subclass of it with
1218
# methods, signals, etc. as created above.
1219
cls = type(b"{0}Alternate".format(cls.__name__),
1220
(cls,), attr)
1221
return cls
1222
return wrapper
1223
1224
1225
@alternate_dbus_interfaces({"se.recompile.Mandos":
1226
"se.bsnet.fukt.Mandos"})
992
1227
class ClientDBus(Client, DBusObjectWithProperties):
993
1228
"""A Client class using D-Bus
994
1229
1005
1240
def __init__(self, bus = None, *args, **kwargs):
1006
1241
self.bus = bus
1007
1242
Client.__init__(self, *args, **kwargs)
1008
1009
self._approvals_pending = 0
1010
1243
# Only now, when this client is initialized, can it show up on
1011
1244
# the D-Bus
1012
1245
client_object_name = unicode(self.name).translate(
1016
1249
("/clients/" + client_object_name))
1017
1250
DBusObjectWithProperties.__init__(self, self.bus,
1018
1251
self.dbus_object_path)
1019
1252
1020
1253
def notifychangeproperty(transform_func,
1021
1254
dbus_name, type_func=lambda x: x,
1022
1255
variant_level=1):
1045
1278
1046
1279
return property(lambda self: getattr(self, attrname), setter)
1047
1280
1048
1049
1281
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1050
1282
approvals_pending = notifychangeproperty(dbus.Boolean,
1051
1283
"ApprovalPending",
1058
1290
checker is not None)
1059
1291
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1060
1292
"LastCheckedOK")
1293
last_checker_status = notifychangeproperty(dbus.Int16,
1294
"LastCheckerStatus")
1061
1295
last_approval_request = notifychangeproperty(
1062
1296
datetime_to_dbus, "LastApprovalRequest")
1063
1297
approved_by_default = notifychangeproperty(dbus.Boolean,
1064
1298
"ApprovedByDefault")
1065
approval_delay = notifychangeproperty(dbus.UInt16,
1299
approval_delay = notifychangeproperty(dbus.UInt64,
1066
1300
"ApprovalDelay",
1067
1301
type_func =
1068
_timedelta_to_milliseconds)
1302
timedelta_to_milliseconds)
1069
1303
approval_duration = notifychangeproperty(
1070
dbus.UInt16, "ApprovalDuration",
1071
type_func = _timedelta_to_milliseconds)
1304
dbus.UInt64, "ApprovalDuration",
1305
type_func = timedelta_to_milliseconds)
1072
1306
host = notifychangeproperty(dbus.String, "Host")
1073
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1307
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1074
1308
type_func =
1075
_timedelta_to_milliseconds)
1309
timedelta_to_milliseconds)
1076
1310
extended_timeout = notifychangeproperty(
1077
dbus.UInt16, "ExtendedTimeout",
1078
type_func = _timedelta_to_milliseconds)
1079
interval = notifychangeproperty(dbus.UInt16,
1311
dbus.UInt64, "ExtendedTimeout",
1312
type_func = timedelta_to_milliseconds)
1313
interval = notifychangeproperty(dbus.UInt64,
1080
1314
"Interval",
1081
1315
type_func =
1082
_timedelta_to_milliseconds)
1316
timedelta_to_milliseconds)
1083
1317
checker_command = notifychangeproperty(dbus.String, "Checker")
1084
1318
1085
1319
del notifychangeproperty
1127
1361
return r
1128
1362
1129
1363
def _reset_approved(self):
1130
self._approved = None
1364
self.approved = None
1131
1365
return False
1132
1366
1133
1367
def approve(self, value=True):
1134
self.send_changedstate()
1135
self._approved = value
1136
gobject.timeout_add(_timedelta_to_milliseconds
1368
self.approved = value
1369
gobject.timeout_add(timedelta_to_milliseconds
1137
1370
(self.approval_duration),
1138
1371
self._reset_approved)
1139
1372
self.send_changedstate()
1140
1373
1141
1374
## D-Bus methods, signals & properties
1142
1375
_interface = "se.recompile.Mandos.Client"
1143
1376
1377
## Interfaces
1378
1379
@dbus_interface_annotations(_interface)
1380
def _foo(self):
1381
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1382
"false"}
1383
1144
1384
## Signals
1145
1385
1146
1386
# CheckerCompleted - signal
1182
1422
"D-Bus signal"
1183
1423
return self.need_approval()
1184
1424
1185
# NeRwequest - signal
1186
@dbus.service.signal(_interface, signature="s")
1187
def NewRequest(self, ip):
1188
"""D-Bus signal
1189
Is sent after a client request a password.
1190
"""
1191
pass
1192
1193
1425
## Methods
1194
1426
1195
1427
# Approve - method
1253
1485
access="readwrite")
1254
1486
def ApprovalDuration_dbus_property(self, value=None):
1255
1487
if value is None: # get
1256
return dbus.UInt64(_timedelta_to_milliseconds(
1488
return dbus.UInt64(timedelta_to_milliseconds(
1257
1489
self.approval_duration))
1258
1490
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1259
1491
1273
1505
def Host_dbus_property(self, value=None):
1274
1506
if value is None: # get
1275
1507
return dbus.String(self.host)
1276
self.host = value
1508
self.host = unicode(value)
1277
1509
1278
1510
# Created - property
1279
1511
@dbus_service_property(_interface, signature="s", access="read")
1280
1512
def Created_dbus_property(self):
1281
return dbus.String(datetime_to_dbus(self.created))
1513
return datetime_to_dbus(self.created)
1282
1514
1283
1515
# LastEnabled - property
1284
1516
@dbus_service_property(_interface, signature="s", access="read")
1305
1537
return
1306
1538
return datetime_to_dbus(self.last_checked_ok)
1307
1539
1540
# LastCheckerStatus - property
1541
@dbus_service_property(_interface, signature="n",
1542
access="read")
1543
def LastCheckerStatus_dbus_property(self):
1544
return dbus.Int16(self.last_checker_status)
1545
1308
1546
# Expires - property
1309
1547
@dbus_service_property(_interface, signature="s", access="read")
1310
1548
def Expires_dbus_property(self):
1321
1559
def Timeout_dbus_property(self, value=None):
1322
1560
if value is None: # get
1323
1561
return dbus.UInt64(self.timeout_milliseconds())
1562
old_timeout = self.timeout
1324
1563
self.timeout = datetime.timedelta(0, 0, 0, value)
1325
if getattr(self, "disable_initiator_tag", None) is None:
1326
return
1327
# Reschedule timeout
1328
gobject.source_remove(self.disable_initiator_tag)
1329
self.disable_initiator_tag = None
1330
self.expires = None
1331
time_to_die = _timedelta_to_milliseconds((self
1332
.last_checked_ok
1333
+ self.timeout)
1334
- datetime.datetime
1335
.utcnow())
1336
if time_to_die <= 0:
1337
# The timeout has passed
1338
self.disable()
1339
else:
1340
self.expires = (datetime.datetime.utcnow()
1341
+ datetime.timedelta(milliseconds =
1342
time_to_die))
1343
self.disable_initiator_tag = (gobject.timeout_add
1344
(time_to_die, self.disable))
1564
# Reschedule disabling
1565
if self.enabled:
1566
now = datetime.datetime.utcnow()
1567
self.expires += self.timeout - old_timeout
1568
if self.expires <= now:
1569
# The timeout has passed
1570
self.disable()
1571
else:
1572
if (getattr(self, "disable_initiator_tag", None)
1573
is None):
1574
return
1575
gobject.source_remove(self.disable_initiator_tag)
1576
self.disable_initiator_tag = (
1577
gobject.timeout_add(
1578
timedelta_to_milliseconds(self.expires - now),
1579
self.disable))
1345
1580
1346
1581
# ExtendedTimeout - property
1347
1582
@dbus_service_property(_interface, signature="t",
1360
1595
self.interval = datetime.timedelta(0, 0, 0, value)
1361
1596
if getattr(self, "checker_initiator_tag", None) is None:
1362
1597
return
1363
# Reschedule checker run
1364
gobject.source_remove(self.checker_initiator_tag)
1365
self.checker_initiator_tag = (gobject.timeout_add
1366
(value, self.start_checker))
1367
self.start_checker() # Start one now, too
1598
if self.enabled:
1599
# Reschedule checker run
1600
gobject.source_remove(self.checker_initiator_tag)
1601
self.checker_initiator_tag = (gobject.timeout_add
1602
(value, self.start_checker))
1603
self.start_checker() # Start one now, too
1368
1604
1369
1605
# Checker - property
1370
1606
@dbus_service_property(_interface, signature="s",
1372
1608
def Checker_dbus_property(self, value=None):
1373
1609
if value is None: # get
1374
1610
return dbus.String(self.checker_command)
1375
self.checker_command = value
1611
self.checker_command = unicode(value)
1376
1612
1377
1613
# CheckerRunning - property
1378
1614
@dbus_service_property(_interface, signature="b",
1407
1643
raise KeyError()
1408
1644
1409
1645
def __getattribute__(self, name):
1410
if(name == '_pipe'):
1646
if name == '_pipe':
1411
1647
return super(ProxyClient, self).__getattribute__(name)
1412
1648
self._pipe.send(('getattr', name))
1413
1649
data = self._pipe.recv()
1420
1656
return func
1421
1657
1422
1658
def __setattr__(self, name, value):
1423
if(name == '_pipe'):
1659
if name == '_pipe':
1424
1660
return super(ProxyClient, self).__setattr__(name, value)
1425
1661
self._pipe.send(('setattr', name, value))
1426
1662
1427
1663
1428
class ClientDBusTransitional(ClientDBus):
1429
__metaclass__ = AlternateDBusNamesMetaclass
1430
1431
1432
1664
class ClientHandler(socketserver.BaseRequestHandler, object):
1433
1665
"""A class to handle client connections.
1434
1666
1495
1727
logger.warning("Bad certificate: %s", error)
1496
1728
return
1497
1729
logger.debug("Fingerprint: %s", fpr)
1498
if self.server.use_dbus:
1499
# Emit D-Bus signal
1500
client.NewRequest(str(self.client_address))
1501
1730
1502
1731
try:
1503
1732
client = ProxyClient(child_pipe, fpr,
1519
1748
client.Rejected("Disabled")
1520
1749
return
1521
1750
1522
if client._approved or not client.approval_delay:
1751
if client.approved or not client.approval_delay:
1523
1752
#We are approved or approval is disabled
1524
1753
break
1525
elif client._approved is None:
1754
elif client.approved is None:
1526
1755
logger.info("Client %s needs approval",
1527
1756
client.name)
1528
1757
if self.server.use_dbus:
1541
1770
#wait until timeout or approved
1542
1771
time = datetime.datetime.now()
1543
1772
client.changedstate.acquire()
1544
(client.changedstate.wait
1545
(float(client._timedelta_to_milliseconds(delay)
1546
/ 1000)))
1773
client.changedstate.wait(
1774
float(timedelta_to_milliseconds(delay)
1775
/ 1000))
1547
1776
client.changedstate.release()
1548
1777
time2 = datetime.datetime.now()
1549
1778
if (time2 - time) >= delay:
1565
1794
try:
1566
1795
sent = session.send(client.secret[sent_size:])
1567
1796
except gnutls.errors.GNUTLSError as error:
1568
logger.warning("gnutls send failed")
1797
logger.warning("gnutls send failed",
1798
exc_info=error)
1569
1799
return
1570
1800
logger.debug("Sent: %d, remaining: %d",
1571
1801
sent, len(client.secret)
1574
1804
1575
1805
logger.info("Sending secret to %s", client.name)
1576
1806
# bump the timeout using extended_timeout
1577
client.checked_ok(client.extended_timeout)
1807
client.bump_timeout(client.extended_timeout)
1578
1808
if self.server.use_dbus:
1579
1809
# Emit D-Bus signal
1580
1810
client.GotSecret()
1585
1815
try:
1586
1816
session.bye()
1587
1817
except gnutls.errors.GNUTLSError as error:
1588
logger.warning("GnuTLS bye failed")
1818
logger.warning("GnuTLS bye failed",
1819
exc_info=error)
1589
1820
1590
1821
@staticmethod
1591
1822
def peer_certificate(session):
1656
1887
def sub_process_main(self, request, address):
1657
1888
try:
1658
1889
self.finish_request(request, address)
1659
except:
1890
except Exception:
1660
1891
self.handle_error(request, address)
1661
1892
self.close_request(request)
1662
1893
1663
1894
def process_request(self, request, address):
1664
1895
"""Start a new process to process the request."""
1665
1896
proc = multiprocessing.Process(target = self.sub_process_main,
1666
args = (request,
1667
address))
1897
args = (request, address))
1668
1898
proc.start()
1669
1899
return proc
1670
1900
1698
1928
use_ipv6: Boolean; to use IPv6 or not
1699
1929
"""
1700
1930
def __init__(self, server_address, RequestHandlerClass,
1701
interface=None, use_ipv6=True):
1931
interface=None, use_ipv6=True, socketfd=None):
1932
"""If socketfd is set, use that file descriptor instead of
1933
creating a new one with socket.socket().
1934
"""
1702
1935
self.interface = interface
1703
1936
if use_ipv6:
1704
1937
self.address_family = socket.AF_INET6
1938
if socketfd is not None:
1939
# Save the file descriptor
1940
self.socketfd = socketfd
1941
# Save the original socket.socket() function
1942
self.socket_socket = socket.socket
1943
# To implement --socket, we monkey patch socket.socket.
1944
#
1945
# (When socketserver.TCPServer is a new-style class, we
1946
# could make self.socket into a property instead of monkey
1947
# patching socket.socket.)
1948
#
1949
# Create a one-time-only replacement for socket.socket()
1950
@functools.wraps(socket.socket)
1951
def socket_wrapper(*args, **kwargs):
1952
# Restore original function so subsequent calls are
1953
# not affected.
1954
socket.socket = self.socket_socket
1955
del self.socket_socket
1956
# This time only, return a new socket object from the
1957
# saved file descriptor.
1958
return socket.fromfd(self.socketfd, *args, **kwargs)
1959
# Replace socket.socket() function with wrapper
1960
socket.socket = socket_wrapper
1961
# The socketserver.TCPServer.__init__ will call
1962
# socket.socket(), which might be our replacement,
1963
# socket_wrapper(), if socketfd was set.
1705
1964
socketserver.TCPServer.__init__(self, server_address,
1706
1965
RequestHandlerClass)
1966
1707
1967
def server_bind(self):
1708
1968
"""This overrides the normal server_bind() function
1709
1969
to bind to an interface if one was specified, and also NOT to
1717
1977
try:
1718
1978
self.socket.setsockopt(socket.SOL_SOCKET,
1719
1979
SO_BINDTODEVICE,
1720
str(self.interface
1721
+ '\0'))
1980
str(self.interface + '\0'))
1722
1981
except socket.error as error:
1723
if error[0] == errno.EPERM:
1724
logger.error("No permission to"
1725
" bind to interface %s",
1726
self.interface)
1727
elif error[0] == errno.ENOPROTOOPT:
1982
if error.errno == errno.EPERM:
1983
logger.error("No permission to bind to"
1984
" interface %s", self.interface)
1985
elif error.errno == errno.ENOPROTOOPT:
1728
1986
logger.error("SO_BINDTODEVICE not available;"
1729
1987
" cannot bind to interface %s",
1730
1988
self.interface)
1989
elif error.errno == errno.ENODEV:
1990
logger.error("Interface %s does not exist,"
1991
" cannot bind", self.interface)
1731
1992
else:
1732
1993
raise
1733
1994
# Only bind(2) the socket if we really need to.
1736
1997
if self.address_family == socket.AF_INET6:
1737
1998
any_address = "::" # in6addr_any
1738
1999
else:
1739
any_address = socket.INADDR_ANY
2000
any_address = "0.0.0.0" # INADDR_ANY
1740
2001
self.server_address = (any_address,
1741
2002
self.server_address[1])
1742
2003
elif not self.server_address[1]:
1763
2024
"""
1764
2025
def __init__(self, server_address, RequestHandlerClass,
1765
2026
interface=None, use_ipv6=True, clients=None,
1766
gnutls_priority=None, use_dbus=True):
2027
gnutls_priority=None, use_dbus=True, socketfd=None):
1767
2028
self.enabled = False
1768
2029
self.clients = clients
1769
2030
if self.clients is None:
1773
2034
IPv6_TCPServer.__init__(self, server_address,
1774
2035
RequestHandlerClass,
1775
2036
interface = interface,
1776
use_ipv6 = use_ipv6)
2037
use_ipv6 = use_ipv6,
2038
socketfd = socketfd)
1777
2039
def server_activate(self):
1778
2040
if self.enabled:
1779
2041
return socketserver.TCPServer.server_activate(self)
1792
2054
1793
2055
def handle_ipc(self, source, condition, parent_pipe=None,
1794
2056
proc = None, client_object=None):
1795
condition_names = {
1796
gobject.IO_IN: "IN", # There is data to read.
1797
gobject.IO_OUT: "OUT", # Data can be written (without
1798
# blocking).
1799
gobject.IO_PRI: "PRI", # There is urgent data to read.
1800
gobject.IO_ERR: "ERR", # Error condition.
1801
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1802
# broken, usually for pipes and
1803
# sockets).
1804
}
1805
conditions_string = ' | '.join(name
1806
for cond, name in
1807
condition_names.iteritems()
1808
if cond & condition)
1809
2057
# error, or the other end of multiprocessing.Pipe has closed
1810
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2058
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1811
2059
# Wait for other process to exit
1812
2060
proc.join()
1813
2061
return False
1871
2119
return True
1872
2120
1873
2121
2122
def rfc3339_duration_to_delta(duration):
2123
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2124
2125
>>> rfc3339_duration_to_delta("P7D")
2126
datetime.timedelta(7)
2127
>>> rfc3339_duration_to_delta("PT60S")
2128
datetime.timedelta(0, 60)
2129
>>> rfc3339_duration_to_delta("PT60M")
2130
datetime.timedelta(0, 3600)
2131
>>> rfc3339_duration_to_delta("PT24H")
2132
datetime.timedelta(1)
2133
>>> rfc3339_duration_to_delta("P1W")
2134
datetime.timedelta(7)
2135
>>> rfc3339_duration_to_delta("PT5M30S")
2136
datetime.timedelta(0, 330)
2137
>>> rfc3339_duration_to_delta("P1DT3M20S")
2138
datetime.timedelta(1, 200)
2139
"""
2140
2141
# Parsing an RFC 3339 duration with regular expressions is not
2142
# possible - there would have to be multiple places for the same
2143
# values, like seconds. The current code, while more esoteric, is
2144
# cleaner without depending on a parsing library. If Python had a
2145
# built-in library for parsing we would use it, but we'd like to
2146
# avoid excessive use of external libraries.
2147
2148
# New type for defining tokens, syntax, and semantics all-in-one
2149
Token = collections.namedtuple("Token",
2150
("regexp", # To match token; if
2151
# "value" is not None,
2152
# must have a "group"
2153
# containing digits
2154
"value", # datetime.timedelta or
2155
# None
2156
"followers")) # Tokens valid after
2157
# this token
2158
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2159
# the "duration" ABNF definition in RFC 3339, Appendix A.
2160
token_end = Token(re.compile(r"$"), None, frozenset())
2161
token_second = Token(re.compile(r"(\d+)S"),
2162
datetime.timedelta(seconds=1),
2163
frozenset((token_end,)))
2164
token_minute = Token(re.compile(r"(\d+)M"),
2165
datetime.timedelta(minutes=1),
2166
frozenset((token_second, token_end)))
2167
token_hour = Token(re.compile(r"(\d+)H"),
2168
datetime.timedelta(hours=1),
2169
frozenset((token_minute, token_end)))
2170
token_time = Token(re.compile(r"T"),
2171
None,
2172
frozenset((token_hour, token_minute,
2173
token_second)))
2174
token_day = Token(re.compile(r"(\d+)D"),
2175
datetime.timedelta(days=1),
2176
frozenset((token_time, token_end)))
2177
token_month = Token(re.compile(r"(\d+)M"),
2178
datetime.timedelta(weeks=4),
2179
frozenset((token_day, token_end)))
2180
token_year = Token(re.compile(r"(\d+)Y"),
2181
datetime.timedelta(weeks=52),
2182
frozenset((token_month, token_end)))
2183
token_week = Token(re.compile(r"(\d+)W"),
2184
datetime.timedelta(weeks=1),
2185
frozenset((token_end,)))
2186
token_duration = Token(re.compile(r"P"), None,
2187
frozenset((token_year, token_month,
2188
token_day, token_time,
2189
token_week))),
2190
# Define starting values
2191
value = datetime.timedelta() # Value so far
2192
found_token = None
2193
followers = frozenset(token_duration,) # Following valid tokens
2194
s = duration # String left to parse
2195
# Loop until end token is found
2196
while found_token is not token_end:
2197
# Search for any currently valid tokens
2198
for token in followers:
2199
match = token.regexp.match(s)
2200
if match is not None:
2201
# Token found
2202
if token.value is not None:
2203
# Value found, parse digits
2204
factor = int(match.group(1), 10)
2205
# Add to value so far
2206
value += factor * token.value
2207
# Strip token from string
2208
s = token.regexp.sub("", s, 1)
2209
# Go to found token
2210
found_token = token
2211
# Set valid next tokens
2212
followers = found_token.followers
2213
break
2214
else:
2215
# No currently valid tokens were found
2216
raise ValueError("Invalid RFC 3339 duration")
2217
# End token found
2218
return value
2219
2220
1874
2221
def string_to_delta(interval):
1875
2222
"""Parse a string and return a datetime.timedelta
1876
2223
1887
2234
>>> string_to_delta('5m 30s')
1888
2235
datetime.timedelta(0, 330)
1889
2236
"""
2237
2238
try:
2239
return rfc3339_duration_to_delta(interval)
2240
except ValueError:
2241
pass
2242
1890
2243
timevalue = datetime.timedelta(0)
1891
2244
for s in interval.split():
1892
2245
try:
1903
2256
elif suffix == "w":
1904
2257
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1905
2258
else:
1906
raise ValueError("Unknown suffix %r" % suffix)
2259
raise ValueError("Unknown suffix {0!r}"
2260
.format(suffix))
1907
2261
except (ValueError, IndexError) as e:
1908
2262
raise ValueError(*(e.args))
1909
2263
timevalue += delta
1923
2277
sys.exit()
1924
2278
if not noclose:
1925
2279
# Close all standard open file descriptors
1926
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2280
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1927
2281
if not stat.S_ISCHR(os.fstat(null).st_mode):
1928
2282
raise OSError(errno.ENODEV,
1929
"%s not a character device"
1930
% os.path.devnull)
2283
"{0} not a character device"
2284
.format(os.devnull))
1931
2285
os.dup2(null, sys.stdin.fileno())
1932
2286
os.dup2(null, sys.stdout.fileno())
1933
2287
os.dup2(null, sys.stderr.fileno())
1942
2296
1943
2297
parser = argparse.ArgumentParser()
1944
2298
parser.add_argument("-v", "--version", action="version",
1945
version = "%%(prog)s %s" % version,
2299
version = "%(prog)s {0}".format(version),
1946
2300
help="show version number and exit")
1947
2301
parser.add_argument("-i", "--interface", metavar="IF",
1948
2302
help="Bind to interface IF")
1954
2308
help="Run self-test")
1955
2309
parser.add_argument("--debug", action="store_true",
1956
2310
help="Debug mode; run in foreground and log"
1957
" to terminal")
2311
" to terminal", default=None)
1958
2312
parser.add_argument("--debuglevel", metavar="LEVEL",
1959
2313
help="Debug level for stdout output")
1960
2314
parser.add_argument("--priority", help="GnuTLS"
1967
2321
" files")
1968
2322
parser.add_argument("--no-dbus", action="store_false",
1969
2323
dest="use_dbus", help="Do not provide D-Bus"
1970
" system bus interface")
2324
" system bus interface", default=None)
1971
2325
parser.add_argument("--no-ipv6", action="store_false",
1972
dest="use_ipv6", help="Do not use IPv6")
2326
dest="use_ipv6", help="Do not use IPv6",
2327
default=None)
1973
2328
parser.add_argument("--no-restore", action="store_false",
1974
2329
dest="restore", help="Do not restore stored"
1975
" state")
2330
" state", default=None)
2331
parser.add_argument("--socket", type=int,
2332
help="Specify a file descriptor to a network"
2333
" socket to use instead of creating one")
1976
2334
parser.add_argument("--statedir", metavar="DIR",
1977
2335
help="Directory to save/restore state in")
2336
parser.add_argument("--foreground", action="store_true",
2337
help="Run in foreground", default=None)
1978
2338
1979
2339
options = parser.parse_args()
1980
2340
1989
2349
"port": "",
1990
2350
"debug": "False",
1991
2351
"priority":
1992
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2352
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
1993
2353
"servicename": "Mandos",
1994
2354
"use_dbus": "True",
1995
2355
"use_ipv6": "True",
1996
2356
"debuglevel": "",
1997
2357
"restore": "True",
1998
"statedir": "/var/lib/mandos"
2358
"socket": "",
2359
"statedir": "/var/lib/mandos",
2360
"foreground": "False",
1999
2361
}
2000
2362
2001
2363
# Parse config file for server-global settings
2006
2368
# Convert the SafeConfigParser object to a dict
2007
2369
server_settings = server_config.defaults()
2008
2370
# Use the appropriate methods on the non-string config options
2009
for option in ("debug", "use_dbus", "use_ipv6"):
2371
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2010
2372
server_settings[option] = server_config.getboolean("DEFAULT",
2011
2373
option)
2012
2374
if server_settings["port"]:
2013
2375
server_settings["port"] = server_config.getint("DEFAULT",
2014
2376
"port")
2377
if server_settings["socket"]:
2378
server_settings["socket"] = server_config.getint("DEFAULT",
2379
"socket")
2380
# Later, stdin will, and stdout and stderr might, be dup'ed
2381
# over with an opened os.devnull. But we don't want this to
2382
# happen with a supplied network socket.
2383
if 0 <= server_settings["socket"] <= 2:
2384
server_settings["socket"] = os.dup(server_settings
2385
["socket"])
2015
2386
del server_config
2016
2387
2017
2388
# Override the settings from the config file with command line
2019
2390
for option in ("interface", "address", "port", "debug",
2020
2391
"priority", "servicename", "configdir",
2021
2392
"use_dbus", "use_ipv6", "debuglevel", "restore",
2022
"statedir"):
2393
"statedir", "socket", "foreground"):
2023
2394
value = getattr(options, option)
2024
2395
if value is not None:
2025
2396
server_settings[option] = value
2028
2399
for option in server_settings.keys():
2029
2400
if type(server_settings[option]) is str:
2030
2401
server_settings[option] = unicode(server_settings[option])
2402
# Force all boolean options to be boolean
2403
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2404
"foreground"):
2405
server_settings[option] = bool(server_settings[option])
2406
# Debug implies foreground
2407
if server_settings["debug"]:
2408
server_settings["foreground"] = True
2031
2409
# Now we have our good server settings in "server_settings"
2032
2410
2033
2411
##################################################################
2039
2417
use_ipv6 = server_settings["use_ipv6"]
2040
2418
stored_state_path = os.path.join(server_settings["statedir"],
2041
2419
stored_state_file)
2420
foreground = server_settings["foreground"]
2042
2421
2043
2422
if debug:
2044
initlogger(logging.DEBUG)
2423
initlogger(debug, logging.DEBUG)
2045
2424
else:
2046
2425
if not debuglevel:
2047
initlogger()
2426
initlogger(debug)
2048
2427
else:
2049
2428
level = getattr(logging, debuglevel.upper())
2050
initlogger(level)
2429
initlogger(debug, level)
2051
2430
2052
2431
if server_settings["servicename"] != "Mandos":
2053
2432
syslogger.setFormatter(logging.Formatter
2054
('Mandos (%s) [%%(process)d]:'
2055
' %%(levelname)s: %%(message)s'
2056
% server_settings["servicename"]))
2433
('Mandos ({0}) [%(process)d]:'
2434
' %(levelname)s: %(message)s'
2435
.format(server_settings
2436
["servicename"])))
2057
2437
2058
2438
# Parse config file with clients
2059
client_defaults = { "timeout": "5m",
2060
"extended_timeout": "15m",
2061
"interval": "2m",
2062
"checker": "fping -q -- %%(host)s",
2063
"host": "",
2064
"approval_delay": "0s",
2065
"approval_duration": "1s",
2066
}
2067
client_config = configparser.SafeConfigParser(client_defaults)
2439
client_config = configparser.SafeConfigParser(Client
2440
.client_defaults)
2068
2441
client_config.read(os.path.join(server_settings["configdir"],
2069
2442
"clients.conf"))
2070
2443
2079
2452
use_ipv6=use_ipv6,
2080
2453
gnutls_priority=
2081
2454
server_settings["priority"],
2082
use_dbus=use_dbus)
2083
if not debug:
2084
pidfilename = "/var/run/mandos.pid"
2455
use_dbus=use_dbus,
2456
socketfd=(server_settings["socket"]
2457
or None))
2458
if not foreground:
2459
pidfilename = "/run/mandos.pid"
2460
pidfile = None
2085
2461
try:
2086
2462
pidfile = open(pidfilename, "w")
2087
except IOError:
2088
logger.error("Could not open file %r", pidfilename)
2463
except IOError as e:
2464
logger.error("Could not open file %r", pidfilename,
2465
exc_info=e)
2089
2466
2090
try:
2091
uid = pwd.getpwnam("_mandos").pw_uid
2092
gid = pwd.getpwnam("_mandos").pw_gid
2093
except KeyError:
2467
for name in ("_mandos", "mandos", "nobody"):
2094
2468
try:
2095
uid = pwd.getpwnam("mandos").pw_uid
2096
gid = pwd.getpwnam("mandos").pw_gid
2469
uid = pwd.getpwnam(name).pw_uid
2470
gid = pwd.getpwnam(name).pw_gid
2471
break
2097
2472
except KeyError:
2098
try:
2099
uid = pwd.getpwnam("nobody").pw_uid
2100
gid = pwd.getpwnam("nobody").pw_gid
2101
except KeyError:
2102
uid = 65534
2103
gid = 65534
2473
continue
2474
else:
2475
uid = 65534
2476
gid = 65534
2104
2477
try:
2105
2478
os.setgid(gid)
2106
2479
os.setuid(uid)
2107
2480
except OSError as error:
2108
if error[0] != errno.EPERM:
2481
if error.errno != errno.EPERM:
2109
2482
raise error
2110
2483
2111
2484
if debug:
2123
2496
.gnutls_global_set_log_function(debug_gnutls))
2124
2497
2125
2498
# Redirect stdin so all checkers get /dev/null
2126
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2499
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2127
2500
os.dup2(null, sys.stdin.fileno())
2128
2501
if null > 2:
2129
2502
os.close(null)
2130
else:
2131
# No console logging
2132
logger.removeHandler(console)
2133
2503
2134
2504
# Need to fork before connecting to D-Bus
2135
if not debug:
2505
if not foreground:
2136
2506
# Close all input and output, do double fork, etc.
2137
2507
daemon()
2138
2508
2509
# multiprocessing will use threads, so before we use gobject we
2510
# need to inform gobject that threads will be used.
2511
gobject.threads_init()
2512
2139
2513
global main_loop
2140
2514
# From the Avahi example code
2141
DBusGMainLoop(set_as_default=True )
2515
DBusGMainLoop(set_as_default=True)
2142
2516
main_loop = gobject.MainLoop()
2143
2517
bus = dbus.SystemBus()
2144
2518
# End of Avahi example code
2150
2524
("se.bsnet.fukt.Mandos", bus,
2151
2525
do_not_queue=True))
2152
2526
except dbus.exceptions.NameExistsException as e:
2153
logger.error(unicode(e) + ", disabling D-Bus")
2527
logger.error("Disabling D-Bus:", exc_info=e)
2154
2528
use_dbus = False
2155
2529
server_settings["use_dbus"] = False
2156
2530
tcp_server.use_dbus = False
2168
2542
2169
2543
client_class = Client
2170
2544
if use_dbus:
2171
client_class = functools.partial(ClientDBusTransitional,
2172
bus = bus)
2173
2174
special_settings = {
2175
# Some settings need to be accessd by special methods;
2176
# booleans need .getboolean(), etc. Here is a list of them:
2177
"approved_by_default":
2178
lambda section:
2179
client_config.getboolean(section, "approved_by_default"),
2180
}
2181
# Construct a new dict of client settings of this form:
2182
# { client_name: {setting_name: value, ...}, ...}
2183
# with exceptions for any special settings as defined above
2184
client_settings = dict((clientname,
2185
dict((setting,
2186
(value
2187
if setting not in special_settings
2188
else special_settings[setting]
2189
(clientname)))
2190
for setting, value in
2191
client_config.items(clientname)))
2192
for clientname in client_config.sections())
2193
2545
client_class = functools.partial(ClientDBus, bus = bus)
2546
2547
client_settings = Client.config_parser(client_config)
2194
2548
old_client_settings = {}
2195
clients_data = []
2549
clients_data = {}
2550
2551
# This is used to redirect stdout and stderr for checker processes
2552
global wnull
2553
wnull = open(os.devnull, "w") # A writable /dev/null
2554
# Only used if server is running in foreground but not in debug
2555
# mode
2556
if debug or not foreground:
2557
wnull.close()
2196
2558
2197
2559
# Get client data and settings from last running state.
2198
2560
if server_settings["restore"]:
2202
2564
(stored_state))
2203
2565
os.remove(stored_state_path)
2204
2566
except IOError as e:
2205
logger.warning("Could not load persistent state: {0}"
2206
.format(e))
2207
if e.errno != errno.ENOENT:
2567
if e.errno == errno.ENOENT:
2568
logger.warning("Could not load persistent state: {0}"
2569
.format(os.strerror(e.errno)))
2570
else:
2571
logger.critical("Could not load persistent state:",
2572
exc_info=e)
2208
2573
raise
2574
except EOFError as e:
2575
logger.warning("Could not load persistent state: "
2576
"EOFError:", exc_info=e)
2209
2577
2210
with Crypto() as crypt:
2211
for client in clients_data:
2212
client_name = client["name"]
2578
with PGPEngine() as pgp:
2579
for client_name, client in clients_data.iteritems():
2580
# Skip removed clients
2581
if client_name not in client_settings:
2582
continue
2213
2583
2214
2584
# Decide which value to use after restoring saved state.
2215
2585
# We have three different values: Old config file,
2224
2594
if (name != "secret" and
2225
2595
value != old_client_settings[client_name]
2226
2596
[name]):
2227
setattr(client, name, value)
2597
client[name] = value
2228
2598
except KeyError:
2229
2599
pass
2230
2600
2231
2601
# Clients who has passed its expire date can still be
2232
# enabled if its last checker was sucessful. Clients
2233
# whose checker failed before we stored its state is
2234
# assumed to have failed all checkers during downtime.
2235
if client["enabled"] and client["last_checked_ok"]:
2236
if ((datetime.datetime.utcnow()
2237
- client["last_checked_ok"])
2238
> client["interval"]):
2239
if client["last_checker_status"] != 0:
2602
# enabled if its last checker was successful. Clients
2603
# whose checker succeeded before we stored its state is
2604
# assumed to have successfully run all checkers during
2605
# downtime.
2606
if client["enabled"]:
2607
if datetime.datetime.utcnow() >= client["expires"]:
2608
if not client["last_checked_ok"]:
2609
logger.warning(
2610
"disabling client {0} - Client never "
2611
"performed a successful checker"
2612
.format(client_name))
2613
client["enabled"] = False
2614
elif client["last_checker_status"] != 0:
2615
logger.warning(
2616
"disabling client {0} - Client "
2617
"last checker failed with error code {1}"
2618
.format(client_name,
2619
client["last_checker_status"]))
2240
2620
client["enabled"] = False
2241
2621
else:
2242
2622
client["expires"] = (datetime.datetime
2243
2623
.utcnow()
2244
2624
+ client["timeout"])
2245
2246
client["changedstate"] = (multiprocessing_manager
2247
.Condition
2248
(multiprocessing_manager
2249
.Lock()))
2250
if use_dbus:
2251
new_client = (ClientDBusTransitional.__new__
2252
(ClientDBusTransitional))
2253
tcp_server.clients[client_name] = new_client
2254
new_client.bus = bus
2255
for name, value in client.iteritems():
2256
setattr(new_client, name, value)
2257
client_object_name = unicode(client_name).translate(
2258
{ord("."): ord("_"),
2259
ord("-"): ord("_")})
2260
new_client.dbus_object_path = (dbus.ObjectPath
2261
("/clients/"
2262
+ client_object_name))
2263
DBusObjectWithProperties.__init__(new_client,
2264
new_client.bus,
2265
new_client
2266
.dbus_object_path)
2267
else:
2268
tcp_server.clients[client_name] = (Client.__new__
2269
(Client))
2270
for name, value in client.iteritems():
2271
setattr(tcp_server.clients[client_name],
2272
name, value)
2273
2625
logger.debug("Last checker succeeded,"
2626
" keeping {0} enabled"
2627
.format(client_name))
2274
2628
try:
2275
tcp_server.clients[client_name].secret = (
2276
crypt.decrypt(tcp_server.clients[client_name]
2277
.encrypted_secret,
2278
client_settings[client_name]
2279
["secret"]))
2280
except CryptoError:
2629
client["secret"] = (
2630
pgp.decrypt(client["encrypted_secret"],
2631
client_settings[client_name]
2632
["secret"]))
2633
except PGPError:
2281
2634
# If decryption fails, we use secret from new settings
2282
tcp_server.clients[client_name].secret = (
2635
logger.debug("Failed to decrypt {0} old secret"
2636
.format(client_name))
2637
client["secret"] = (
2283
2638
client_settings[client_name]["secret"])
2284
2639
2285
# Create/remove clients based on new changes made to config
2286
for clientname in set(old_client_settings) - set(client_settings):
2287
del tcp_server.clients[clientname]
2288
for clientname in set(client_settings) - set(old_client_settings):
2289
tcp_server.clients[clientname] = (client_class(name
2290
= clientname,
2291
config =
2292
client_settings
2293
[clientname]))
2640
# Add/remove clients based on new changes made to config
2641
for client_name in (set(old_client_settings)
2642
- set(client_settings)):
2643
del clients_data[client_name]
2644
for client_name in (set(client_settings)
2645
- set(old_client_settings)):
2646
clients_data[client_name] = client_settings[client_name]
2647
2648
# Create all client objects
2649
for client_name, client in clients_data.iteritems():
2650
tcp_server.clients[client_name] = client_class(
2651
name = client_name, settings = client,
2652
server_settings = server_settings)
2294
2653
2295
2654
if not tcp_server.clients:
2296
2655
logger.warning("No clients defined")
2297
2298
if not debug:
2299
try:
2300
with pidfile:
2301
pid = os.getpid()
2302
pidfile.write(str(pid) + "\n".encode("utf-8"))
2303
del pidfile
2304
except IOError:
2305
logger.error("Could not write to file %r with PID %d",
2306
pidfilename, pid)
2307
except NameError:
2308
# "pidfile" was never created
2309
pass
2656
2657
if not foreground:
2658
if pidfile is not None:
2659
try:
2660
with pidfile:
2661
pid = os.getpid()
2662
pidfile.write(str(pid) + "\n".encode("utf-8"))
2663
except IOError:
2664
logger.error("Could not write to file %r with PID %d",
2665
pidfilename, pid)
2666
del pidfile
2310
2667
del pidfilename
2311
2312
signal.signal(signal.SIGINT, signal.SIG_IGN)
2313
2668
2314
2669
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2315
2670
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2316
2671
2317
2672
if use_dbus:
2318
class MandosDBusService(dbus.service.Object):
2673
@alternate_dbus_interfaces({"se.recompile.Mandos":
2674
"se.bsnet.fukt.Mandos"})
2675
class MandosDBusService(DBusObjectWithProperties):
2319
2676
"""A D-Bus proxy object"""
2320
2677
def __init__(self):
2321
2678
dbus.service.Object.__init__(self, bus, "/")
2322
2679
_interface = "se.recompile.Mandos"
2323
2680
2681
@dbus_interface_annotations(_interface)
2682
def _foo(self):
2683
return { "org.freedesktop.DBus.Property"
2684
".EmitsChangedSignal":
2685
"false"}
2686
2324
2687
@dbus.service.signal(_interface, signature="o")
2325
2688
def ClientAdded(self, objpath):
2326
2689
"D-Bus signal"
2368
2731
2369
2732
del _interface
2370
2733
2371
class MandosDBusServiceTransitional(MandosDBusService):
2372
__metaclass__ = AlternateDBusNamesMetaclass
2373
mandos_dbus_service = MandosDBusServiceTransitional()
2734
mandos_dbus_service = MandosDBusService()
2374
2735
2375
2736
def cleanup():
2376
2737
"Cleanup function; run on exit"
2377
2738
service.cleanup()
2378
2739
2379
2740
multiprocessing.active_children()
2741
wnull.close()
2380
2742
if not (tcp_server.clients or client_settings):
2381
2743
return
2382
2744
2383
2745
# Store client before exiting. Secrets are encrypted with key
2384
2746
# based on what config file has. If config file is
2385
2747
# removed/edited, old secret will thus be unrecovable.
2386
clients = []
2387
with Crypto() as crypt:
2748
clients = {}
2749
with PGPEngine() as pgp:
2388
2750
for client in tcp_server.clients.itervalues():
2389
2751
key = client_settings[client.name]["secret"]
2390
client.encrypted_secret = crypt.encrypt(client.secret,
2391
key)
2752
client.encrypted_secret = pgp.encrypt(client.secret,
2753
key)
2392
2754
client_dict = {}
2393
2755
2394
# A list of attributes that will not be stored when
2395
# shutting down.
2396
exclude = set(("bus", "changedstate", "secret"))
2756
# A list of attributes that can not be pickled
2757
# + secret.
2758
exclude = set(("bus", "changedstate", "secret",
2759
"checker", "server_settings"))
2397
2760
for name, typ in (inspect.getmembers
2398
2761
(dbus.service.Object)):
2399
2762
exclude.add(name)
2404
2767
if attr not in exclude:
2405
2768
client_dict[attr] = getattr(client, attr)
2406
2769
2407
clients.append(client_dict)
2770
clients[client.name] = client_dict
2408
2771
del client_settings[client.name]["secret"]
2409
2772
2410
2773
try:
2411
with os.fdopen(os.open(stored_state_path,
2412
os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2413
0600), "wb") as stored_state:
2774
with (tempfile.NamedTemporaryFile
2775
(mode='wb', suffix=".pickle", prefix='clients-',
2776
dir=os.path.dirname(stored_state_path),
2777
delete=False)) as stored_state:
2414
2778
pickle.dump((clients, client_settings), stored_state)
2779
tempname=stored_state.name
2780
os.rename(tempname, stored_state_path)
2415
2781
except (IOError, OSError) as e:
2416
logger.warning("Could not save persistent state: {0}"
2417
.format(e))
2418
if e.errno not in (errno.ENOENT, errno.EACCES):
2419
raise
2782
if not debug:
2783
try:
2784
os.remove(tempname)
2785
except NameError:
2786
pass
2787
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2788
logger.warning("Could not save persistent state: {0}"
2789
.format(os.strerror(e.errno)))
2790
else:
2791
logger.warning("Could not save persistent state:",
2792
exc_info=e)
2793
raise e
2420
2794
2421
2795
# Delete all clients, and settings from config
2422
2796
while tcp_server.clients:
2449
2823
service.port = tcp_server.socket.getsockname()[1]
2450
2824
if use_ipv6:
2451
2825
logger.info("Now listening on address %r, port %d,"
2452
" flowinfo %d, scope_id %d"
2453
% tcp_server.socket.getsockname())
2826
" flowinfo %d, scope_id %d",
2827
*tcp_server.socket.getsockname())
2454
2828
else: # IPv4
2455
logger.info("Now listening on address %r, port %d"
2456
% tcp_server.socket.getsockname())
2829
logger.info("Now listening on address %r, port %d",
2830
*tcp_server.socket.getsockname())
2457
2831
2458
2832
#service.interface = tcp_server.socket.getsockname()[3]
2459
2833
2462
2836
try:
2463
2837
service.activate()
2464
2838
except dbus.exceptions.DBusException as error:
2465
logger.critical("DBusException: %s", error)
2839
logger.critical("D-Bus Exception", exc_info=error)
2466
2840
cleanup()
2467
2841
sys.exit(1)
2468
2842
# End of Avahi example code
2475
2849
logger.debug("Starting main loop")
2476
2850
main_loop.run()
2477
2851
except AvahiError as error:
2478
logger.critical("AvahiError: %s", error)
2852
logger.critical("Avahi Error", exc_info=error)
2479
2853
cleanup()
2480
2854
sys.exit(1)
2481
2855
except KeyboardInterrupt:
2486
2860
# Must run before the D-Bus bus name gets deregistered
2487
2861
cleanup()
2488
2862
2489
2490
2863
if __name__ == '__main__':
2491
2864
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0