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
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
66
import hashlib
71
67
72
68
import dbus
73
69
import dbus.service
78
74
import ctypes.util
79
75
import xml.dom.minidom
80
76
import inspect
81
import GnuPGInterface
77
import Crypto.Cipher.AES
82
78
83
79
try:
84
80
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
84
except ImportError:
89
85
SO_BINDTODEVICE = None
90
86
91
version = "1.5.3"
92
stored_state_file = "clients.pickle"
87
88
version = "1.4.1"
93
89
94
90
logger = logging.getLogger()
91
stored_state_path = "/var/lib/mandos/clients.pickle"
92
95
93
syslogger = (logging.handlers.SysLogHandler
96
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
95
address = str("/dev/log")))
98
99
try:
100
if_nametoindex = (ctypes.cdll.LoadLibrary
101
(ctypes.util.find_library("c"))
102
.if_nametoindex)
103
except (OSError, AttributeError):
104
def if_nametoindex(interface):
105
"Get an interface index the hard way, i.e. using fcntl()"
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
107
with contextlib.closing(socket.socket()) as s:
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
struct.pack(str("16s16x"),
110
interface))
111
interface_index = struct.unpack(str("I"),
112
ifreq[16:20])[0]
113
return interface_index
114
115
116
def initlogger(debug, level=logging.WARNING):
117
"""init logger and add loglevel"""
118
119
syslogger.setFormatter(logging.Formatter
120
('Mandos [%(process)d]: %(levelname)s:'
121
' %(message)s'))
122
logger.addHandler(syslogger)
123
124
if debug:
125
console = logging.StreamHandler()
126
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
' [%(process)d]:'
128
' %(levelname)s:'
129
' %(message)s'))
130
logger.addHandler(console)
131
logger.setLevel(level)
132
133
134
class PGPError(Exception):
135
"""Exception if encryption/decryption fails"""
136
pass
137
138
139
class PGPEngine(object):
140
"""A simple class for OpenPGP symmetric encryption & decryption"""
141
def __init__(self):
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
144
self.gnupg = GnuPGInterface.GnuPG()
145
self.gnupg.options.meta_interactive = False
146
self.gnupg.options.homedir = self.tempdir
147
self.gnupg.options.extra_args.extend(['--force-mdc',
148
'--quiet',
149
'--no-use-agent'])
150
151
def __enter__(self):
152
return self
153
154
def __exit__ (self, exc_type, exc_value, traceback):
155
self._cleanup()
156
return False
157
158
def __del__(self):
159
self._cleanup()
160
161
def _cleanup(self):
162
if self.tempdir is not None:
163
# Delete contents of tempdir
164
for root, dirs, files in os.walk(self.tempdir,
165
topdown = False):
166
for filename in files:
167
os.remove(os.path.join(root, filename))
168
for dirname in dirs:
169
os.rmdir(os.path.join(root, dirname))
170
# Remove tempdir
171
os.rmdir(self.tempdir)
172
self.tempdir = None
173
174
def password_encode(self, password):
175
# Passphrase can not be empty and can not contain newlines or
176
# NUL bytes. So we prefix it and hex encode it.
177
return b"mandos" + binascii.hexlify(password)
178
179
def encrypt(self, data, password):
180
self.gnupg.passphrase = self.password_encode(password)
181
with open(os.devnull, "w") as devnull:
182
try:
183
proc = self.gnupg.run(['--symmetric'],
184
create_fhs=['stdin', 'stdout'],
185
attach_fhs={'stderr': devnull})
186
with contextlib.closing(proc.handles['stdin']) as f:
187
f.write(data)
188
with contextlib.closing(proc.handles['stdout']) as f:
189
ciphertext = f.read()
190
proc.wait()
191
except IOError as e:
192
raise PGPError(e)
193
self.gnupg.passphrase = None
194
return ciphertext
195
196
def decrypt(self, data, password):
197
self.gnupg.passphrase = self.password_encode(password)
198
with open(os.devnull, "w") as devnull:
199
try:
200
proc = self.gnupg.run(['--decrypt'],
201
create_fhs=['stdin', 'stdout'],
202
attach_fhs={'stderr': devnull})
203
with contextlib.closing(proc.handles['stdin']) as f:
204
f.write(data)
205
with contextlib.closing(proc.handles['stdout']) as f:
206
decrypted_plaintext = f.read()
207
proc.wait()
208
except IOError as e:
209
raise PGPError(e)
210
self.gnupg.passphrase = None
211
return decrypted_plaintext
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)
212
107
213
108
214
109
class AvahiError(Exception):
245
140
server: D-Bus Server
246
141
bus: dbus.SystemBus()
247
142
"""
248
249
143
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
144
servicetype = None, port = None, TXT = None,
251
145
domain = "", host = "", max_renames = 32768,
264
158
self.server = None
265
159
self.bus = bus
266
160
self.entry_group_state_changed_match = None
267
268
161
def rename(self):
269
162
"""Derived from the Avahi example code"""
270
163
if self.rename_count >= self.max_renames:
280
173
try:
281
174
self.add()
282
175
except dbus.exceptions.DBusException as error:
283
logger.critical("D-Bus Exception", exc_info=error)
176
logger.critical("DBusException: %s", error)
284
177
self.cleanup()
285
178
os._exit(1)
286
179
self.rename_count += 1
287
288
180
def remove(self):
289
181
"""Derived from the Avahi example code"""
290
182
if self.entry_group_state_changed_match is not None:
292
184
self.entry_group_state_changed_match = None
293
185
if self.group is not None:
294
186
self.group.Reset()
295
296
187
def add(self):
297
188
"""Derived from the Avahi example code"""
298
189
self.remove()
315
206
dbus.UInt16(self.port),
316
207
avahi.string_array_to_txt_array(self.TXT))
317
208
self.group.Commit()
318
319
209
def entry_group_state_changed(self, state, error):
320
210
"""Derived from the Avahi example code"""
321
211
logger.debug("Avahi entry group state change: %i", state)
328
218
elif state == avahi.ENTRY_GROUP_FAILURE:
329
219
logger.critical("Avahi: Error in group state changed %s",
330
220
unicode(error))
331
raise AvahiGroupError("State changed: {0!s}"
332
.format(error))
333
221
raise AvahiGroupError("State changed: %s"
222
% unicode(error))
334
223
def cleanup(self):
335
224
"""Derived from the Avahi example code"""
336
225
if self.group is not None:
337
226
try:
338
227
self.group.Free()
339
228
except (dbus.exceptions.UnknownMethodException,
340
dbus.exceptions.DBusException):
229
dbus.exceptions.DBusException) as e:
341
230
pass
342
231
self.group = None
343
232
self.remove()
344
345
233
def server_state_changed(self, state, error=None):
346
234
"""Derived from the Avahi example code"""
347
235
logger.debug("Avahi server state change: %i", state)
366
254
logger.debug("Unknown state: %r", state)
367
255
else:
368
256
logger.debug("Unknown state: %r: %r", state, error)
369
370
257
def activate(self):
371
258
"""Derived from the Avahi example code"""
372
259
if self.server is None:
384
271
"""Add the new name to the syslog messages"""
385
272
ret = AvahiService.rename(self)
386
273
syslogger.setFormatter(logging.Formatter
387
('Mandos ({0}) [%(process)d]:'
388
' %(levelname)s: %(message)s'
389
.format(self.name)))
274
('Mandos (%s) [%%(process)d]:'
275
' %%(levelname)s: %%(message)s'
276
% self.name))
390
277
return ret
391
278
392
def timedelta_to_milliseconds(td):
279
def _timedelta_to_milliseconds(td):
393
280
"Convert a datetime.timedelta() to milliseconds"
394
281
return ((td.days * 24 * 60 * 60 * 1000)
395
282
+ (td.seconds * 1000)
396
283
+ (td.microseconds // 1000))
397
284
398
285
class Client(object):
399
286
"""A representation of a client host served by this server.
400
287
401
288
Attributes:
402
approved: bool(); 'None' if not yet approved/disapproved
289
_approved: bool(); 'None' if not yet approved/disapproved
403
290
approval_delay: datetime.timedelta(); Time to wait for approval
404
291
approval_duration: datetime.timedelta(); Duration of one approval
405
292
checker: subprocess.Popen(); a running checker process used
423
310
interval: datetime.timedelta(); How often to start a new checker
424
311
last_approval_request: datetime.datetime(); (UTC) or None
425
312
last_checked_ok: datetime.datetime(); (UTC) or None
426
last_checker_status: integer between 0 and 255 reflecting exit
427
status of last checker. -1 reflects crashed
428
checker, -2 means no checker completed yet.
429
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)
430
317
name: string; from the config file, used in log messages and
431
318
D-Bus identifiers
432
319
secret: bytestring; sent verbatim (over TLS) to client
433
320
timeout: datetime.timedelta(); How long from last_checked_ok
434
321
until this client is disabled
435
extended_timeout: extra long timeout when secret has been sent
322
extended_timeout: extra long timeout when password has been sent
436
323
runtime_expansions: Allowed attributes for runtime expansion.
437
324
expires: datetime.datetime(); time (UTC) when a client will be
438
325
disabled, or None
442
329
"created", "enabled", "fingerprint",
443
330
"host", "interval", "last_checked_ok",
444
331
"last_enabled", "name", "timeout")
445
client_defaults = { "timeout": "5m",
446
"extended_timeout": "15m",
447
"interval": "2m",
448
"checker": "fping -q -- %%(host)s",
449
"host": "",
450
"approval_delay": "0s",
451
"approval_duration": "1s",
452
"approved_by_default": "True",
453
"enabled": "True",
454
}
455
332
456
333
def timeout_milliseconds(self):
457
334
"Return the 'timeout' attribute in milliseconds"
458
return timedelta_to_milliseconds(self.timeout)
335
return _timedelta_to_milliseconds(self.timeout)
459
336
460
337
def extended_timeout_milliseconds(self):
461
338
"Return the 'extended_timeout' attribute in milliseconds"
462
return timedelta_to_milliseconds(self.extended_timeout)
339
return _timedelta_to_milliseconds(self.extended_timeout)
463
340
464
341
def interval_milliseconds(self):
465
342
"Return the 'interval' attribute in milliseconds"
466
return timedelta_to_milliseconds(self.interval)
343
return _timedelta_to_milliseconds(self.interval)
467
344
468
345
def approval_delay_milliseconds(self):
469
return timedelta_to_milliseconds(self.approval_delay)
470
471
@staticmethod
472
def config_parser(config):
473
"""Construct a new dict of client settings of this form:
474
{ client_name: {setting_name: value, ...}, ...}
475
with exceptions for any special settings as defined above.
476
NOTE: Must be a pure function. Must return the same result
477
value given the same arguments.
478
"""
479
settings = {}
480
for client_name in config.sections():
481
section = dict(config.items(client_name))
482
client = settings[client_name] = {}
483
484
client["host"] = section["host"]
485
# Reformat values from string types to Python types
486
client["approved_by_default"] = config.getboolean(
487
client_name, "approved_by_default")
488
client["enabled"] = config.getboolean(client_name,
489
"enabled")
490
491
client["fingerprint"] = (section["fingerprint"].upper()
492
.replace(" ", ""))
493
if "secret" in section:
494
client["secret"] = section["secret"].decode("base64")
495
elif "secfile" in section:
496
with open(os.path.expanduser(os.path.expandvars
497
(section["secfile"])),
498
"rb") as secfile:
499
client["secret"] = secfile.read()
500
else:
501
raise TypeError("No secret or secfile for section {0}"
502
.format(section))
503
client["timeout"] = string_to_delta(section["timeout"])
504
client["extended_timeout"] = string_to_delta(
505
section["extended_timeout"])
506
client["interval"] = string_to_delta(section["interval"])
507
client["approval_delay"] = string_to_delta(
508
section["approval_delay"])
509
client["approval_duration"] = string_to_delta(
510
section["approval_duration"])
511
client["checker_command"] = section["checker"]
512
client["last_approval_request"] = None
513
client["last_checked_ok"] = None
514
client["last_checker_status"] = -2
515
516
return settings
517
518
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."""
519
352
self.name = name
520
# adding all client settings
521
for setting, value in settings.iteritems():
522
setattr(self, setting, value)
523
524
if self.enabled:
525
if not hasattr(self, "last_enabled"):
526
self.last_enabled = datetime.datetime.utcnow()
527
if not hasattr(self, "expires"):
528
self.expires = (datetime.datetime.utcnow()
529
+ self.timeout)
530
else:
531
self.last_enabled = None
532
self.expires = None
533
353
if config is None:
354
config = {}
534
355
logger.debug("Creating client %r", self.name)
535
356
# Uppercase and remove spaces from fingerprint for later
536
357
# comparison purposes with return value from the fingerprint()
537
358
# function
359
self.fingerprint = (config["fingerprint"].upper()
360
.replace(" ", ""))
538
361
logger.debug(" Fingerprint: %s", self.fingerprint)
539
self.created = settings.get("created",
540
datetime.datetime.utcnow())
541
542
# 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"])
543
383
self.checker = None
544
384
self.checker_initiator_tag = None
545
385
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
546
387
self.checker_callback_tag = None
388
self.checker_command = config["checker"]
547
389
self.current_checker_command = None
548
self.approved = None
390
self._approved = None
391
self.approved_by_default = config.get("approved_by_default",
392
True)
549
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"])
550
398
self.changedstate = (multiprocessing_manager
551
399
.Condition(multiprocessing_manager
552
400
.Lock()))
553
self.client_structure = [attr for attr in
554
self.__dict__.iterkeys()
555
if not attr.startswith("_")]
401
self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
556
402
self.client_structure.append("client_structure")
557
403
404
558
405
for name, t in inspect.getmembers(type(self),
559
lambda obj:
560
isinstance(obj,
561
property)):
406
lambda obj: isinstance(obj, property)):
562
407
if not name.startswith("_"):
563
408
self.client_structure.append(name)
564
409
600
445
601
446
def __del__(self):
602
447
self.disable()
603
448
604
449
def init_checker(self):
605
450
# Schedule a new checker to be started an 'interval' from now,
606
451
# and every interval from then on.
613
458
self.disable))
614
459
# Also start a new checker *right now*.
615
460
self.start_checker()
616
461
462
617
463
def checker_callback(self, pid, condition, command):
618
464
"""The checker has completed, so take appropriate actions."""
619
465
self.checker_callback_tag = None
620
466
self.checker = None
621
467
if os.WIFEXITED(condition):
622
self.last_checker_status = os.WEXITSTATUS(condition)
468
self.last_checker_status = os.WEXITSTATUS(condition)
623
469
if self.last_checker_status == 0:
624
470
logger.info("Checker for %(name)s succeeded",
625
471
vars(self))
632
478
logger.warning("Checker for %(name)s crashed?",
633
479
vars(self))
634
480
635
def checked_ok(self):
636
"""Assert that the client has been seen, alive and well."""
637
self.last_checked_ok = datetime.datetime.utcnow()
638
self.last_checker_status = 0
639
self.bump_timeout()
640
641
def bump_timeout(self, timeout=None):
642
"""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
"""
643
487
if timeout is None:
644
488
timeout = self.timeout
489
self.last_checked_ok = datetime.datetime.utcnow()
645
490
if self.disable_initiator_tag is not None:
646
491
gobject.source_remove(self.disable_initiator_tag)
647
492
if getattr(self, "enabled", False):
648
493
self.disable_initiator_tag = (gobject.timeout_add
649
(timedelta_to_milliseconds
494
(_timedelta_to_milliseconds
650
495
(timeout), self.disable))
651
496
self.expires = datetime.datetime.utcnow() + timeout
652
497
659
504
If a checker already exists, leave it running and do
660
505
nothing."""
661
506
# The reason for not killing a running checker is that if we
662
# did that, and if a checker (for some reason) started running
663
# slowly and taking more than 'interval' time, then the client
664
# would inevitably timeout, since no checker would get a
665
# 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
666
511
# checkers alone, the checker would have to take more time
667
512
# than 'timeout' for the client to be disabled, which is as it
668
513
# should be.
698
543
try:
699
544
command = self.checker_command % escaped_attrs
700
545
except TypeError as error:
701
logger.error('Could not format string "%s"',
702
self.checker_command, exc_info=error)
546
logger.error('Could not format string "%s":'
547
' %s', self.checker_command, error)
703
548
return True # Try again later
704
549
self.current_checker_command = command
705
550
try:
723
568
gobject.source_remove(self.checker_callback_tag)
724
569
self.checker_callback(pid, status, command)
725
570
except OSError as error:
726
logger.error("Failed to start subprocess",
727
exc_info=error)
571
logger.error("Failed to start subprocess: %s",
572
error)
728
573
# Re-run this periodically if run by gobject.timeout_add
729
574
return True
730
575
737
582
return
738
583
logger.debug("Stopping checker for %(name)s", vars(self))
739
584
try:
740
self.checker.terminate()
585
os.kill(self.checker.pid, signal.SIGTERM)
741
586
#time.sleep(0.5)
742
587
#if self.checker.poll() is None:
743
# self.checker.kill()
588
# os.kill(self.checker.pid, signal.SIGKILL)
744
589
except OSError as error:
745
590
if error.errno != errno.ESRCH: # No such process
746
591
raise
747
592
self.checker = None
748
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
749
640
750
641
def dbus_service_property(dbus_interface, signature="v",
751
642
access="readwrite", byte_arrays=False):
763
654
# "Set" method, so we fail early here:
764
655
if byte_arrays and signature != "ay":
765
656
raise ValueError("Byte arrays not supported for non-'ay'"
766
" signature {0!r}".format(signature))
657
" signature %r" % signature)
767
658
def decorator(func):
768
659
func._dbus_is_property = True
769
660
func._dbus_interface = dbus_interface
777
668
return decorator
778
669
779
670
780
def dbus_interface_annotations(dbus_interface):
781
"""Decorator for marking functions returning interface annotations
782
783
Usage:
784
785
@dbus_interface_annotations("org.example.Interface")
786
def _foo(self): # Function name does not matter
787
return {"org.freedesktop.DBus.Deprecated": "true",
788
"org.freedesktop.DBus.Property.EmitsChangedSignal":
789
"false"}
790
"""
791
def decorator(func):
792
func._dbus_is_interface = True
793
func._dbus_interface = dbus_interface
794
func._dbus_name = dbus_interface
795
return func
796
return decorator
797
798
799
def dbus_annotations(annotations):
800
"""Decorator to annotate D-Bus methods, signals or properties
801
Usage:
802
803
@dbus_service_property("org.example.Interface", signature="b",
804
access="r")
805
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
806
"org.freedesktop.DBus.Property."
807
"EmitsChangedSignal": "false"})
808
def Property_dbus_property(self):
809
return dbus.Boolean(False)
810
"""
811
def decorator(func):
812
func._dbus_annotations = annotations
813
return func
814
return decorator
815
816
817
671
class DBusPropertyException(dbus.exceptions.DBusException):
818
672
"""A base class for D-Bus property-related exceptions
819
673
"""
842
696
"""
843
697
844
698
@staticmethod
845
def _is_dbus_thing(thing):
846
"""Returns a function testing if an attribute is a D-Bus thing
847
848
If called like _is_dbus_thing("method") it returns a function
849
suitable for use as predicate to inspect.getmembers().
850
"""
851
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
852
False)
699
def _is_dbus_property(obj):
700
return getattr(obj, "_dbus_is_property", False)
853
701
854
def _get_all_dbus_things(self, thing):
702
def _get_all_dbus_properties(self):
855
703
"""Returns a generator of (name, attribute) pairs
856
704
"""
857
return ((getattr(athing.__get__(self), "_dbus_name",
858
name),
859
athing.__get__(self))
705
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
860
706
for cls in self.__class__.__mro__
861
for name, athing in
862
inspect.getmembers(cls,
863
self._is_dbus_thing(thing)))
707
for name, prop in
708
inspect.getmembers(cls, self._is_dbus_property))
864
709
865
710
def _get_dbus_property(self, interface_name, property_name):
866
711
"""Returns a bound method if one exists which is a D-Bus
868
713
"""
869
714
for cls in self.__class__.__mro__:
870
715
for name, value in (inspect.getmembers
871
(cls,
872
self._is_dbus_thing("property"))):
716
(cls, self._is_dbus_property)):
873
717
if (value._dbus_name == property_name
874
718
and value._dbus_interface == interface_name):
875
719
return value.__get__(self)
904
748
# signatures other than "ay".
905
749
if prop._dbus_signature != "ay":
906
750
raise ValueError
907
value = dbus.ByteArray(b''.join(chr(byte)
908
for byte in value))
751
value = dbus.ByteArray(''.join(unichr(byte)
752
for byte in value))
909
753
prop(value)
910
754
911
755
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
916
760
917
761
Note: Will not include properties with access="write".
918
762
"""
919
properties = {}
920
for name, prop in self._get_all_dbus_things("property"):
763
all = {}
764
for name, prop in self._get_all_dbus_properties():
921
765
if (interface_name
922
766
and interface_name != prop._dbus_interface):
923
767
# Interface non-empty but did not match
927
771
continue
928
772
value = prop()
929
773
if not hasattr(value, "variant_level"):
930
properties[name] = value
774
all[name] = value
931
775
continue
932
properties[name] = type(value)(value, variant_level=
933
value.variant_level+1)
934
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")
935
779
936
780
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
937
781
out_signature="s",
938
782
path_keyword='object_path',
939
783
connection_keyword='connection')
940
784
def Introspect(self, object_path, connection):
941
"""Overloading of standard D-Bus method.
942
943
Inserts property tags and interface annotation tags.
785
"""Standard D-Bus method, overloaded to insert property tags.
944
786
"""
945
787
xmlstring = dbus.service.Object.Introspect(self, object_path,
946
788
connection)
953
795
e.setAttribute("access", prop._dbus_access)
954
796
return e
955
797
for if_tag in document.getElementsByTagName("interface"):
956
# Add property tags
957
798
for tag in (make_tag(document, name, prop)
958
799
for name, prop
959
in self._get_all_dbus_things("property")
800
in self._get_all_dbus_properties()
960
801
if prop._dbus_interface
961
802
== if_tag.getAttribute("name")):
962
803
if_tag.appendChild(tag)
963
# Add annotation tags
964
for typ in ("method", "signal", "property"):
965
for tag in if_tag.getElementsByTagName(typ):
966
annots = dict()
967
for name, prop in (self.
968
_get_all_dbus_things(typ)):
969
if (name == tag.getAttribute("name")
970
and prop._dbus_interface
971
== if_tag.getAttribute("name")):
972
annots.update(getattr
973
(prop,
974
"_dbus_annotations",
975
{}))
976
for name, value in annots.iteritems():
977
ann_tag = document.createElement(
978
"annotation")
979
ann_tag.setAttribute("name", name)
980
ann_tag.setAttribute("value", value)
981
tag.appendChild(ann_tag)
982
# Add interface annotation tags
983
for annotation, value in dict(
984
itertools.chain.from_iterable(
985
annotations().iteritems()
986
for name, annotations in
987
self._get_all_dbus_things("interface")
988
if name == if_tag.getAttribute("name")
989
)).iteritems():
990
ann_tag = document.createElement("annotation")
991
ann_tag.setAttribute("name", annotation)
992
ann_tag.setAttribute("value", value)
993
if_tag.appendChild(ann_tag)
994
804
# Add the names to the return values for the
995
805
# "org.freedesktop.DBus.Properties" methods
996
806
if (if_tag.getAttribute("name")
1011
821
except (AttributeError, xml.dom.DOMException,
1012
822
xml.parsers.expat.ExpatError) as error:
1013
823
logger.error("Failed to override Introspection method",
1014
exc_info=error)
824
error)
1015
825
return xmlstring
1016
826
1017
827
1022
832
return dbus.String(dt.isoformat(),
1023
833
variant_level=variant_level)
1024
834
1025
1026
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1027
"""A class decorator; applied to a subclass of
1028
dbus.service.Object, it will add alternate D-Bus attributes with
1029
interface names according to the "alt_interface_names" mapping.
1030
Usage:
1031
1032
@alternate_dbus_names({"org.example.Interface":
1033
"net.example.AlternateInterface"})
1034
class SampleDBusObject(dbus.service.Object):
1035
@dbus.service.method("org.example.Interface")
1036
def SampleDBusMethod():
1037
pass
1038
1039
The above "SampleDBusMethod" on "SampleDBusObject" will be
1040
reachable via two interfaces: "org.example.Interface" and
1041
"net.example.AlternateInterface", the latter of which will have
1042
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1043
"true", unless "deprecate" is passed with a False value.
1044
1045
This works for methods and signals, and also for D-Bus properties
1046
(from DBusObjectWithProperties) and interfaces (from the
1047
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.
1048
839
"""
1049
def wrapper(cls):
1050
for orig_interface_name, alt_interface_name in (
1051
alt_interface_names.iteritems()):
1052
attr = {}
1053
interface_names = set()
1054
# Go though all attributes of the class
1055
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):
1056
847
# Ignore non-D-Bus attributes, and D-Bus attributes
1057
848
# with the wrong interface name
1058
849
if (not hasattr(attribute, "_dbus_interface")
1059
850
or not attribute._dbus_interface
1060
.startswith(orig_interface_name)):
851
.startswith("se.recompile.Mandos")):
1061
852
continue
1062
853
# Create an alternate D-Bus interface name based on
1063
854
# the current name
1064
855
alt_interface = (attribute._dbus_interface
1065
.replace(orig_interface_name,
1066
alt_interface_name))
1067
interface_names.add(alt_interface)
856
.replace("se.recompile.Mandos",
857
"se.bsnet.fukt.Mandos"))
1068
858
# Is this a D-Bus signal?
1069
859
if getattr(attribute, "_dbus_is_signal", False):
1070
860
# Extract the original non-method function by
1085
875
nonmethod_func.func_name,
1086
876
nonmethod_func.func_defaults,
1087
877
nonmethod_func.func_closure)))
1088
# Copy annotations, if any
1089
try:
1090
new_function._dbus_annotations = (
1091
dict(attribute._dbus_annotations))
1092
except AttributeError:
1093
pass
1094
878
# Define a creator of a function to call both the
1095
# original and alternate functions, so both the
1096
# original and alternate signals gets sent when
1097
# the function is called
879
# old and new functions, so both the old and new
880
# signals gets sent when the function is called
1098
881
def fixscope(func1, func2):
1099
882
"""This function is a scope container to pass
1100
883
func1 and func2 to the "call_both" function
1107
890
return call_both
1108
891
# Create the "call_both" function and add it to
1109
892
# the class
1110
attr[attrname] = fixscope(attribute, new_function)
893
attr[attrname] = fixscope(attribute,
894
new_function)
1111
895
# Is this a D-Bus method?
1112
896
elif getattr(attribute, "_dbus_is_method", False):
1113
897
# Create a new, but exactly alike, function
1124
908
attribute.func_name,
1125
909
attribute.func_defaults,
1126
910
attribute.func_closure)))
1127
# Copy annotations, if any
1128
try:
1129
attr[attrname]._dbus_annotations = (
1130
dict(attribute._dbus_annotations))
1131
except AttributeError:
1132
pass
1133
911
# Is this a D-Bus property?
1134
912
elif getattr(attribute, "_dbus_is_property", False):
1135
913
# Create a new, but exactly alike, function
1149
927
attribute.func_name,
1150
928
attribute.func_defaults,
1151
929
attribute.func_closure)))
1152
# Copy annotations, if any
1153
try:
1154
attr[attrname]._dbus_annotations = (
1155
dict(attribute._dbus_annotations))
1156
except AttributeError:
1157
pass
1158
# Is this a D-Bus interface?
1159
elif getattr(attribute, "_dbus_is_interface", False):
1160
# Create a new, but exactly alike, function
1161
# object. Decorate it to be a new D-Bus interface
1162
# with the alternate D-Bus interface name. Add it
1163
# to the class.
1164
attr[attrname] = (dbus_interface_annotations
1165
(alt_interface)
1166
(types.FunctionType
1167
(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1172
if deprecate:
1173
# Deprecate all alternate interfaces
1174
iname="_AlternateDBusNames_interface_annotation{0}"
1175
for interface_name in interface_names:
1176
@dbus_interface_annotations(interface_name)
1177
def func(self):
1178
return { "org.freedesktop.DBus.Deprecated":
1179
"true" }
1180
# Find an unused name
1181
for aname in (iname.format(i)
1182
for i in itertools.count()):
1183
if aname not in attr:
1184
attr[aname] = func
1185
break
1186
if interface_names:
1187
# Replace the class with a new subclass of it with
1188
# methods, signals, etc. as created above.
1189
cls = type(b"{0}Alternate".format(cls.__name__),
1190
(cls,), attr)
1191
return cls
1192
return wrapper
1193
1194
1195
@alternate_dbus_interfaces({"se.recompile.Mandos":
1196
"se.bsnet.fukt.Mandos"})
930
return type.__new__(mcs, name, bases, attr)
931
1197
932
class ClientDBus(Client, DBusObjectWithProperties):
1198
933
"""A Client class using D-Bus
1199
934
1210
945
def __init__(self, bus = None, *args, **kwargs):
1211
946
self.bus = bus
1212
947
Client.__init__(self, *args, **kwargs)
948
949
self._approvals_pending = 0
1213
950
# Only now, when this client is initialized, can it show up on
1214
951
# the D-Bus
1215
952
client_object_name = unicode(self.name).translate(
1219
956
("/clients/" + client_object_name))
1220
957
DBusObjectWithProperties.__init__(self, self.bus,
1221
958
self.dbus_object_path)
1222
959
1223
960
def notifychangeproperty(transform_func,
1224
961
dbus_name, type_func=lambda x: x,
1225
962
variant_level=1):
1226
963
""" Modify a variable so that it's a property which announces
1227
964
its changes to DBus.
1228
965
1229
966
transform_fun: Function that takes a value and a variant_level
1230
967
and transforms it to a D-Bus type.
1231
968
dbus_name: D-Bus name of the variable
1248
985
1249
986
return property(lambda self: getattr(self, attrname), setter)
1250
987
988
1251
989
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1252
990
approvals_pending = notifychangeproperty(dbus.Boolean,
1253
991
"ApprovalPending",
1260
998
checker is not None)
1261
999
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1262
1000
"LastCheckedOK")
1263
last_checker_status = notifychangeproperty(dbus.Int16,
1264
"LastCheckerStatus")
1265
1001
last_approval_request = notifychangeproperty(
1266
1002
datetime_to_dbus, "LastApprovalRequest")
1267
1003
approved_by_default = notifychangeproperty(dbus.Boolean,
1268
1004
"ApprovedByDefault")
1269
approval_delay = notifychangeproperty(dbus.UInt64,
1005
approval_delay = notifychangeproperty(dbus.UInt16,
1270
1006
"ApprovalDelay",
1271
1007
type_func =
1272
timedelta_to_milliseconds)
1008
_timedelta_to_milliseconds)
1273
1009
approval_duration = notifychangeproperty(
1274
dbus.UInt64, "ApprovalDuration",
1275
type_func = timedelta_to_milliseconds)
1010
dbus.UInt16, "ApprovalDuration",
1011
type_func = _timedelta_to_milliseconds)
1276
1012
host = notifychangeproperty(dbus.String, "Host")
1277
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1013
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1278
1014
type_func =
1279
timedelta_to_milliseconds)
1015
_timedelta_to_milliseconds)
1280
1016
extended_timeout = notifychangeproperty(
1281
dbus.UInt64, "ExtendedTimeout",
1282
type_func = timedelta_to_milliseconds)
1283
interval = notifychangeproperty(dbus.UInt64,
1017
dbus.UInt16, "ExtendedTimeout",
1018
type_func = _timedelta_to_milliseconds)
1019
interval = notifychangeproperty(dbus.UInt16,
1284
1020
"Interval",
1285
1021
type_func =
1286
timedelta_to_milliseconds)
1022
_timedelta_to_milliseconds)
1287
1023
checker_command = notifychangeproperty(dbus.String, "Checker")
1288
1024
1289
1025
del notifychangeproperty
1331
1067
return r
1332
1068
1333
1069
def _reset_approved(self):
1334
self.approved = None
1070
self._approved = None
1335
1071
return False
1336
1072
1337
1073
def approve(self, value=True):
1338
1074
self.send_changedstate()
1339
self.approved = value
1340
gobject.timeout_add(timedelta_to_milliseconds
1075
self._approved = value
1076
gobject.timeout_add(_timedelta_to_milliseconds
1341
1077
(self.approval_duration),
1342
1078
self._reset_approved)
1343
1079
1080
1344
1081
## D-Bus methods, signals & properties
1345
1082
_interface = "se.recompile.Mandos.Client"
1346
1083
1347
## Interfaces
1348
1349
@dbus_interface_annotations(_interface)
1350
def _foo(self):
1351
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1352
"false"}
1353
1354
1084
## Signals
1355
1085
1356
1086
# CheckerCompleted - signal
1455
1185
access="readwrite")
1456
1186
def ApprovalDuration_dbus_property(self, value=None):
1457
1187
if value is None: # get
1458
return dbus.UInt64(timedelta_to_milliseconds(
1188
return dbus.UInt64(_timedelta_to_milliseconds(
1459
1189
self.approval_duration))
1460
1190
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1461
1191
1475
1205
def Host_dbus_property(self, value=None):
1476
1206
if value is None: # get
1477
1207
return dbus.String(self.host)
1478
self.host = unicode(value)
1208
self.host = value
1479
1209
1480
1210
# Created - property
1481
1211
@dbus_service_property(_interface, signature="s", access="read")
1482
1212
def Created_dbus_property(self):
1483
return datetime_to_dbus(self.created)
1213
return dbus.String(datetime_to_dbus(self.created))
1484
1214
1485
1215
# LastEnabled - property
1486
1216
@dbus_service_property(_interface, signature="s", access="read")
1507
1237
return
1508
1238
return datetime_to_dbus(self.last_checked_ok)
1509
1239
1510
# LastCheckerStatus - property
1511
@dbus_service_property(_interface, signature="n",
1512
access="read")
1513
def LastCheckerStatus_dbus_property(self):
1514
return dbus.Int16(self.last_checker_status)
1515
1516
1240
# Expires - property
1517
1241
@dbus_service_property(_interface, signature="s", access="read")
1518
1242
def Expires_dbus_property(self):
1530
1254
if value is None: # get
1531
1255
return dbus.UInt64(self.timeout_milliseconds())
1532
1256
self.timeout = datetime.timedelta(0, 0, 0, value)
1257
if getattr(self, "disable_initiator_tag", None) is None:
1258
return
1533
1259
# Reschedule timeout
1534
if self.enabled:
1535
now = datetime.datetime.utcnow()
1536
time_to_die = timedelta_to_milliseconds(
1537
(self.last_checked_ok + self.timeout) - now)
1538
if time_to_die <= 0:
1539
# The timeout has passed
1540
self.disable()
1541
else:
1542
self.expires = (now +
1543
datetime.timedelta(milliseconds =
1544
time_to_die))
1545
if (getattr(self, "disable_initiator_tag", None)
1546
is None):
1547
return
1548
gobject.source_remove(self.disable_initiator_tag)
1549
self.disable_initiator_tag = (gobject.timeout_add
1550
(time_to_die,
1551
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))
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:
1743
1469
time = datetime.datetime.now()
1744
1470
client.changedstate.acquire()
1745
1471
(client.changedstate.wait
1746
(float(client.timedelta_to_milliseconds(delay)
1472
(float(client._timedelta_to_milliseconds(delay)
1747
1473
/ 1000)))
1748
1474
client.changedstate.release()
1749
1475
time2 = datetime.datetime.now()
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
1994
1719
1995
1720
def handle_ipc(self, source, condition, parent_pipe=None,
1996
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)
1997
1736
# error, or the other end of multiprocessing.Pipe has closed
1998
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1737
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1999
1738
# Wait for other process to exit
2000
1739
proc.join()
2001
1740
return False
2091
1830
elif suffix == "w":
2092
1831
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2093
1832
else:
2094
raise ValueError("Unknown suffix {0!r}"
2095
.format(suffix))
1833
raise ValueError("Unknown suffix %r" % suffix)
2096
1834
except (ValueError, IndexError) as e:
2097
1835
raise ValueError(*(e.args))
2098
1836
timevalue += delta
2099
1837
return timevalue
2100
1838
2101
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
2102
1864
def daemon(nochdir = False, noclose = False):
2103
1865
"""See daemon(3). Standard BSD Unix function.
2104
1866
2112
1874
sys.exit()
2113
1875
if not noclose:
2114
1876
# Close all standard open file descriptors
2115
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1877
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2116
1878
if not stat.S_ISCHR(os.fstat(null).st_mode):
2117
1879
raise OSError(errno.ENODEV,
2118
"{0} not a character device"
2119
.format(os.devnull))
1880
"%s not a character device"
1881
% os.path.devnull)
2120
1882
os.dup2(null, sys.stdin.fileno())
2121
1883
os.dup2(null, sys.stdout.fileno())
2122
1884
os.dup2(null, sys.stderr.fileno())
2131
1893
2132
1894
parser = argparse.ArgumentParser()
2133
1895
parser.add_argument("-v", "--version", action="version",
2134
version = "%(prog)s {0}".format(version),
1896
version = "%%(prog)s %s" % version,
2135
1897
help="show version number and exit")
2136
1898
parser.add_argument("-i", "--interface", metavar="IF",
2137
1899
help="Bind to interface IF")
2160
1922
parser.add_argument("--no-ipv6", action="store_false",
2161
1923
dest="use_ipv6", help="Do not use IPv6")
2162
1924
parser.add_argument("--no-restore", action="store_false",
2163
dest="restore", help="Do not restore stored"
2164
" state")
2165
parser.add_argument("--statedir", metavar="DIR",
2166
help="Directory to save/restore state in")
2167
1925
dest="restore", help="Do not restore stored state",
1926
default=True)
1927
2168
1928
options = parser.parse_args()
2169
1929
2170
1930
if options.check:
2183
1943
"use_dbus": "True",
2184
1944
"use_ipv6": "True",
2185
1945
"debuglevel": "",
2186
"restore": "True",
2187
"statedir": "/var/lib/mandos"
2188
1946
}
2189
1947
2190
1948
# Parse config file for server-global settings
2207
1965
# options, if set.
2208
1966
for option in ("interface", "address", "port", "debug",
2209
1967
"priority", "servicename", "configdir",
2210
"use_dbus", "use_ipv6", "debuglevel", "restore",
2211
"statedir"):
1968
"use_dbus", "use_ipv6", "debuglevel", "restore"):
2212
1969
value = getattr(options, option)
2213
1970
if value is not None:
2214
1971
server_settings[option] = value
2226
1983
debuglevel = server_settings["debuglevel"]
2227
1984
use_dbus = server_settings["use_dbus"]
2228
1985
use_ipv6 = server_settings["use_ipv6"]
2229
stored_state_path = os.path.join(server_settings["statedir"],
2230
stored_state_file)
2231
2232
if debug:
2233
initlogger(debug, logging.DEBUG)
2234
else:
2235
if not debuglevel:
2236
initlogger(debug)
2237
else:
2238
level = getattr(logging, debuglevel.upper())
2239
initlogger(debug, level)
2240
1986
2241
1987
if server_settings["servicename"] != "Mandos":
2242
1988
syslogger.setFormatter(logging.Formatter
2243
('Mandos ({0}) [%(process)d]:'
2244
' %(levelname)s: %(message)s'
2245
.format(server_settings
2246
["servicename"])))
1989
('Mandos (%s) [%%(process)d]:'
1990
' %%(levelname)s: %%(message)s'
1991
% server_settings["servicename"]))
2247
1992
2248
1993
# Parse config file with clients
2249
client_config = configparser.SafeConfigParser(Client
2250
.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)
2251
2003
client_config.read(os.path.join(server_settings["configdir"],
2252
2004
"clients.conf"))
2253
2005
2267
2019
pidfilename = "/var/run/mandos.pid"
2268
2020
try:
2269
2021
pidfile = open(pidfilename, "w")
2270
except IOError as e:
2271
logger.error("Could not open file %r", pidfilename,
2272
exc_info=e)
2022
except IOError:
2023
logger.error("Could not open file %r", pidfilename)
2273
2024
2274
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:
2275
2029
try:
2276
uid = pwd.getpwnam(name).pw_uid
2277
gid = pwd.getpwnam(name).pw_gid
2278
break
2030
uid = pwd.getpwnam("mandos").pw_uid
2031
gid = pwd.getpwnam("mandos").pw_gid
2279
2032
except KeyError:
2280
continue
2281
else:
2282
uid = 65534
2283
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
2284
2039
try:
2285
2040
os.setgid(gid)
2286
2041
os.setuid(uid)
2288
2043
if error[0] != errno.EPERM:
2289
2044
raise error
2290
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
2291
2052
if debug:
2053
logger.setLevel(logging.DEBUG)
2292
2054
# Enable all possible GnuTLS debugging
2293
2055
2294
2056
# "Use a log level over 10 to enable all debugging options."
2303
2065
.gnutls_global_set_log_function(debug_gnutls))
2304
2066
2305
2067
# Redirect stdin so all checkers get /dev/null
2306
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2068
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2307
2069
os.dup2(null, sys.stdin.fileno())
2308
2070
if null > 2:
2309
2071
os.close(null)
2072
else:
2073
# No console logging
2074
logger.removeHandler(console)
2310
2075
2311
2076
# Need to fork before connecting to D-Bus
2312
2077
if not debug:
2313
2078
# Close all input and output, do double fork, etc.
2314
2079
daemon()
2315
2080
2316
gobject.threads_init()
2317
2318
2081
global main_loop
2319
2082
# From the Avahi example code
2320
DBusGMainLoop(set_as_default=True)
2083
DBusGMainLoop(set_as_default=True )
2321
2084
main_loop = gobject.MainLoop()
2322
2085
bus = dbus.SystemBus()
2323
2086
# End of Avahi example code
2329
2092
("se.bsnet.fukt.Mandos", bus,
2330
2093
do_not_queue=True))
2331
2094
except dbus.exceptions.NameExistsException as e:
2332
logger.error("Disabling D-Bus:", exc_info=e)
2095
logger.error(unicode(e) + ", disabling D-Bus")
2333
2096
use_dbus = False
2334
2097
server_settings["use_dbus"] = False
2335
2098
tcp_server.use_dbus = False
2347
2110
2348
2111
client_class = Client
2349
2112
if use_dbus:
2350
client_class = functools.partial(ClientDBus, bus = bus)
2351
2352
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
2353
2133
old_client_settings = {}
2354
clients_data = {}
2355
2356
# Get client data and settings from last running state.
2134
clients_data = []
2135
2136
# Get client data and settings from last running state.
2357
2137
if server_settings["restore"]:
2358
2138
try:
2359
2139
with open(stored_state_path, "rb") as stored_state:
2360
clients_data, old_client_settings = (pickle.load
2361
(stored_state))
2140
clients_data, old_client_settings = pickle.load(stored_state)
2362
2141
os.remove(stored_state_path)
2363
2142
except IOError as e:
2364
if e.errno == errno.ENOENT:
2365
logger.warning("Could not load persistent state: {0}"
2366
.format(os.strerror(e.errno)))
2367
else:
2368
logger.critical("Could not load persistent state:",
2369
exc_info=e)
2143
logger.warning("Could not load persistant state: {0}".format(e))
2144
if e.errno != errno.ENOENT:
2370
2145
raise
2371
except EOFError as e:
2372
logger.warning("Could not load persistent state: "
2373
"EOFError:", exc_info=e)
2374
2375
with PGPEngine() as pgp:
2376
for client_name, client in clients_data.iteritems():
2377
# Decide which value to use after restoring saved state.
2378
# We have three different values: Old config file,
2379
# new config file, and saved state.
2380
# New config value takes precedence if it differs from old
2381
# config value, otherwise use saved state.
2382
for name, value in client_settings[client_name].items():
2383
try:
2384
# For each value in new config, check if it
2385
# differs from the old config value (Except for
2386
# the "secret" attribute)
2387
if (name != "secret" and
2388
value != old_client_settings[client_name]
2389
[name]):
2390
client[name] = value
2391
except KeyError:
2392
pass
2393
2394
# Clients who has passed its expire date can still be
2395
# enabled if its last checker was successful. Clients
2396
# whose checker succeeded before we stored its state is
2397
# assumed to have successfully run all checkers during
2398
# downtime.
2399
if client["enabled"]:
2400
if datetime.datetime.utcnow() >= client["expires"]:
2401
if not client["last_checked_ok"]:
2402
logger.warning(
2403
"disabling client {0} - Client never "
2404
"performed a successful checker"
2405
.format(client_name))
2406
client["enabled"] = False
2407
elif client["last_checker_status"] != 0:
2408
logger.warning(
2409
"disabling client {0} - Client "
2410
"last checker failed with error code {1}"
2411
.format(client_name,
2412
client["last_checker_status"]))
2413
client["enabled"] = False
2414
else:
2415
client["expires"] = (datetime.datetime
2416
.utcnow()
2417
+ client["timeout"])
2418
logger.debug("Last checker succeeded,"
2419
" keeping {0} enabled"
2420
.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():
2421
2156
try:
2422
client["secret"] = (
2423
pgp.decrypt(client["encrypted_secret"],
2424
client_settings[client_name]
2425
["secret"]))
2426
except PGPError:
2427
# If decryption fails, we use secret from new settings
2428
logger.debug("Failed to decrypt {0} old secret"
2429
.format(client_name))
2430
client["secret"] = (
2431
client_settings[client_name]["secret"])
2432
2433
# Add/remove clients based on new changes made to config
2434
for client_name in (set(old_client_settings)
2435
- set(client_settings)):
2436
del clients_data[client_name]
2437
for client_name in (set(client_settings)
2438
- set(old_client_settings)):
2439
clients_data[client_name] = client_settings[client_name]
2440
2441
# Create all client objects
2442
for client_name, client in clients_data.iteritems():
2443
tcp_server.clients[client_name] = client_class(
2444
name = client_name, settings = client)
2445
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
2446
2211
if not tcp_server.clients:
2447
2212
logger.warning("No clients defined")
2448
2213
2449
2214
if not debug:
2450
2215
try:
2451
2216
with pidfile:
2459
2224
# "pidfile" was never created
2460
2225
pass
2461
2226
del pidfilename
2227
2462
2228
signal.signal(signal.SIGINT, signal.SIG_IGN)
2463
2229
2464
2230
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2465
2231
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2466
2232
2467
2233
if use_dbus:
2468
@alternate_dbus_interfaces({"se.recompile.Mandos":
2469
"se.bsnet.fukt.Mandos"})
2470
class MandosDBusService(DBusObjectWithProperties):
2234
class MandosDBusService(dbus.service.Object):
2471
2235
"""A D-Bus proxy object"""
2472
2236
def __init__(self):
2473
2237
dbus.service.Object.__init__(self, bus, "/")
2474
2238
_interface = "se.recompile.Mandos"
2475
2239
2476
@dbus_interface_annotations(_interface)
2477
def _foo(self):
2478
return { "org.freedesktop.DBus.Property"
2479
".EmitsChangedSignal":
2480
"false"}
2481
2482
2240
@dbus.service.signal(_interface, signature="o")
2483
2241
def ClientAdded(self, objpath):
2484
2242
"D-Bus signal"
2526
2284
2527
2285
del _interface
2528
2286
2529
mandos_dbus_service = MandosDBusService()
2287
class MandosDBusServiceTransitional(MandosDBusService):
2288
__metaclass__ = AlternateDBusNamesMetaclass
2289
mandos_dbus_service = MandosDBusServiceTransitional()
2530
2290
2531
2291
def cleanup():
2532
2292
"Cleanup function; run on exit"
2535
2295
multiprocessing.active_children()
2536
2296
if not (tcp_server.clients or client_settings):
2537
2297
return
2538
2539
# Store client before exiting. Secrets are encrypted with key
2540
# based on what config file has. If config file is
2541
# removed/edited, old secret will thus be unrecovable.
2542
clients = {}
2543
with PGPEngine() as pgp:
2544
for client in tcp_server.clients.itervalues():
2545
key = client_settings[client.name]["secret"]
2546
client.encrypted_secret = pgp.encrypt(client.secret,
2547
key)
2548
client_dict = {}
2549
2550
# A list of attributes that can not be pickled
2551
# + secret.
2552
exclude = set(("bus", "changedstate", "secret",
2553
"checker"))
2554
for name, typ in (inspect.getmembers
2555
(dbus.service.Object)):
2556
exclude.add(name)
2557
2558
client_dict["encrypted_secret"] = (client
2559
.encrypted_secret)
2560
for attr in client.client_structure:
2561
if attr not in exclude:
2562
client_dict[attr] = getattr(client, attr)
2563
2564
clients[client.name] = client_dict
2565
del client_settings[client.name]["secret"]
2566
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
2567
2321
try:
2568
with (tempfile.NamedTemporaryFile
2569
(mode='wb', suffix=".pickle", prefix='clients-',
2570
dir=os.path.dirname(stored_state_path),
2571
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:
2572
2323
pickle.dump((clients, client_settings), stored_state)
2573
tempname=stored_state.name
2574
os.rename(tempname, stored_state_path)
2575
except (IOError, OSError) as e:
2576
if not debug:
2577
try:
2578
os.remove(tempname)
2579
except NameError:
2580
pass
2581
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2582
logger.warning("Could not save persistent state: {0}"
2583
.format(os.strerror(e.errno)))
2584
else:
2585
logger.warning("Could not save persistent state:",
2586
exc_info=e)
2587
raise e
2588
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
2589
2329
# Delete all clients, and settings from config
2590
2330
while tcp_server.clients:
2591
2331
name, client = tcp_server.clients.popitem()
2609
2349
# Need to initiate checking of clients
2610
2350
if client.enabled:
2611
2351
client.init_checker()
2352
2612
2353
2613
2354
tcp_server.enable()
2614
2355
tcp_server.server_activate()
2617
2358
service.port = tcp_server.socket.getsockname()[1]
2618
2359
if use_ipv6:
2619
2360
logger.info("Now listening on address %r, port %d,"
2620
" flowinfo %d, scope_id %d",
2621
*tcp_server.socket.getsockname())
2361
" flowinfo %d, scope_id %d"
2362
% tcp_server.socket.getsockname())
2622
2363
else: # IPv4
2623
logger.info("Now listening on address %r, port %d",
2624
*tcp_server.socket.getsockname())
2364
logger.info("Now listening on address %r, port %d"
2365
% tcp_server.socket.getsockname())
2625
2366
2626
2367
#service.interface = tcp_server.socket.getsockname()[3]
2627
2368
2630
2371
try:
2631
2372
service.activate()
2632
2373
except dbus.exceptions.DBusException as error:
2633
logger.critical("D-Bus Exception", exc_info=error)
2374
logger.critical("DBusException: %s", error)
2634
2375
cleanup()
2635
2376
sys.exit(1)
2636
2377
# End of Avahi example code
2643
2384
logger.debug("Starting main loop")
2644
2385
main_loop.run()
2645
2386
except AvahiError as error:
2646
logger.critical("Avahi Error", exc_info=error)
2387
logger.critical("AvahiError: %s", error)
2647
2388
cleanup()
2648
2389
sys.exit(1)
2649
2390
except KeyboardInterrupt:
2654
2395
# Must run before the D-Bus bus name gets deregistered
2655
2396
cleanup()
2656
2397
2398
2657
2399
if __name__ == '__main__':
2658
2400
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0