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
82
import GnuPGInterface
77
import Crypto.Cipher.AES
83
78
84
79
try:
85
80
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
89
84
except ImportError:
90
85
SO_BINDTODEVICE = None
91
86
92
version = "1.6.0"
93
stored_state_file = "clients.pickle"
87
88
version = "1.4.1"
94
89
95
90
logger = logging.getLogger()
91
stored_state_path = "/var/lib/mandos/clients.pickle"
92
96
93
syslogger = (logging.handlers.SysLogHandler
97
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
98
95
address = str("/dev/log")))
99
100
try:
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
103
.if_nametoindex)
104
except (OSError, AttributeError):
105
def if_nametoindex(interface):
106
"Get an interface index the hard way, i.e. using fcntl()"
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
with contextlib.closing(socket.socket()) as s:
109
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(str("16s16x"),
111
interface))
112
interface_index = struct.unpack(str("I"),
113
ifreq[16:20])[0]
114
return interface_index
115
116
117
def initlogger(debug, level=logging.WARNING):
118
"""init logger and add loglevel"""
119
120
syslogger.setFormatter(logging.Formatter
121
('Mandos [%(process)d]: %(levelname)s:'
122
' %(message)s'))
123
logger.addHandler(syslogger)
124
125
if debug:
126
console = logging.StreamHandler()
127
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
128
' [%(process)d]:'
129
' %(levelname)s:'
130
' %(message)s'))
131
logger.addHandler(console)
132
logger.setLevel(level)
133
134
135
class PGPError(Exception):
136
"""Exception if encryption/decryption fails"""
137
pass
138
139
140
class PGPEngine(object):
141
"""A simple class for OpenPGP symmetric encryption & decryption"""
142
def __init__(self):
143
self.gnupg = GnuPGInterface.GnuPG()
144
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
145
self.gnupg = GnuPGInterface.GnuPG()
146
self.gnupg.options.meta_interactive = False
147
self.gnupg.options.homedir = self.tempdir
148
self.gnupg.options.extra_args.extend(['--force-mdc',
149
'--quiet',
150
'--no-use-agent'])
151
152
def __enter__(self):
153
return self
154
155
def __exit__(self, exc_type, exc_value, traceback):
156
self._cleanup()
157
return False
158
159
def __del__(self):
160
self._cleanup()
161
162
def _cleanup(self):
163
if self.tempdir is not None:
164
# Delete contents of tempdir
165
for root, dirs, files in os.walk(self.tempdir,
166
topdown = False):
167
for filename in files:
168
os.remove(os.path.join(root, filename))
169
for dirname in dirs:
170
os.rmdir(os.path.join(root, dirname))
171
# Remove tempdir
172
os.rmdir(self.tempdir)
173
self.tempdir = None
174
175
def password_encode(self, password):
176
# Passphrase can not be empty and can not contain newlines or
177
# NUL bytes. So we prefix it and hex encode it.
178
return b"mandos" + binascii.hexlify(password)
179
180
def encrypt(self, data, password):
181
self.gnupg.passphrase = self.password_encode(password)
182
with open(os.devnull, "w") as devnull:
183
try:
184
proc = self.gnupg.run(['--symmetric'],
185
create_fhs=['stdin', 'stdout'],
186
attach_fhs={'stderr': devnull})
187
with contextlib.closing(proc.handles['stdin']) as f:
188
f.write(data)
189
with contextlib.closing(proc.handles['stdout']) as f:
190
ciphertext = f.read()
191
proc.wait()
192
except IOError as e:
193
raise PGPError(e)
194
self.gnupg.passphrase = None
195
return ciphertext
196
197
def decrypt(self, data, password):
198
self.gnupg.passphrase = self.password_encode(password)
199
with open(os.devnull, "w") as devnull:
200
try:
201
proc = self.gnupg.run(['--decrypt'],
202
create_fhs=['stdin', 'stdout'],
203
attach_fhs={'stderr': devnull})
204
with contextlib.closing(proc.handles['stdin']) as f:
205
f.write(data)
206
with contextlib.closing(proc.handles['stdout']) as f:
207
decrypted_plaintext = f.read()
208
proc.wait()
209
except IOError as e:
210
raise PGPError(e)
211
self.gnupg.passphrase = None
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):
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="/")
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.
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)
717
570
except OSError as error:
718
logger.error("Failed to start subprocess",
719
exc_info=error)
720
self.checker_callback_tag = (gobject.child_watch_add
721
(self.checker.pid,
722
self.checker_callback,
723
data=command))
724
# The checker may have completed before the gobject
725
# watch was added. Check for this.
726
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
727
if pid:
728
gobject.source_remove(self.checker_callback_tag)
729
self.checker_callback(pid, status, command)
571
logger.error("Failed to start subprocess: %s",
572
error)
730
573
# Re-run this periodically if run by gobject.timeout_add
731
574
return True
732
575
739
582
return
740
583
logger.debug("Stopping checker for %(name)s", vars(self))
741
584
try:
742
self.checker.terminate()
585
os.kill(self.checker.pid, signal.SIGTERM)
743
586
#time.sleep(0.5)
744
587
#if self.checker.poll() is None:
745
# self.checker.kill()
588
# os.kill(self.checker.pid, signal.SIGKILL)
746
589
except OSError as error:
747
590
if error.errno != errno.ESRCH: # No such process
748
591
raise
749
592
self.checker = None
750
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
751
640
752
641
def dbus_service_property(dbus_interface, signature="v",
753
642
access="readwrite", byte_arrays=False):
765
654
# "Set" method, so we fail early here:
766
655
if byte_arrays and signature != "ay":
767
656
raise ValueError("Byte arrays not supported for non-'ay'"
768
" signature {0!r}".format(signature))
657
" signature %r" % signature)
769
658
def decorator(func):
770
659
func._dbus_is_property = True
771
660
func._dbus_interface = dbus_interface
779
668
return decorator
780
669
781
670
782
def dbus_interface_annotations(dbus_interface):
783
"""Decorator for marking functions returning interface annotations
784
785
Usage:
786
787
@dbus_interface_annotations("org.example.Interface")
788
def _foo(self): # Function name does not matter
789
return {"org.freedesktop.DBus.Deprecated": "true",
790
"org.freedesktop.DBus.Property.EmitsChangedSignal":
791
"false"}
792
"""
793
def decorator(func):
794
func._dbus_is_interface = True
795
func._dbus_interface = dbus_interface
796
func._dbus_name = dbus_interface
797
return func
798
return decorator
799
800
801
def dbus_annotations(annotations):
802
"""Decorator to annotate D-Bus methods, signals or properties
803
Usage:
804
805
@dbus_service_property("org.example.Interface", signature="b",
806
access="r")
807
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
808
"org.freedesktop.DBus.Property."
809
"EmitsChangedSignal": "false"})
810
def Property_dbus_property(self):
811
return dbus.Boolean(False)
812
"""
813
def decorator(func):
814
func._dbus_annotations = annotations
815
return func
816
return decorator
817
818
819
671
class DBusPropertyException(dbus.exceptions.DBusException):
820
672
"""A base class for D-Bus property-related exceptions
821
673
"""
844
696
"""
845
697
846
698
@staticmethod
847
def _is_dbus_thing(thing):
848
"""Returns a function testing if an attribute is a D-Bus thing
849
850
If called like _is_dbus_thing("method") it returns a function
851
suitable for use as predicate to inspect.getmembers().
852
"""
853
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
854
False)
699
def _is_dbus_property(obj):
700
return getattr(obj, "_dbus_is_property", False)
855
701
856
def _get_all_dbus_things(self, thing):
702
def _get_all_dbus_properties(self):
857
703
"""Returns a generator of (name, attribute) pairs
858
704
"""
859
return ((getattr(athing.__get__(self), "_dbus_name",
860
name),
861
athing.__get__(self))
705
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
862
706
for cls in self.__class__.__mro__
863
for name, athing in
864
inspect.getmembers(cls,
865
self._is_dbus_thing(thing)))
707
for name, prop in
708
inspect.getmembers(cls, self._is_dbus_property))
866
709
867
710
def _get_dbus_property(self, interface_name, property_name):
868
711
"""Returns a bound method if one exists which is a D-Bus
870
713
"""
871
714
for cls in self.__class__.__mro__:
872
715
for name, value in (inspect.getmembers
873
(cls,
874
self._is_dbus_thing("property"))):
716
(cls, self._is_dbus_property)):
875
717
if (value._dbus_name == property_name
876
718
and value._dbus_interface == interface_name):
877
719
return value.__get__(self)
906
748
# signatures other than "ay".
907
749
if prop._dbus_signature != "ay":
908
750
raise ValueError
909
value = dbus.ByteArray(b''.join(chr(byte)
910
for byte in value))
751
value = dbus.ByteArray(''.join(unichr(byte)
752
for byte in value))
911
753
prop(value)
912
754
913
755
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
918
760
919
761
Note: Will not include properties with access="write".
920
762
"""
921
properties = {}
922
for name, prop in self._get_all_dbus_things("property"):
763
all = {}
764
for name, prop in self._get_all_dbus_properties():
923
765
if (interface_name
924
766
and interface_name != prop._dbus_interface):
925
767
# Interface non-empty but did not match
929
771
continue
930
772
value = prop()
931
773
if not hasattr(value, "variant_level"):
932
properties[name] = value
774
all[name] = value
933
775
continue
934
properties[name] = type(value)(value, variant_level=
935
value.variant_level+1)
936
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")
937
779
938
780
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
939
781
out_signature="s",
940
782
path_keyword='object_path',
941
783
connection_keyword='connection')
942
784
def Introspect(self, object_path, connection):
943
"""Overloading of standard D-Bus method.
944
945
Inserts property tags and interface annotation tags.
785
"""Standard D-Bus method, overloaded to insert property tags.
946
786
"""
947
787
xmlstring = dbus.service.Object.Introspect(self, object_path,
948
788
connection)
955
795
e.setAttribute("access", prop._dbus_access)
956
796
return e
957
797
for if_tag in document.getElementsByTagName("interface"):
958
# Add property tags
959
798
for tag in (make_tag(document, name, prop)
960
799
for name, prop
961
in self._get_all_dbus_things("property")
800
in self._get_all_dbus_properties()
962
801
if prop._dbus_interface
963
802
== if_tag.getAttribute("name")):
964
803
if_tag.appendChild(tag)
965
# Add annotation tags
966
for typ in ("method", "signal", "property"):
967
for tag in if_tag.getElementsByTagName(typ):
968
annots = dict()
969
for name, prop in (self.
970
_get_all_dbus_things(typ)):
971
if (name == tag.getAttribute("name")
972
and prop._dbus_interface
973
== if_tag.getAttribute("name")):
974
annots.update(getattr
975
(prop,
976
"_dbus_annotations",
977
{}))
978
for name, value in annots.iteritems():
979
ann_tag = document.createElement(
980
"annotation")
981
ann_tag.setAttribute("name", name)
982
ann_tag.setAttribute("value", value)
983
tag.appendChild(ann_tag)
984
# Add interface annotation tags
985
for annotation, value in dict(
986
itertools.chain.from_iterable(
987
annotations().iteritems()
988
for name, annotations in
989
self._get_all_dbus_things("interface")
990
if name == if_tag.getAttribute("name")
991
)).iteritems():
992
ann_tag = document.createElement("annotation")
993
ann_tag.setAttribute("name", annotation)
994
ann_tag.setAttribute("value", value)
995
if_tag.appendChild(ann_tag)
996
804
# Add the names to the return values for the
997
805
# "org.freedesktop.DBus.Properties" methods
998
806
if (if_tag.getAttribute("name")
1013
821
except (AttributeError, xml.dom.DOMException,
1014
822
xml.parsers.expat.ExpatError) as error:
1015
823
logger.error("Failed to override Introspection method",
1016
exc_info=error)
824
error)
1017
825
return xmlstring
1018
826
1019
827
1020
def datetime_to_dbus(dt, variant_level=0):
828
def datetime_to_dbus (dt, variant_level=0):
1021
829
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1022
830
if dt is None:
1023
831
return dbus.String("", variant_level = variant_level)
1024
832
return dbus.String(dt.isoformat(),
1025
833
variant_level=variant_level)
1026
834
1027
1028
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1029
"""A class decorator; applied to a subclass of
1030
dbus.service.Object, it will add alternate D-Bus attributes with
1031
interface names according to the "alt_interface_names" mapping.
1032
Usage:
1033
1034
@alternate_dbus_interfaces({"org.example.Interface":
1035
"net.example.AlternateInterface"})
1036
class SampleDBusObject(dbus.service.Object):
1037
@dbus.service.method("org.example.Interface")
1038
def SampleDBusMethod():
1039
pass
1040
1041
The above "SampleDBusMethod" on "SampleDBusObject" will be
1042
reachable via two interfaces: "org.example.Interface" and
1043
"net.example.AlternateInterface", the latter of which will have
1044
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1045
"true", unless "deprecate" is passed with a False value.
1046
1047
This works for methods and signals, and also for D-Bus properties
1048
(from DBusObjectWithProperties) and interfaces (from the
1049
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.
1050
839
"""
1051
def wrapper(cls):
1052
for orig_interface_name, alt_interface_name in (
1053
alt_interface_names.iteritems()):
1054
attr = {}
1055
interface_names = set()
1056
# Go though all attributes of the class
1057
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):
1058
847
# Ignore non-D-Bus attributes, and D-Bus attributes
1059
848
# with the wrong interface name
1060
849
if (not hasattr(attribute, "_dbus_interface")
1061
850
or not attribute._dbus_interface
1062
.startswith(orig_interface_name)):
851
.startswith("se.recompile.Mandos")):
1063
852
continue
1064
853
# Create an alternate D-Bus interface name based on
1065
854
# the current name
1066
855
alt_interface = (attribute._dbus_interface
1067
.replace(orig_interface_name,
1068
alt_interface_name))
1069
interface_names.add(alt_interface)
856
.replace("se.recompile.Mandos",
857
"se.bsnet.fukt.Mandos"))
1070
858
# Is this a D-Bus signal?
1071
859
if getattr(attribute, "_dbus_is_signal", False):
1072
860
# Extract the original non-method function by
1087
875
nonmethod_func.func_name,
1088
876
nonmethod_func.func_defaults,
1089
877
nonmethod_func.func_closure)))
1090
# Copy annotations, if any
1091
try:
1092
new_function._dbus_annotations = (
1093
dict(attribute._dbus_annotations))
1094
except AttributeError:
1095
pass
1096
878
# Define a creator of a function to call both the
1097
# original and alternate functions, so both the
1098
# original and alternate signals gets sent when
1099
# the function is called
879
# old and new functions, so both the old and new
880
# signals gets sent when the function is called
1100
881
def fixscope(func1, func2):
1101
882
"""This function is a scope container to pass
1102
883
func1 and func2 to the "call_both" function
1109
890
return call_both
1110
891
# Create the "call_both" function and add it to
1111
892
# the class
1112
attr[attrname] = fixscope(attribute, new_function)
893
attr[attrname] = fixscope(attribute,
894
new_function)
1113
895
# Is this a D-Bus method?
1114
896
elif getattr(attribute, "_dbus_is_method", False):
1115
897
# Create a new, but exactly alike, function
1126
908
attribute.func_name,
1127
909
attribute.func_defaults,
1128
910
attribute.func_closure)))
1129
# Copy annotations, if any
1130
try:
1131
attr[attrname]._dbus_annotations = (
1132
dict(attribute._dbus_annotations))
1133
except AttributeError:
1134
pass
1135
911
# Is this a D-Bus property?
1136
912
elif getattr(attribute, "_dbus_is_property", False):
1137
913
# Create a new, but exactly alike, function
1151
927
attribute.func_name,
1152
928
attribute.func_defaults,
1153
929
attribute.func_closure)))
1154
# Copy annotations, if any
1155
try:
1156
attr[attrname]._dbus_annotations = (
1157
dict(attribute._dbus_annotations))
1158
except AttributeError:
1159
pass
1160
# Is this a D-Bus interface?
1161
elif getattr(attribute, "_dbus_is_interface", False):
1162
# Create a new, but exactly alike, function
1163
# object. Decorate it to be a new D-Bus interface
1164
# with the alternate D-Bus interface name. Add it
1165
# to the class.
1166
attr[attrname] = (dbus_interface_annotations
1167
(alt_interface)
1168
(types.FunctionType
1169
(attribute.func_code,
1170
attribute.func_globals,
1171
attribute.func_name,
1172
attribute.func_defaults,
1173
attribute.func_closure)))
1174
if deprecate:
1175
# Deprecate all alternate interfaces
1176
iname="_AlternateDBusNames_interface_annotation{0}"
1177
for interface_name in interface_names:
1178
@dbus_interface_annotations(interface_name)
1179
def func(self):
1180
return { "org.freedesktop.DBus.Deprecated":
1181
"true" }
1182
# Find an unused name
1183
for aname in (iname.format(i)
1184
for i in itertools.count()):
1185
if aname not in attr:
1186
attr[aname] = func
1187
break
1188
if interface_names:
1189
# Replace the class with a new subclass of it with
1190
# methods, signals, etc. as created above.
1191
cls = type(b"{0}Alternate".format(cls.__name__),
1192
(cls,), attr)
1193
return cls
1194
return wrapper
1195
1196
1197
@alternate_dbus_interfaces({"se.recompile.Mandos":
1198
"se.bsnet.fukt.Mandos"})
930
return type.__new__(mcs, name, bases, attr)
931
1199
932
class ClientDBus(Client, DBusObjectWithProperties):
1200
933
"""A Client class using D-Bus
1201
934
1212
945
def __init__(self, bus = None, *args, **kwargs):
1213
946
self.bus = bus
1214
947
Client.__init__(self, *args, **kwargs)
948
949
self._approvals_pending = 0
1215
950
# Only now, when this client is initialized, can it show up on
1216
951
# the D-Bus
1217
952
client_object_name = unicode(self.name).translate(
1221
956
("/clients/" + client_object_name))
1222
957
DBusObjectWithProperties.__init__(self, self.bus,
1223
958
self.dbus_object_path)
1224
959
1225
960
def notifychangeproperty(transform_func,
1226
961
dbus_name, type_func=lambda x: x,
1227
962
variant_level=1):
1228
963
""" Modify a variable so that it's a property which announces
1229
964
its changes to DBus.
1230
965
1231
966
transform_fun: Function that takes a value and a variant_level
1232
967
and transforms it to a D-Bus type.
1233
968
dbus_name: D-Bus name of the variable
1250
985
1251
986
return property(lambda self: getattr(self, attrname), setter)
1252
987
988
1253
989
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1254
990
approvals_pending = notifychangeproperty(dbus.Boolean,
1255
991
"ApprovalPending",
1262
998
checker is not None)
1263
999
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1264
1000
"LastCheckedOK")
1265
last_checker_status = notifychangeproperty(dbus.Int16,
1266
"LastCheckerStatus")
1267
1001
last_approval_request = notifychangeproperty(
1268
1002
datetime_to_dbus, "LastApprovalRequest")
1269
1003
approved_by_default = notifychangeproperty(dbus.Boolean,
1270
1004
"ApprovedByDefault")
1271
approval_delay = notifychangeproperty(dbus.UInt64,
1005
approval_delay = notifychangeproperty(dbus.UInt16,
1272
1006
"ApprovalDelay",
1273
1007
type_func =
1274
timedelta_to_milliseconds)
1008
_timedelta_to_milliseconds)
1275
1009
approval_duration = notifychangeproperty(
1276
dbus.UInt64, "ApprovalDuration",
1277
type_func = timedelta_to_milliseconds)
1010
dbus.UInt16, "ApprovalDuration",
1011
type_func = _timedelta_to_milliseconds)
1278
1012
host = notifychangeproperty(dbus.String, "Host")
1279
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1013
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1280
1014
type_func =
1281
timedelta_to_milliseconds)
1015
_timedelta_to_milliseconds)
1282
1016
extended_timeout = notifychangeproperty(
1283
dbus.UInt64, "ExtendedTimeout",
1284
type_func = timedelta_to_milliseconds)
1285
interval = notifychangeproperty(dbus.UInt64,
1017
dbus.UInt16, "ExtendedTimeout",
1018
type_func = _timedelta_to_milliseconds)
1019
interval = notifychangeproperty(dbus.UInt16,
1286
1020
"Interval",
1287
1021
type_func =
1288
timedelta_to_milliseconds)
1022
_timedelta_to_milliseconds)
1289
1023
checker_command = notifychangeproperty(dbus.String, "Checker")
1290
1024
1291
1025
del notifychangeproperty
1333
1067
return r
1334
1068
1335
1069
def _reset_approved(self):
1336
self.approved = None
1070
self._approved = None
1337
1071
return False
1338
1072
1339
1073
def approve(self, value=True):
1340
self.approved = value
1341
gobject.timeout_add(timedelta_to_milliseconds
1074
self.send_changedstate()
1075
self._approved = value
1076
gobject.timeout_add(_timedelta_to_milliseconds
1342
1077
(self.approval_duration),
1343
1078
self._reset_approved)
1344
self.send_changedstate()
1079
1345
1080
1346
1081
## D-Bus methods, signals & properties
1347
1082
_interface = "se.recompile.Mandos.Client"
1348
1083
1349
## Interfaces
1350
1351
@dbus_interface_annotations(_interface)
1352
def _foo(self):
1353
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1354
"false"}
1355
1356
1084
## Signals
1357
1085
1358
1086
# CheckerCompleted - signal
1457
1185
access="readwrite")
1458
1186
def ApprovalDuration_dbus_property(self, value=None):
1459
1187
if value is None: # get
1460
return dbus.UInt64(timedelta_to_milliseconds(
1188
return dbus.UInt64(_timedelta_to_milliseconds(
1461
1189
self.approval_duration))
1462
1190
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1463
1191
1477
1205
def Host_dbus_property(self, value=None):
1478
1206
if value is None: # get
1479
1207
return dbus.String(self.host)
1480
self.host = unicode(value)
1208
self.host = value
1481
1209
1482
1210
# Created - property
1483
1211
@dbus_service_property(_interface, signature="s", access="read")
1484
1212
def Created_dbus_property(self):
1485
return datetime_to_dbus(self.created)
1213
return dbus.String(datetime_to_dbus(self.created))
1486
1214
1487
1215
# LastEnabled - property
1488
1216
@dbus_service_property(_interface, signature="s", access="read")
1509
1237
return
1510
1238
return datetime_to_dbus(self.last_checked_ok)
1511
1239
1512
# LastCheckerStatus - property
1513
@dbus_service_property(_interface, signature="n",
1514
access="read")
1515
def LastCheckerStatus_dbus_property(self):
1516
return dbus.Int16(self.last_checker_status)
1517
1518
1240
# Expires - property
1519
1241
@dbus_service_property(_interface, signature="s", access="read")
1520
1242
def Expires_dbus_property(self):
1531
1253
def Timeout_dbus_property(self, value=None):
1532
1254
if value is None: # get
1533
1255
return dbus.UInt64(self.timeout_milliseconds())
1534
old_timeout = self.timeout
1535
1256
self.timeout = datetime.timedelta(0, 0, 0, value)
1536
# Reschedule disabling
1537
if self.enabled:
1538
now = datetime.datetime.utcnow()
1539
self.expires += self.timeout - old_timeout
1540
if self.expires <= now:
1541
# The timeout has passed
1542
self.disable()
1543
else:
1544
if (getattr(self, "disable_initiator_tag", None)
1545
is None):
1546
return
1547
gobject.source_remove(self.disable_initiator_tag)
1548
self.disable_initiator_tag = (
1549
gobject.timeout_add(
1550
timedelta_to_milliseconds(self.expires - now),
1551
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))
1552
1277
1553
1278
# ExtendedTimeout - property
1554
1279
@dbus_service_property(_interface, signature="t",
1567
1292
self.interval = datetime.timedelta(0, 0, 0, value)
1568
1293
if getattr(self, "checker_initiator_tag", None) is None:
1569
1294
return
1570
if self.enabled:
1571
# Reschedule checker run
1572
gobject.source_remove(self.checker_initiator_tag)
1573
self.checker_initiator_tag = (gobject.timeout_add
1574
(value, self.start_checker))
1575
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
1576
1300
1577
1301
# Checker - property
1578
1302
@dbus_service_property(_interface, signature="s",
1580
1304
def Checker_dbus_property(self, value=None):
1581
1305
if value is None: # get
1582
1306
return dbus.String(self.checker_command)
1583
self.checker_command = unicode(value)
1307
self.checker_command = value
1584
1308
1585
1309
# CheckerRunning - property
1586
1310
@dbus_service_property(_interface, signature="b",
1615
1339
raise KeyError()
1616
1340
1617
1341
def __getattribute__(self, name):
1618
if name == '_pipe':
1342
if(name == '_pipe'):
1619
1343
return super(ProxyClient, self).__getattribute__(name)
1620
1344
self._pipe.send(('getattr', name))
1621
1345
data = self._pipe.recv()
1628
1352
return func
1629
1353
1630
1354
def __setattr__(self, name, value):
1631
if name == '_pipe':
1355
if(name == '_pipe'):
1632
1356
return super(ProxyClient, self).__setattr__(name, value)
1633
1357
self._pipe.send(('setattr', name, value))
1634
1358
1359
class ClientDBusTransitional(ClientDBus):
1360
__metaclass__ = AlternateDBusNamesMetaclass
1635
1361
1636
1362
class ClientHandler(socketserver.BaseRequestHandler, object):
1637
1363
"""A class to handle client connections.
1720
1446
client.Rejected("Disabled")
1721
1447
return
1722
1448
1723
if client.approved or not client.approval_delay:
1449
if client._approved or not client.approval_delay:
1724
1450
#We are approved or approval is disabled
1725
1451
break
1726
elif client.approved is None:
1452
elif client._approved is None:
1727
1453
logger.info("Client %s needs approval",
1728
1454
client.name)
1729
1455
if self.server.use_dbus:
1742
1468
#wait until timeout or approved
1743
1469
time = datetime.datetime.now()
1744
1470
client.changedstate.acquire()
1745
client.changedstate.wait(
1746
float(timedelta_to_milliseconds(delay)
1747
/ 1000))
1471
(client.changedstate.wait
1472
(float(client._timedelta_to_milliseconds(delay)
1473
/ 1000)))
1748
1474
client.changedstate.release()
1749
1475
time2 = datetime.datetime.now()
1750
1476
if (time2 - time) >= delay:
1766
1492
try:
1767
1493
sent = session.send(client.secret[sent_size:])
1768
1494
except gnutls.errors.GNUTLSError as error:
1769
logger.warning("gnutls send failed",
1770
exc_info=error)
1495
logger.warning("gnutls send failed")
1771
1496
return
1772
1497
logger.debug("Sent: %d, remaining: %d",
1773
1498
sent, len(client.secret)
1776
1501
1777
1502
logger.info("Sending secret to %s", client.name)
1778
1503
# bump the timeout using extended_timeout
1779
client.bump_timeout(client.extended_timeout)
1504
client.checked_ok(client.extended_timeout)
1780
1505
if self.server.use_dbus:
1781
1506
# Emit D-Bus signal
1782
1507
client.GotSecret()
1787
1512
try:
1788
1513
session.bye()
1789
1514
except gnutls.errors.GNUTLSError as error:
1790
logger.warning("GnuTLS bye failed",
1791
exc_info=error)
1515
logger.warning("GnuTLS bye failed")
1792
1516
1793
1517
@staticmethod
1794
1518
def peer_certificate(session):
1850
1574
# Convert the buffer to a Python bytestring
1851
1575
fpr = ctypes.string_at(buf, buf_len.value)
1852
1576
# Convert the bytestring to hexadecimal notation
1853
hex_fpr = binascii.hexlify(fpr).upper()
1577
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1854
1578
return hex_fpr
1855
1579
1856
1580
1859
1583
def sub_process_main(self, request, address):
1860
1584
try:
1861
1585
self.finish_request(request, address)
1862
except Exception:
1586
except:
1863
1587
self.handle_error(request, address)
1864
1588
self.close_request(request)
1865
1589
1866
1590
def process_request(self, request, address):
1867
1591
"""Start a new process to process the request."""
1868
1592
proc = multiprocessing.Process(target = self.sub_process_main,
1869
args = (request, address))
1593
args = (request,
1594
address))
1870
1595
proc.start()
1871
1596
return proc
1872
1597
1900
1625
use_ipv6: Boolean; to use IPv6 or not
1901
1626
"""
1902
1627
def __init__(self, server_address, RequestHandlerClass,
1903
interface=None, use_ipv6=True, socketfd=None):
1904
"""If socketfd is set, use that file descriptor instead of
1905
creating a new one with socket.socket().
1906
"""
1628
interface=None, use_ipv6=True):
1907
1629
self.interface = interface
1908
1630
if use_ipv6:
1909
1631
self.address_family = socket.AF_INET6
1910
if socketfd is not None:
1911
# Save the file descriptor
1912
self.socketfd = socketfd
1913
# Save the original socket.socket() function
1914
self.socket_socket = socket.socket
1915
# To implement --socket, we monkey patch socket.socket.
1916
#
1917
# (When socketserver.TCPServer is a new-style class, we
1918
# could make self.socket into a property instead of monkey
1919
# patching socket.socket.)
1920
#
1921
# Create a one-time-only replacement for socket.socket()
1922
@functools.wraps(socket.socket)
1923
def socket_wrapper(*args, **kwargs):
1924
# Restore original function so subsequent calls are
1925
# not affected.
1926
socket.socket = self.socket_socket
1927
del self.socket_socket
1928
# This time only, return a new socket object from the
1929
# saved file descriptor.
1930
return socket.fromfd(self.socketfd, *args, **kwargs)
1931
# Replace socket.socket() function with wrapper
1932
socket.socket = socket_wrapper
1933
# The socketserver.TCPServer.__init__ will call
1934
# socket.socket(), which might be our replacement,
1935
# socket_wrapper(), if socketfd was set.
1936
1632
socketserver.TCPServer.__init__(self, server_address,
1937
1633
RequestHandlerClass)
1938
1939
1634
def server_bind(self):
1940
1635
"""This overrides the normal server_bind() function
1941
1636
to bind to an interface if one was specified, and also NOT to
1949
1644
try:
1950
1645
self.socket.setsockopt(socket.SOL_SOCKET,
1951
1646
SO_BINDTODEVICE,
1952
str(self.interface + '\0'))
1647
str(self.interface
1648
+ '\0'))
1953
1649
except socket.error as error:
1954
if error.errno == errno.EPERM:
1955
logger.error("No permission to bind to"
1956
" interface %s", self.interface)
1957
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:
1958
1655
logger.error("SO_BINDTODEVICE not available;"
1959
1656
" cannot bind to interface %s",
1960
1657
self.interface)
1961
elif error.errno == errno.ENODEV:
1962
logger.error("Interface %s does not exist,"
1963
" cannot bind", self.interface)
1964
1658
else:
1965
1659
raise
1966
1660
# Only bind(2) the socket if we really need to.
1996
1690
"""
1997
1691
def __init__(self, server_address, RequestHandlerClass,
1998
1692
interface=None, use_ipv6=True, clients=None,
1999
gnutls_priority=None, use_dbus=True, socketfd=None):
1693
gnutls_priority=None, use_dbus=True):
2000
1694
self.enabled = False
2001
1695
self.clients = clients
2002
1696
if self.clients is None:
2006
1700
IPv6_TCPServer.__init__(self, server_address,
2007
1701
RequestHandlerClass,
2008
1702
interface = interface,
2009
use_ipv6 = use_ipv6,
2010
socketfd = socketfd)
1703
use_ipv6 = use_ipv6)
2011
1704
def server_activate(self):
2012
1705
if self.enabled:
2013
1706
return socketserver.TCPServer.server_activate(self)
2026
1719
2027
1720
def handle_ipc(self, source, condition, parent_pipe=None,
2028
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)
2029
1736
# error, or the other end of multiprocessing.Pipe has closed
2030
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1737
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2031
1738
# Wait for other process to exit
2032
1739
proc.join()
2033
1740
return False
2091
1798
return True
2092
1799
2093
1800
2094
def rfc3339_duration_to_delta(duration):
2095
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2096
2097
>>> rfc3339_duration_to_delta("P7D")
2098
datetime.timedelta(7)
2099
>>> rfc3339_duration_to_delta("PT60S")
2100
datetime.timedelta(0, 60)
2101
>>> rfc3339_duration_to_delta("PT60M")
2102
datetime.timedelta(0, 3600)
2103
>>> rfc3339_duration_to_delta("PT24H")
2104
datetime.timedelta(1)
2105
>>> rfc3339_duration_to_delta("P1W")
2106
datetime.timedelta(7)
2107
>>> rfc3339_duration_to_delta("PT5M30S")
2108
datetime.timedelta(0, 330)
2109
>>> rfc3339_duration_to_delta("P1DT3M20S")
2110
datetime.timedelta(1, 200)
2111
"""
2112
2113
# Parsing an RFC 3339 duration with regular expressions is not
2114
# possible - there would have to be multiple places for the same
2115
# values, like seconds. The current code, while more esoteric, is
2116
# cleaner without depending on a parsing library. If Python had a
2117
# built-in library for parsing we would use it, but we'd like to
2118
# avoid excessive use of external libraries.
2119
2120
# New type for defining tokens, syntax, and semantics all-in-one
2121
Token = collections.namedtuple("Token",
2122
("regexp", # To match token; if
2123
# "value" is not None,
2124
# must have a "group"
2125
# containing digits
2126
"value", # datetime.timedelta or
2127
# None
2128
"followers")) # Tokens valid after
2129
# this token
2130
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2131
# the "duration" ABNF definition in RFC 3339, Appendix A.
2132
token_end = Token(re.compile(r"$"), None, frozenset())
2133
token_second = Token(re.compile(r"(\d+)S"),
2134
datetime.timedelta(seconds=1),
2135
frozenset((token_end,)))
2136
token_minute = Token(re.compile(r"(\d+)M"),
2137
datetime.timedelta(minutes=1),
2138
frozenset((token_second, token_end)))
2139
token_hour = Token(re.compile(r"(\d+)H"),
2140
datetime.timedelta(hours=1),
2141
frozenset((token_minute, token_end)))
2142
token_time = Token(re.compile(r"T"),
2143
None,
2144
frozenset((token_hour, token_minute,
2145
token_second)))
2146
token_day = Token(re.compile(r"(\d+)D"),
2147
datetime.timedelta(days=1),
2148
frozenset((token_time, token_end)))
2149
token_month = Token(re.compile(r"(\d+)M"),
2150
datetime.timedelta(weeks=4),
2151
frozenset((token_day, token_end)))
2152
token_year = Token(re.compile(r"(\d+)Y"),
2153
datetime.timedelta(weeks=52),
2154
frozenset((token_month, token_end)))
2155
token_week = Token(re.compile(r"(\d+)W"),
2156
datetime.timedelta(weeks=1),
2157
frozenset((token_end,)))
2158
token_duration = Token(re.compile(r"P"), None,
2159
frozenset((token_year, token_month,
2160
token_day, token_time,
2161
token_week))),
2162
# Define starting values
2163
value = datetime.timedelta() # Value so far
2164
found_token = None
2165
followers = frozenset(token_duration,) # Following valid tokens
2166
s = duration # String left to parse
2167
# Loop until end token is found
2168
while found_token is not token_end:
2169
# Search for any currently valid tokens
2170
for token in followers:
2171
match = token.regexp.match(s)
2172
if match is not None:
2173
# Token found
2174
if token.value is not None:
2175
# Value found, parse digits
2176
factor = int(match.group(1), 10)
2177
# Add to value so far
2178
value += factor * token.value
2179
# Strip token from string
2180
s = token.regexp.sub("", s, 1)
2181
# Go to found token
2182
found_token = token
2183
# Set valid next tokens
2184
followers = found_token.followers
2185
break
2186
else:
2187
# No currently valid tokens were found
2188
raise ValueError("Invalid RFC 3339 duration")
2189
# End token found
2190
return value
2191
2192
2193
1801
def string_to_delta(interval):
2194
1802
"""Parse a string and return a datetime.timedelta
2195
1803
2206
1814
>>> string_to_delta('5m 30s')
2207
1815
datetime.timedelta(0, 330)
2208
1816
"""
2209
2210
try:
2211
return rfc3339_duration_to_delta(interval)
2212
except ValueError:
2213
pass
2214
2215
1817
timevalue = datetime.timedelta(0)
2216
1818
for s in interval.split():
2217
1819
try:
2228
1830
elif suffix == "w":
2229
1831
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2230
1832
else:
2231
raise ValueError("Unknown suffix {0!r}"
2232
.format(suffix))
1833
raise ValueError("Unknown suffix %r" % suffix)
2233
1834
except (ValueError, IndexError) as e:
2234
1835
raise ValueError(*(e.args))
2235
1836
timevalue += delta
2236
1837
return timevalue
2237
1838
2238
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
2239
1864
def daemon(nochdir = False, noclose = False):
2240
1865
"""See daemon(3). Standard BSD Unix function.
2241
1866
2249
1874
sys.exit()
2250
1875
if not noclose:
2251
1876
# Close all standard open file descriptors
2252
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1877
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2253
1878
if not stat.S_ISCHR(os.fstat(null).st_mode):
2254
1879
raise OSError(errno.ENODEV,
2255
"{0} not a character device"
2256
.format(os.devnull))
1880
"%s not a character device"
1881
% os.path.devnull)
2257
1882
os.dup2(null, sys.stdin.fileno())
2258
1883
os.dup2(null, sys.stdout.fileno())
2259
1884
os.dup2(null, sys.stderr.fileno())
2268
1893
2269
1894
parser = argparse.ArgumentParser()
2270
1895
parser.add_argument("-v", "--version", action="version",
2271
version = "%(prog)s {0}".format(version),
1896
version = "%%(prog)s %s" % version,
2272
1897
help="show version number and exit")
2273
1898
parser.add_argument("-i", "--interface", metavar="IF",
2274
1899
help="Bind to interface IF")
2297
1922
parser.add_argument("--no-ipv6", action="store_false",
2298
1923
dest="use_ipv6", help="Do not use IPv6")
2299
1924
parser.add_argument("--no-restore", action="store_false",
2300
dest="restore", help="Do not restore stored"
2301
" state")
2302
parser.add_argument("--socket", type=int,
2303
help="Specify a file descriptor to a network"
2304
" socket to use instead of creating one")
2305
parser.add_argument("--statedir", metavar="DIR",
2306
help="Directory to save/restore state in")
2307
parser.add_argument("--foreground", action="store_true",
2308
help="Run in foreground")
2309
1925
dest="restore", help="Do not restore stored state",
1926
default=True)
1927
2310
1928
options = parser.parse_args()
2311
1929
2312
1930
if options.check:
2325
1943
"use_dbus": "True",
2326
1944
"use_ipv6": "True",
2327
1945
"debuglevel": "",
2328
"restore": "True",
2329
"socket": "",
2330
"statedir": "/var/lib/mandos",
2331
"foreground": "False",
2332
1946
}
2333
1947
2334
1948
# Parse config file for server-global settings
2339
1953
# Convert the SafeConfigParser object to a dict
2340
1954
server_settings = server_config.defaults()
2341
1955
# Use the appropriate methods on the non-string config options
2342
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1956
for option in ("debug", "use_dbus", "use_ipv6"):
2343
1957
server_settings[option] = server_config.getboolean("DEFAULT",
2344
1958
option)
2345
1959
if server_settings["port"]:
2346
1960
server_settings["port"] = server_config.getint("DEFAULT",
2347
1961
"port")
2348
if server_settings["socket"]:
2349
server_settings["socket"] = server_config.getint("DEFAULT",
2350
"socket")
2351
# Later, stdin will, and stdout and stderr might, be dup'ed
2352
# over with an opened os.devnull. But we don't want this to
2353
# happen with a supplied network socket.
2354
if 0 <= server_settings["socket"] <= 2:
2355
server_settings["socket"] = os.dup(server_settings
2356
["socket"])
2357
1962
del server_config
2358
1963
2359
1964
# Override the settings from the config file with command line
2360
1965
# options, if set.
2361
1966
for option in ("interface", "address", "port", "debug",
2362
1967
"priority", "servicename", "configdir",
2363
"use_dbus", "use_ipv6", "debuglevel", "restore",
2364
"statedir", "socket", "foreground"):
1968
"use_dbus", "use_ipv6", "debuglevel", "restore"):
2365
1969
value = getattr(options, option)
2366
1970
if value is not None:
2367
1971
server_settings[option] = value
2370
1974
for option in server_settings.keys():
2371
1975
if type(server_settings[option]) is str:
2372
1976
server_settings[option] = unicode(server_settings[option])
2373
# Debug implies foreground
2374
if server_settings["debug"]:
2375
server_settings["foreground"] = True
2376
1977
# Now we have our good server settings in "server_settings"
2377
1978
2378
1979
##################################################################
2382
1983
debuglevel = server_settings["debuglevel"]
2383
1984
use_dbus = server_settings["use_dbus"]
2384
1985
use_ipv6 = server_settings["use_ipv6"]
2385
stored_state_path = os.path.join(server_settings["statedir"],
2386
stored_state_file)
2387
foreground = server_settings["foreground"]
2388
2389
if debug:
2390
initlogger(debug, logging.DEBUG)
2391
else:
2392
if not debuglevel:
2393
initlogger(debug)
2394
else:
2395
level = getattr(logging, debuglevel.upper())
2396
initlogger(debug, level)
2397
1986
2398
1987
if server_settings["servicename"] != "Mandos":
2399
1988
syslogger.setFormatter(logging.Formatter
2400
('Mandos ({0}) [%(process)d]:'
2401
' %(levelname)s: %(message)s'
2402
.format(server_settings
2403
["servicename"])))
1989
('Mandos (%s) [%%(process)d]:'
1990
' %%(levelname)s: %%(message)s'
1991
% server_settings["servicename"]))
2404
1992
2405
1993
# Parse config file with clients
2406
client_config = configparser.SafeConfigParser(Client
2407
.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)
2408
2003
client_config.read(os.path.join(server_settings["configdir"],
2409
2004
"clients.conf"))
2410
2005
2419
2014
use_ipv6=use_ipv6,
2420
2015
gnutls_priority=
2421
2016
server_settings["priority"],
2422
use_dbus=use_dbus,
2423
socketfd=(server_settings["socket"]
2424
or None))
2425
if not foreground:
2017
use_dbus=use_dbus)
2018
if not debug:
2426
2019
pidfilename = "/var/run/mandos.pid"
2427
pidfile = None
2428
2020
try:
2429
2021
pidfile = open(pidfilename, "w")
2430
except IOError as e:
2431
logger.error("Could not open file %r", pidfilename,
2432
exc_info=e)
2022
except IOError:
2023
logger.error("Could not open file %r", pidfilename)
2433
2024
2434
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:
2435
2029
try:
2436
uid = pwd.getpwnam(name).pw_uid
2437
gid = pwd.getpwnam(name).pw_gid
2438
break
2030
uid = pwd.getpwnam("mandos").pw_uid
2031
gid = pwd.getpwnam("mandos").pw_gid
2439
2032
except KeyError:
2440
continue
2441
else:
2442
uid = 65534
2443
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
2444
2039
try:
2445
2040
os.setgid(gid)
2446
2041
os.setuid(uid)
2447
2042
except OSError as error:
2448
if error.errno != errno.EPERM:
2043
if error[0] != errno.EPERM:
2449
2044
raise error
2450
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
2451
2052
if debug:
2053
logger.setLevel(logging.DEBUG)
2452
2054
# Enable all possible GnuTLS debugging
2453
2055
2454
2056
# "Use a log level over 10 to enable all debugging options."
2463
2065
.gnutls_global_set_log_function(debug_gnutls))
2464
2066
2465
2067
# Redirect stdin so all checkers get /dev/null
2466
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2068
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2467
2069
os.dup2(null, sys.stdin.fileno())
2468
2070
if null > 2:
2469
2071
os.close(null)
2072
else:
2073
# No console logging
2074
logger.removeHandler(console)
2470
2075
2471
2076
# Need to fork before connecting to D-Bus
2472
if not foreground:
2077
if not debug:
2473
2078
# Close all input and output, do double fork, etc.
2474
2079
daemon()
2475
2080
2476
# multiprocessing will use threads, so before we use gobject we
2477
# need to inform gobject that threads will be used.
2478
gobject.threads_init()
2479
2480
2081
global main_loop
2481
2082
# From the Avahi example code
2482
DBusGMainLoop(set_as_default=True)
2083
DBusGMainLoop(set_as_default=True )
2483
2084
main_loop = gobject.MainLoop()
2484
2085
bus = dbus.SystemBus()
2485
2086
# End of Avahi example code
2491
2092
("se.bsnet.fukt.Mandos", bus,
2492
2093
do_not_queue=True))
2493
2094
except dbus.exceptions.NameExistsException as e:
2494
logger.error("Disabling D-Bus:", exc_info=e)
2095
logger.error(unicode(e) + ", disabling D-Bus")
2495
2096
use_dbus = False
2496
2097
server_settings["use_dbus"] = False
2497
2098
tcp_server.use_dbus = False
2509
2110
2510
2111
client_class = Client
2511
2112
if use_dbus:
2512
client_class = functools.partial(ClientDBus, bus = bus)
2513
2514
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
2515
2133
old_client_settings = {}
2516
clients_data = {}
2517
2518
# Get client data and settings from last running state.
2134
clients_data = []
2135
2136
# Get client data and settings from last running state.
2519
2137
if server_settings["restore"]:
2520
2138
try:
2521
2139
with open(stored_state_path, "rb") as stored_state:
2522
clients_data, old_client_settings = (pickle.load
2523
(stored_state))
2140
clients_data, old_client_settings = pickle.load(stored_state)
2524
2141
os.remove(stored_state_path)
2525
2142
except IOError as e:
2526
if e.errno == errno.ENOENT:
2527
logger.warning("Could not load persistent state: {0}"
2528
.format(os.strerror(e.errno)))
2529
else:
2530
logger.critical("Could not load persistent state:",
2531
exc_info=e)
2143
logger.warning("Could not load persistant state: {0}".format(e))
2144
if e.errno != errno.ENOENT:
2532
2145
raise
2533
except EOFError as e:
2534
logger.warning("Could not load persistent state: "
2535
"EOFError:", exc_info=e)
2536
2537
with PGPEngine() as pgp:
2538
for client_name, client in clients_data.iteritems():
2539
# Decide which value to use after restoring saved state.
2540
# We have three different values: Old config file,
2541
# new config file, and saved state.
2542
# New config value takes precedence if it differs from old
2543
# config value, otherwise use saved state.
2544
for name, value in client_settings[client_name].items():
2545
try:
2546
# For each value in new config, check if it
2547
# differs from the old config value (Except for
2548
# the "secret" attribute)
2549
if (name != "secret" and
2550
value != old_client_settings[client_name]
2551
[name]):
2552
client[name] = value
2553
except KeyError:
2554
pass
2555
2556
# Clients who has passed its expire date can still be
2557
# enabled if its last checker was successful. Clients
2558
# whose checker succeeded before we stored its state is
2559
# assumed to have successfully run all checkers during
2560
# downtime.
2561
if client["enabled"]:
2562
if datetime.datetime.utcnow() >= client["expires"]:
2563
if not client["last_checked_ok"]:
2564
logger.warning(
2565
"disabling client {0} - Client never "
2566
"performed a successful checker"
2567
.format(client_name))
2568
client["enabled"] = False
2569
elif client["last_checker_status"] != 0:
2570
logger.warning(
2571
"disabling client {0} - Client "
2572
"last checker failed with error code {1}"
2573
.format(client_name,
2574
client["last_checker_status"]))
2575
client["enabled"] = False
2576
else:
2577
client["expires"] = (datetime.datetime
2578
.utcnow()
2579
+ client["timeout"])
2580
logger.debug("Last checker succeeded,"
2581
" keeping {0} enabled"
2582
.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():
2583
2156
try:
2584
client["secret"] = (
2585
pgp.decrypt(client["encrypted_secret"],
2586
client_settings[client_name]
2587
["secret"]))
2588
except PGPError:
2589
# If decryption fails, we use secret from new settings
2590
logger.debug("Failed to decrypt {0} old secret"
2591
.format(client_name))
2592
client["secret"] = (
2593
client_settings[client_name]["secret"])
2594
2595
# Add/remove clients based on new changes made to config
2596
for client_name in (set(old_client_settings)
2597
- set(client_settings)):
2598
del clients_data[client_name]
2599
for client_name in (set(client_settings)
2600
- set(old_client_settings)):
2601
clients_data[client_name] = client_settings[client_name]
2602
2603
# Create all client objects
2604
for client_name, client in clients_data.iteritems():
2605
tcp_server.clients[client_name] = client_class(
2606
name = client_name, settings = client)
2607
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
2608
2211
if not tcp_server.clients:
2609
2212
logger.warning("No clients defined")
2610
2611
if not foreground:
2612
if pidfile is not None:
2613
try:
2614
with pidfile:
2615
pid = os.getpid()
2616
pidfile.write(str(pid) + "\n".encode("utf-8"))
2617
except IOError:
2618
logger.error("Could not write to file %r with PID %d",
2619
pidfilename, pid)
2620
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
2621
2226
del pidfilename
2227
2228
signal.signal(signal.SIGINT, signal.SIG_IGN)
2622
2229
2623
2230
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2624
2231
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2625
2232
2626
2233
if use_dbus:
2627
@alternate_dbus_interfaces({"se.recompile.Mandos":
2628
"se.bsnet.fukt.Mandos"})
2629
class MandosDBusService(DBusObjectWithProperties):
2234
class MandosDBusService(dbus.service.Object):
2630
2235
"""A D-Bus proxy object"""
2631
2236
def __init__(self):
2632
2237
dbus.service.Object.__init__(self, bus, "/")
2633
2238
_interface = "se.recompile.Mandos"
2634
2239
2635
@dbus_interface_annotations(_interface)
2636
def _foo(self):
2637
return { "org.freedesktop.DBus.Property"
2638
".EmitsChangedSignal":
2639
"false"}
2640
2641
2240
@dbus.service.signal(_interface, signature="o")
2642
2241
def ClientAdded(self, objpath):
2643
2242
"D-Bus signal"
2685
2284
2686
2285
del _interface
2687
2286
2688
mandos_dbus_service = MandosDBusService()
2287
class MandosDBusServiceTransitional(MandosDBusService):
2288
__metaclass__ = AlternateDBusNamesMetaclass
2289
mandos_dbus_service = MandosDBusServiceTransitional()
2689
2290
2690
2291
def cleanup():
2691
2292
"Cleanup function; run on exit"
2694
2295
multiprocessing.active_children()
2695
2296
if not (tcp_server.clients or client_settings):
2696
2297
return
2697
2698
# Store client before exiting. Secrets are encrypted with key
2699
# based on what config file has. If config file is
2700
# removed/edited, old secret will thus be unrecovable.
2701
clients = {}
2702
with PGPEngine() as pgp:
2703
for client in tcp_server.clients.itervalues():
2704
key = client_settings[client.name]["secret"]
2705
client.encrypted_secret = pgp.encrypt(client.secret,
2706
key)
2707
client_dict = {}
2708
2709
# A list of attributes that can not be pickled
2710
# + secret.
2711
exclude = set(("bus", "changedstate", "secret",
2712
"checker"))
2713
for name, typ in (inspect.getmembers
2714
(dbus.service.Object)):
2715
exclude.add(name)
2716
2717
client_dict["encrypted_secret"] = (client
2718
.encrypted_secret)
2719
for attr in client.client_structure:
2720
if attr not in exclude:
2721
client_dict[attr] = getattr(client, attr)
2722
2723
clients[client.name] = client_dict
2724
del client_settings[client.name]["secret"]
2725
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
2726
2321
try:
2727
with (tempfile.NamedTemporaryFile
2728
(mode='wb', suffix=".pickle", prefix='clients-',
2729
dir=os.path.dirname(stored_state_path),
2730
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:
2731
2323
pickle.dump((clients, client_settings), stored_state)
2732
tempname=stored_state.name
2733
os.rename(tempname, stored_state_path)
2734
except (IOError, OSError) as e:
2735
if not debug:
2736
try:
2737
os.remove(tempname)
2738
except NameError:
2739
pass
2740
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2741
logger.warning("Could not save persistent state: {0}"
2742
.format(os.strerror(e.errno)))
2743
else:
2744
logger.warning("Could not save persistent state:",
2745
exc_info=e)
2746
raise e
2747
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
2748
2329
# Delete all clients, and settings from config
2749
2330
while tcp_server.clients:
2750
2331
name, client = tcp_server.clients.popitem()
2768
2349
# Need to initiate checking of clients
2769
2350
if client.enabled:
2770
2351
client.init_checker()
2352
2771
2353
2772
2354
tcp_server.enable()
2773
2355
tcp_server.server_activate()
2776
2358
service.port = tcp_server.socket.getsockname()[1]
2777
2359
if use_ipv6:
2778
2360
logger.info("Now listening on address %r, port %d,"
2779
" flowinfo %d, scope_id %d",
2780
*tcp_server.socket.getsockname())
2361
" flowinfo %d, scope_id %d"
2362
% tcp_server.socket.getsockname())
2781
2363
else: # IPv4
2782
logger.info("Now listening on address %r, port %d",
2783
*tcp_server.socket.getsockname())
2364
logger.info("Now listening on address %r, port %d"
2365
% tcp_server.socket.getsockname())
2784
2366
2785
2367
#service.interface = tcp_server.socket.getsockname()[3]
2786
2368
2789
2371
try:
2790
2372
service.activate()
2791
2373
except dbus.exceptions.DBusException as error:
2792
logger.critical("D-Bus Exception", exc_info=error)
2374
logger.critical("DBusException: %s", error)
2793
2375
cleanup()
2794
2376
sys.exit(1)
2795
2377
# End of Avahi example code
2802
2384
logger.debug("Starting main loop")
2803
2385
main_loop.run()
2804
2386
except AvahiError as error:
2805
logger.critical("Avahi Error", exc_info=error)
2387
logger.critical("AvahiError: %s", error)
2806
2388
cleanup()
2807
2389
sys.exit(1)
2808
2390
except KeyboardInterrupt:
2813
2395
# Must run before the D-Bus bus name gets deregistered
2814
2396
cleanup()
2815
2397
2398
2816
2399
if __name__ == '__main__':
2817
2400
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0