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 520
- compare with another revision
- download diff
- download tarball
- view history from revision 520
- Committer: Björn Påhlsson
- Date: 2011-11-09 17:16:03 UTC
- mfrom: (518.1.1 mandos-persistent)
- Revision ID: belorn@fukt.bsnet.se-20111109171603-srz21uoclpldp5ve
merge persistent state
- files removed:
- 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-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
unicode_literals)
36
36
37
from future_builtins import *
38
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
65
63
import cPickle as pickle
66
64
import multiprocessing
67
65
import types
68
import binascii
69
import tempfile
70
import itertools
71
import collections
66
import hashlib
72
67
73
68
import dbus
74
69
import dbus.service
79
74
import ctypes.util
80
75
import xml.dom.minidom
81
76
import inspect
77
import Crypto.Cipher.AES
82
78
83
79
try:
84
80
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
84
except ImportError:
89
85
SO_BINDTODEVICE = None
90
86
91
version = "1.6.0"
92
stored_state_file = "clients.pickle"
87
88
version = "1.4.1"
93
89
94
90
logger = logging.getLogger()
91
stored_state_path = "/var/lib/mandos/clients.pickle"
92
95
93
syslogger = (logging.handlers.SysLogHandler
96
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
95
address = str("/dev/log")))
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.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
self.gnupgargs = ['--batch',
144
'--home', self.tempdir,
145
'--force-mdc',
146
'--quiet',
147
'--no-use-agent']
148
149
def __enter__(self):
150
return self
151
152
def __exit__(self, exc_type, exc_value, traceback):
153
self._cleanup()
154
return False
155
156
def __del__(self):
157
self._cleanup()
158
159
def _cleanup(self):
160
if self.tempdir is not None:
161
# Delete contents of tempdir
162
for root, dirs, files in os.walk(self.tempdir,
163
topdown = False):
164
for filename in files:
165
os.remove(os.path.join(root, filename))
166
for dirname in dirs:
167
os.rmdir(os.path.join(root, dirname))
168
# Remove tempdir
169
os.rmdir(self.tempdir)
170
self.tempdir = None
171
172
def password_encode(self, password):
173
# Passphrase can not be empty and can not contain newlines or
174
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
176
177
def encrypt(self, data, password):
178
passphrase = self.password_encode(password)
179
with tempfile.NamedTemporaryFile(dir=self.tempdir
180
) as passfile:
181
passfile.write(passphrase)
182
passfile.flush()
183
proc = subprocess.Popen(['gpg', '--symmetric',
184
'--passphrase-file',
185
passfile.name]
186
+ self.gnupgargs,
187
stdin = subprocess.PIPE,
188
stdout = subprocess.PIPE,
189
stderr = subprocess.PIPE)
190
ciphertext, err = proc.communicate(input = data)
191
if proc.returncode != 0:
192
raise PGPError(err)
193
return ciphertext
194
195
def decrypt(self, data, password):
196
passphrase = self.password_encode(password)
197
with tempfile.NamedTemporaryFile(dir = self.tempdir
198
) as passfile:
199
passfile.write(passphrase)
200
passfile.flush()
201
proc = subprocess.Popen(['gpg', '--decrypt',
202
'--passphrase-file',
203
passfile.name]
204
+ self.gnupgargs,
205
stdin = subprocess.PIPE,
206
stdout = subprocess.PIPE,
207
stderr = subprocess.PIPE)
208
decrypted_plaintext, err = proc.communicate(input
209
= data)
210
if proc.returncode != 0:
211
raise PGPError(err)
212
return decrypted_plaintext
96
syslogger.setFormatter(logging.Formatter
97
('Mandos [%(process)d]: %(levelname)s:'
98
' %(message)s'))
99
logger.addHandler(syslogger)
100
101
console = logging.StreamHandler()
102
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
' [%(process)d]:'
104
' %(levelname)s:'
105
' %(message)s'))
106
logger.addHandler(console)
213
107
214
108
215
109
class AvahiError(Exception):
234
128
Used to optionally bind to the specified interface.
235
129
name: string; Example: 'Mandos'
236
130
type: string; Example: '_mandos._tcp'.
237
See <https://www.iana.org/assignments/service-names-port-numbers>
131
See <http://www.dns-sd.org/ServiceTypes.html>
238
132
port: integer; what port to announce
239
133
TXT: list of strings; TXT record for the service
240
134
domain: string; Domain to publish on, default to .local if empty.
246
140
server: D-Bus Server
247
141
bus: dbus.SystemBus()
248
142
"""
249
250
143
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
144
servicetype = None, port = None, TXT = None,
252
145
domain = "", host = "", max_renames = 32768,
265
158
self.server = None
266
159
self.bus = bus
267
160
self.entry_group_state_changed_match = None
268
269
161
def rename(self):
270
162
"""Derived from the Avahi example code"""
271
163
if self.rename_count >= self.max_renames:
281
173
try:
282
174
self.add()
283
175
except dbus.exceptions.DBusException as error:
284
logger.critical("D-Bus Exception", exc_info=error)
176
logger.critical("DBusException: %s", error)
285
177
self.cleanup()
286
178
os._exit(1)
287
179
self.rename_count += 1
288
289
180
def remove(self):
290
181
"""Derived from the Avahi example code"""
291
182
if self.entry_group_state_changed_match is not None:
293
184
self.entry_group_state_changed_match = None
294
185
if self.group is not None:
295
186
self.group.Reset()
296
297
187
def add(self):
298
188
"""Derived from the Avahi example code"""
299
189
self.remove()
316
206
dbus.UInt16(self.port),
317
207
avahi.string_array_to_txt_array(self.TXT))
318
208
self.group.Commit()
319
320
209
def entry_group_state_changed(self, state, error):
321
210
"""Derived from the Avahi example code"""
322
211
logger.debug("Avahi entry group state change: %i", state)
329
218
elif state == avahi.ENTRY_GROUP_FAILURE:
330
219
logger.critical("Avahi: Error in group state changed %s",
331
220
unicode(error))
332
raise AvahiGroupError("State changed: {0!s}"
333
.format(error))
334
221
raise AvahiGroupError("State changed: %s"
222
% unicode(error))
335
223
def cleanup(self):
336
224
"""Derived from the Avahi example code"""
337
225
if self.group is not None:
338
226
try:
339
227
self.group.Free()
340
228
except (dbus.exceptions.UnknownMethodException,
341
dbus.exceptions.DBusException):
229
dbus.exceptions.DBusException) as e:
342
230
pass
343
231
self.group = None
344
232
self.remove()
345
346
233
def server_state_changed(self, state, error=None):
347
234
"""Derived from the Avahi example code"""
348
235
logger.debug("Avahi server state change: %i", state)
367
254
logger.debug("Unknown state: %r", state)
368
255
else:
369
256
logger.debug("Unknown state: %r: %r", state, error)
370
371
257
def activate(self):
372
258
"""Derived from the Avahi example code"""
373
259
if self.server is None:
380
266
self.server_state_changed)
381
267
self.server_state_changed(self.server.GetState())
382
268
383
384
269
class AvahiServiceToSyslog(AvahiService):
385
270
def rename(self):
386
271
"""Add the new name to the syslog messages"""
387
272
ret = AvahiService.rename(self)
388
273
syslogger.setFormatter(logging.Formatter
389
('Mandos ({0}) [%(process)d]:'
390
' %(levelname)s: %(message)s'
391
.format(self.name)))
274
('Mandos (%s) [%%(process)d]:'
275
' %%(levelname)s: %%(message)s'
276
% self.name))
392
277
return ret
393
278
394
395
def timedelta_to_milliseconds(td):
279
def _timedelta_to_milliseconds(td):
396
280
"Convert a datetime.timedelta() to milliseconds"
397
281
return ((td.days * 24 * 60 * 60 * 1000)
398
282
+ (td.seconds * 1000)
399
283
+ (td.microseconds // 1000))
400
401
284
402
285
class Client(object):
403
286
"""A representation of a client host served by this server.
404
287
405
288
Attributes:
406
approved: bool(); 'None' if not yet approved/disapproved
289
_approved: bool(); 'None' if not yet approved/disapproved
407
290
approval_delay: datetime.timedelta(); Time to wait for approval
408
291
approval_duration: datetime.timedelta(); Duration of one approval
409
292
checker: subprocess.Popen(); a running checker process used
427
310
interval: datetime.timedelta(); How often to start a new checker
428
311
last_approval_request: datetime.datetime(); (UTC) or None
429
312
last_checked_ok: datetime.datetime(); (UTC) or None
430
last_checker_status: integer between 0 and 255 reflecting exit
431
status of last checker. -1 reflects crashed
432
checker, -2 means no checker completed yet.
433
last_enabled: datetime.datetime(); (UTC) or None
313
last_checker_status: integer between 0 and 255 reflecting exit status
314
of last checker. -1 reflect crashed checker,
315
or None.
316
last_enabled: datetime.datetime(); (UTC)
434
317
name: string; from the config file, used in log messages and
435
318
D-Bus identifiers
436
319
secret: bytestring; sent verbatim (over TLS) to client
437
320
timeout: datetime.timedelta(); How long from last_checked_ok
438
321
until this client is disabled
439
extended_timeout: extra long timeout when secret has been sent
322
extended_timeout: extra long timeout when password has been sent
440
323
runtime_expansions: Allowed attributes for runtime expansion.
441
324
expires: datetime.datetime(); time (UTC) when a client will be
442
325
disabled, or None
443
326
"""
444
327
445
328
runtime_expansions = ("approval_delay", "approval_duration",
446
"created", "enabled", "expires",
447
"fingerprint", "host", "interval",
448
"last_approval_request", "last_checked_ok",
329
"created", "enabled", "fingerprint",
330
"host", "interval", "last_checked_ok",
449
331
"last_enabled", "name", "timeout")
450
client_defaults = { "timeout": "PT5M",
451
"extended_timeout": "PT15M",
452
"interval": "PT2M",
453
"checker": "fping -q -- %%(host)s",
454
"host": "",
455
"approval_delay": "PT0S",
456
"approval_duration": "PT1S",
457
"approved_by_default": "True",
458
"enabled": "True",
459
}
460
332
461
333
def timeout_milliseconds(self):
462
334
"Return the 'timeout' attribute in milliseconds"
463
return timedelta_to_milliseconds(self.timeout)
335
return _timedelta_to_milliseconds(self.timeout)
464
336
465
337
def extended_timeout_milliseconds(self):
466
338
"Return the 'extended_timeout' attribute in milliseconds"
467
return timedelta_to_milliseconds(self.extended_timeout)
339
return _timedelta_to_milliseconds(self.extended_timeout)
468
340
469
341
def interval_milliseconds(self):
470
342
"Return the 'interval' attribute in milliseconds"
471
return timedelta_to_milliseconds(self.interval)
343
return _timedelta_to_milliseconds(self.interval)
472
344
473
345
def approval_delay_milliseconds(self):
474
return timedelta_to_milliseconds(self.approval_delay)
475
476
@staticmethod
477
def config_parser(config):
478
"""Construct a new dict of client settings of this form:
479
{ client_name: {setting_name: value, ...}, ...}
480
with exceptions for any special settings as defined above.
481
NOTE: Must be a pure function. Must return the same result
482
value given the same arguments.
483
"""
484
settings = {}
485
for client_name in config.sections():
486
section = dict(config.items(client_name))
487
client = settings[client_name] = {}
488
489
client["host"] = section["host"]
490
# Reformat values from string types to Python types
491
client["approved_by_default"] = config.getboolean(
492
client_name, "approved_by_default")
493
client["enabled"] = config.getboolean(client_name,
494
"enabled")
495
496
client["fingerprint"] = (section["fingerprint"].upper()
497
.replace(" ", ""))
498
if "secret" in section:
499
client["secret"] = section["secret"].decode("base64")
500
elif "secfile" in section:
501
with open(os.path.expanduser(os.path.expandvars
502
(section["secfile"])),
503
"rb") as secfile:
504
client["secret"] = secfile.read()
505
else:
506
raise TypeError("No secret or secfile for section {0}"
507
.format(section))
508
client["timeout"] = string_to_delta(section["timeout"])
509
client["extended_timeout"] = string_to_delta(
510
section["extended_timeout"])
511
client["interval"] = string_to_delta(section["interval"])
512
client["approval_delay"] = string_to_delta(
513
section["approval_delay"])
514
client["approval_duration"] = string_to_delta(
515
section["approval_duration"])
516
client["checker_command"] = section["checker"]
517
client["last_approval_request"] = None
518
client["last_checked_ok"] = None
519
client["last_checker_status"] = -2
520
521
return settings
522
523
def __init__(self, settings, name = None):
346
return _timedelta_to_milliseconds(self.approval_delay)
347
348
def __init__(self, name = None, config=None):
349
"""Note: the 'checker' key in 'config' sets the
350
'checker_command' attribute and *not* the 'checker'
351
attribute."""
524
352
self.name = name
525
# adding all client settings
526
for setting, value in settings.iteritems():
527
setattr(self, setting, value)
528
529
if self.enabled:
530
if not hasattr(self, "last_enabled"):
531
self.last_enabled = datetime.datetime.utcnow()
532
if not hasattr(self, "expires"):
533
self.expires = (datetime.datetime.utcnow()
534
+ self.timeout)
535
else:
536
self.last_enabled = None
537
self.expires = None
538
353
if config is None:
354
config = {}
539
355
logger.debug("Creating client %r", self.name)
540
356
# Uppercase and remove spaces from fingerprint for later
541
357
# comparison purposes with return value from the fingerprint()
542
358
# function
359
self.fingerprint = (config["fingerprint"].upper()
360
.replace(" ", ""))
543
361
logger.debug(" Fingerprint: %s", self.fingerprint)
544
self.created = settings.get("created",
545
datetime.datetime.utcnow())
546
547
# attributes specific for this server instance
362
if "secret" in config:
363
self.secret = config["secret"].decode("base64")
364
elif "secfile" in config:
365
with open(os.path.expanduser(os.path.expandvars
366
(config["secfile"])),
367
"rb") as secfile:
368
self.secret = secfile.read()
369
else:
370
raise TypeError("No secret or secfile for client %s"
371
% self.name)
372
self.host = config.get("host", "")
373
self.created = datetime.datetime.utcnow()
374
self.enabled = True
375
self.last_approval_request = None
376
self.last_enabled = datetime.datetime.utcnow()
377
self.last_checked_ok = None
378
self.last_checker_status = None
379
self.timeout = string_to_delta(config["timeout"])
380
self.extended_timeout = string_to_delta(config
381
["extended_timeout"])
382
self.interval = string_to_delta(config["interval"])
548
383
self.checker = None
549
384
self.checker_initiator_tag = None
550
385
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
551
387
self.checker_callback_tag = None
388
self.checker_command = config["checker"]
552
389
self.current_checker_command = None
553
self.approved = None
390
self._approved = None
391
self.approved_by_default = config.get("approved_by_default",
392
True)
554
393
self.approvals_pending = 0
394
self.approval_delay = string_to_delta(
395
config["approval_delay"])
396
self.approval_duration = string_to_delta(
397
config["approval_duration"])
555
398
self.changedstate = (multiprocessing_manager
556
399
.Condition(multiprocessing_manager
557
400
.Lock()))
558
self.client_structure = [attr for attr in
559
self.__dict__.iterkeys()
560
if not attr.startswith("_")]
401
self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
561
402
self.client_structure.append("client_structure")
562
403
404
563
405
for name, t in inspect.getmembers(type(self),
564
lambda obj:
565
isinstance(obj,
566
property)):
406
lambda obj: isinstance(obj, property)):
567
407
if not name.startswith("_"):
568
408
self.client_structure.append(name)
569
409
577
417
if getattr(self, "enabled", False):
578
418
# Already enabled
579
419
return
420
self.send_changedstate()
580
421
self.expires = datetime.datetime.utcnow() + self.timeout
581
422
self.enabled = True
582
423
self.last_enabled = datetime.datetime.utcnow()
583
424
self.init_checker()
584
self.send_changedstate()
585
425
586
426
def disable(self, quiet=True):
587
427
"""Disable this client."""
588
428
if not getattr(self, "enabled", False):
589
429
return False
590
430
if not quiet:
431
self.send_changedstate()
432
if not quiet:
591
433
logger.info("Disabling client %s", self.name)
592
if getattr(self, "disable_initiator_tag", None) is not None:
434
if getattr(self, "disable_initiator_tag", False):
593
435
gobject.source_remove(self.disable_initiator_tag)
594
436
self.disable_initiator_tag = None
595
437
self.expires = None
596
if getattr(self, "checker_initiator_tag", None) is not None:
438
if getattr(self, "checker_initiator_tag", False):
597
439
gobject.source_remove(self.checker_initiator_tag)
598
440
self.checker_initiator_tag = None
599
441
self.stop_checker()
600
442
self.enabled = False
601
if not quiet:
602
self.send_changedstate()
603
443
# Do not run this again if called by a gobject.timeout_add
604
444
return False
605
445
606
446
def __del__(self):
607
447
self.disable()
608
448
609
449
def init_checker(self):
610
450
# Schedule a new checker to be started an 'interval' from now,
611
451
# and every interval from then on.
612
if self.checker_initiator_tag is not None:
613
gobject.source_remove(self.checker_initiator_tag)
614
452
self.checker_initiator_tag = (gobject.timeout_add
615
453
(self.interval_milliseconds(),
616
454
self.start_checker))
617
455
# Schedule a disable() when 'timeout' has passed
618
if self.disable_initiator_tag is not None:
619
gobject.source_remove(self.disable_initiator_tag)
620
456
self.disable_initiator_tag = (gobject.timeout_add
621
457
(self.timeout_milliseconds(),
622
458
self.disable))
623
459
# Also start a new checker *right now*.
624
460
self.start_checker()
625
461
462
626
463
def checker_callback(self, pid, condition, command):
627
464
"""The checker has completed, so take appropriate actions."""
628
465
self.checker_callback_tag = None
629
466
self.checker = None
630
467
if os.WIFEXITED(condition):
631
self.last_checker_status = os.WEXITSTATUS(condition)
468
self.last_checker_status = os.WEXITSTATUS(condition)
632
469
if self.last_checker_status == 0:
633
470
logger.info("Checker for %(name)s succeeded",
634
471
vars(self))
641
478
logger.warning("Checker for %(name)s crashed?",
642
479
vars(self))
643
480
644
def checked_ok(self):
645
"""Assert that the client has been seen, alive and well."""
646
self.last_checked_ok = datetime.datetime.utcnow()
647
self.last_checker_status = 0
648
self.bump_timeout()
649
650
def bump_timeout(self, timeout=None):
651
"""Bump up the timeout for this client."""
481
def checked_ok(self, timeout=None):
482
"""Bump up the timeout for this client.
483
484
This should only be called when the client has been seen,
485
alive and well.
486
"""
652
487
if timeout is None:
653
488
timeout = self.timeout
489
self.last_checked_ok = datetime.datetime.utcnow()
654
490
if self.disable_initiator_tag is not None:
655
491
gobject.source_remove(self.disable_initiator_tag)
656
self.disable_initiator_tag = None
657
492
if getattr(self, "enabled", False):
658
493
self.disable_initiator_tag = (gobject.timeout_add
659
(timedelta_to_milliseconds
494
(_timedelta_to_milliseconds
660
495
(timeout), self.disable))
661
496
self.expires = datetime.datetime.utcnow() + timeout
662
497
669
504
If a checker already exists, leave it running and do
670
505
nothing."""
671
506
# The reason for not killing a running checker is that if we
672
# did that, and if a checker (for some reason) started running
673
# slowly and taking more than 'interval' time, then the client
674
# would inevitably timeout, since no checker would get a
675
# chance to run to completion. If we instead leave running
507
# did that, then if a checker (for some reason) started
508
# running slowly and taking more than 'interval' time, the
509
# client would inevitably timeout, since no checker would get
510
# a chance to run to completion. If we instead leave running
676
511
# checkers alone, the checker would have to take more time
677
512
# than 'timeout' for the client to be disabled, which is as it
678
513
# should be.
692
527
self.current_checker_command)
693
528
# Start a new checker if needed
694
529
if self.checker is None:
695
# Escape attributes for the shell
696
escaped_attrs = dict(
697
(attr, re.escape(unicode(getattr(self, attr))))
698
for attr in
699
self.runtime_expansions)
700
530
try:
701
command = self.checker_command % escaped_attrs
702
except TypeError as error:
703
logger.error('Could not format string "%s"',
704
self.checker_command, exc_info=error)
705
return True # Try again later
531
# In case checker_command has exactly one % operator
532
command = self.checker_command % self.host
533
except TypeError:
534
# Escape attributes for the shell
535
escaped_attrs = dict(
536
(attr,
537
re.escape(unicode(str(getattr(self, attr, "")),
538
errors=
539
'replace')))
540
for attr in
541
self.runtime_expansions)
542
543
try:
544
command = self.checker_command % escaped_attrs
545
except TypeError as error:
546
logger.error('Could not format string "%s":'
547
' %s', self.checker_command, error)
548
return True # Try again later
706
549
self.current_checker_command = command
707
550
try:
708
551
logger.info("Starting checker %r for %s",
714
557
self.checker = subprocess.Popen(command,
715
558
close_fds=True,
716
559
shell=True, cwd="/")
717
except OSError as error:
718
logger.error("Failed to start subprocess",
719
exc_info=error)
720
return True
721
self.checker_callback_tag = (gobject.child_watch_add
722
(self.checker.pid,
723
self.checker_callback,
724
data=command))
725
# The checker may have completed before the gobject
726
# watch was added. Check for this.
727
try:
560
self.checker_callback_tag = (gobject.child_watch_add
561
(self.checker.pid,
562
self.checker_callback,
563
data=command))
564
# The checker may have completed before the gobject
565
# watch was added. Check for this.
728
566
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
567
if pid:
568
gobject.source_remove(self.checker_callback_tag)
569
self.checker_callback(pid, status, command)
729
570
except OSError as error:
730
if error.errno == errno.ECHILD:
731
# This should never happen
732
logger.error("Child process vanished",
733
exc_info=error)
734
return True
735
raise
736
if pid:
737
gobject.source_remove(self.checker_callback_tag)
738
self.checker_callback(pid, status, command)
571
logger.error("Failed to start subprocess: %s",
572
error)
739
573
# Re-run this periodically if run by gobject.timeout_add
740
574
return True
741
575
748
582
return
749
583
logger.debug("Stopping checker for %(name)s", vars(self))
750
584
try:
751
self.checker.terminate()
585
os.kill(self.checker.pid, signal.SIGTERM)
752
586
#time.sleep(0.5)
753
587
#if self.checker.poll() is None:
754
# self.checker.kill()
588
# os.kill(self.checker.pid, signal.SIGKILL)
755
589
except OSError as error:
756
590
if error.errno != errno.ESRCH: # No such process
757
591
raise
758
592
self.checker = None
759
593
594
# Encrypts a client secret and stores it in a varible encrypted_secret
595
def encrypt_secret(self, key):
596
# Encryption-key need to be of a specific size, so we hash inputed key
597
hasheng = hashlib.sha256()
598
hasheng.update(key)
599
encryptionkey = hasheng.digest()
600
601
# Create validation hash so we know at decryption if it was sucessful
602
hasheng = hashlib.sha256()
603
hasheng.update(self.secret)
604
validationhash = hasheng.digest()
605
606
# Encrypt secret
607
iv = os.urandom(Crypto.Cipher.AES.block_size)
608
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
609
Crypto.Cipher.AES.MODE_CFB, iv)
610
ciphertext = ciphereng.encrypt(validationhash+self.secret)
611
self.encrypted_secret = (ciphertext, iv)
612
613
# Decrypt a encrypted client secret
614
def decrypt_secret(self, key):
615
# Decryption-key need to be of a specific size, so we hash inputed key
616
hasheng = hashlib.sha256()
617
hasheng.update(key)
618
encryptionkey = hasheng.digest()
619
620
# Decrypt encrypted secret
621
ciphertext, iv = self.encrypted_secret
622
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
623
Crypto.Cipher.AES.MODE_CFB, iv)
624
plain = ciphereng.decrypt(ciphertext)
625
626
# Validate decrypted secret to know if it was succesful
627
hasheng = hashlib.sha256()
628
validationhash = plain[:hasheng.digest_size]
629
secret = plain[hasheng.digest_size:]
630
hasheng.update(secret)
631
632
# if validation fails, we use key as new secret. Otherwhise, we use
633
# the decrypted secret
634
if hasheng.digest() == validationhash:
635
self.secret = secret
636
else:
637
self.secret = key
638
del self.encrypted_secret
639
760
640
761
641
def dbus_service_property(dbus_interface, signature="v",
762
642
access="readwrite", byte_arrays=False):
774
654
# "Set" method, so we fail early here:
775
655
if byte_arrays and signature != "ay":
776
656
raise ValueError("Byte arrays not supported for non-'ay'"
777
" signature {0!r}".format(signature))
657
" signature %r" % signature)
778
658
def decorator(func):
779
659
func._dbus_is_property = True
780
660
func._dbus_interface = dbus_interface
788
668
return decorator
789
669
790
670
791
def dbus_interface_annotations(dbus_interface):
792
"""Decorator for marking functions returning interface annotations
793
794
Usage:
795
796
@dbus_interface_annotations("org.example.Interface")
797
def _foo(self): # Function name does not matter
798
return {"org.freedesktop.DBus.Deprecated": "true",
799
"org.freedesktop.DBus.Property.EmitsChangedSignal":
800
"false"}
801
"""
802
def decorator(func):
803
func._dbus_is_interface = True
804
func._dbus_interface = dbus_interface
805
func._dbus_name = dbus_interface
806
return func
807
return decorator
808
809
810
def dbus_annotations(annotations):
811
"""Decorator to annotate D-Bus methods, signals or properties
812
Usage:
813
814
@dbus_service_property("org.example.Interface", signature="b",
815
access="r")
816
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
817
"org.freedesktop.DBus.Property."
818
"EmitsChangedSignal": "false"})
819
def Property_dbus_property(self):
820
return dbus.Boolean(False)
821
"""
822
def decorator(func):
823
func._dbus_annotations = annotations
824
return func
825
return decorator
826
827
828
671
class DBusPropertyException(dbus.exceptions.DBusException):
829
672
"""A base class for D-Bus property-related exceptions
830
673
"""
853
696
"""
854
697
855
698
@staticmethod
856
def _is_dbus_thing(thing):
857
"""Returns a function testing if an attribute is a D-Bus thing
858
859
If called like _is_dbus_thing("method") it returns a function
860
suitable for use as predicate to inspect.getmembers().
861
"""
862
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
863
False)
699
def _is_dbus_property(obj):
700
return getattr(obj, "_dbus_is_property", False)
864
701
865
def _get_all_dbus_things(self, thing):
702
def _get_all_dbus_properties(self):
866
703
"""Returns a generator of (name, attribute) pairs
867
704
"""
868
return ((getattr(athing.__get__(self), "_dbus_name",
869
name),
870
athing.__get__(self))
705
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
871
706
for cls in self.__class__.__mro__
872
for name, athing in
873
inspect.getmembers(cls,
874
self._is_dbus_thing(thing)))
707
for name, prop in
708
inspect.getmembers(cls, self._is_dbus_property))
875
709
876
710
def _get_dbus_property(self, interface_name, property_name):
877
711
"""Returns a bound method if one exists which is a D-Bus
879
713
"""
880
714
for cls in self.__class__.__mro__:
881
715
for name, value in (inspect.getmembers
882
(cls,
883
self._is_dbus_thing("property"))):
716
(cls, self._is_dbus_property)):
884
717
if (value._dbus_name == property_name
885
718
and value._dbus_interface == interface_name):
886
719
return value.__get__(self)
915
748
# signatures other than "ay".
916
749
if prop._dbus_signature != "ay":
917
750
raise ValueError
918
value = dbus.ByteArray(b''.join(chr(byte)
919
for byte in value))
751
value = dbus.ByteArray(''.join(unichr(byte)
752
for byte in value))
920
753
prop(value)
921
754
922
755
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
927
760
928
761
Note: Will not include properties with access="write".
929
762
"""
930
properties = {}
931
for name, prop in self._get_all_dbus_things("property"):
763
all = {}
764
for name, prop in self._get_all_dbus_properties():
932
765
if (interface_name
933
766
and interface_name != prop._dbus_interface):
934
767
# Interface non-empty but did not match
938
771
continue
939
772
value = prop()
940
773
if not hasattr(value, "variant_level"):
941
properties[name] = value
774
all[name] = value
942
775
continue
943
properties[name] = type(value)(value, variant_level=
944
value.variant_level+1)
945
return dbus.Dictionary(properties, signature="sv")
776
all[name] = type(value)(value, variant_level=
777
value.variant_level+1)
778
return dbus.Dictionary(all, signature="sv")
946
779
947
780
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
948
781
out_signature="s",
949
782
path_keyword='object_path',
950
783
connection_keyword='connection')
951
784
def Introspect(self, object_path, connection):
952
"""Overloading of standard D-Bus method.
953
954
Inserts property tags and interface annotation tags.
785
"""Standard D-Bus method, overloaded to insert property tags.
955
786
"""
956
787
xmlstring = dbus.service.Object.Introspect(self, object_path,
957
788
connection)
964
795
e.setAttribute("access", prop._dbus_access)
965
796
return e
966
797
for if_tag in document.getElementsByTagName("interface"):
967
# Add property tags
968
798
for tag in (make_tag(document, name, prop)
969
799
for name, prop
970
in self._get_all_dbus_things("property")
800
in self._get_all_dbus_properties()
971
801
if prop._dbus_interface
972
802
== if_tag.getAttribute("name")):
973
803
if_tag.appendChild(tag)
974
# Add annotation tags
975
for typ in ("method", "signal", "property"):
976
for tag in if_tag.getElementsByTagName(typ):
977
annots = dict()
978
for name, prop in (self.
979
_get_all_dbus_things(typ)):
980
if (name == tag.getAttribute("name")
981
and prop._dbus_interface
982
== if_tag.getAttribute("name")):
983
annots.update(getattr
984
(prop,
985
"_dbus_annotations",
986
{}))
987
for name, value in annots.iteritems():
988
ann_tag = document.createElement(
989
"annotation")
990
ann_tag.setAttribute("name", name)
991
ann_tag.setAttribute("value", value)
992
tag.appendChild(ann_tag)
993
# Add interface annotation tags
994
for annotation, value in dict(
995
itertools.chain.from_iterable(
996
annotations().iteritems()
997
for name, annotations in
998
self._get_all_dbus_things("interface")
999
if name == if_tag.getAttribute("name")
1000
)).iteritems():
1001
ann_tag = document.createElement("annotation")
1002
ann_tag.setAttribute("name", annotation)
1003
ann_tag.setAttribute("value", value)
1004
if_tag.appendChild(ann_tag)
1005
804
# Add the names to the return values for the
1006
805
# "org.freedesktop.DBus.Properties" methods
1007
806
if (if_tag.getAttribute("name")
1022
821
except (AttributeError, xml.dom.DOMException,
1023
822
xml.parsers.expat.ExpatError) as error:
1024
823
logger.error("Failed to override Introspection method",
1025
exc_info=error)
824
error)
1026
825
return xmlstring
1027
826
1028
827
1029
def datetime_to_dbus(dt, variant_level=0):
828
def datetime_to_dbus (dt, variant_level=0):
1030
829
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1031
830
if dt is None:
1032
831
return dbus.String("", variant_level = variant_level)
1033
832
return dbus.String(dt.isoformat(),
1034
833
variant_level=variant_level)
1035
834
1036
1037
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1038
"""A class decorator; applied to a subclass of
1039
dbus.service.Object, it will add alternate D-Bus attributes with
1040
interface names according to the "alt_interface_names" mapping.
1041
Usage:
1042
1043
@alternate_dbus_interfaces({"org.example.Interface":
1044
"net.example.AlternateInterface"})
1045
class SampleDBusObject(dbus.service.Object):
1046
@dbus.service.method("org.example.Interface")
1047
def SampleDBusMethod():
1048
pass
1049
1050
The above "SampleDBusMethod" on "SampleDBusObject" will be
1051
reachable via two interfaces: "org.example.Interface" and
1052
"net.example.AlternateInterface", the latter of which will have
1053
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1054
"true", unless "deprecate" is passed with a False value.
1055
1056
This works for methods and signals, and also for D-Bus properties
1057
(from DBusObjectWithProperties) and interfaces (from the
1058
dbus_interface_annotations decorator).
835
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
836
.__metaclass__):
837
"""Applied to an empty subclass of a D-Bus object, this metaclass
838
will add additional D-Bus attributes matching a certain pattern.
1059
839
"""
1060
def wrapper(cls):
1061
for orig_interface_name, alt_interface_name in (
1062
alt_interface_names.iteritems()):
1063
attr = {}
1064
interface_names = set()
1065
# Go though all attributes of the class
1066
for attrname, attribute in inspect.getmembers(cls):
840
def __new__(mcs, name, bases, attr):
841
# Go through all the base classes which could have D-Bus
842
# methods, signals, or properties in them
843
for base in (b for b in bases
844
if issubclass(b, dbus.service.Object)):
845
# Go though all attributes of the base class
846
for attrname, attribute in inspect.getmembers(base):
1067
847
# Ignore non-D-Bus attributes, and D-Bus attributes
1068
848
# with the wrong interface name
1069
849
if (not hasattr(attribute, "_dbus_interface")
1070
850
or not attribute._dbus_interface
1071
.startswith(orig_interface_name)):
851
.startswith("se.recompile.Mandos")):
1072
852
continue
1073
853
# Create an alternate D-Bus interface name based on
1074
854
# the current name
1075
855
alt_interface = (attribute._dbus_interface
1076
.replace(orig_interface_name,
1077
alt_interface_name))
1078
interface_names.add(alt_interface)
856
.replace("se.recompile.Mandos",
857
"se.bsnet.fukt.Mandos"))
1079
858
# Is this a D-Bus signal?
1080
859
if getattr(attribute, "_dbus_is_signal", False):
1081
# Extract the original non-method undecorated
1082
# function by black magic
860
# Extract the original non-method function by
861
# black magic
1083
862
nonmethod_func = (dict(
1084
863
zip(attribute.func_code.co_freevars,
1085
864
attribute.__closure__))["func"]
1096
875
nonmethod_func.func_name,
1097
876
nonmethod_func.func_defaults,
1098
877
nonmethod_func.func_closure)))
1099
# Copy annotations, if any
1100
try:
1101
new_function._dbus_annotations = (
1102
dict(attribute._dbus_annotations))
1103
except AttributeError:
1104
pass
1105
878
# Define a creator of a function to call both the
1106
# original and alternate functions, so both the
1107
# original and alternate signals gets sent when
1108
# the function is called
879
# old and new functions, so both the old and new
880
# signals gets sent when the function is called
1109
881
def fixscope(func1, func2):
1110
882
"""This function is a scope container to pass
1111
883
func1 and func2 to the "call_both" function
1118
890
return call_both
1119
891
# Create the "call_both" function and add it to
1120
892
# the class
1121
attr[attrname] = fixscope(attribute, new_function)
893
attr[attrname] = fixscope(attribute,
894
new_function)
1122
895
# Is this a D-Bus method?
1123
896
elif getattr(attribute, "_dbus_is_method", False):
1124
897
# Create a new, but exactly alike, function
1135
908
attribute.func_name,
1136
909
attribute.func_defaults,
1137
910
attribute.func_closure)))
1138
# Copy annotations, if any
1139
try:
1140
attr[attrname]._dbus_annotations = (
1141
dict(attribute._dbus_annotations))
1142
except AttributeError:
1143
pass
1144
911
# Is this a D-Bus property?
1145
912
elif getattr(attribute, "_dbus_is_property", False):
1146
913
# Create a new, but exactly alike, function
1160
927
attribute.func_name,
1161
928
attribute.func_defaults,
1162
929
attribute.func_closure)))
1163
# Copy annotations, if any
1164
try:
1165
attr[attrname]._dbus_annotations = (
1166
dict(attribute._dbus_annotations))
1167
except AttributeError:
1168
pass
1169
# Is this a D-Bus interface?
1170
elif getattr(attribute, "_dbus_is_interface", False):
1171
# Create a new, but exactly alike, function
1172
# object. Decorate it to be a new D-Bus interface
1173
# with the alternate D-Bus interface name. Add it
1174
# to the class.
1175
attr[attrname] = (dbus_interface_annotations
1176
(alt_interface)
1177
(types.FunctionType
1178
(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1183
if deprecate:
1184
# Deprecate all alternate interfaces
1185
iname="_AlternateDBusNames_interface_annotation{0}"
1186
for interface_name in interface_names:
1187
@dbus_interface_annotations(interface_name)
1188
def func(self):
1189
return { "org.freedesktop.DBus.Deprecated":
1190
"true" }
1191
# Find an unused name
1192
for aname in (iname.format(i)
1193
for i in itertools.count()):
1194
if aname not in attr:
1195
attr[aname] = func
1196
break
1197
if interface_names:
1198
# Replace the class with a new subclass of it with
1199
# methods, signals, etc. as created above.
1200
cls = type(b"{0}Alternate".format(cls.__name__),
1201
(cls,), attr)
1202
return cls
1203
return wrapper
1204
1205
1206
@alternate_dbus_interfaces({"se.recompile.Mandos":
1207
"se.bsnet.fukt.Mandos"})
930
return type.__new__(mcs, name, bases, attr)
931
1208
932
class ClientDBus(Client, DBusObjectWithProperties):
1209
933
"""A Client class using D-Bus
1210
934
1221
945
def __init__(self, bus = None, *args, **kwargs):
1222
946
self.bus = bus
1223
947
Client.__init__(self, *args, **kwargs)
948
949
self._approvals_pending = 0
1224
950
# Only now, when this client is initialized, can it show up on
1225
951
# the D-Bus
1226
952
client_object_name = unicode(self.name).translate(
1230
956
("/clients/" + client_object_name))
1231
957
DBusObjectWithProperties.__init__(self, self.bus,
1232
958
self.dbus_object_path)
1233
959
1234
960
def notifychangeproperty(transform_func,
1235
961
dbus_name, type_func=lambda x: x,
1236
962
variant_level=1):
1237
963
""" Modify a variable so that it's a property which announces
1238
964
its changes to DBus.
1239
965
1240
966
transform_fun: Function that takes a value and a variant_level
1241
967
and transforms it to a D-Bus type.
1242
968
dbus_name: D-Bus name of the variable
1259
985
1260
986
return property(lambda self: getattr(self, attrname), setter)
1261
987
988
1262
989
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1263
990
approvals_pending = notifychangeproperty(dbus.Boolean,
1264
991
"ApprovalPending",
1271
998
checker is not None)
1272
999
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1273
1000
"LastCheckedOK")
1274
last_checker_status = notifychangeproperty(dbus.Int16,
1275
"LastCheckerStatus")
1276
1001
last_approval_request = notifychangeproperty(
1277
1002
datetime_to_dbus, "LastApprovalRequest")
1278
1003
approved_by_default = notifychangeproperty(dbus.Boolean,
1279
1004
"ApprovedByDefault")
1280
approval_delay = notifychangeproperty(dbus.UInt64,
1005
approval_delay = notifychangeproperty(dbus.UInt16,
1281
1006
"ApprovalDelay",
1282
1007
type_func =
1283
timedelta_to_milliseconds)
1008
_timedelta_to_milliseconds)
1284
1009
approval_duration = notifychangeproperty(
1285
dbus.UInt64, "ApprovalDuration",
1286
type_func = timedelta_to_milliseconds)
1010
dbus.UInt16, "ApprovalDuration",
1011
type_func = _timedelta_to_milliseconds)
1287
1012
host = notifychangeproperty(dbus.String, "Host")
1288
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1013
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1289
1014
type_func =
1290
timedelta_to_milliseconds)
1015
_timedelta_to_milliseconds)
1291
1016
extended_timeout = notifychangeproperty(
1292
dbus.UInt64, "ExtendedTimeout",
1293
type_func = timedelta_to_milliseconds)
1294
interval = notifychangeproperty(dbus.UInt64,
1017
dbus.UInt16, "ExtendedTimeout",
1018
type_func = _timedelta_to_milliseconds)
1019
interval = notifychangeproperty(dbus.UInt16,
1295
1020
"Interval",
1296
1021
type_func =
1297
timedelta_to_milliseconds)
1022
_timedelta_to_milliseconds)
1298
1023
checker_command = notifychangeproperty(dbus.String, "Checker")
1299
1024
1300
1025
del notifychangeproperty
1342
1067
return r
1343
1068
1344
1069
def _reset_approved(self):
1345
self.approved = None
1070
self._approved = None
1346
1071
return False
1347
1072
1348
1073
def approve(self, value=True):
1349
self.approved = value
1350
gobject.timeout_add(timedelta_to_milliseconds
1074
self.send_changedstate()
1075
self._approved = value
1076
gobject.timeout_add(_timedelta_to_milliseconds
1351
1077
(self.approval_duration),
1352
1078
self._reset_approved)
1353
self.send_changedstate()
1079
1354
1080
1355
1081
## D-Bus methods, signals & properties
1356
1082
_interface = "se.recompile.Mandos.Client"
1357
1083
1358
## Interfaces
1359
1360
@dbus_interface_annotations(_interface)
1361
def _foo(self):
1362
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1363
"false"}
1364
1365
1084
## Signals
1366
1085
1367
1086
# CheckerCompleted - signal
1466
1185
access="readwrite")
1467
1186
def ApprovalDuration_dbus_property(self, value=None):
1468
1187
if value is None: # get
1469
return dbus.UInt64(timedelta_to_milliseconds(
1188
return dbus.UInt64(_timedelta_to_milliseconds(
1470
1189
self.approval_duration))
1471
1190
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1472
1191
1486
1205
def Host_dbus_property(self, value=None):
1487
1206
if value is None: # get
1488
1207
return dbus.String(self.host)
1489
self.host = unicode(value)
1208
self.host = value
1490
1209
1491
1210
# Created - property
1492
1211
@dbus_service_property(_interface, signature="s", access="read")
1493
1212
def Created_dbus_property(self):
1494
return datetime_to_dbus(self.created)
1213
return dbus.String(datetime_to_dbus(self.created))
1495
1214
1496
1215
# LastEnabled - property
1497
1216
@dbus_service_property(_interface, signature="s", access="read")
1518
1237
return
1519
1238
return datetime_to_dbus(self.last_checked_ok)
1520
1239
1521
# LastCheckerStatus - property
1522
@dbus_service_property(_interface, signature="n",
1523
access="read")
1524
def LastCheckerStatus_dbus_property(self):
1525
return dbus.Int16(self.last_checker_status)
1526
1527
1240
# Expires - property
1528
1241
@dbus_service_property(_interface, signature="s", access="read")
1529
1242
def Expires_dbus_property(self):
1540
1253
def Timeout_dbus_property(self, value=None):
1541
1254
if value is None: # get
1542
1255
return dbus.UInt64(self.timeout_milliseconds())
1543
old_timeout = self.timeout
1544
1256
self.timeout = datetime.timedelta(0, 0, 0, value)
1545
# Reschedule disabling
1546
if self.enabled:
1547
now = datetime.datetime.utcnow()
1548
self.expires += self.timeout - old_timeout
1549
if self.expires <= now:
1550
# The timeout has passed
1551
self.disable()
1552
else:
1553
if (getattr(self, "disable_initiator_tag", None)
1554
is None):
1555
return
1556
gobject.source_remove(self.disable_initiator_tag)
1557
self.disable_initiator_tag = (
1558
gobject.timeout_add(
1559
timedelta_to_milliseconds(self.expires - now),
1560
self.disable))
1257
if getattr(self, "disable_initiator_tag", None) is None:
1258
return
1259
# Reschedule timeout
1260
gobject.source_remove(self.disable_initiator_tag)
1261
self.disable_initiator_tag = None
1262
self.expires = None
1263
time_to_die = _timedelta_to_milliseconds((self
1264
.last_checked_ok
1265
+ self.timeout)
1266
- datetime.datetime
1267
.utcnow())
1268
if time_to_die <= 0:
1269
# The timeout has passed
1270
self.disable()
1271
else:
1272
self.expires = (datetime.datetime.utcnow()
1273
+ datetime.timedelta(milliseconds =
1274
time_to_die))
1275
self.disable_initiator_tag = (gobject.timeout_add
1276
(time_to_die, self.disable))
1561
1277
1562
1278
# ExtendedTimeout - property
1563
1279
@dbus_service_property(_interface, signature="t",
1576
1292
self.interval = datetime.timedelta(0, 0, 0, value)
1577
1293
if getattr(self, "checker_initiator_tag", None) is None:
1578
1294
return
1579
if self.enabled:
1580
# Reschedule checker run
1581
gobject.source_remove(self.checker_initiator_tag)
1582
self.checker_initiator_tag = (gobject.timeout_add
1583
(value, self.start_checker))
1584
self.start_checker() # Start one now, too
1295
# Reschedule checker run
1296
gobject.source_remove(self.checker_initiator_tag)
1297
self.checker_initiator_tag = (gobject.timeout_add
1298
(value, self.start_checker))
1299
self.start_checker() # Start one now, too
1585
1300
1586
1301
# Checker - property
1587
1302
@dbus_service_property(_interface, signature="s",
1589
1304
def Checker_dbus_property(self, value=None):
1590
1305
if value is None: # get
1591
1306
return dbus.String(self.checker_command)
1592
self.checker_command = unicode(value)
1307
self.checker_command = value
1593
1308
1594
1309
# CheckerRunning - property
1595
1310
@dbus_service_property(_interface, signature="b",
1624
1339
raise KeyError()
1625
1340
1626
1341
def __getattribute__(self, name):
1627
if name == '_pipe':
1342
if(name == '_pipe'):
1628
1343
return super(ProxyClient, self).__getattribute__(name)
1629
1344
self._pipe.send(('getattr', name))
1630
1345
data = self._pipe.recv()
1637
1352
return func
1638
1353
1639
1354
def __setattr__(self, name, value):
1640
if name == '_pipe':
1355
if(name == '_pipe'):
1641
1356
return super(ProxyClient, self).__setattr__(name, value)
1642
1357
self._pipe.send(('setattr', name, value))
1643
1358
1359
class ClientDBusTransitional(ClientDBus):
1360
__metaclass__ = AlternateDBusNamesMetaclass
1644
1361
1645
1362
class ClientHandler(socketserver.BaseRequestHandler, object):
1646
1363
"""A class to handle client connections.
1729
1446
client.Rejected("Disabled")
1730
1447
return
1731
1448
1732
if client.approved or not client.approval_delay:
1449
if client._approved or not client.approval_delay:
1733
1450
#We are approved or approval is disabled
1734
1451
break
1735
elif client.approved is None:
1452
elif client._approved is None:
1736
1453
logger.info("Client %s needs approval",
1737
1454
client.name)
1738
1455
if self.server.use_dbus:
1751
1468
#wait until timeout or approved
1752
1469
time = datetime.datetime.now()
1753
1470
client.changedstate.acquire()
1754
client.changedstate.wait(
1755
float(timedelta_to_milliseconds(delay)
1756
/ 1000))
1471
(client.changedstate.wait
1472
(float(client._timedelta_to_milliseconds(delay)
1473
/ 1000)))
1757
1474
client.changedstate.release()
1758
1475
time2 = datetime.datetime.now()
1759
1476
if (time2 - time) >= delay:
1775
1492
try:
1776
1493
sent = session.send(client.secret[sent_size:])
1777
1494
except gnutls.errors.GNUTLSError as error:
1778
logger.warning("gnutls send failed",
1779
exc_info=error)
1495
logger.warning("gnutls send failed")
1780
1496
return
1781
1497
logger.debug("Sent: %d, remaining: %d",
1782
1498
sent, len(client.secret)
1785
1501
1786
1502
logger.info("Sending secret to %s", client.name)
1787
1503
# bump the timeout using extended_timeout
1788
client.bump_timeout(client.extended_timeout)
1504
client.checked_ok(client.extended_timeout)
1789
1505
if self.server.use_dbus:
1790
1506
# Emit D-Bus signal
1791
1507
client.GotSecret()
1796
1512
try:
1797
1513
session.bye()
1798
1514
except gnutls.errors.GNUTLSError as error:
1799
logger.warning("GnuTLS bye failed",
1800
exc_info=error)
1515
logger.warning("GnuTLS bye failed")
1801
1516
1802
1517
@staticmethod
1803
1518
def peer_certificate(session):
1859
1574
# Convert the buffer to a Python bytestring
1860
1575
fpr = ctypes.string_at(buf, buf_len.value)
1861
1576
# Convert the bytestring to hexadecimal notation
1862
hex_fpr = binascii.hexlify(fpr).upper()
1577
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1863
1578
return hex_fpr
1864
1579
1865
1580
1868
1583
def sub_process_main(self, request, address):
1869
1584
try:
1870
1585
self.finish_request(request, address)
1871
except Exception:
1586
except:
1872
1587
self.handle_error(request, address)
1873
1588
self.close_request(request)
1874
1589
1875
1590
def process_request(self, request, address):
1876
1591
"""Start a new process to process the request."""
1877
1592
proc = multiprocessing.Process(target = self.sub_process_main,
1878
args = (request, address))
1593
args = (request,
1594
address))
1879
1595
proc.start()
1880
1596
return proc
1881
1597
1909
1625
use_ipv6: Boolean; to use IPv6 or not
1910
1626
"""
1911
1627
def __init__(self, server_address, RequestHandlerClass,
1912
interface=None, use_ipv6=True, socketfd=None):
1913
"""If socketfd is set, use that file descriptor instead of
1914
creating a new one with socket.socket().
1915
"""
1628
interface=None, use_ipv6=True):
1916
1629
self.interface = interface
1917
1630
if use_ipv6:
1918
1631
self.address_family = socket.AF_INET6
1919
if socketfd is not None:
1920
# Save the file descriptor
1921
self.socketfd = socketfd
1922
# Save the original socket.socket() function
1923
self.socket_socket = socket.socket
1924
# To implement --socket, we monkey patch socket.socket.
1925
#
1926
# (When socketserver.TCPServer is a new-style class, we
1927
# could make self.socket into a property instead of monkey
1928
# patching socket.socket.)
1929
#
1930
# Create a one-time-only replacement for socket.socket()
1931
@functools.wraps(socket.socket)
1932
def socket_wrapper(*args, **kwargs):
1933
# Restore original function so subsequent calls are
1934
# not affected.
1935
socket.socket = self.socket_socket
1936
del self.socket_socket
1937
# This time only, return a new socket object from the
1938
# saved file descriptor.
1939
return socket.fromfd(self.socketfd, *args, **kwargs)
1940
# Replace socket.socket() function with wrapper
1941
socket.socket = socket_wrapper
1942
# The socketserver.TCPServer.__init__ will call
1943
# socket.socket(), which might be our replacement,
1944
# socket_wrapper(), if socketfd was set.
1945
1632
socketserver.TCPServer.__init__(self, server_address,
1946
1633
RequestHandlerClass)
1947
1948
1634
def server_bind(self):
1949
1635
"""This overrides the normal server_bind() function
1950
1636
to bind to an interface if one was specified, and also NOT to
1958
1644
try:
1959
1645
self.socket.setsockopt(socket.SOL_SOCKET,
1960
1646
SO_BINDTODEVICE,
1961
str(self.interface + '\0'))
1647
str(self.interface
1648
+ '\0'))
1962
1649
except socket.error as error:
1963
if error.errno == errno.EPERM:
1964
logger.error("No permission to bind to"
1965
" interface %s", self.interface)
1966
elif error.errno == errno.ENOPROTOOPT:
1650
if error[0] == errno.EPERM:
1651
logger.error("No permission to"
1652
" bind to interface %s",
1653
self.interface)
1654
elif error[0] == errno.ENOPROTOOPT:
1967
1655
logger.error("SO_BINDTODEVICE not available;"
1968
1656
" cannot bind to interface %s",
1969
1657
self.interface)
1970
elif error.errno == errno.ENODEV:
1971
logger.error("Interface %s does not exist,"
1972
" cannot bind", self.interface)
1973
1658
else:
1974
1659
raise
1975
1660
# Only bind(2) the socket if we really need to.
2005
1690
"""
2006
1691
def __init__(self, server_address, RequestHandlerClass,
2007
1692
interface=None, use_ipv6=True, clients=None,
2008
gnutls_priority=None, use_dbus=True, socketfd=None):
1693
gnutls_priority=None, use_dbus=True):
2009
1694
self.enabled = False
2010
1695
self.clients = clients
2011
1696
if self.clients is None:
2015
1700
IPv6_TCPServer.__init__(self, server_address,
2016
1701
RequestHandlerClass,
2017
1702
interface = interface,
2018
use_ipv6 = use_ipv6,
2019
socketfd = socketfd)
1703
use_ipv6 = use_ipv6)
2020
1704
def server_activate(self):
2021
1705
if self.enabled:
2022
1706
return socketserver.TCPServer.server_activate(self)
2035
1719
2036
1720
def handle_ipc(self, source, condition, parent_pipe=None,
2037
1721
proc = None, client_object=None):
1722
condition_names = {
1723
gobject.IO_IN: "IN", # There is data to read.
1724
gobject.IO_OUT: "OUT", # Data can be written (without
1725
# blocking).
1726
gobject.IO_PRI: "PRI", # There is urgent data to read.
1727
gobject.IO_ERR: "ERR", # Error condition.
1728
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1729
# broken, usually for pipes and
1730
# sockets).
1731
}
1732
conditions_string = ' | '.join(name
1733
for cond, name in
1734
condition_names.iteritems()
1735
if cond & condition)
2038
1736
# error, or the other end of multiprocessing.Pipe has closed
2039
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1737
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2040
1738
# Wait for other process to exit
2041
1739
proc.join()
2042
1740
return False
2100
1798
return True
2101
1799
2102
1800
2103
def rfc3339_duration_to_delta(duration):
2104
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2105
2106
>>> rfc3339_duration_to_delta("P7D")
2107
datetime.timedelta(7)
2108
>>> rfc3339_duration_to_delta("PT60S")
2109
datetime.timedelta(0, 60)
2110
>>> rfc3339_duration_to_delta("PT60M")
2111
datetime.timedelta(0, 3600)
2112
>>> rfc3339_duration_to_delta("PT24H")
2113
datetime.timedelta(1)
2114
>>> rfc3339_duration_to_delta("P1W")
2115
datetime.timedelta(7)
2116
>>> rfc3339_duration_to_delta("PT5M30S")
2117
datetime.timedelta(0, 330)
2118
>>> rfc3339_duration_to_delta("P1DT3M20S")
2119
datetime.timedelta(1, 200)
2120
"""
2121
2122
# Parsing an RFC 3339 duration with regular expressions is not
2123
# possible - there would have to be multiple places for the same
2124
# values, like seconds. The current code, while more esoteric, is
2125
# cleaner without depending on a parsing library. If Python had a
2126
# built-in library for parsing we would use it, but we'd like to
2127
# avoid excessive use of external libraries.
2128
2129
# New type for defining tokens, syntax, and semantics all-in-one
2130
Token = collections.namedtuple("Token",
2131
("regexp", # To match token; if
2132
# "value" is not None,
2133
# must have a "group"
2134
# containing digits
2135
"value", # datetime.timedelta or
2136
# None
2137
"followers")) # Tokens valid after
2138
# this token
2139
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2140
# the "duration" ABNF definition in RFC 3339, Appendix A.
2141
token_end = Token(re.compile(r"$"), None, frozenset())
2142
token_second = Token(re.compile(r"(\d+)S"),
2143
datetime.timedelta(seconds=1),
2144
frozenset((token_end,)))
2145
token_minute = Token(re.compile(r"(\d+)M"),
2146
datetime.timedelta(minutes=1),
2147
frozenset((token_second, token_end)))
2148
token_hour = Token(re.compile(r"(\d+)H"),
2149
datetime.timedelta(hours=1),
2150
frozenset((token_minute, token_end)))
2151
token_time = Token(re.compile(r"T"),
2152
None,
2153
frozenset((token_hour, token_minute,
2154
token_second)))
2155
token_day = Token(re.compile(r"(\d+)D"),
2156
datetime.timedelta(days=1),
2157
frozenset((token_time, token_end)))
2158
token_month = Token(re.compile(r"(\d+)M"),
2159
datetime.timedelta(weeks=4),
2160
frozenset((token_day, token_end)))
2161
token_year = Token(re.compile(r"(\d+)Y"),
2162
datetime.timedelta(weeks=52),
2163
frozenset((token_month, token_end)))
2164
token_week = Token(re.compile(r"(\d+)W"),
2165
datetime.timedelta(weeks=1),
2166
frozenset((token_end,)))
2167
token_duration = Token(re.compile(r"P"), None,
2168
frozenset((token_year, token_month,
2169
token_day, token_time,
2170
token_week))),
2171
# Define starting values
2172
value = datetime.timedelta() # Value so far
2173
found_token = None
2174
followers = frozenset(token_duration,) # Following valid tokens
2175
s = duration # String left to parse
2176
# Loop until end token is found
2177
while found_token is not token_end:
2178
# Search for any currently valid tokens
2179
for token in followers:
2180
match = token.regexp.match(s)
2181
if match is not None:
2182
# Token found
2183
if token.value is not None:
2184
# Value found, parse digits
2185
factor = int(match.group(1), 10)
2186
# Add to value so far
2187
value += factor * token.value
2188
# Strip token from string
2189
s = token.regexp.sub("", s, 1)
2190
# Go to found token
2191
found_token = token
2192
# Set valid next tokens
2193
followers = found_token.followers
2194
break
2195
else:
2196
# No currently valid tokens were found
2197
raise ValueError("Invalid RFC 3339 duration")
2198
# End token found
2199
return value
2200
2201
2202
1801
def string_to_delta(interval):
2203
1802
"""Parse a string and return a datetime.timedelta
2204
1803
2215
1814
>>> string_to_delta('5m 30s')
2216
1815
datetime.timedelta(0, 330)
2217
1816
"""
2218
2219
try:
2220
return rfc3339_duration_to_delta(interval)
2221
except ValueError:
2222
pass
2223
2224
1817
timevalue = datetime.timedelta(0)
2225
1818
for s in interval.split():
2226
1819
try:
2237
1830
elif suffix == "w":
2238
1831
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2239
1832
else:
2240
raise ValueError("Unknown suffix {0!r}"
2241
.format(suffix))
1833
raise ValueError("Unknown suffix %r" % suffix)
2242
1834
except (ValueError, IndexError) as e:
2243
1835
raise ValueError(*(e.args))
2244
1836
timevalue += delta
2245
1837
return timevalue
2246
1838
2247
1839
1840
def if_nametoindex(interface):
1841
"""Call the C function if_nametoindex(), or equivalent
1842
1843
Note: This function cannot accept a unicode string."""
1844
global if_nametoindex
1845
try:
1846
if_nametoindex = (ctypes.cdll.LoadLibrary
1847
(ctypes.util.find_library("c"))
1848
.if_nametoindex)
1849
except (OSError, AttributeError):
1850
logger.warning("Doing if_nametoindex the hard way")
1851
def if_nametoindex(interface):
1852
"Get an interface index the hard way, i.e. using fcntl()"
1853
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1854
with contextlib.closing(socket.socket()) as s:
1855
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1856
struct.pack(str("16s16x"),
1857
interface))
1858
interface_index = struct.unpack(str("I"),
1859
ifreq[16:20])[0]
1860
return interface_index
1861
return if_nametoindex(interface)
1862
1863
2248
1864
def daemon(nochdir = False, noclose = False):
2249
1865
"""See daemon(3). Standard BSD Unix function.
2250
1866
2258
1874
sys.exit()
2259
1875
if not noclose:
2260
1876
# Close all standard open file descriptors
2261
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1877
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2262
1878
if not stat.S_ISCHR(os.fstat(null).st_mode):
2263
1879
raise OSError(errno.ENODEV,
2264
"{0} not a character device"
2265
.format(os.devnull))
1880
"%s not a character device"
1881
% os.path.devnull)
2266
1882
os.dup2(null, sys.stdin.fileno())
2267
1883
os.dup2(null, sys.stdout.fileno())
2268
1884
os.dup2(null, sys.stderr.fileno())
2277
1893
2278
1894
parser = argparse.ArgumentParser()
2279
1895
parser.add_argument("-v", "--version", action="version",
2280
version = "%(prog)s {0}".format(version),
1896
version = "%%(prog)s %s" % version,
2281
1897
help="show version number and exit")
2282
1898
parser.add_argument("-i", "--interface", metavar="IF",
2283
1899
help="Bind to interface IF")
2306
1922
parser.add_argument("--no-ipv6", action="store_false",
2307
1923
dest="use_ipv6", help="Do not use IPv6")
2308
1924
parser.add_argument("--no-restore", action="store_false",
2309
dest="restore", help="Do not restore stored"
2310
" state")
2311
parser.add_argument("--socket", type=int,
2312
help="Specify a file descriptor to a network"
2313
" socket to use instead of creating one")
2314
parser.add_argument("--statedir", metavar="DIR",
2315
help="Directory to save/restore state in")
2316
parser.add_argument("--foreground", action="store_true",
2317
help="Run in foreground")
2318
1925
dest="restore", help="Do not restore stored state",
1926
default=True)
1927
2319
1928
options = parser.parse_args()
2320
1929
2321
1930
if options.check:
2334
1943
"use_dbus": "True",
2335
1944
"use_ipv6": "True",
2336
1945
"debuglevel": "",
2337
"restore": "True",
2338
"socket": "",
2339
"statedir": "/var/lib/mandos",
2340
"foreground": "False",
2341
1946
}
2342
1947
2343
1948
# Parse config file for server-global settings
2348
1953
# Convert the SafeConfigParser object to a dict
2349
1954
server_settings = server_config.defaults()
2350
1955
# Use the appropriate methods on the non-string config options
2351
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1956
for option in ("debug", "use_dbus", "use_ipv6"):
2352
1957
server_settings[option] = server_config.getboolean("DEFAULT",
2353
1958
option)
2354
1959
if server_settings["port"]:
2355
1960
server_settings["port"] = server_config.getint("DEFAULT",
2356
1961
"port")
2357
if server_settings["socket"]:
2358
server_settings["socket"] = server_config.getint("DEFAULT",
2359
"socket")
2360
# Later, stdin will, and stdout and stderr might, be dup'ed
2361
# over with an opened os.devnull. But we don't want this to
2362
# happen with a supplied network socket.
2363
if 0 <= server_settings["socket"] <= 2:
2364
server_settings["socket"] = os.dup(server_settings
2365
["socket"])
2366
1962
del server_config
2367
1963
2368
1964
# Override the settings from the config file with command line
2369
1965
# options, if set.
2370
1966
for option in ("interface", "address", "port", "debug",
2371
1967
"priority", "servicename", "configdir",
2372
"use_dbus", "use_ipv6", "debuglevel", "restore",
2373
"statedir", "socket", "foreground"):
1968
"use_dbus", "use_ipv6", "debuglevel", "restore"):
2374
1969
value = getattr(options, option)
2375
1970
if value is not None:
2376
1971
server_settings[option] = value
2379
1974
for option in server_settings.keys():
2380
1975
if type(server_settings[option]) is str:
2381
1976
server_settings[option] = unicode(server_settings[option])
2382
# Debug implies foreground
2383
if server_settings["debug"]:
2384
server_settings["foreground"] = True
2385
1977
# Now we have our good server settings in "server_settings"
2386
1978
2387
1979
##################################################################
2391
1983
debuglevel = server_settings["debuglevel"]
2392
1984
use_dbus = server_settings["use_dbus"]
2393
1985
use_ipv6 = server_settings["use_ipv6"]
2394
stored_state_path = os.path.join(server_settings["statedir"],
2395
stored_state_file)
2396
foreground = server_settings["foreground"]
2397
2398
if debug:
2399
initlogger(debug, logging.DEBUG)
2400
else:
2401
if not debuglevel:
2402
initlogger(debug)
2403
else:
2404
level = getattr(logging, debuglevel.upper())
2405
initlogger(debug, level)
2406
1986
2407
1987
if server_settings["servicename"] != "Mandos":
2408
1988
syslogger.setFormatter(logging.Formatter
2409
('Mandos ({0}) [%(process)d]:'
2410
' %(levelname)s: %(message)s'
2411
.format(server_settings
2412
["servicename"])))
1989
('Mandos (%s) [%%(process)d]:'
1990
' %%(levelname)s: %%(message)s'
1991
% server_settings["servicename"]))
2413
1992
2414
1993
# Parse config file with clients
2415
client_config = configparser.SafeConfigParser(Client
2416
.client_defaults)
1994
client_defaults = { "timeout": "5m",
1995
"extended_timeout": "15m",
1996
"interval": "2m",
1997
"checker": "fping -q -- %%(host)s",
1998
"host": "",
1999
"approval_delay": "0s",
2000
"approval_duration": "1s",
2001
}
2002
client_config = configparser.SafeConfigParser(client_defaults)
2417
2003
client_config.read(os.path.join(server_settings["configdir"],
2418
2004
"clients.conf"))
2419
2005
2428
2014
use_ipv6=use_ipv6,
2429
2015
gnutls_priority=
2430
2016
server_settings["priority"],
2431
use_dbus=use_dbus,
2432
socketfd=(server_settings["socket"]
2433
or None))
2434
if not foreground:
2017
use_dbus=use_dbus)
2018
if not debug:
2435
2019
pidfilename = "/var/run/mandos.pid"
2436
pidfile = None
2437
2020
try:
2438
2021
pidfile = open(pidfilename, "w")
2439
except IOError as e:
2440
logger.error("Could not open file %r", pidfilename,
2441
exc_info=e)
2022
except IOError:
2023
logger.error("Could not open file %r", pidfilename)
2442
2024
2443
for name in ("_mandos", "mandos", "nobody"):
2025
try:
2026
uid = pwd.getpwnam("_mandos").pw_uid
2027
gid = pwd.getpwnam("_mandos").pw_gid
2028
except KeyError:
2444
2029
try:
2445
uid = pwd.getpwnam(name).pw_uid
2446
gid = pwd.getpwnam(name).pw_gid
2447
break
2030
uid = pwd.getpwnam("mandos").pw_uid
2031
gid = pwd.getpwnam("mandos").pw_gid
2448
2032
except KeyError:
2449
continue
2450
else:
2451
uid = 65534
2452
gid = 65534
2033
try:
2034
uid = pwd.getpwnam("nobody").pw_uid
2035
gid = pwd.getpwnam("nobody").pw_gid
2036
except KeyError:
2037
uid = 65534
2038
gid = 65534
2453
2039
try:
2454
2040
os.setgid(gid)
2455
2041
os.setuid(uid)
2456
2042
except OSError as error:
2457
if error.errno != errno.EPERM:
2043
if error[0] != errno.EPERM:
2458
2044
raise error
2459
2045
2046
if not debug and not debuglevel:
2047
logger.setLevel(logging.WARNING)
2048
if debuglevel:
2049
level = getattr(logging, debuglevel.upper())
2050
logger.setLevel(level)
2051
2460
2052
if debug:
2053
logger.setLevel(logging.DEBUG)
2461
2054
# Enable all possible GnuTLS debugging
2462
2055
2463
2056
# "Use a log level over 10 to enable all debugging options."
2472
2065
.gnutls_global_set_log_function(debug_gnutls))
2473
2066
2474
2067
# Redirect stdin so all checkers get /dev/null
2475
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2068
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2476
2069
os.dup2(null, sys.stdin.fileno())
2477
2070
if null > 2:
2478
2071
os.close(null)
2072
else:
2073
# No console logging
2074
logger.removeHandler(console)
2479
2075
2480
2076
# Need to fork before connecting to D-Bus
2481
if not foreground:
2077
if not debug:
2482
2078
# Close all input and output, do double fork, etc.
2483
2079
daemon()
2484
2080
2485
# multiprocessing will use threads, so before we use gobject we
2486
# need to inform gobject that threads will be used.
2487
gobject.threads_init()
2488
2489
2081
global main_loop
2490
2082
# From the Avahi example code
2491
DBusGMainLoop(set_as_default=True)
2083
DBusGMainLoop(set_as_default=True )
2492
2084
main_loop = gobject.MainLoop()
2493
2085
bus = dbus.SystemBus()
2494
2086
# End of Avahi example code
2500
2092
("se.bsnet.fukt.Mandos", bus,
2501
2093
do_not_queue=True))
2502
2094
except dbus.exceptions.NameExistsException as e:
2503
logger.error("Disabling D-Bus:", exc_info=e)
2095
logger.error(unicode(e) + ", disabling D-Bus")
2504
2096
use_dbus = False
2505
2097
server_settings["use_dbus"] = False
2506
2098
tcp_server.use_dbus = False
2518
2110
2519
2111
client_class = Client
2520
2112
if use_dbus:
2521
client_class = functools.partial(ClientDBus, bus = bus)
2522
2523
client_settings = Client.config_parser(client_config)
2113
client_class = functools.partial(ClientDBusTransitional,
2114
bus = bus)
2115
2116
special_settings = {
2117
# Some settings need to be accessd by special methods;
2118
# booleans need .getboolean(), etc. Here is a list of them:
2119
"approved_by_default":
2120
lambda section:
2121
client_config.getboolean(section, "approved_by_default"),
2122
}
2123
# Construct a new dict of client settings of this form:
2124
# { client_name: {setting_name: value, ...}, ...}
2125
# with exceptions for any special settings as defined above
2126
client_settings = dict((clientname,
2127
dict((setting,
2128
(value if setting not in special_settings
2129
else special_settings[setting](clientname)))
2130
for setting, value in client_config.items(clientname)))
2131
for clientname in client_config.sections())
2132
2524
2133
old_client_settings = {}
2525
clients_data = {}
2526
2527
# Get client data and settings from last running state.
2134
clients_data = []
2135
2136
# Get client data and settings from last running state.
2528
2137
if server_settings["restore"]:
2529
2138
try:
2530
2139
with open(stored_state_path, "rb") as stored_state:
2531
clients_data, old_client_settings = (pickle.load
2532
(stored_state))
2140
clients_data, old_client_settings = pickle.load(stored_state)
2533
2141
os.remove(stored_state_path)
2534
2142
except IOError as e:
2535
if e.errno == errno.ENOENT:
2536
logger.warning("Could not load persistent state: {0}"
2537
.format(os.strerror(e.errno)))
2538
else:
2539
logger.critical("Could not load persistent state:",
2540
exc_info=e)
2143
logger.warning("Could not load persistant state: {0}".format(e))
2144
if e.errno != errno.ENOENT:
2541
2145
raise
2542
except EOFError as e:
2543
logger.warning("Could not load persistent state: "
2544
"EOFError:", exc_info=e)
2545
2546
with PGPEngine() as pgp:
2547
for client_name, client in clients_data.iteritems():
2548
# Decide which value to use after restoring saved state.
2549
# We have three different values: Old config file,
2550
# new config file, and saved state.
2551
# New config value takes precedence if it differs from old
2552
# config value, otherwise use saved state.
2553
for name, value in client_settings[client_name].items():
2554
try:
2555
# For each value in new config, check if it
2556
# differs from the old config value (Except for
2557
# the "secret" attribute)
2558
if (name != "secret" and
2559
value != old_client_settings[client_name]
2560
[name]):
2561
client[name] = value
2562
except KeyError:
2563
pass
2564
2565
# Clients who has passed its expire date can still be
2566
# enabled if its last checker was successful. Clients
2567
# whose checker succeeded before we stored its state is
2568
# assumed to have successfully run all checkers during
2569
# downtime.
2570
if client["enabled"]:
2571
if datetime.datetime.utcnow() >= client["expires"]:
2572
if not client["last_checked_ok"]:
2573
logger.warning(
2574
"disabling client {0} - Client never "
2575
"performed a successful checker"
2576
.format(client_name))
2577
client["enabled"] = False
2578
elif client["last_checker_status"] != 0:
2579
logger.warning(
2580
"disabling client {0} - Client "
2581
"last checker failed with error code {1}"
2582
.format(client_name,
2583
client["last_checker_status"]))
2584
client["enabled"] = False
2585
else:
2586
client["expires"] = (datetime.datetime
2587
.utcnow()
2588
+ client["timeout"])
2589
logger.debug("Last checker succeeded,"
2590
" keeping {0} enabled"
2591
.format(client_name))
2146
2147
for client in clients_data:
2148
client_name = client["name"]
2149
2150
# Decide which value to use after restoring saved state.
2151
# We have three different values: Old config file,
2152
# new config file, and saved state.
2153
# New config value takes precedence if it differs from old
2154
# config value, otherwise use saved state.
2155
for name, value in client_settings[client_name].items():
2592
2156
try:
2593
client["secret"] = (
2594
pgp.decrypt(client["encrypted_secret"],
2595
client_settings[client_name]
2596
["secret"]))
2597
except PGPError:
2598
# If decryption fails, we use secret from new settings
2599
logger.debug("Failed to decrypt {0} old secret"
2600
.format(client_name))
2601
client["secret"] = (
2602
client_settings[client_name]["secret"])
2603
2604
# Add/remove clients based on new changes made to config
2605
for client_name in (set(old_client_settings)
2606
- set(client_settings)):
2607
del clients_data[client_name]
2608
for client_name in (set(client_settings)
2609
- set(old_client_settings)):
2610
clients_data[client_name] = client_settings[client_name]
2611
2612
# Create all client objects
2613
for client_name, client in clients_data.iteritems():
2614
tcp_server.clients[client_name] = client_class(
2615
name = client_name, settings = client)
2616
2157
# For each value in new config, check if it differs
2158
# from the old config value (Except for the "secret"
2159
# attribute)
2160
if name != "secret" and value != old_client_settings[client_name][name]:
2161
setattr(client, name, value)
2162
except KeyError:
2163
pass
2164
2165
# Clients who has passed its expire date, can still be enabled if its
2166
# last checker was sucessful. Clients who checkers failed before we
2167
# stored it state is asumed to had failed checker during downtime.
2168
if client["enabled"] and client["last_checked_ok"]:
2169
if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2170
> client["interval"]):
2171
if client["last_checker_status"] != 0:
2172
client["enabled"] = False
2173
else:
2174
client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2175
2176
client["changedstate"] = (multiprocessing_manager
2177
.Condition(multiprocessing_manager
2178
.Lock()))
2179
if use_dbus:
2180
new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2181
tcp_server.clients[client_name] = new_client
2182
new_client.bus = bus
2183
for name, value in client.iteritems():
2184
setattr(new_client, name, value)
2185
client_object_name = unicode(client_name).translate(
2186
{ord("."): ord("_"),
2187
ord("-"): ord("_")})
2188
new_client.dbus_object_path = (dbus.ObjectPath
2189
("/clients/" + client_object_name))
2190
DBusObjectWithProperties.__init__(new_client,
2191
new_client.bus,
2192
new_client.dbus_object_path)
2193
else:
2194
tcp_server.clients[client_name] = Client.__new__(Client)
2195
for name, value in client.iteritems():
2196
setattr(tcp_server.clients[client_name], name, value)
2197
2198
tcp_server.clients[client_name].decrypt_secret(
2199
client_settings[client_name]["secret"])
2200
2201
# Create/remove clients based on new changes made to config
2202
for clientname in set(old_client_settings) - set(client_settings):
2203
del tcp_server.clients[clientname]
2204
for clientname in set(client_settings) - set(old_client_settings):
2205
tcp_server.clients[clientname] = (client_class(name = clientname,
2206
config =
2207
client_settings
2208
[clientname]))
2209
2210
2617
2211
if not tcp_server.clients:
2618
2212
logger.warning("No clients defined")
2619
2620
if not foreground:
2621
if pidfile is not None:
2622
try:
2623
with pidfile:
2624
pid = os.getpid()
2625
pidfile.write(str(pid) + "\n".encode("utf-8"))
2626
except IOError:
2627
logger.error("Could not write to file %r with PID %d",
2628
pidfilename, pid)
2629
del pidfile
2213
2214
if not debug:
2215
try:
2216
with pidfile:
2217
pid = os.getpid()
2218
pidfile.write(str(pid) + "\n".encode("utf-8"))
2219
del pidfile
2220
except IOError:
2221
logger.error("Could not write to file %r with PID %d",
2222
pidfilename, pid)
2223
except NameError:
2224
# "pidfile" was never created
2225
pass
2630
2226
del pidfilename
2227
2228
signal.signal(signal.SIGINT, signal.SIG_IGN)
2631
2229
2632
2230
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2633
2231
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2634
2232
2635
2233
if use_dbus:
2636
@alternate_dbus_interfaces({"se.recompile.Mandos":
2637
"se.bsnet.fukt.Mandos"})
2638
class MandosDBusService(DBusObjectWithProperties):
2234
class MandosDBusService(dbus.service.Object):
2639
2235
"""A D-Bus proxy object"""
2640
2236
def __init__(self):
2641
2237
dbus.service.Object.__init__(self, bus, "/")
2642
2238
_interface = "se.recompile.Mandos"
2643
2239
2644
@dbus_interface_annotations(_interface)
2645
def _foo(self):
2646
return { "org.freedesktop.DBus.Property"
2647
".EmitsChangedSignal":
2648
"false"}
2649
2650
2240
@dbus.service.signal(_interface, signature="o")
2651
2241
def ClientAdded(self, objpath):
2652
2242
"D-Bus signal"
2694
2284
2695
2285
del _interface
2696
2286
2697
mandos_dbus_service = MandosDBusService()
2287
class MandosDBusServiceTransitional(MandosDBusService):
2288
__metaclass__ = AlternateDBusNamesMetaclass
2289
mandos_dbus_service = MandosDBusServiceTransitional()
2698
2290
2699
2291
def cleanup():
2700
2292
"Cleanup function; run on exit"
2703
2295
multiprocessing.active_children()
2704
2296
if not (tcp_server.clients or client_settings):
2705
2297
return
2706
2707
# Store client before exiting. Secrets are encrypted with key
2708
# based on what config file has. If config file is
2709
# removed/edited, old secret will thus be unrecovable.
2710
clients = {}
2711
with PGPEngine() as pgp:
2712
for client in tcp_server.clients.itervalues():
2713
key = client_settings[client.name]["secret"]
2714
client.encrypted_secret = pgp.encrypt(client.secret,
2715
key)
2716
client_dict = {}
2717
2718
# A list of attributes that can not be pickled
2719
# + secret.
2720
exclude = set(("bus", "changedstate", "secret",
2721
"checker"))
2722
for name, typ in (inspect.getmembers
2723
(dbus.service.Object)):
2724
exclude.add(name)
2725
2726
client_dict["encrypted_secret"] = (client
2727
.encrypted_secret)
2728
for attr in client.client_structure:
2729
if attr not in exclude:
2730
client_dict[attr] = getattr(client, attr)
2731
2732
clients[client.name] = client_dict
2733
del client_settings[client.name]["secret"]
2734
2298
2299
# Store client before exiting. Secrets are encrypted with key based
2300
# on what config file has. If config file is removed/edited, old
2301
# secret will thus be unrecovable.
2302
clients = []
2303
for client in tcp_server.clients.itervalues():
2304
client.encrypt_secret(client_settings[client.name]["secret"])
2305
2306
client_dict = {}
2307
2308
# A list of attributes that will not be stored when shuting down.
2309
exclude = set(("bus", "changedstate", "secret"))
2310
for name, typ in inspect.getmembers(dbus.service.Object):
2311
exclude.add(name)
2312
2313
client_dict["encrypted_secret"] = client.encrypted_secret
2314
for attr in client.client_structure:
2315
if attr not in exclude:
2316
client_dict[attr] = getattr(client, attr)
2317
2318
clients.append(client_dict)
2319
del client_settings[client.name]["secret"]
2320
2735
2321
try:
2736
with (tempfile.NamedTemporaryFile
2737
(mode='wb', suffix=".pickle", prefix='clients-',
2738
dir=os.path.dirname(stored_state_path),
2739
delete=False)) as stored_state:
2322
with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
2740
2323
pickle.dump((clients, client_settings), stored_state)
2741
tempname=stored_state.name
2742
os.rename(tempname, stored_state_path)
2743
except (IOError, OSError) as e:
2744
if not debug:
2745
try:
2746
os.remove(tempname)
2747
except NameError:
2748
pass
2749
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2750
logger.warning("Could not save persistent state: {0}"
2751
.format(os.strerror(e.errno)))
2752
else:
2753
logger.warning("Could not save persistent state:",
2754
exc_info=e)
2755
raise e
2756
2324
except IOError as e:
2325
logger.warning("Could not save persistant state: {0}".format(e))
2326
if e.errno != errno.ENOENT:
2327
raise
2328
2757
2329
# Delete all clients, and settings from config
2758
2330
while tcp_server.clients:
2759
2331
name, client = tcp_server.clients.popitem()
2777
2349
# Need to initiate checking of clients
2778
2350
if client.enabled:
2779
2351
client.init_checker()
2352
2780
2353
2781
2354
tcp_server.enable()
2782
2355
tcp_server.server_activate()
2785
2358
service.port = tcp_server.socket.getsockname()[1]
2786
2359
if use_ipv6:
2787
2360
logger.info("Now listening on address %r, port %d,"
2788
" flowinfo %d, scope_id %d",
2789
*tcp_server.socket.getsockname())
2361
" flowinfo %d, scope_id %d"
2362
% tcp_server.socket.getsockname())
2790
2363
else: # IPv4
2791
logger.info("Now listening on address %r, port %d",
2792
*tcp_server.socket.getsockname())
2364
logger.info("Now listening on address %r, port %d"
2365
% tcp_server.socket.getsockname())
2793
2366
2794
2367
#service.interface = tcp_server.socket.getsockname()[3]
2795
2368
2798
2371
try:
2799
2372
service.activate()
2800
2373
except dbus.exceptions.DBusException as error:
2801
logger.critical("D-Bus Exception", exc_info=error)
2374
logger.critical("DBusException: %s", error)
2802
2375
cleanup()
2803
2376
sys.exit(1)
2804
2377
# End of Avahi example code
2811
2384
logger.debug("Starting main loop")
2812
2385
main_loop.run()
2813
2386
except AvahiError as error:
2814
logger.critical("Avahi Error", exc_info=error)
2387
logger.critical("AvahiError: %s", error)
2815
2388
cleanup()
2816
2389
sys.exit(1)
2817
2390
except KeyboardInterrupt:
2822
2395
# Must run before the D-Bus bus name gets deregistered
2823
2396
cleanup()
2824
2397
2398
2825
2399
if __name__ == '__main__':
2826
2400
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0