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:
- network-hooks.d
- files modified:
- DBUS-API
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
63
63
import cPickle as pickle
64
64
import multiprocessing
65
65
import types
66
import binascii
67
import tempfile
68
import itertools
66
import hashlib
69
67
70
68
import dbus
71
69
import dbus.service
76
74
import ctypes.util
77
75
import xml.dom.minidom
78
76
import inspect
79
import GnuPGInterface
77
import Crypto.Cipher.AES
80
78
81
79
try:
82
80
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
84
except ImportError:
87
85
SO_BINDTODEVICE = None
88
86
89
version = "1.5.3"
90
stored_state_file = "clients.pickle"
87
88
version = "1.4.1"
91
89
92
90
logger = logging.getLogger()
91
stored_state_path = "/var/lib/mandos/clients.pickle"
92
93
93
syslogger = (logging.handlers.SysLogHandler
94
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
95
address = str("/dev/log")))
96
97
try:
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
101
except (OSError, AttributeError):
102
def if_nametoindex(interface):
103
"Get an interface index the hard way, i.e. using fcntl()"
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
with contextlib.closing(socket.socket()) as s:
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
111
return interface_index
112
113
114
def initlogger(debug, level=logging.WARNING):
115
"""init logger and add loglevel"""
116
117
syslogger.setFormatter(logging.Formatter
118
('Mandos [%(process)d]: %(levelname)s:'
119
' %(message)s'))
120
logger.addHandler(syslogger)
121
122
if debug:
123
console = logging.StreamHandler()
124
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
125
' [%(process)d]:'
126
' %(levelname)s:'
127
' %(message)s'))
128
logger.addHandler(console)
129
logger.setLevel(level)
130
131
132
class PGPError(Exception):
133
"""Exception if encryption/decryption fails"""
134
pass
135
136
137
class PGPEngine(object):
138
"""A simple class for OpenPGP symmetric encryption & decryption"""
139
def __init__(self):
140
self.gnupg = GnuPGInterface.GnuPG()
141
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.gnupg.options.meta_interactive = False
144
self.gnupg.options.homedir = self.tempdir
145
self.gnupg.options.extra_args.extend(['--force-mdc',
146
'--quiet',
147
'--no-use-agent'])
148
149
def __enter__(self):
150
return self
151
152
def __exit__ (self, exc_type, exc_value, traceback):
153
self._cleanup()
154
return False
155
156
def __del__(self):
157
self._cleanup()
158
159
def _cleanup(self):
160
if self.tempdir is not None:
161
# Delete contents of tempdir
162
for root, dirs, files in os.walk(self.tempdir,
163
topdown = False):
164
for filename in files:
165
os.remove(os.path.join(root, filename))
166
for dirname in dirs:
167
os.rmdir(os.path.join(root, dirname))
168
# Remove tempdir
169
os.rmdir(self.tempdir)
170
self.tempdir = None
171
172
def password_encode(self, password):
173
# Passphrase can not be empty and can not contain newlines or
174
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
176
177
def encrypt(self, data, password):
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
180
try:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
185
f.write(data)
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
188
proc.wait()
189
except IOError as e:
190
raise PGPError(e)
191
self.gnupg.passphrase = None
192
return ciphertext
193
194
def decrypt(self, data, password):
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
197
try:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
202
f.write(data)
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
205
proc.wait()
206
except IOError as e:
207
raise PGPError(e)
208
self.gnupg.passphrase = None
209
return decrypted_plaintext
210
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)
211
107
212
108
213
109
class AvahiError(Exception):
277
173
try:
278
174
self.add()
279
175
except dbus.exceptions.DBusException as error:
280
logger.critical("D-Bus Exception", exc_info=error)
176
logger.critical("DBusException: %s", error)
281
177
self.cleanup()
282
178
os._exit(1)
283
179
self.rename_count += 1
330
226
try:
331
227
self.group.Free()
332
228
except (dbus.exceptions.UnknownMethodException,
333
dbus.exceptions.DBusException):
229
dbus.exceptions.DBusException) as e:
334
230
pass
335
231
self.group = None
336
232
self.remove()
380
276
% self.name))
381
277
return ret
382
278
383
def timedelta_to_milliseconds(td):
279
def _timedelta_to_milliseconds(td):
384
280
"Convert a datetime.timedelta() to milliseconds"
385
281
return ((td.days * 24 * 60 * 60 * 1000)
386
282
+ (td.seconds * 1000)
390
286
"""A representation of a client host served by this server.
391
287
392
288
Attributes:
393
approved: bool(); 'None' if not yet approved/disapproved
289
_approved: bool(); 'None' if not yet approved/disapproved
394
290
approval_delay: datetime.timedelta(); Time to wait for approval
395
291
approval_duration: datetime.timedelta(); Duration of one approval
396
292
checker: subprocess.Popen(); a running checker process used
414
310
interval: datetime.timedelta(); How often to start a new checker
415
311
last_approval_request: datetime.datetime(); (UTC) or None
416
312
last_checked_ok: datetime.datetime(); (UTC) or None
417
last_checker_status: integer between 0 and 255 reflecting exit
418
status of last checker. -1 reflects crashed
419
checker, -2 means no checker completed yet.
420
last_enabled: datetime.datetime(); (UTC) or None
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)
421
317
name: string; from the config file, used in log messages and
422
318
D-Bus identifiers
423
319
secret: bytestring; sent verbatim (over TLS) to client
424
320
timeout: datetime.timedelta(); How long from last_checked_ok
425
321
until this client is disabled
426
extended_timeout: extra long timeout when secret has been sent
322
extended_timeout: extra long timeout when password has been sent
427
323
runtime_expansions: Allowed attributes for runtime expansion.
428
324
expires: datetime.datetime(); time (UTC) when a client will be
429
325
disabled, or None
433
329
"created", "enabled", "fingerprint",
434
330
"host", "interval", "last_checked_ok",
435
331
"last_enabled", "name", "timeout")
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
438
"interval": "2m",
439
"checker": "fping -q -- %%(host)s",
440
"host": "",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
443
"approved_by_default": "True",
444
"enabled": "True",
445
}
446
332
447
333
def timeout_milliseconds(self):
448
334
"Return the 'timeout' attribute in milliseconds"
449
return timedelta_to_milliseconds(self.timeout)
335
return _timedelta_to_milliseconds(self.timeout)
450
336
451
337
def extended_timeout_milliseconds(self):
452
338
"Return the 'extended_timeout' attribute in milliseconds"
453
return timedelta_to_milliseconds(self.extended_timeout)
339
return _timedelta_to_milliseconds(self.extended_timeout)
454
340
455
341
def interval_milliseconds(self):
456
342
"Return the 'interval' attribute in milliseconds"
457
return timedelta_to_milliseconds(self.interval)
343
return _timedelta_to_milliseconds(self.interval)
458
344
459
345
def approval_delay_milliseconds(self):
460
return timedelta_to_milliseconds(self.approval_delay)
461
462
@staticmethod
463
def config_parser(config):
464
"""Construct a new dict of client settings of this form:
465
{ client_name: {setting_name: value, ...}, ...}
466
with exceptions for any special settings as defined above.
467
NOTE: Must be a pure function. Must return the same result
468
value given the same arguments.
469
"""
470
settings = {}
471
for client_name in config.sections():
472
section = dict(config.items(client_name))
473
client = settings[client_name] = {}
474
475
client["host"] = section["host"]
476
# Reformat values from string types to Python types
477
client["approved_by_default"] = config.getboolean(
478
client_name, "approved_by_default")
479
client["enabled"] = config.getboolean(client_name,
480
"enabled")
481
482
client["fingerprint"] = (section["fingerprint"].upper()
483
.replace(" ", ""))
484
if "secret" in section:
485
client["secret"] = section["secret"].decode("base64")
486
elif "secfile" in section:
487
with open(os.path.expanduser(os.path.expandvars
488
(section["secfile"])),
489
"rb") as secfile:
490
client["secret"] = secfile.read()
491
else:
492
raise TypeError("No secret or secfile for section %s"
493
% section)
494
client["timeout"] = string_to_delta(section["timeout"])
495
client["extended_timeout"] = string_to_delta(
496
section["extended_timeout"])
497
client["interval"] = string_to_delta(section["interval"])
498
client["approval_delay"] = string_to_delta(
499
section["approval_delay"])
500
client["approval_duration"] = string_to_delta(
501
section["approval_duration"])
502
client["checker_command"] = section["checker"]
503
client["last_approval_request"] = None
504
client["last_checked_ok"] = None
505
client["last_checker_status"] = -2
506
507
return settings
508
509
510
def __init__(self, settings, name = None):
346
return _timedelta_to_milliseconds(self.approval_delay)
347
348
def __init__(self, name = None, config=None):
511
349
"""Note: the 'checker' key in 'config' sets the
512
350
'checker_command' attribute and *not* the 'checker'
513
351
attribute."""
514
352
self.name = name
515
# adding all client settings
516
for setting, value in settings.iteritems():
517
setattr(self, setting, value)
518
519
if self.enabled:
520
if not hasattr(self, "last_enabled"):
521
self.last_enabled = datetime.datetime.utcnow()
522
if not hasattr(self, "expires"):
523
self.expires = (datetime.datetime.utcnow()
524
+ self.timeout)
525
else:
526
self.last_enabled = None
527
self.expires = None
528
353
if config is None:
354
config = {}
529
355
logger.debug("Creating client %r", self.name)
530
356
# Uppercase and remove spaces from fingerprint for later
531
357
# comparison purposes with return value from the fingerprint()
532
358
# function
359
self.fingerprint = (config["fingerprint"].upper()
360
.replace(" ", ""))
533
361
logger.debug(" Fingerprint: %s", self.fingerprint)
534
self.created = settings.get("created",
535
datetime.datetime.utcnow())
536
537
# 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"])
538
383
self.checker = None
539
384
self.checker_initiator_tag = None
540
385
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
541
387
self.checker_callback_tag = None
388
self.checker_command = config["checker"]
542
389
self.current_checker_command = None
543
self.approved = None
390
self._approved = None
391
self.approved_by_default = config.get("approved_by_default",
392
True)
544
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"])
545
398
self.changedstate = (multiprocessing_manager
546
399
.Condition(multiprocessing_manager
547
400
.Lock()))
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
550
if not attr.startswith("_")]
401
self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
551
402
self.client_structure.append("client_structure")
552
403
404
553
405
for name, t in inspect.getmembers(type(self),
554
lambda obj:
555
isinstance(obj,
556
property)):
406
lambda obj: isinstance(obj, property)):
557
407
if not name.startswith("_"):
558
408
self.client_structure.append(name)
559
409
595
445
596
446
def __del__(self):
597
447
self.disable()
598
448
599
449
def init_checker(self):
600
450
# Schedule a new checker to be started an 'interval' from now,
601
451
# and every interval from then on.
608
458
self.disable))
609
459
# Also start a new checker *right now*.
610
460
self.start_checker()
611
461
462
612
463
def checker_callback(self, pid, condition, command):
613
464
"""The checker has completed, so take appropriate actions."""
614
465
self.checker_callback_tag = None
615
466
self.checker = None
616
467
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
468
self.last_checker_status = os.WEXITSTATUS(condition)
618
469
if self.last_checker_status == 0:
619
470
logger.info("Checker for %(name)s succeeded",
620
471
vars(self))
627
478
logger.warning("Checker for %(name)s crashed?",
628
479
vars(self))
629
480
630
def checked_ok(self):
631
"""Assert that the client has been seen, alive and well."""
632
self.last_checked_ok = datetime.datetime.utcnow()
633
self.last_checker_status = 0
634
self.bump_timeout()
635
636
def bump_timeout(self, timeout=None):
637
"""Bump up the timeout for this client."""
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
"""
638
487
if timeout is None:
639
488
timeout = self.timeout
489
self.last_checked_ok = datetime.datetime.utcnow()
640
490
if self.disable_initiator_tag is not None:
641
491
gobject.source_remove(self.disable_initiator_tag)
642
492
if getattr(self, "enabled", False):
643
493
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
494
(_timedelta_to_milliseconds
645
495
(timeout), self.disable))
646
496
self.expires = datetime.datetime.utcnow() + timeout
647
497
693
543
try:
694
544
command = self.checker_command % escaped_attrs
695
545
except TypeError as error:
696
logger.error('Could not format string "%s"',
697
self.checker_command, exc_info=error)
546
logger.error('Could not format string "%s":'
547
' %s', self.checker_command, error)
698
548
return True # Try again later
699
549
self.current_checker_command = command
700
550
try:
718
568
gobject.source_remove(self.checker_callback_tag)
719
569
self.checker_callback(pid, status, command)
720
570
except OSError as error:
721
logger.error("Failed to start subprocess",
722
exc_info=error)
571
logger.error("Failed to start subprocess: %s",
572
error)
723
573
# Re-run this periodically if run by gobject.timeout_add
724
574
return True
725
575
732
582
return
733
583
logger.debug("Stopping checker for %(name)s", vars(self))
734
584
try:
735
self.checker.terminate()
585
os.kill(self.checker.pid, signal.SIGTERM)
736
586
#time.sleep(0.5)
737
587
#if self.checker.poll() is None:
738
# self.checker.kill()
588
# os.kill(self.checker.pid, signal.SIGKILL)
739
589
except OSError as error:
740
590
if error.errno != errno.ESRCH: # No such process
741
591
raise
742
592
self.checker = None
743
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
744
640
745
641
def dbus_service_property(dbus_interface, signature="v",
746
642
access="readwrite", byte_arrays=False):
772
668
return decorator
773
669
774
670
775
def dbus_interface_annotations(dbus_interface):
776
"""Decorator for marking functions returning interface annotations.
777
778
Usage:
779
780
@dbus_interface_annotations("org.example.Interface")
781
def _foo(self): # Function name does not matter
782
return {"org.freedesktop.DBus.Deprecated": "true",
783
"org.freedesktop.DBus.Property.EmitsChangedSignal":
784
"false"}
785
"""
786
def decorator(func):
787
func._dbus_is_interface = True
788
func._dbus_interface = dbus_interface
789
func._dbus_name = dbus_interface
790
return func
791
return decorator
792
793
794
def dbus_annotations(annotations):
795
"""Decorator to annotate D-Bus methods, signals or properties
796
Usage:
797
798
@dbus_service_property("org.example.Interface", signature="b",
799
access="r")
800
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
"org.freedesktop.DBus.Property."
802
"EmitsChangedSignal": "false"})
803
def Property_dbus_property(self):
804
return dbus.Boolean(False)
805
"""
806
def decorator(func):
807
func._dbus_annotations = annotations
808
return func
809
return decorator
810
811
812
671
class DBusPropertyException(dbus.exceptions.DBusException):
813
672
"""A base class for D-Bus property-related exceptions
814
673
"""
837
696
"""
838
697
839
698
@staticmethod
840
def _is_dbus_thing(thing):
841
"""Returns a function testing if an attribute is a D-Bus thing
842
843
If called like _is_dbus_thing("method") it returns a function
844
suitable for use as predicate to inspect.getmembers().
845
"""
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
847
False)
699
def _is_dbus_property(obj):
700
return getattr(obj, "_dbus_is_property", False)
848
701
849
def _get_all_dbus_things(self, thing):
702
def _get_all_dbus_properties(self):
850
703
"""Returns a generator of (name, attribute) pairs
851
704
"""
852
return ((getattr(athing.__get__(self), "_dbus_name",
853
name),
854
athing.__get__(self))
705
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
855
706
for cls in self.__class__.__mro__
856
for name, athing in
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
707
for name, prop in
708
inspect.getmembers(cls, self._is_dbus_property))
859
709
860
710
def _get_dbus_property(self, interface_name, property_name):
861
711
"""Returns a bound method if one exists which is a D-Bus
863
713
"""
864
714
for cls in self.__class__.__mro__:
865
715
for name, value in (inspect.getmembers
866
(cls,
867
self._is_dbus_thing("property"))):
716
(cls, self._is_dbus_property)):
868
717
if (value._dbus_name == property_name
869
718
and value._dbus_interface == interface_name):
870
719
return value.__get__(self)
899
748
# signatures other than "ay".
900
749
if prop._dbus_signature != "ay":
901
750
raise ValueError
902
value = dbus.ByteArray(b''.join(chr(byte)
903
for byte in value))
751
value = dbus.ByteArray(''.join(unichr(byte)
752
for byte in value))
904
753
prop(value)
905
754
906
755
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
911
760
912
761
Note: Will not include properties with access="write".
913
762
"""
914
properties = {}
915
for name, prop in self._get_all_dbus_things("property"):
763
all = {}
764
for name, prop in self._get_all_dbus_properties():
916
765
if (interface_name
917
766
and interface_name != prop._dbus_interface):
918
767
# Interface non-empty but did not match
922
771
continue
923
772
value = prop()
924
773
if not hasattr(value, "variant_level"):
925
properties[name] = value
774
all[name] = value
926
775
continue
927
properties[name] = type(value)(value, variant_level=
928
value.variant_level+1)
929
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")
930
779
931
780
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
932
781
out_signature="s",
933
782
path_keyword='object_path',
934
783
connection_keyword='connection')
935
784
def Introspect(self, object_path, connection):
936
"""Overloading of standard D-Bus method.
937
938
Inserts property tags and interface annotation tags.
785
"""Standard D-Bus method, overloaded to insert property tags.
939
786
"""
940
787
xmlstring = dbus.service.Object.Introspect(self, object_path,
941
788
connection)
948
795
e.setAttribute("access", prop._dbus_access)
949
796
return e
950
797
for if_tag in document.getElementsByTagName("interface"):
951
# Add property tags
952
798
for tag in (make_tag(document, name, prop)
953
799
for name, prop
954
in self._get_all_dbus_things("property")
800
in self._get_all_dbus_properties()
955
801
if prop._dbus_interface
956
802
== if_tag.getAttribute("name")):
957
803
if_tag.appendChild(tag)
958
# Add annotation tags
959
for typ in ("method", "signal", "property"):
960
for tag in if_tag.getElementsByTagName(typ):
961
annots = dict()
962
for name, prop in (self.
963
_get_all_dbus_things(typ)):
964
if (name == tag.getAttribute("name")
965
and prop._dbus_interface
966
== if_tag.getAttribute("name")):
967
annots.update(getattr
968
(prop,
969
"_dbus_annotations",
970
{}))
971
for name, value in annots.iteritems():
972
ann_tag = document.createElement(
973
"annotation")
974
ann_tag.setAttribute("name", name)
975
ann_tag.setAttribute("value", value)
976
tag.appendChild(ann_tag)
977
# Add interface annotation tags
978
for annotation, value in dict(
979
itertools.chain(
980
*(annotations().iteritems()
981
for name, annotations in
982
self._get_all_dbus_things("interface")
983
if name == if_tag.getAttribute("name")
984
))).iteritems():
985
ann_tag = document.createElement("annotation")
986
ann_tag.setAttribute("name", annotation)
987
ann_tag.setAttribute("value", value)
988
if_tag.appendChild(ann_tag)
989
804
# Add the names to the return values for the
990
805
# "org.freedesktop.DBus.Properties" methods
991
806
if (if_tag.getAttribute("name")
1006
821
except (AttributeError, xml.dom.DOMException,
1007
822
xml.parsers.expat.ExpatError) as error:
1008
823
logger.error("Failed to override Introspection method",
1009
exc_info=error)
824
error)
1010
825
return xmlstring
1011
826
1012
827
1017
832
return dbus.String(dt.isoformat(),
1018
833
variant_level=variant_level)
1019
834
1020
1021
835
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1022
836
.__metaclass__):
1023
837
"""Applied to an empty subclass of a D-Bus object, this metaclass
1026
840
def __new__(mcs, name, bases, attr):
1027
841
# Go through all the base classes which could have D-Bus
1028
842
# methods, signals, or properties in them
1029
old_interface_names = []
1030
843
for base in (b for b in bases
1031
844
if issubclass(b, dbus.service.Object)):
1032
845
# Go though all attributes of the base class
1042
855
alt_interface = (attribute._dbus_interface
1043
856
.replace("se.recompile.Mandos",
1044
857
"se.bsnet.fukt.Mandos"))
1045
if alt_interface != attribute._dbus_interface:
1046
old_interface_names.append(alt_interface)
1047
858
# Is this a D-Bus signal?
1048
859
if getattr(attribute, "_dbus_is_signal", False):
1049
860
# Extract the original non-method function by
1064
875
nonmethod_func.func_name,
1065
876
nonmethod_func.func_defaults,
1066
877
nonmethod_func.func_closure)))
1067
# Copy annotations, if any
1068
try:
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1071
except AttributeError:
1072
pass
1073
878
# Define a creator of a function to call both the
1074
879
# old and new functions, so both the old and new
1075
880
# signals gets sent when the function is called
1103
908
attribute.func_name,
1104
909
attribute.func_defaults,
1105
910
attribute.func_closure)))
1106
# Copy annotations, if any
1107
try:
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1110
except AttributeError:
1111
pass
1112
911
# Is this a D-Bus property?
1113
912
elif getattr(attribute, "_dbus_is_property", False):
1114
913
# Create a new, but exactly alike, function
1128
927
attribute.func_name,
1129
928
attribute.func_defaults,
1130
929
attribute.func_closure)))
1131
# Copy annotations, if any
1132
try:
1133
attr[attrname]._dbus_annotations = (
1134
dict(attribute._dbus_annotations))
1135
except AttributeError:
1136
pass
1137
# Is this a D-Bus interface?
1138
elif getattr(attribute, "_dbus_is_interface", False):
1139
# Create a new, but exactly alike, function
1140
# object. Decorate it to be a new D-Bus interface
1141
# with the alternate D-Bus interface name. Add it
1142
# to the class.
1143
attr[attrname] = (dbus_interface_annotations
1144
(alt_interface)
1145
(types.FunctionType
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1155
def func(self):
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1159
itertools.count()):
1160
if aname not in attr:
1161
attr[aname] = func
1162
break
1163
930
return type.__new__(mcs, name, bases, attr)
1164
931
1165
1166
932
class ClientDBus(Client, DBusObjectWithProperties):
1167
933
"""A Client class using D-Bus
1168
934
1179
945
def __init__(self, bus = None, *args, **kwargs):
1180
946
self.bus = bus
1181
947
Client.__init__(self, *args, **kwargs)
948
949
self._approvals_pending = 0
1182
950
# Only now, when this client is initialized, can it show up on
1183
951
# the D-Bus
1184
952
client_object_name = unicode(self.name).translate(
1194
962
variant_level=1):
1195
963
""" Modify a variable so that it's a property which announces
1196
964
its changes to DBus.
1197
965
1198
966
transform_fun: Function that takes a value and a variant_level
1199
967
and transforms it to a D-Bus type.
1200
968
dbus_name: D-Bus name of the variable
1230
998
checker is not None)
1231
999
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1232
1000
"LastCheckedOK")
1233
last_checker_status = notifychangeproperty(dbus.Int16,
1234
"LastCheckerStatus")
1235
1001
last_approval_request = notifychangeproperty(
1236
1002
datetime_to_dbus, "LastApprovalRequest")
1237
1003
approved_by_default = notifychangeproperty(dbus.Boolean,
1238
1004
"ApprovedByDefault")
1239
approval_delay = notifychangeproperty(dbus.UInt64,
1005
approval_delay = notifychangeproperty(dbus.UInt16,
1240
1006
"ApprovalDelay",
1241
1007
type_func =
1242
timedelta_to_milliseconds)
1008
_timedelta_to_milliseconds)
1243
1009
approval_duration = notifychangeproperty(
1244
dbus.UInt64, "ApprovalDuration",
1245
type_func = timedelta_to_milliseconds)
1010
dbus.UInt16, "ApprovalDuration",
1011
type_func = _timedelta_to_milliseconds)
1246
1012
host = notifychangeproperty(dbus.String, "Host")
1247
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1013
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1248
1014
type_func =
1249
timedelta_to_milliseconds)
1015
_timedelta_to_milliseconds)
1250
1016
extended_timeout = notifychangeproperty(
1251
dbus.UInt64, "ExtendedTimeout",
1252
type_func = timedelta_to_milliseconds)
1253
interval = notifychangeproperty(dbus.UInt64,
1017
dbus.UInt16, "ExtendedTimeout",
1018
type_func = _timedelta_to_milliseconds)
1019
interval = notifychangeproperty(dbus.UInt16,
1254
1020
"Interval",
1255
1021
type_func =
1256
timedelta_to_milliseconds)
1022
_timedelta_to_milliseconds)
1257
1023
checker_command = notifychangeproperty(dbus.String, "Checker")
1258
1024
1259
1025
del notifychangeproperty
1301
1067
return r
1302
1068
1303
1069
def _reset_approved(self):
1304
self.approved = None
1070
self._approved = None
1305
1071
return False
1306
1072
1307
1073
def approve(self, value=True):
1308
1074
self.send_changedstate()
1309
self.approved = value
1310
gobject.timeout_add(timedelta_to_milliseconds
1075
self._approved = value
1076
gobject.timeout_add(_timedelta_to_milliseconds
1311
1077
(self.approval_duration),
1312
1078
self._reset_approved)
1313
1079
1315
1081
## D-Bus methods, signals & properties
1316
1082
_interface = "se.recompile.Mandos.Client"
1317
1083
1318
## Interfaces
1319
1320
@dbus_interface_annotations(_interface)
1321
def _foo(self):
1322
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
"false"}
1324
1325
1084
## Signals
1326
1085
1327
1086
# CheckerCompleted - signal
1426
1185
access="readwrite")
1427
1186
def ApprovalDuration_dbus_property(self, value=None):
1428
1187
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1188
return dbus.UInt64(_timedelta_to_milliseconds(
1430
1189
self.approval_duration))
1431
1190
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1432
1191
1446
1205
def Host_dbus_property(self, value=None):
1447
1206
if value is None: # get
1448
1207
return dbus.String(self.host)
1449
self.host = unicode(value)
1208
self.host = value
1450
1209
1451
1210
# Created - property
1452
1211
@dbus_service_property(_interface, signature="s", access="read")
1453
1212
def Created_dbus_property(self):
1454
return datetime_to_dbus(self.created)
1213
return dbus.String(datetime_to_dbus(self.created))
1455
1214
1456
1215
# LastEnabled - property
1457
1216
@dbus_service_property(_interface, signature="s", access="read")
1478
1237
return
1479
1238
return datetime_to_dbus(self.last_checked_ok)
1480
1239
1481
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
1483
access="read")
1484
def LastCheckerStatus_dbus_property(self):
1485
return dbus.Int16(self.last_checker_status)
1486
1487
1240
# Expires - property
1488
1241
@dbus_service_property(_interface, signature="s", access="read")
1489
1242
def Expires_dbus_property(self):
1501
1254
if value is None: # get
1502
1255
return dbus.UInt64(self.timeout_milliseconds())
1503
1256
self.timeout = datetime.timedelta(0, 0, 0, value)
1257
if getattr(self, "disable_initiator_tag", None) is None:
1258
return
1504
1259
# Reschedule timeout
1505
if self.enabled:
1506
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1510
# The timeout has passed
1511
self.disable()
1512
else:
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1515
time_to_die))
1516
if (getattr(self, "disable_initiator_tag", None)
1517
is None):
1518
return
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
1521
(time_to_die,
1522
self.disable))
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))
1523
1277
1524
1278
# ExtendedTimeout - property
1525
1279
@dbus_service_property(_interface, signature="t",
1538
1292
self.interval = datetime.timedelta(0, 0, 0, value)
1539
1293
if getattr(self, "checker_initiator_tag", None) is None:
1540
1294
return
1541
if self.enabled:
1542
# Reschedule checker run
1543
gobject.source_remove(self.checker_initiator_tag)
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
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
1547
1300
1548
1301
# Checker - property
1549
1302
@dbus_service_property(_interface, signature="s",
1551
1304
def Checker_dbus_property(self, value=None):
1552
1305
if value is None: # get
1553
1306
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
1307
self.checker_command = value
1555
1308
1556
1309
# CheckerRunning - property
1557
1310
@dbus_service_property(_interface, signature="b",
1586
1339
raise KeyError()
1587
1340
1588
1341
def __getattribute__(self, name):
1589
if name == '_pipe':
1342
if(name == '_pipe'):
1590
1343
return super(ProxyClient, self).__getattribute__(name)
1591
1344
self._pipe.send(('getattr', name))
1592
1345
data = self._pipe.recv()
1599
1352
return func
1600
1353
1601
1354
def __setattr__(self, name, value):
1602
if name == '_pipe':
1355
if(name == '_pipe'):
1603
1356
return super(ProxyClient, self).__setattr__(name, value)
1604
1357
self._pipe.send(('setattr', name, value))
1605
1358
1606
1607
1359
class ClientDBusTransitional(ClientDBus):
1608
1360
__metaclass__ = AlternateDBusNamesMetaclass
1609
1361
1610
1611
1362
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1363
"""A class to handle client connections.
1613
1364
1695
1446
client.Rejected("Disabled")
1696
1447
return
1697
1448
1698
if client.approved or not client.approval_delay:
1449
if client._approved or not client.approval_delay:
1699
1450
#We are approved or approval is disabled
1700
1451
break
1701
elif client.approved is None:
1452
elif client._approved is None:
1702
1453
logger.info("Client %s needs approval",
1703
1454
client.name)
1704
1455
if self.server.use_dbus:
1718
1469
time = datetime.datetime.now()
1719
1470
client.changedstate.acquire()
1720
1471
(client.changedstate.wait
1721
(float(client.timedelta_to_milliseconds(delay)
1472
(float(client._timedelta_to_milliseconds(delay)
1722
1473
/ 1000)))
1723
1474
client.changedstate.release()
1724
1475
time2 = datetime.datetime.now()
1750
1501
1751
1502
logger.info("Sending secret to %s", client.name)
1752
1503
# bump the timeout using extended_timeout
1753
client.bump_timeout(client.extended_timeout)
1504
client.checked_ok(client.extended_timeout)
1754
1505
if self.server.use_dbus:
1755
1506
# Emit D-Bus signal
1756
1507
client.GotSecret()
1823
1574
# Convert the buffer to a Python bytestring
1824
1575
fpr = ctypes.string_at(buf, buf_len.value)
1825
1576
# Convert the bytestring to hexadecimal notation
1826
hex_fpr = binascii.hexlify(fpr).upper()
1577
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1827
1578
return hex_fpr
1828
1579
1829
1580
1832
1583
def sub_process_main(self, request, address):
1833
1584
try:
1834
1585
self.finish_request(request, address)
1835
except Exception:
1586
except:
1836
1587
self.handle_error(request, address)
1837
1588
self.close_request(request)
1838
1589
2086
1837
return timevalue
2087
1838
2088
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
2089
1864
def daemon(nochdir = False, noclose = False):
2090
1865
"""See daemon(3). Standard BSD Unix function.
2091
1866
2099
1874
sys.exit()
2100
1875
if not noclose:
2101
1876
# Close all standard open file descriptors
2102
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1877
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2103
1878
if not stat.S_ISCHR(os.fstat(null).st_mode):
2104
1879
raise OSError(errno.ENODEV,
2105
1880
"%s not a character device"
2106
% os.devnull)
1881
% os.path.devnull)
2107
1882
os.dup2(null, sys.stdin.fileno())
2108
1883
os.dup2(null, sys.stdout.fileno())
2109
1884
os.dup2(null, sys.stderr.fileno())
2147
1922
parser.add_argument("--no-ipv6", action="store_false",
2148
1923
dest="use_ipv6", help="Do not use IPv6")
2149
1924
parser.add_argument("--no-restore", action="store_false",
2150
dest="restore", help="Do not restore stored"
2151
" state")
2152
parser.add_argument("--statedir", metavar="DIR",
2153
help="Directory to save/restore state in")
2154
1925
dest="restore", help="Do not restore stored state",
1926
default=True)
1927
2155
1928
options = parser.parse_args()
2156
1929
2157
1930
if options.check:
2170
1943
"use_dbus": "True",
2171
1944
"use_ipv6": "True",
2172
1945
"debuglevel": "",
2173
"restore": "True",
2174
"statedir": "/var/lib/mandos"
2175
1946
}
2176
1947
2177
1948
# Parse config file for server-global settings
2194
1965
# options, if set.
2195
1966
for option in ("interface", "address", "port", "debug",
2196
1967
"priority", "servicename", "configdir",
2197
"use_dbus", "use_ipv6", "debuglevel", "restore",
2198
"statedir"):
1968
"use_dbus", "use_ipv6", "debuglevel", "restore"):
2199
1969
value = getattr(options, option)
2200
1970
if value is not None:
2201
1971
server_settings[option] = value
2213
1983
debuglevel = server_settings["debuglevel"]
2214
1984
use_dbus = server_settings["use_dbus"]
2215
1985
use_ipv6 = server_settings["use_ipv6"]
2216
stored_state_path = os.path.join(server_settings["statedir"],
2217
stored_state_file)
2218
2219
if debug:
2220
initlogger(debug, logging.DEBUG)
2221
else:
2222
if not debuglevel:
2223
initlogger(debug)
2224
else:
2225
level = getattr(logging, debuglevel.upper())
2226
initlogger(debug, level)
2227
1986
2228
1987
if server_settings["servicename"] != "Mandos":
2229
1988
syslogger.setFormatter(logging.Formatter
2232
1991
% server_settings["servicename"]))
2233
1992
2234
1993
# Parse config file with clients
2235
client_config = configparser.SafeConfigParser(Client
2236
.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)
2237
2003
client_config.read(os.path.join(server_settings["configdir"],
2238
2004
"clients.conf"))
2239
2005
2256
2022
except IOError:
2257
2023
logger.error("Could not open file %r", pidfilename)
2258
2024
2259
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:
2260
2029
try:
2261
uid = pwd.getpwnam(name).pw_uid
2262
gid = pwd.getpwnam(name).pw_gid
2263
break
2030
uid = pwd.getpwnam("mandos").pw_uid
2031
gid = pwd.getpwnam("mandos").pw_gid
2264
2032
except KeyError:
2265
continue
2266
else:
2267
uid = 65534
2268
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
2269
2039
try:
2270
2040
os.setgid(gid)
2271
2041
os.setuid(uid)
2273
2043
if error[0] != errno.EPERM:
2274
2044
raise error
2275
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
2276
2052
if debug:
2053
logger.setLevel(logging.DEBUG)
2277
2054
# Enable all possible GnuTLS debugging
2278
2055
2279
2056
# "Use a log level over 10 to enable all debugging options."
2288
2065
.gnutls_global_set_log_function(debug_gnutls))
2289
2066
2290
2067
# Redirect stdin so all checkers get /dev/null
2291
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2068
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2292
2069
os.dup2(null, sys.stdin.fileno())
2293
2070
if null > 2:
2294
2071
os.close(null)
2072
else:
2073
# No console logging
2074
logger.removeHandler(console)
2295
2075
2296
2076
# Need to fork before connecting to D-Bus
2297
2077
if not debug:
2298
2078
# Close all input and output, do double fork, etc.
2299
2079
daemon()
2300
2080
2301
gobject.threads_init()
2302
2303
2081
global main_loop
2304
2082
# From the Avahi example code
2305
DBusGMainLoop(set_as_default=True)
2083
DBusGMainLoop(set_as_default=True )
2306
2084
main_loop = gobject.MainLoop()
2307
2085
bus = dbus.SystemBus()
2308
2086
# End of Avahi example code
2335
2113
client_class = functools.partial(ClientDBusTransitional,
2336
2114
bus = bus)
2337
2115
2338
client_settings = Client.config_parser(client_config)
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
2339
2133
old_client_settings = {}
2340
clients_data = {}
2341
2342
# Get client data and settings from last running state.
2134
clients_data = []
2135
2136
# Get client data and settings from last running state.
2343
2137
if server_settings["restore"]:
2344
2138
try:
2345
2139
with open(stored_state_path, "rb") as stored_state:
2346
clients_data, old_client_settings = (pickle.load
2347
(stored_state))
2140
clients_data, old_client_settings = pickle.load(stored_state)
2348
2141
os.remove(stored_state_path)
2349
2142
except IOError as e:
2350
logger.warning("Could not load persistent state: {0}"
2351
.format(e))
2143
logger.warning("Could not load persistant state: {0}".format(e))
2352
2144
if e.errno != errno.ENOENT:
2353
2145
raise
2354
except EOFError as e:
2355
logger.warning("Could not load persistent state: "
2356
"EOFError: {0}".format(e))
2357
2358
with PGPEngine() as pgp:
2359
for client_name, client in clients_data.iteritems():
2360
# Decide which value to use after restoring saved state.
2361
# We have three different values: Old config file,
2362
# new config file, and saved state.
2363
# New config value takes precedence if it differs from old
2364
# config value, otherwise use saved state.
2365
for name, value in client_settings[client_name].items():
2366
try:
2367
# For each value in new config, check if it
2368
# differs from the old config value (Except for
2369
# the "secret" attribute)
2370
if (name != "secret" and
2371
value != old_client_settings[client_name]
2372
[name]):
2373
client[name] = value
2374
except KeyError:
2375
pass
2376
2377
# Clients who has passed its expire date can still be
2378
# enabled if its last checker was successful. Clients
2379
# whose checker succeeded before we stored its state is
2380
# assumed to have successfully run all checkers during
2381
# downtime.
2382
if client["enabled"]:
2383
if datetime.datetime.utcnow() >= client["expires"]:
2384
if not client["last_checked_ok"]:
2385
logger.warning(
2386
"disabling client {0} - Client never "
2387
"performed a successful checker"
2388
.format(client_name))
2389
client["enabled"] = False
2390
elif client["last_checker_status"] != 0:
2391
logger.warning(
2392
"disabling client {0} - Client "
2393
"last checker failed with error code {1}"
2394
.format(client_name,
2395
client["last_checker_status"]))
2396
client["enabled"] = False
2397
else:
2398
client["expires"] = (datetime.datetime
2399
.utcnow()
2400
+ client["timeout"])
2401
logger.debug("Last checker succeeded,"
2402
" keeping {0} enabled"
2403
.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():
2404
2156
try:
2405
client["secret"] = (
2406
pgp.decrypt(client["encrypted_secret"],
2407
client_settings[client_name]
2408
["secret"]))
2409
except PGPError:
2410
# If decryption fails, we use secret from new settings
2411
logger.debug("Failed to decrypt {0} old secret"
2412
.format(client_name))
2413
client["secret"] = (
2414
client_settings[client_name]["secret"])
2415
2416
2417
# Add/remove clients based on new changes made to config
2418
for client_name in (set(old_client_settings)
2419
- set(client_settings)):
2420
del clients_data[client_name]
2421
for client_name in (set(client_settings)
2422
- set(old_client_settings)):
2423
clients_data[client_name] = client_settings[client_name]
2424
2425
# Create all client objects
2426
for client_name, client in clients_data.iteritems():
2427
tcp_server.clients[client_name] = client_class(
2428
name = client_name, settings = client)
2429
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
2430
2211
if not tcp_server.clients:
2431
2212
logger.warning("No clients defined")
2432
2213
2443
2224
# "pidfile" was never created
2444
2225
pass
2445
2226
del pidfilename
2227
2446
2228
signal.signal(signal.SIGINT, signal.SIG_IGN)
2447
2229
2448
2230
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2449
2231
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2450
2232
2451
2233
if use_dbus:
2452
class MandosDBusService(DBusObjectWithProperties):
2234
class MandosDBusService(dbus.service.Object):
2453
2235
"""A D-Bus proxy object"""
2454
2236
def __init__(self):
2455
2237
dbus.service.Object.__init__(self, bus, "/")
2456
2238
_interface = "se.recompile.Mandos"
2457
2239
2458
@dbus_interface_annotations(_interface)
2459
def _foo(self):
2460
return { "org.freedesktop.DBus.Property"
2461
".EmitsChangedSignal":
2462
"false"}
2463
2464
2240
@dbus.service.signal(_interface, signature="o")
2465
2241
def ClientAdded(self, objpath):
2466
2242
"D-Bus signal"
2519
2295
multiprocessing.active_children()
2520
2296
if not (tcp_server.clients or client_settings):
2521
2297
return
2522
2523
# Store client before exiting. Secrets are encrypted with key
2524
# based on what config file has. If config file is
2525
# removed/edited, old secret will thus be unrecovable.
2526
clients = {}
2527
with PGPEngine() as pgp:
2528
for client in tcp_server.clients.itervalues():
2529
key = client_settings[client.name]["secret"]
2530
client.encrypted_secret = pgp.encrypt(client.secret,
2531
key)
2532
client_dict = {}
2533
2534
# A list of attributes that can not be pickled
2535
# + secret.
2536
exclude = set(("bus", "changedstate", "secret",
2537
"checker"))
2538
for name, typ in (inspect.getmembers
2539
(dbus.service.Object)):
2540
exclude.add(name)
2541
2542
client_dict["encrypted_secret"] = (client
2543
.encrypted_secret)
2544
for attr in client.client_structure:
2545
if attr not in exclude:
2546
client_dict[attr] = getattr(client, attr)
2547
2548
clients[client.name] = client_dict
2549
del client_settings[client.name]["secret"]
2550
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
2551
2321
try:
2552
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2553
prefix="clients-",
2554
dir=os.path.dirname
2555
(stored_state_path))
2556
with os.fdopen(tempfd, "wb") 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:
2557
2323
pickle.dump((clients, client_settings), stored_state)
2558
os.rename(tempname, stored_state_path)
2559
except (IOError, OSError) as e:
2560
logger.warning("Could not save persistent state: {0}"
2561
.format(e))
2562
if not debug:
2563
try:
2564
os.remove(tempname)
2565
except NameError:
2566
pass
2567
if e.errno not in set((errno.ENOENT, errno.EACCES,
2568
errno.EEXIST)):
2569
raise e
2570
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
2571
2329
# Delete all clients, and settings from config
2572
2330
while tcp_server.clients:
2573
2331
name, client = tcp_server.clients.popitem()
2591
2349
# Need to initiate checking of clients
2592
2350
if client.enabled:
2593
2351
client.init_checker()
2352
2594
2353
2595
2354
tcp_server.enable()
2596
2355
tcp_server.server_activate()
2612
2371
try:
2613
2372
service.activate()
2614
2373
except dbus.exceptions.DBusException as error:
2615
logger.critical("D-Bus Exception", exc_info=error)
2374
logger.critical("DBusException: %s", error)
2616
2375
cleanup()
2617
2376
sys.exit(1)
2618
2377
# End of Avahi example code
2625
2384
logger.debug("Starting main loop")
2626
2385
main_loop.run()
2627
2386
except AvahiError as error:
2628
logger.critical("Avahi Error", exc_info=error)
2387
logger.critical("AvahiError: %s", error)
2629
2388
cleanup()
2630
2389
sys.exit(1)
2631
2390
except KeyboardInterrupt:
2636
2395
# Must run before the D-Bus bus name gets deregistered
2637
2396
cleanup()
2638
2397
2398
2639
2399
if __name__ == '__main__':
2640
2400
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0