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 463.1.10
- compare with another revision
- download diff
- download tarball
- view history from revision 463.1.10
- Committer: Teddy Hogeborn
- Date: 2011-02-27 16:56:09 UTC
- mto: This revision was merged to the branch mainline in revision 465.
- Revision ID: teddy@fukt.bsnet.se-20110227165609-2uij9a5ytirpxq0n
* debian/control (mandos): Depend on Python 2.6. Do not depend on
python-multiprocessing.
(mandos-client): Conflict with dropbear (< 0.52-5); Debian bug
#584780.
python-multiprocessing.
(mandos-client): Conflict with dropbear (< 0.52-5); Debian bug
#584780.
- files removed:
- debian/source/local-options
- 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-2010 Teddy Hogeborn
15
# Copyright © 2008-2010 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
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@recompile.se>.
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
34
from __future__ import (division, absolute_import, print_function,
36
36
37
37
import SocketServer as socketserver
38
38
import socket
39
import argparse
39
import optparse
40
40
import datetime
41
41
import errno
42
42
import gnutls.crypto
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
import types
66
import binascii
67
import tempfile
68
import itertools
69
65
70
66
import dbus
71
67
import dbus.service
76
72
import ctypes.util
77
73
import xml.dom.minidom
78
74
import inspect
79
import GnuPGInterface
80
75
81
76
try:
82
77
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
81
except ImportError:
87
82
SO_BINDTODEVICE = None
88
83
89
version = "1.5.3"
90
stored_state_file = "clients.pickle"
91
92
logger = logging.getLogger()
84
85
version = "1.2.3"
86
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
93
89
syslogger = (logging.handlers.SysLogHandler
94
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
91
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
92
syslogger.setFormatter(logging.Formatter
93
('Mandos [%(process)d]: %(levelname)s:'
94
' %(message)s'))
95
logger.addHandler(syslogger)
96
97
console = logging.StreamHandler()
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
' %(levelname)s:'
100
' %(message)s'))
101
logger.addHandler(console)
211
102
212
103
class AvahiError(Exception):
213
104
def __init__(self, value, *args, **kwargs):
243
134
server: D-Bus Server
244
135
bus: dbus.SystemBus()
245
136
"""
246
247
137
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
138
servicetype = None, port = None, TXT = None,
249
139
domain = "", host = "", max_renames = 32768,
261
151
self.group = None # our entry group
262
152
self.server = None
263
153
self.bus = bus
264
self.entry_group_state_changed_match = None
265
266
154
def rename(self):
267
155
"""Derived from the Avahi example code"""
268
156
if self.rename_count >= self.max_renames:
270
158
" after %i retries, exiting.",
271
159
self.rename_count)
272
160
raise AvahiServiceError("Too many renames")
273
self.name = unicode(self.server
274
.GetAlternativeServiceName(self.name))
161
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
275
162
logger.info("Changing Zeroconf service name to %r ...",
276
163
self.name)
164
syslogger.setFormatter(logging.Formatter
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
167
% self.name))
277
168
self.remove()
278
169
try:
279
170
self.add()
280
except dbus.exceptions.DBusException as error:
281
logger.critical("D-Bus Exception", exc_info=error)
171
except dbus.exceptions.DBusException, error:
172
logger.critical("DBusException: %s", error)
282
173
self.cleanup()
283
174
os._exit(1)
284
175
self.rename_count += 1
285
286
176
def remove(self):
287
177
"""Derived from the Avahi example code"""
288
if self.entry_group_state_changed_match is not None:
289
self.entry_group_state_changed_match.remove()
290
self.entry_group_state_changed_match = None
291
178
if self.group is not None:
292
179
self.group.Reset()
293
294
180
def add(self):
295
181
"""Derived from the Avahi example code"""
296
self.remove()
297
182
if self.group is None:
298
183
self.group = dbus.Interface(
299
184
self.bus.get_object(avahi.DBUS_NAME,
300
185
self.server.EntryGroupNew()),
301
186
avahi.DBUS_INTERFACE_ENTRY_GROUP)
302
self.entry_group_state_changed_match = (
303
self.group.connect_to_signal(
304
'StateChanged', self.entry_group_state_changed))
187
self.group.connect_to_signal('StateChanged',
188
self
189
.entry_group_state_changed)
305
190
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
306
191
self.name, self.type)
307
192
self.group.AddService(
313
198
dbus.UInt16(self.port),
314
199
avahi.string_array_to_txt_array(self.TXT))
315
200
self.group.Commit()
316
317
201
def entry_group_state_changed(self, state, error):
318
202
"""Derived from the Avahi example code"""
319
203
logger.debug("Avahi entry group state change: %i", state)
326
210
elif state == avahi.ENTRY_GROUP_FAILURE:
327
211
logger.critical("Avahi: Error in group state changed %s",
328
212
unicode(error))
329
raise AvahiGroupError("State changed: {0!s}"
330
.format(error))
331
213
raise AvahiGroupError("State changed: %s"
214
% unicode(error))
332
215
def cleanup(self):
333
216
"""Derived from the Avahi example code"""
334
217
if self.group is not None:
335
try:
336
self.group.Free()
337
except (dbus.exceptions.UnknownMethodException,
338
dbus.exceptions.DBusException):
339
pass
218
self.group.Free()
340
219
self.group = None
341
self.remove()
342
343
def server_state_changed(self, state, error=None):
220
def server_state_changed(self, state):
344
221
"""Derived from the Avahi example code"""
345
222
logger.debug("Avahi server state change: %i", state)
346
bad_states = { avahi.SERVER_INVALID:
347
"Zeroconf server invalid",
348
avahi.SERVER_REGISTERING: None,
349
avahi.SERVER_COLLISION:
350
"Zeroconf server name collision",
351
avahi.SERVER_FAILURE:
352
"Zeroconf server failure" }
353
if state in bad_states:
354
if bad_states[state] is not None:
355
if error is None:
356
logger.error(bad_states[state])
357
else:
358
logger.error(bad_states[state] + ": %r", error)
359
self.cleanup()
223
if state == avahi.SERVER_COLLISION:
224
logger.error("Zeroconf server name collision")
225
self.remove()
360
226
elif state == avahi.SERVER_RUNNING:
361
227
self.add()
362
else:
363
if error is None:
364
logger.debug("Unknown state: %r", state)
365
else:
366
logger.debug("Unknown state: %r: %r", state, error)
367
368
228
def activate(self):
369
229
"""Derived from the Avahi example code"""
370
230
if self.server is None:
371
231
self.server = dbus.Interface(
372
232
self.bus.get_object(avahi.DBUS_NAME,
373
avahi.DBUS_PATH_SERVER,
374
follow_name_owner_changes=True),
233
avahi.DBUS_PATH_SERVER),
375
234
avahi.DBUS_INTERFACE_SERVER)
376
235
self.server.connect_to_signal("StateChanged",
377
236
self.server_state_changed)
378
237
self.server_state_changed(self.server.GetState())
379
238
380
class AvahiServiceToSyslog(AvahiService):
381
def rename(self):
382
"""Add the new name to the syslog messages"""
383
ret = AvahiService.rename(self)
384
syslogger.setFormatter(logging.Formatter
385
('Mandos ({0}) [%(process)d]:'
386
' %(levelname)s: %(message)s'
387
.format(self.name)))
388
return ret
389
390
def timedelta_to_milliseconds(td):
391
"Convert a datetime.timedelta() to milliseconds"
392
return ((td.days * 24 * 60 * 60 * 1000)
393
+ (td.seconds * 1000)
394
+ (td.microseconds // 1000))
395
239
396
240
class Client(object):
397
241
"""A representation of a client host served by this server.
398
242
399
243
Attributes:
400
approved: bool(); 'None' if not yet approved/disapproved
244
_approved: bool(); 'None' if not yet approved/disapproved
401
245
approval_delay: datetime.timedelta(); Time to wait for approval
402
246
approval_duration: datetime.timedelta(); Duration of one approval
403
247
checker: subprocess.Popen(); a running checker process used
410
254
instance %(name)s can be used in the command.
411
255
checker_initiator_tag: a gobject event source tag, or None
412
256
created: datetime.datetime(); (UTC) object creation
413
client_structure: Object describing what attributes a client has
414
and is used for storing the client at exit
415
257
current_checker_command: string; current running checker_command
258
disable_hook: If set, called by disable() as disable_hook(self)
416
259
disable_initiator_tag: a gobject event source tag, or None
417
260
enabled: bool()
418
261
fingerprint: string (40 or 32 hexadecimal digits); used to
421
264
interval: datetime.timedelta(); How often to start a new checker
422
265
last_approval_request: datetime.datetime(); (UTC) or None
423
266
last_checked_ok: datetime.datetime(); (UTC) or None
424
last_checker_status: integer between 0 and 255 reflecting exit
425
status of last checker. -1 reflects crashed
426
checker, -2 means no checker completed yet.
427
last_enabled: datetime.datetime(); (UTC) or None
267
last_enabled: datetime.datetime(); (UTC)
428
268
name: string; from the config file, used in log messages and
429
269
D-Bus identifiers
430
270
secret: bytestring; sent verbatim (over TLS) to client
431
271
timeout: datetime.timedelta(); How long from last_checked_ok
432
272
until this client is disabled
433
extended_timeout: extra long timeout when secret has been sent
434
273
runtime_expansions: Allowed attributes for runtime expansion.
435
expires: datetime.datetime(); time (UTC) when a client will be
436
disabled, or None
437
274
"""
438
275
439
276
runtime_expansions = ("approval_delay", "approval_duration",
440
277
"created", "enabled", "fingerprint",
441
278
"host", "interval", "last_checked_ok",
442
279
"last_enabled", "name", "timeout")
443
client_defaults = { "timeout": "5m",
444
"extended_timeout": "15m",
445
"interval": "2m",
446
"checker": "fping -q -- %%(host)s",
447
"host": "",
448
"approval_delay": "0s",
449
"approval_duration": "1s",
450
"approved_by_default": "True",
451
"enabled": "True",
452
}
280
281
@staticmethod
282
def _timedelta_to_milliseconds(td):
283
"Convert a datetime.timedelta() to milliseconds"
284
return ((td.days * 24 * 60 * 60 * 1000)
285
+ (td.seconds * 1000)
286
+ (td.microseconds // 1000))
453
287
454
288
def timeout_milliseconds(self):
455
289
"Return the 'timeout' attribute in milliseconds"
456
return timedelta_to_milliseconds(self.timeout)
457
458
def extended_timeout_milliseconds(self):
459
"Return the 'extended_timeout' attribute in milliseconds"
460
return timedelta_to_milliseconds(self.extended_timeout)
290
return self._timedelta_to_milliseconds(self.timeout)
461
291
462
292
def interval_milliseconds(self):
463
293
"Return the 'interval' attribute in milliseconds"
464
return timedelta_to_milliseconds(self.interval)
465
294
return self._timedelta_to_milliseconds(self.interval)
295
466
296
def approval_delay_milliseconds(self):
467
return timedelta_to_milliseconds(self.approval_delay)
468
469
@staticmethod
470
def config_parser(config):
471
"""Construct a new dict of client settings of this form:
472
{ client_name: {setting_name: value, ...}, ...}
473
with exceptions for any special settings as defined above.
474
NOTE: Must be a pure function. Must return the same result
475
value given the same arguments.
476
"""
477
settings = {}
478
for client_name in config.sections():
479
section = dict(config.items(client_name))
480
client = settings[client_name] = {}
481
482
client["host"] = section["host"]
483
# Reformat values from string types to Python types
484
client["approved_by_default"] = config.getboolean(
485
client_name, "approved_by_default")
486
client["enabled"] = config.getboolean(client_name,
487
"enabled")
488
489
client["fingerprint"] = (section["fingerprint"].upper()
490
.replace(" ", ""))
491
if "secret" in section:
492
client["secret"] = section["secret"].decode("base64")
493
elif "secfile" in section:
494
with open(os.path.expanduser(os.path.expandvars
495
(section["secfile"])),
496
"rb") as secfile:
497
client["secret"] = secfile.read()
498
else:
499
raise TypeError("No secret or secfile for section {0}"
500
.format(section))
501
client["timeout"] = string_to_delta(section["timeout"])
502
client["extended_timeout"] = string_to_delta(
503
section["extended_timeout"])
504
client["interval"] = string_to_delta(section["interval"])
505
client["approval_delay"] = string_to_delta(
506
section["approval_delay"])
507
client["approval_duration"] = string_to_delta(
508
section["approval_duration"])
509
client["checker_command"] = section["checker"]
510
client["last_approval_request"] = None
511
client["last_checked_ok"] = None
512
client["last_checker_status"] = -2
513
514
return settings
515
516
def __init__(self, settings, name = None):
297
return self._timedelta_to_milliseconds(self.approval_delay)
298
299
def __init__(self, name = None, disable_hook=None, config=None):
300
"""Note: the 'checker' key in 'config' sets the
301
'checker_command' attribute and *not* the 'checker'
302
attribute."""
517
303
self.name = name
518
# adding all client settings
519
for setting, value in settings.iteritems():
520
setattr(self, setting, value)
521
522
if self.enabled:
523
if not hasattr(self, "last_enabled"):
524
self.last_enabled = datetime.datetime.utcnow()
525
if not hasattr(self, "expires"):
526
self.expires = (datetime.datetime.utcnow()
527
+ self.timeout)
528
else:
529
self.last_enabled = None
530
self.expires = None
531
304
if config is None:
305
config = {}
532
306
logger.debug("Creating client %r", self.name)
533
307
# Uppercase and remove spaces from fingerprint for later
534
308
# comparison purposes with return value from the fingerprint()
535
309
# function
310
self.fingerprint = (config["fingerprint"].upper()
311
.replace(" ", ""))
536
312
logger.debug(" Fingerprint: %s", self.fingerprint)
537
self.created = settings.get("created",
538
datetime.datetime.utcnow())
539
540
# attributes specific for this server instance
313
if "secret" in config:
314
self.secret = config["secret"].decode("base64")
315
elif "secfile" in config:
316
with open(os.path.expanduser(os.path.expandvars
317
(config["secfile"])),
318
"rb") as secfile:
319
self.secret = secfile.read()
320
else:
321
raise TypeError("No secret or secfile for client %s"
322
% self.name)
323
self.host = config.get("host", "")
324
self.created = datetime.datetime.utcnow()
325
self.enabled = False
326
self.last_approval_request = None
327
self.last_enabled = None
328
self.last_checked_ok = None
329
self.timeout = string_to_delta(config["timeout"])
330
self.interval = string_to_delta(config["interval"])
331
self.disable_hook = disable_hook
541
332
self.checker = None
542
333
self.checker_initiator_tag = None
543
334
self.disable_initiator_tag = None
544
335
self.checker_callback_tag = None
336
self.checker_command = config["checker"]
545
337
self.current_checker_command = None
546
self.approved = None
338
self.last_connect = None
339
self._approved = None
340
self.approved_by_default = config.get("approved_by_default",
341
True)
547
342
self.approvals_pending = 0
548
self.changedstate = (multiprocessing_manager
549
.Condition(multiprocessing_manager
550
.Lock()))
551
self.client_structure = [attr for attr in
552
self.__dict__.iterkeys()
553
if not attr.startswith("_")]
554
self.client_structure.append("client_structure")
555
556
for name, t in inspect.getmembers(type(self),
557
lambda obj:
558
isinstance(obj,
559
property)):
560
if not name.startswith("_"):
561
self.client_structure.append(name)
343
self.approval_delay = string_to_delta(
344
config["approval_delay"])
345
self.approval_duration = string_to_delta(
346
config["approval_duration"])
347
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
562
348
563
# Send notice to process children that client state has changed
564
349
def send_changedstate(self):
565
with self.changedstate:
566
self.changedstate.notify_all()
567
350
self.changedstate.acquire()
351
self.changedstate.notify_all()
352
self.changedstate.release()
353
568
354
def enable(self):
569
355
"""Start this client's checker and timeout hooks"""
570
356
if getattr(self, "enabled", False):
571
357
# Already enabled
572
358
return
573
359
self.send_changedstate()
574
self.expires = datetime.datetime.utcnow() + self.timeout
575
self.enabled = True
576
360
self.last_enabled = datetime.datetime.utcnow()
577
self.init_checker()
361
# Schedule a new checker to be started an 'interval' from now,
362
# and every interval from then on.
363
self.checker_initiator_tag = (gobject.timeout_add
364
(self.interval_milliseconds(),
365
self.start_checker))
366
# Schedule a disable() when 'timeout' has passed
367
self.disable_initiator_tag = (gobject.timeout_add
368
(self.timeout_milliseconds(),
369
self.disable))
370
self.enabled = True
371
# Also start a new checker *right now*.
372
self.start_checker()
578
373
579
374
def disable(self, quiet=True):
580
375
"""Disable this client."""
587
382
if getattr(self, "disable_initiator_tag", False):
588
383
gobject.source_remove(self.disable_initiator_tag)
589
384
self.disable_initiator_tag = None
590
self.expires = None
591
385
if getattr(self, "checker_initiator_tag", False):
592
386
gobject.source_remove(self.checker_initiator_tag)
593
387
self.checker_initiator_tag = None
594
388
self.stop_checker()
389
if self.disable_hook:
390
self.disable_hook(self)
595
391
self.enabled = False
596
392
# Do not run this again if called by a gobject.timeout_add
597
393
return False
598
394
599
395
def __del__(self):
396
self.disable_hook = None
600
397
self.disable()
601
398
602
def init_checker(self):
603
# Schedule a new checker to be started an 'interval' from now,
604
# and every interval from then on.
605
self.checker_initiator_tag = (gobject.timeout_add
606
(self.interval_milliseconds(),
607
self.start_checker))
608
# Schedule a disable() when 'timeout' has passed
609
self.disable_initiator_tag = (gobject.timeout_add
610
(self.timeout_milliseconds(),
611
self.disable))
612
# Also start a new checker *right now*.
613
self.start_checker()
614
615
399
def checker_callback(self, pid, condition, command):
616
400
"""The checker has completed, so take appropriate actions."""
617
401
self.checker_callback_tag = None
618
402
self.checker = None
619
403
if os.WIFEXITED(condition):
620
self.last_checker_status = os.WEXITSTATUS(condition)
621
if self.last_checker_status == 0:
404
exitstatus = os.WEXITSTATUS(condition)
405
if exitstatus == 0:
622
406
logger.info("Checker for %(name)s succeeded",
623
407
vars(self))
624
408
self.checked_ok()
626
410
logger.info("Checker for %(name)s failed",
627
411
vars(self))
628
412
else:
629
self.last_checker_status = -1
630
413
logger.warning("Checker for %(name)s crashed?",
631
414
vars(self))
632
415
633
416
def checked_ok(self):
634
"""Assert that the client has been seen, alive and well."""
417
"""Bump up the timeout for this client.
418
419
This should only be called when the client has been seen,
420
alive and well.
421
"""
635
422
self.last_checked_ok = datetime.datetime.utcnow()
636
self.last_checker_status = 0
637
self.bump_timeout()
638
639
def bump_timeout(self, timeout=None):
640
"""Bump up the timeout for this client."""
641
if timeout is None:
642
timeout = self.timeout
643
if self.disable_initiator_tag is not None:
644
gobject.source_remove(self.disable_initiator_tag)
645
if getattr(self, "enabled", False):
646
self.disable_initiator_tag = (gobject.timeout_add
647
(timedelta_to_milliseconds
648
(timeout), self.disable))
649
self.expires = datetime.datetime.utcnow() + timeout
423
gobject.source_remove(self.disable_initiator_tag)
424
self.disable_initiator_tag = (gobject.timeout_add
425
(self.timeout_milliseconds(),
426
self.disable))
650
427
651
428
def need_approval(self):
652
429
self.last_approval_request = datetime.datetime.utcnow()
668
445
# If a checker exists, make sure it is not a zombie
669
446
try:
670
447
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
except (AttributeError, OSError) as error:
448
except (AttributeError, OSError), error:
672
449
if (isinstance(error, OSError)
673
450
and error.errno != errno.ECHILD):
674
451
raise error
692
469
'replace')))
693
470
for attr in
694
471
self.runtime_expansions)
695
472
696
473
try:
697
474
command = self.checker_command % escaped_attrs
698
except TypeError as error:
699
logger.error('Could not format string "%s"',
700
self.checker_command, exc_info=error)
475
except TypeError, error:
476
logger.error('Could not format string "%s":'
477
' %s', self.checker_command, error)
701
478
return True # Try again later
702
479
self.current_checker_command = command
703
480
try:
720
497
if pid:
721
498
gobject.source_remove(self.checker_callback_tag)
722
499
self.checker_callback(pid, status, command)
723
except OSError as error:
724
logger.error("Failed to start subprocess",
725
exc_info=error)
500
except OSError, error:
501
logger.error("Failed to start subprocess: %s",
502
error)
726
503
# Re-run this periodically if run by gobject.timeout_add
727
504
return True
728
505
735
512
return
736
513
logger.debug("Stopping checker for %(name)s", vars(self))
737
514
try:
738
self.checker.terminate()
515
os.kill(self.checker.pid, signal.SIGTERM)
739
516
#time.sleep(0.5)
740
517
#if self.checker.poll() is None:
741
# self.checker.kill()
742
except OSError as error:
518
# os.kill(self.checker.pid, signal.SIGKILL)
519
except OSError, error:
743
520
if error.errno != errno.ESRCH: # No such process
744
521
raise
745
522
self.checker = None
746
523
747
748
524
def dbus_service_property(dbus_interface, signature="v",
749
525
access="readwrite", byte_arrays=False):
750
526
"""Decorators for marking methods of a DBusObjectWithProperties to
761
537
# "Set" method, so we fail early here:
762
538
if byte_arrays and signature != "ay":
763
539
raise ValueError("Byte arrays not supported for non-'ay'"
764
" signature {0!r}".format(signature))
540
" signature %r" % signature)
765
541
def decorator(func):
766
542
func._dbus_is_property = True
767
543
func._dbus_interface = dbus_interface
775
551
return decorator
776
552
777
553
778
def dbus_interface_annotations(dbus_interface):
779
"""Decorator for marking functions returning interface annotations
780
781
Usage:
782
783
@dbus_interface_annotations("org.example.Interface")
784
def _foo(self): # Function name does not matter
785
return {"org.freedesktop.DBus.Deprecated": "true",
786
"org.freedesktop.DBus.Property.EmitsChangedSignal":
787
"false"}
788
"""
789
def decorator(func):
790
func._dbus_is_interface = True
791
func._dbus_interface = dbus_interface
792
func._dbus_name = dbus_interface
793
return func
794
return decorator
795
796
797
def dbus_annotations(annotations):
798
"""Decorator to annotate D-Bus methods, signals or properties
799
Usage:
800
801
@dbus_service_property("org.example.Interface", signature="b",
802
access="r")
803
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
804
"org.freedesktop.DBus.Property."
805
"EmitsChangedSignal": "false"})
806
def Property_dbus_property(self):
807
return dbus.Boolean(False)
808
"""
809
def decorator(func):
810
func._dbus_annotations = annotations
811
return func
812
return decorator
813
814
815
554
class DBusPropertyException(dbus.exceptions.DBusException):
816
555
"""A base class for D-Bus property-related exceptions
817
556
"""
833
572
834
573
class DBusObjectWithProperties(dbus.service.Object):
835
574
"""A D-Bus object with properties.
836
575
837
576
Classes inheriting from this can use the dbus_service_property
838
577
decorator to expose methods as D-Bus properties. It exposes the
839
578
standard Get(), Set(), and GetAll() methods on the D-Bus.
840
579
"""
841
580
842
581
@staticmethod
843
def _is_dbus_thing(thing):
844
"""Returns a function testing if an attribute is a D-Bus thing
845
846
If called like _is_dbus_thing("method") it returns a function
847
suitable for use as predicate to inspect.getmembers().
848
"""
849
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
850
False)
582
def _is_dbus_property(obj):
583
return getattr(obj, "_dbus_is_property", False)
851
584
852
def _get_all_dbus_things(self, thing):
585
def _get_all_dbus_properties(self):
853
586
"""Returns a generator of (name, attribute) pairs
854
587
"""
855
return ((getattr(athing.__get__(self), "_dbus_name",
856
name),
857
athing.__get__(self))
858
for cls in self.__class__.__mro__
859
for name, athing in
860
inspect.getmembers(cls,
861
self._is_dbus_thing(thing)))
588
return ((prop._dbus_name, prop)
589
for name, prop in
590
inspect.getmembers(self, self._is_dbus_property))
862
591
863
592
def _get_dbus_property(self, interface_name, property_name):
864
593
"""Returns a bound method if one exists which is a D-Bus
865
594
property with the specified name and interface.
866
595
"""
867
for cls in self.__class__.__mro__:
868
for name, value in (inspect.getmembers
869
(cls,
870
self._is_dbus_thing("property"))):
871
if (value._dbus_name == property_name
872
and value._dbus_interface == interface_name):
873
return value.__get__(self)
874
596
for name in (property_name,
597
property_name + "_dbus_property"):
598
prop = getattr(self, name, None)
599
if (prop is None
600
or not self._is_dbus_property(prop)
601
or prop._dbus_name != property_name
602
or (interface_name and prop._dbus_interface
603
and interface_name != prop._dbus_interface)):
604
continue
605
return prop
875
606
# No such property
876
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
877
608
+ interface_name + "."
902
633
# signatures other than "ay".
903
634
if prop._dbus_signature != "ay":
904
635
raise ValueError
905
value = dbus.ByteArray(b''.join(chr(byte)
906
for byte in value))
636
value = dbus.ByteArray(''.join(unichr(byte)
637
for byte in value))
907
638
prop(value)
908
639
909
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
911
642
def GetAll(self, interface_name):
912
643
"""Standard D-Bus property GetAll() method, see D-Bus
913
644
standard.
914
645
915
646
Note: Will not include properties with access="write".
916
647
"""
917
properties = {}
918
for name, prop in self._get_all_dbus_things("property"):
648
all = {}
649
for name, prop in self._get_all_dbus_properties():
919
650
if (interface_name
920
651
and interface_name != prop._dbus_interface):
921
652
# Interface non-empty but did not match
925
656
continue
926
657
value = prop()
927
658
if not hasattr(value, "variant_level"):
928
properties[name] = value
659
all[name] = value
929
660
continue
930
properties[name] = type(value)(value, variant_level=
931
value.variant_level+1)
932
return dbus.Dictionary(properties, signature="sv")
661
all[name] = type(value)(value, variant_level=
662
value.variant_level+1)
663
return dbus.Dictionary(all, signature="sv")
933
664
934
665
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
935
666
out_signature="s",
936
667
path_keyword='object_path',
937
668
connection_keyword='connection')
938
669
def Introspect(self, object_path, connection):
939
"""Overloading of standard D-Bus method.
940
941
Inserts property tags and interface annotation tags.
670
"""Standard D-Bus method, overloaded to insert property tags.
942
671
"""
943
672
xmlstring = dbus.service.Object.Introspect(self, object_path,
944
673
connection)
951
680
e.setAttribute("access", prop._dbus_access)
952
681
return e
953
682
for if_tag in document.getElementsByTagName("interface"):
954
# Add property tags
955
683
for tag in (make_tag(document, name, prop)
956
684
for name, prop
957
in self._get_all_dbus_things("property")
685
in self._get_all_dbus_properties()
958
686
if prop._dbus_interface
959
687
== if_tag.getAttribute("name")):
960
688
if_tag.appendChild(tag)
961
# Add annotation tags
962
for typ in ("method", "signal", "property"):
963
for tag in if_tag.getElementsByTagName(typ):
964
annots = dict()
965
for name, prop in (self.
966
_get_all_dbus_things(typ)):
967
if (name == tag.getAttribute("name")
968
and prop._dbus_interface
969
== if_tag.getAttribute("name")):
970
annots.update(getattr
971
(prop,
972
"_dbus_annotations",
973
{}))
974
for name, value in annots.iteritems():
975
ann_tag = document.createElement(
976
"annotation")
977
ann_tag.setAttribute("name", name)
978
ann_tag.setAttribute("value", value)
979
tag.appendChild(ann_tag)
980
# Add interface annotation tags
981
for annotation, value in dict(
982
itertools.chain(
983
*(annotations().iteritems()
984
for name, annotations in
985
self._get_all_dbus_things("interface")
986
if name == if_tag.getAttribute("name")
987
))).iteritems():
988
ann_tag = document.createElement("annotation")
989
ann_tag.setAttribute("name", annotation)
990
ann_tag.setAttribute("value", value)
991
if_tag.appendChild(ann_tag)
992
689
# Add the names to the return values for the
993
690
# "org.freedesktop.DBus.Properties" methods
994
691
if (if_tag.getAttribute("name")
1007
704
xmlstring = document.toxml("utf-8")
1008
705
document.unlink()
1009
706
except (AttributeError, xml.dom.DOMException,
1010
xml.parsers.expat.ExpatError) as error:
707
xml.parsers.expat.ExpatError), error:
1011
708
logger.error("Failed to override Introspection method",
1012
exc_info=error)
709
error)
1013
710
return xmlstring
1014
711
1015
712
1016
def datetime_to_dbus (dt, variant_level=0):
1017
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1018
if dt is None:
1019
return dbus.String("", variant_level = variant_level)
1020
return dbus.String(dt.isoformat(),
1021
variant_level=variant_level)
1022
1023
1024
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1025
"""A class decorator; applied to a subclass of
1026
dbus.service.Object, it will add alternate D-Bus attributes with
1027
interface names according to the "alt_interface_names" mapping.
1028
Usage:
1029
1030
@alternate_dbus_names({"org.example.Interface":
1031
"net.example.AlternateInterface"})
1032
class SampleDBusObject(dbus.service.Object):
1033
@dbus.service.method("org.example.Interface")
1034
def SampleDBusMethod():
1035
pass
1036
1037
The above "SampleDBusMethod" on "SampleDBusObject" will be
1038
reachable via two interfaces: "org.example.Interface" and
1039
"net.example.AlternateInterface", the latter of which will have
1040
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1041
"true", unless "deprecate" is passed with a False value.
1042
1043
This works for methods and signals, and also for D-Bus properties
1044
(from DBusObjectWithProperties) and interfaces (from the
1045
dbus_interface_annotations decorator).
1046
"""
1047
def wrapper(cls):
1048
for orig_interface_name, alt_interface_name in (
1049
alt_interface_names.iteritems()):
1050
attr = {}
1051
interface_names = set()
1052
# Go though all attributes of the class
1053
for attrname, attribute in inspect.getmembers(cls):
1054
# Ignore non-D-Bus attributes, and D-Bus attributes
1055
# with the wrong interface name
1056
if (not hasattr(attribute, "_dbus_interface")
1057
or not attribute._dbus_interface
1058
.startswith(orig_interface_name)):
1059
continue
1060
# Create an alternate D-Bus interface name based on
1061
# the current name
1062
alt_interface = (attribute._dbus_interface
1063
.replace(orig_interface_name,
1064
alt_interface_name))
1065
interface_names.add(alt_interface)
1066
# Is this a D-Bus signal?
1067
if getattr(attribute, "_dbus_is_signal", False):
1068
# Extract the original non-method function by
1069
# black magic
1070
nonmethod_func = (dict(
1071
zip(attribute.func_code.co_freevars,
1072
attribute.__closure__))["func"]
1073
.cell_contents)
1074
# Create a new, but exactly alike, function
1075
# object, and decorate it to be a new D-Bus signal
1076
# with the alternate D-Bus interface name
1077
new_function = (dbus.service.signal
1078
(alt_interface,
1079
attribute._dbus_signature)
1080
(types.FunctionType(
1081
nonmethod_func.func_code,
1082
nonmethod_func.func_globals,
1083
nonmethod_func.func_name,
1084
nonmethod_func.func_defaults,
1085
nonmethod_func.func_closure)))
1086
# Copy annotations, if any
1087
try:
1088
new_function._dbus_annotations = (
1089
dict(attribute._dbus_annotations))
1090
except AttributeError:
1091
pass
1092
# Define a creator of a function to call both the
1093
# original and alternate functions, so both the
1094
# original and alternate signals gets sent when
1095
# the function is called
1096
def fixscope(func1, func2):
1097
"""This function is a scope container to pass
1098
func1 and func2 to the "call_both" function
1099
outside of its arguments"""
1100
def call_both(*args, **kwargs):
1101
"""This function will emit two D-Bus
1102
signals by calling func1 and func2"""
1103
func1(*args, **kwargs)
1104
func2(*args, **kwargs)
1105
return call_both
1106
# Create the "call_both" function and add it to
1107
# the class
1108
attr[attrname] = fixscope(attribute, new_function)
1109
# Is this a D-Bus method?
1110
elif getattr(attribute, "_dbus_is_method", False):
1111
# Create a new, but exactly alike, function
1112
# object. Decorate it to be a new D-Bus method
1113
# with the alternate D-Bus interface name. Add it
1114
# to the class.
1115
attr[attrname] = (dbus.service.method
1116
(alt_interface,
1117
attribute._dbus_in_signature,
1118
attribute._dbus_out_signature)
1119
(types.FunctionType
1120
(attribute.func_code,
1121
attribute.func_globals,
1122
attribute.func_name,
1123
attribute.func_defaults,
1124
attribute.func_closure)))
1125
# Copy annotations, if any
1126
try:
1127
attr[attrname]._dbus_annotations = (
1128
dict(attribute._dbus_annotations))
1129
except AttributeError:
1130
pass
1131
# Is this a D-Bus property?
1132
elif getattr(attribute, "_dbus_is_property", False):
1133
# Create a new, but exactly alike, function
1134
# object, and decorate it to be a new D-Bus
1135
# property with the alternate D-Bus interface
1136
# name. Add it to the class.
1137
attr[attrname] = (dbus_service_property
1138
(alt_interface,
1139
attribute._dbus_signature,
1140
attribute._dbus_access,
1141
attribute
1142
._dbus_get_args_options
1143
["byte_arrays"])
1144
(types.FunctionType
1145
(attribute.func_code,
1146
attribute.func_globals,
1147
attribute.func_name,
1148
attribute.func_defaults,
1149
attribute.func_closure)))
1150
# Copy annotations, if any
1151
try:
1152
attr[attrname]._dbus_annotations = (
1153
dict(attribute._dbus_annotations))
1154
except AttributeError:
1155
pass
1156
# Is this a D-Bus interface?
1157
elif getattr(attribute, "_dbus_is_interface", False):
1158
# Create a new, but exactly alike, function
1159
# object. Decorate it to be a new D-Bus interface
1160
# with the alternate D-Bus interface name. Add it
1161
# to the class.
1162
attr[attrname] = (dbus_interface_annotations
1163
(alt_interface)
1164
(types.FunctionType
1165
(attribute.func_code,
1166
attribute.func_globals,
1167
attribute.func_name,
1168
attribute.func_defaults,
1169
attribute.func_closure)))
1170
if deprecate:
1171
# Deprecate all alternate interfaces
1172
iname="_AlternateDBusNames_interface_annotation{0}"
1173
for interface_name in interface_names:
1174
@dbus_interface_annotations(interface_name)
1175
def func(self):
1176
return { "org.freedesktop.DBus.Deprecated":
1177
"true" }
1178
# Find an unused name
1179
for aname in (iname.format(i)
1180
for i in itertools.count()):
1181
if aname not in attr:
1182
attr[aname] = func
1183
break
1184
if interface_names:
1185
# Replace the class with a new subclass of it with
1186
# methods, signals, etc. as created above.
1187
cls = type(b"{0}Alternate".format(cls.__name__),
1188
(cls,), attr)
1189
return cls
1190
return wrapper
1191
1192
1193
@alternate_dbus_interfaces({"se.recompile.Mandos":
1194
"se.bsnet.fukt.Mandos"})
1195
713
class ClientDBus(Client, DBusObjectWithProperties):
1196
714
"""A Client class using D-Bus
1197
715
1206
724
# dbus.service.Object doesn't use super(), so we can't either.
1207
725
1208
726
def __init__(self, bus = None, *args, **kwargs):
727
self._approvals_pending = 0
1209
728
self.bus = bus
1210
729
Client.__init__(self, *args, **kwargs)
1211
730
# Only now, when this client is initialized, can it show up on
1217
736
("/clients/" + client_object_name))
1218
737
DBusObjectWithProperties.__init__(self, self.bus,
1219
738
self.dbus_object_path)
1220
1221
def notifychangeproperty(transform_func,
1222
dbus_name, type_func=lambda x: x,
1223
variant_level=1):
1224
""" Modify a variable so that it's a property which announces
1225
its changes to DBus.
1226
1227
transform_fun: Function that takes a value and a variant_level
1228
and transforms it to a D-Bus type.
1229
dbus_name: D-Bus name of the variable
1230
type_func: Function that transform the value before sending it
1231
to the D-Bus. Default: no transform
1232
variant_level: D-Bus variant level. Default: 1
1233
"""
1234
attrname = "_{0}".format(dbus_name)
1235
def setter(self, value):
1236
if hasattr(self, "dbus_object_path"):
1237
if (not hasattr(self, attrname) or
1238
type_func(getattr(self, attrname, None))
1239
!= type_func(value)):
1240
dbus_value = transform_func(type_func(value),
1241
variant_level
1242
=variant_level)
1243
self.PropertyChanged(dbus.String(dbus_name),
1244
dbus_value)
1245
setattr(self, attrname, value)
1246
1247
return property(lambda self: getattr(self, attrname), setter)
1248
1249
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1250
approvals_pending = notifychangeproperty(dbus.Boolean,
1251
"ApprovalPending",
1252
type_func = bool)
1253
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1254
last_enabled = notifychangeproperty(datetime_to_dbus,
1255
"LastEnabled")
1256
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1257
type_func = lambda checker:
1258
checker is not None)
1259
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1260
"LastCheckedOK")
1261
last_checker_status = notifychangeproperty(dbus.Int16,
1262
"LastCheckerStatus")
1263
last_approval_request = notifychangeproperty(
1264
datetime_to_dbus, "LastApprovalRequest")
1265
approved_by_default = notifychangeproperty(dbus.Boolean,
1266
"ApprovedByDefault")
1267
approval_delay = notifychangeproperty(dbus.UInt64,
1268
"ApprovalDelay",
1269
type_func =
1270
timedelta_to_milliseconds)
1271
approval_duration = notifychangeproperty(
1272
dbus.UInt64, "ApprovalDuration",
1273
type_func = timedelta_to_milliseconds)
1274
host = notifychangeproperty(dbus.String, "Host")
1275
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1276
type_func =
1277
timedelta_to_milliseconds)
1278
extended_timeout = notifychangeproperty(
1279
dbus.UInt64, "ExtendedTimeout",
1280
type_func = timedelta_to_milliseconds)
1281
interval = notifychangeproperty(dbus.UInt64,
1282
"Interval",
1283
type_func =
1284
timedelta_to_milliseconds)
1285
checker_command = notifychangeproperty(dbus.String, "Checker")
1286
1287
del notifychangeproperty
739
740
def _get_approvals_pending(self):
741
return self._approvals_pending
742
def _set_approvals_pending(self, value):
743
old_value = self._approvals_pending
744
self._approvals_pending = value
745
bval = bool(value)
746
if (hasattr(self, "dbus_object_path")
747
and bval is not bool(old_value)):
748
dbus_bool = dbus.Boolean(bval, variant_level=1)
749
self.PropertyChanged(dbus.String("ApprovalPending"),
750
dbus_bool)
751
752
approvals_pending = property(_get_approvals_pending,
753
_set_approvals_pending)
754
del _get_approvals_pending, _set_approvals_pending
755
756
@staticmethod
757
def _datetime_to_dbus(dt, variant_level=0):
758
"""Convert a UTC datetime.datetime() to a D-Bus type."""
759
return dbus.String(dt.isoformat(),
760
variant_level=variant_level)
761
762
def enable(self):
763
oldstate = getattr(self, "enabled", False)
764
r = Client.enable(self)
765
if oldstate != self.enabled:
766
# Emit D-Bus signals
767
self.PropertyChanged(dbus.String("Enabled"),
768
dbus.Boolean(True, variant_level=1))
769
self.PropertyChanged(
770
dbus.String("LastEnabled"),
771
self._datetime_to_dbus(self.last_enabled,
772
variant_level=1))
773
return r
774
775
def disable(self, quiet = False):
776
oldstate = getattr(self, "enabled", False)
777
r = Client.disable(self, quiet=quiet)
778
if not quiet and oldstate != self.enabled:
779
# Emit D-Bus signal
780
self.PropertyChanged(dbus.String("Enabled"),
781
dbus.Boolean(False, variant_level=1))
782
return r
1288
783
1289
784
def __del__(self, *args, **kwargs):
1290
785
try:
1299
794
*args, **kwargs):
1300
795
self.checker_callback_tag = None
1301
796
self.checker = None
797
# Emit D-Bus signal
798
self.PropertyChanged(dbus.String("CheckerRunning"),
799
dbus.Boolean(False, variant_level=1))
1302
800
if os.WIFEXITED(condition):
1303
801
exitstatus = os.WEXITSTATUS(condition)
1304
802
# Emit D-Bus signal
1314
812
return Client.checker_callback(self, pid, condition, command,
1315
813
*args, **kwargs)
1316
814
815
def checked_ok(self, *args, **kwargs):
816
r = Client.checked_ok(self, *args, **kwargs)
817
# Emit D-Bus signal
818
self.PropertyChanged(
819
dbus.String("LastCheckedOK"),
820
(self._datetime_to_dbus(self.last_checked_ok,
821
variant_level=1)))
822
return r
823
824
def need_approval(self, *args, **kwargs):
825
r = Client.need_approval(self, *args, **kwargs)
826
# Emit D-Bus signal
827
self.PropertyChanged(
828
dbus.String("LastApprovalRequest"),
829
(self._datetime_to_dbus(self.last_approval_request,
830
variant_level=1)))
831
return r
832
1317
833
def start_checker(self, *args, **kwargs):
1318
834
old_checker = self.checker
1319
835
if self.checker is not None:
1326
842
and old_checker_pid != self.checker.pid):
1327
843
# Emit D-Bus signal
1328
844
self.CheckerStarted(self.current_checker_command)
845
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
847
dbus.Boolean(True, variant_level=1))
1329
848
return r
1330
849
850
def stop_checker(self, *args, **kwargs):
851
old_checker = getattr(self, "checker", None)
852
r = Client.stop_checker(self, *args, **kwargs)
853
if (old_checker is not None
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
856
dbus.Boolean(False, variant_level=1))
857
return r
858
1331
859
def _reset_approved(self):
1332
self.approved = None
860
self._approved = None
1333
861
return False
1334
862
1335
863
def approve(self, value=True):
1336
864
self.send_changedstate()
1337
self.approved = value
1338
gobject.timeout_add(timedelta_to_milliseconds
865
self._approved = value
866
gobject.timeout_add(self._timedelta_to_milliseconds
1339
867
(self.approval_duration),
1340
868
self._reset_approved)
1341
869
870
1342
871
## D-Bus methods, signals & properties
1343
_interface = "se.recompile.Mandos.Client"
1344
1345
## Interfaces
1346
1347
@dbus_interface_annotations(_interface)
1348
def _foo(self):
1349
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1350
"false"}
872
_interface = "se.bsnet.fukt.Mandos.Client"
1351
873
1352
874
## Signals
1353
875
1400
922
# CheckedOK - method
1401
923
@dbus.service.method(_interface)
1402
924
def CheckedOK(self):
1403
self.checked_ok()
925
return self.checked_ok()
1404
926
1405
927
# Enable - method
1406
928
@dbus.service.method(_interface)
1439
961
if value is None: # get
1440
962
return dbus.Boolean(self.approved_by_default)
1441
963
self.approved_by_default = bool(value)
964
# Emit D-Bus signal
965
self.PropertyChanged(dbus.String("ApprovedByDefault"),
966
dbus.Boolean(value, variant_level=1))
1442
967
1443
968
# ApprovalDelay - property
1444
969
@dbus_service_property(_interface, signature="t",
1447
972
if value is None: # get
1448
973
return dbus.UInt64(self.approval_delay_milliseconds())
1449
974
self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
# Emit D-Bus signal
976
self.PropertyChanged(dbus.String("ApprovalDelay"),
977
dbus.UInt64(value, variant_level=1))
1450
978
1451
979
# ApprovalDuration - property
1452
980
@dbus_service_property(_interface, signature="t",
1453
981
access="readwrite")
1454
982
def ApprovalDuration_dbus_property(self, value=None):
1455
983
if value is None: # get
1456
return dbus.UInt64(timedelta_to_milliseconds(
984
return dbus.UInt64(self._timedelta_to_milliseconds(
1457
985
self.approval_duration))
1458
986
self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
# Emit D-Bus signal
988
self.PropertyChanged(dbus.String("ApprovalDuration"),
989
dbus.UInt64(value, variant_level=1))
1459
990
1460
991
# Name - property
1461
992
@dbus_service_property(_interface, signature="s", access="read")
1473
1004
def Host_dbus_property(self, value=None):
1474
1005
if value is None: # get
1475
1006
return dbus.String(self.host)
1476
self.host = unicode(value)
1007
self.host = value
1008
# Emit D-Bus signal
1009
self.PropertyChanged(dbus.String("Host"),
1010
dbus.String(value, variant_level=1))
1477
1011
1478
1012
# Created - property
1479
1013
@dbus_service_property(_interface, signature="s", access="read")
1480
1014
def Created_dbus_property(self):
1481
return datetime_to_dbus(self.created)
1015
return dbus.String(self._datetime_to_dbus(self.created))
1482
1016
1483
1017
# LastEnabled - property
1484
1018
@dbus_service_property(_interface, signature="s", access="read")
1485
1019
def LastEnabled_dbus_property(self):
1486
return datetime_to_dbus(self.last_enabled)
1020
if self.last_enabled is None:
1021
return dbus.String("")
1022
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1487
1023
1488
1024
# Enabled - property
1489
1025
@dbus_service_property(_interface, signature="b",
1503
1039
if value is not None:
1504
1040
self.checked_ok()
1505
1041
return
1506
return datetime_to_dbus(self.last_checked_ok)
1507
1508
# LastCheckerStatus - property
1509
@dbus_service_property(_interface, signature="n",
1510
access="read")
1511
def LastCheckerStatus_dbus_property(self):
1512
return dbus.Int16(self.last_checker_status)
1513
1514
# Expires - property
1515
@dbus_service_property(_interface, signature="s", access="read")
1516
def Expires_dbus_property(self):
1517
return datetime_to_dbus(self.expires)
1042
if self.last_checked_ok is None:
1043
return dbus.String("")
1044
return dbus.String(self._datetime_to_dbus(self
1045
.last_checked_ok))
1518
1046
1519
1047
# LastApprovalRequest - property
1520
1048
@dbus_service_property(_interface, signature="s", access="read")
1521
1049
def LastApprovalRequest_dbus_property(self):
1522
return datetime_to_dbus(self.last_approval_request)
1050
if self.last_approval_request is None:
1051
return dbus.String("")
1052
return dbus.String(self.
1053
_datetime_to_dbus(self
1054
.last_approval_request))
1523
1055
1524
1056
# Timeout - property
1525
1057
@dbus_service_property(_interface, signature="t",
1528
1060
if value is None: # get
1529
1061
return dbus.UInt64(self.timeout_milliseconds())
1530
1062
self.timeout = datetime.timedelta(0, 0, 0, value)
1063
# Emit D-Bus signal
1064
self.PropertyChanged(dbus.String("Timeout"),
1065
dbus.UInt64(value, variant_level=1))
1066
if getattr(self, "disable_initiator_tag", None) is None:
1067
return
1531
1068
# Reschedule timeout
1532
if self.enabled:
1533
now = datetime.datetime.utcnow()
1534
time_to_die = timedelta_to_milliseconds(
1535
(self.last_checked_ok + self.timeout) - now)
1536
if time_to_die <= 0:
1537
# The timeout has passed
1538
self.disable()
1539
else:
1540
self.expires = (now +
1541
datetime.timedelta(milliseconds =
1542
time_to_die))
1543
if (getattr(self, "disable_initiator_tag", None)
1544
is None):
1545
return
1546
gobject.source_remove(self.disable_initiator_tag)
1547
self.disable_initiator_tag = (gobject.timeout_add
1548
(time_to_die,
1549
self.disable))
1550
1551
# ExtendedTimeout - property
1552
@dbus_service_property(_interface, signature="t",
1553
access="readwrite")
1554
def ExtendedTimeout_dbus_property(self, value=None):
1555
if value is None: # get
1556
return dbus.UInt64(self.extended_timeout_milliseconds())
1557
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1069
gobject.source_remove(self.disable_initiator_tag)
1070
self.disable_initiator_tag = None
1071
time_to_die = (self.
1072
_timedelta_to_milliseconds((self
1073
.last_checked_ok
1074
+ self.timeout)
1075
- datetime.datetime
1076
.utcnow()))
1077
if time_to_die <= 0:
1078
# The timeout has passed
1079
self.disable()
1080
else:
1081
self.disable_initiator_tag = (gobject.timeout_add
1082
(time_to_die, self.disable))
1558
1083
1559
1084
# Interval - property
1560
1085
@dbus_service_property(_interface, signature="t",
1563
1088
if value is None: # get
1564
1089
return dbus.UInt64(self.interval_milliseconds())
1565
1090
self.interval = datetime.timedelta(0, 0, 0, value)
1091
# Emit D-Bus signal
1092
self.PropertyChanged(dbus.String("Interval"),
1093
dbus.UInt64(value, variant_level=1))
1566
1094
if getattr(self, "checker_initiator_tag", None) is None:
1567
1095
return
1568
if self.enabled:
1569
# Reschedule checker run
1570
gobject.source_remove(self.checker_initiator_tag)
1571
self.checker_initiator_tag = (gobject.timeout_add
1572
(value, self.start_checker))
1573
self.start_checker() # Start one now, too
1574
1096
# Reschedule checker run
1097
gobject.source_remove(self.checker_initiator_tag)
1098
self.checker_initiator_tag = (gobject.timeout_add
1099
(value, self.start_checker))
1100
self.start_checker() # Start one now, too
1101
1575
1102
# Checker - property
1576
1103
@dbus_service_property(_interface, signature="s",
1577
1104
access="readwrite")
1578
1105
def Checker_dbus_property(self, value=None):
1579
1106
if value is None: # get
1580
1107
return dbus.String(self.checker_command)
1581
self.checker_command = unicode(value)
1108
self.checker_command = value
1109
# Emit D-Bus signal
1110
self.PropertyChanged(dbus.String("Checker"),
1111
dbus.String(self.checker_command,
1112
variant_level=1))
1582
1113
1583
1114
# CheckerRunning - property
1584
1115
@dbus_service_property(_interface, signature="b",
1611
1142
self._pipe.send(('init', fpr, address))
1612
1143
if not self._pipe.recv():
1613
1144
raise KeyError()
1614
1145
1615
1146
def __getattribute__(self, name):
1616
if name == '_pipe':
1147
if(name == '_pipe'):
1617
1148
return super(ProxyClient, self).__getattribute__(name)
1618
1149
self._pipe.send(('getattr', name))
1619
1150
data = self._pipe.recv()
1624
1155
self._pipe.send(('funcall', name, args, kwargs))
1625
1156
return self._pipe.recv()[1]
1626
1157
return func
1627
1158
1628
1159
def __setattr__(self, name, value):
1629
if name == '_pipe':
1160
if(name == '_pipe'):
1630
1161
return super(ProxyClient, self).__setattr__(name, value)
1631
1162
self._pipe.send(('setattr', name, value))
1632
1163
1643
1174
unicode(self.client_address))
1644
1175
logger.debug("Pipe FD: %d",
1645
1176
self.server.child_pipe.fileno())
1646
1177
1647
1178
session = (gnutls.connection
1648
1179
.ClientSession(self.request,
1649
1180
gnutls.connection
1650
1181
.X509Credentials()))
1651
1182
1652
1183
# Note: gnutls.connection.X509Credentials is really a
1653
1184
# generic GnuTLS certificate credentials object so long as
1654
1185
# no X.509 keys are added to it. Therefore, we can use it
1655
1186
# here despite using OpenPGP certificates.
1656
1187
1657
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1658
1189
# "+AES-256-CBC", "+SHA1",
1659
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1665
1196
(gnutls.library.functions
1666
1197
.gnutls_priority_set_direct(session._c_object,
1667
1198
priority, None))
1668
1199
1669
1200
# Start communication using the Mandos protocol
1670
1201
# Get protocol number
1671
1202
line = self.request.makefile().readline()
1673
1204
try:
1674
1205
if int(line.strip().split()[0]) > 1:
1675
1206
raise RuntimeError
1676
except (ValueError, IndexError, RuntimeError) as error:
1207
except (ValueError, IndexError, RuntimeError), error:
1677
1208
logger.error("Unknown protocol version: %s", error)
1678
1209
return
1679
1210
1680
1211
# Start GnuTLS connection
1681
1212
try:
1682
1213
session.handshake()
1683
except gnutls.errors.GNUTLSError as error:
1214
except gnutls.errors.GNUTLSError, error:
1684
1215
logger.warning("Handshake failed: %s", error)
1685
1216
# Do not run session.bye() here: the session is not
1686
1217
# established. Just abandon the request.
1687
1218
return
1688
1219
logger.debug("Handshake succeeded")
1689
1220
1690
1221
approval_required = False
1691
1222
try:
1692
1223
try:
1693
1224
fpr = self.fingerprint(self.peer_certificate
1694
1225
(session))
1695
except (TypeError,
1696
gnutls.errors.GNUTLSError) as error:
1226
except (TypeError, gnutls.errors.GNUTLSError), error:
1697
1227
logger.warning("Bad certificate: %s", error)
1698
1228
return
1699
1229
logger.debug("Fingerprint: %s", fpr)
1700
1230
1701
1231
try:
1702
1232
client = ProxyClient(child_pipe, fpr,
1703
1233
self.client_address)
1711
1241
1712
1242
while True:
1713
1243
if not client.enabled:
1714
logger.info("Client %s is disabled",
1244
logger.warning("Client %s is disabled",
1715
1245
client.name)
1716
1246
if self.server.use_dbus:
1717
1247
# Emit D-Bus signal
1718
client.Rejected("Disabled")
1248
client.Rejected("Disabled")
1719
1249
return
1720
1250
1721
if client.approved or not client.approval_delay:
1251
if client._approved or not client.approval_delay:
1722
1252
#We are approved or approval is disabled
1723
1253
break
1724
elif client.approved is None:
1254
elif client._approved is None:
1725
1255
logger.info("Client %s needs approval",
1726
1256
client.name)
1727
1257
if self.server.use_dbus:
1738
1268
return
1739
1269
1740
1270
#wait until timeout or approved
1271
#x = float(client._timedelta_to_milliseconds(delay))
1741
1272
time = datetime.datetime.now()
1742
1273
client.changedstate.acquire()
1743
(client.changedstate.wait
1744
(float(client.timedelta_to_milliseconds(delay)
1745
/ 1000)))
1274
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1746
1275
client.changedstate.release()
1747
1276
time2 = datetime.datetime.now()
1748
1277
if (time2 - time) >= delay:
1763
1292
while sent_size < len(client.secret):
1764
1293
try:
1765
1294
sent = session.send(client.secret[sent_size:])
1766
except gnutls.errors.GNUTLSError as error:
1767
logger.warning("gnutls send failed",
1768
exc_info=error)
1295
except (gnutls.errors.GNUTLSError), error:
1296
logger.warning("gnutls send failed")
1769
1297
return
1770
1298
logger.debug("Sent: %d, remaining: %d",
1771
1299
sent, len(client.secret)
1772
1300
- (sent_size + sent))
1773
1301
sent_size += sent
1774
1302
1775
1303
logger.info("Sending secret to %s", client.name)
1776
# bump the timeout using extended_timeout
1777
client.bump_timeout(client.extended_timeout)
1304
# bump the timeout as if seen
1305
client.checked_ok()
1778
1306
if self.server.use_dbus:
1779
1307
# Emit D-Bus signal
1780
1308
client.GotSecret()
1784
1312
client.approvals_pending -= 1
1785
1313
try:
1786
1314
session.bye()
1787
except gnutls.errors.GNUTLSError as error:
1788
logger.warning("GnuTLS bye failed",
1789
exc_info=error)
1315
except (gnutls.errors.GNUTLSError), error:
1316
logger.warning("GnuTLS bye failed")
1790
1317
1791
1318
@staticmethod
1792
1319
def peer_certificate(session):
1848
1375
# Convert the buffer to a Python bytestring
1849
1376
fpr = ctypes.string_at(buf, buf_len.value)
1850
1377
# Convert the bytestring to hexadecimal notation
1851
hex_fpr = binascii.hexlify(fpr).upper()
1378
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1852
1379
return hex_fpr
1853
1380
1854
1381
1857
1384
def sub_process_main(self, request, address):
1858
1385
try:
1859
1386
self.finish_request(request, address)
1860
except Exception:
1387
except:
1861
1388
self.handle_error(request, address)
1862
1389
self.close_request(request)
1863
1390
1864
1391
def process_request(self, request, address):
1865
1392
"""Start a new process to process the request."""
1866
proc = multiprocessing.Process(target = self.sub_process_main,
1867
args = (request,
1868
address))
1869
proc.start()
1870
return proc
1871
1393
multiprocessing.Process(target = self.sub_process_main,
1394
args = (request, address)).start()
1872
1395
1873
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1874
1397
""" adds a pipe to the MixIn """
1878
1401
This function creates a new pipe in self.pipe
1879
1402
"""
1880
1403
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1881
1882
proc = MultiprocessingMixIn.process_request(self, request,
1883
client_address)
1404
1405
super(MultiprocessingMixInWithPipe,
1406
self).process_request(request, client_address)
1884
1407
self.child_pipe.close()
1885
self.add_pipe(parent_pipe, proc)
1886
1887
def add_pipe(self, parent_pipe, proc):
1408
self.add_pipe(parent_pipe)
1409
1410
def add_pipe(self, parent_pipe):
1888
1411
"""Dummy function; override as necessary"""
1889
raise NotImplementedError
1890
1412
pass
1891
1413
1892
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1893
1415
socketserver.TCPServer, object):
1920
1442
SO_BINDTODEVICE,
1921
1443
str(self.interface
1922
1444
+ '\0'))
1923
except socket.error as error:
1445
except socket.error, error:
1924
1446
if error[0] == errno.EPERM:
1925
1447
logger.error("No permission to"
1926
1448
" bind to interface %s",
1968
1490
self.enabled = False
1969
1491
self.clients = clients
1970
1492
if self.clients is None:
1971
self.clients = {}
1493
self.clients = set()
1972
1494
self.use_dbus = use_dbus
1973
1495
self.gnutls_priority = gnutls_priority
1974
1496
IPv6_TCPServer.__init__(self, server_address,
1978
1500
def server_activate(self):
1979
1501
if self.enabled:
1980
1502
return socketserver.TCPServer.server_activate(self)
1981
1982
1503
def enable(self):
1983
1504
self.enabled = True
1984
1985
def add_pipe(self, parent_pipe, proc):
1505
def add_pipe(self, parent_pipe):
1986
1506
# Call "handle_ipc" for both data and EOF events
1987
1507
gobject.io_add_watch(parent_pipe.fileno(),
1988
1508
gobject.IO_IN | gobject.IO_HUP,
1989
1509
functools.partial(self.handle_ipc,
1990
parent_pipe =
1991
parent_pipe,
1992
proc = proc))
1993
1510
parent_pipe = parent_pipe))
1511
1994
1512
def handle_ipc(self, source, condition, parent_pipe=None,
1995
proc = None, client_object=None):
1513
client_object=None):
1996
1514
condition_names = {
1997
1515
gobject.IO_IN: "IN", # There is data to read.
1998
1516
gobject.IO_OUT: "OUT", # Data can be written (without
2007
1525
for cond, name in
2008
1526
condition_names.iteritems()
2009
1527
if cond & condition)
2010
# error, or the other end of multiprocessing.Pipe has closed
1528
# error or the other end of multiprocessing.Pipe has closed
2011
1529
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2012
# Wait for other process to exit
2013
proc.join()
2014
1530
return False
2015
1531
2016
1532
# Read a request from the child
2021
1537
fpr = request[1]
2022
1538
address = request[2]
2023
1539
2024
for c in self.clients.itervalues():
1540
for c in self.clients:
2025
1541
if c.fingerprint == fpr:
2026
1542
client = c
2027
1543
break
2028
1544
else:
2029
logger.info("Client not found for fingerprint: %s, ad"
2030
"dress: %s", fpr, address)
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
2031
1547
if self.use_dbus:
2032
1548
# Emit D-Bus signal
2033
mandos_dbus_service.ClientNotFound(fpr,
2034
address[0])
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
2035
1550
parent_pipe.send(False)
2036
1551
return False
2037
1552
2038
1553
gobject.io_add_watch(parent_pipe.fileno(),
2039
1554
gobject.IO_IN | gobject.IO_HUP,
2040
1555
functools.partial(self.handle_ipc,
2041
parent_pipe =
2042
parent_pipe,
2043
proc = proc,
2044
client_object =
2045
client))
1556
parent_pipe = parent_pipe,
1557
client_object = client))
2046
1558
parent_pipe.send(True)
2047
# remove the old hook in favor of the new above hook on
2048
# same fileno
1559
# remove the old hook in favor of the new above hook on same fileno
2049
1560
return False
2050
1561
if command == 'funcall':
2051
1562
funcname = request[1]
2052
1563
args = request[2]
2053
1564
kwargs = request[3]
2054
1565
2055
parent_pipe.send(('data', getattr(client_object,
2056
funcname)(*args,
2057
**kwargs)))
2058
1566
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1567
2059
1568
if command == 'getattr':
2060
1569
attrname = request[1]
2061
1570
if callable(client_object.__getattribute__(attrname)):
2062
1571
parent_pipe.send(('function',))
2063
1572
else:
2064
parent_pipe.send(('data', client_object
2065
.__getattribute__(attrname)))
1573
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2066
1574
2067
1575
if command == 'setattr':
2068
1576
attrname = request[1]
2069
1577
value = request[2]
2070
1578
setattr(client_object, attrname, value)
2071
1579
2072
1580
return True
2073
1581
2074
1582
2104
1612
elif suffix == "w":
2105
1613
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2106
1614
else:
2107
raise ValueError("Unknown suffix {0!r}"
2108
.format(suffix))
2109
except (ValueError, IndexError) as e:
2110
raise ValueError(*(e.args))
1615
raise ValueError("Unknown suffix %r" % suffix)
1616
except (ValueError, IndexError), e:
1617
raise ValueError(e.message)
2111
1618
timevalue += delta
2112
1619
return timevalue
2113
1620
2114
1621
1622
def if_nametoindex(interface):
1623
"""Call the C function if_nametoindex(), or equivalent
1624
1625
Note: This function cannot accept a unicode string."""
1626
global if_nametoindex
1627
try:
1628
if_nametoindex = (ctypes.cdll.LoadLibrary
1629
(ctypes.util.find_library("c"))
1630
.if_nametoindex)
1631
except (OSError, AttributeError):
1632
logger.warning("Doing if_nametoindex the hard way")
1633
def if_nametoindex(interface):
1634
"Get an interface index the hard way, i.e. using fcntl()"
1635
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1636
with contextlib.closing(socket.socket()) as s:
1637
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1638
struct.pack(str("16s16x"),
1639
interface))
1640
interface_index = struct.unpack(str("I"),
1641
ifreq[16:20])[0]
1642
return interface_index
1643
return if_nametoindex(interface)
1644
1645
2115
1646
def daemon(nochdir = False, noclose = False):
2116
1647
"""See daemon(3). Standard BSD Unix function.
2117
1648
2125
1656
sys.exit()
2126
1657
if not noclose:
2127
1658
# Close all standard open file descriptors
2128
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1659
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2129
1660
if not stat.S_ISCHR(os.fstat(null).st_mode):
2130
1661
raise OSError(errno.ENODEV,
2131
"{0} not a character device"
2132
.format(os.devnull))
1662
"%s not a character device"
1663
% os.path.devnull)
2133
1664
os.dup2(null, sys.stdin.fileno())
2134
1665
os.dup2(null, sys.stdout.fileno())
2135
1666
os.dup2(null, sys.stderr.fileno())
2142
1673
##################################################################
2143
1674
# Parsing of options, both command line and config file
2144
1675
2145
parser = argparse.ArgumentParser()
2146
parser.add_argument("-v", "--version", action="version",
2147
version = "%(prog)s {0}".format(version),
2148
help="show version number and exit")
2149
parser.add_argument("-i", "--interface", metavar="IF",
2150
help="Bind to interface IF")
2151
parser.add_argument("-a", "--address",
2152
help="Address to listen for requests on")
2153
parser.add_argument("-p", "--port", type=int,
2154
help="Port number to receive requests on")
2155
parser.add_argument("--check", action="store_true",
2156
help="Run self-test")
2157
parser.add_argument("--debug", action="store_true",
2158
help="Debug mode; run in foreground and log"
2159
" to terminal")
2160
parser.add_argument("--debuglevel", metavar="LEVEL",
2161
help="Debug level for stdout output")
2162
parser.add_argument("--priority", help="GnuTLS"
2163
" priority string (see GnuTLS documentation)")
2164
parser.add_argument("--servicename",
2165
metavar="NAME", help="Zeroconf service name")
2166
parser.add_argument("--configdir",
2167
default="/etc/mandos", metavar="DIR",
2168
help="Directory to search for configuration"
2169
" files")
2170
parser.add_argument("--no-dbus", action="store_false",
2171
dest="use_dbus", help="Do not provide D-Bus"
2172
" system bus interface")
2173
parser.add_argument("--no-ipv6", action="store_false",
2174
dest="use_ipv6", help="Do not use IPv6")
2175
parser.add_argument("--no-restore", action="store_false",
2176
dest="restore", help="Do not restore stored"
2177
" state")
2178
parser.add_argument("--statedir", metavar="DIR",
2179
help="Directory to save/restore state in")
2180
2181
options = parser.parse_args()
1676
parser = optparse.OptionParser(version = "%%prog %s" % version)
1677
parser.add_option("-i", "--interface", type="string",
1678
metavar="IF", help="Bind to interface IF")
1679
parser.add_option("-a", "--address", type="string",
1680
help="Address to listen for requests on")
1681
parser.add_option("-p", "--port", type="int",
1682
help="Port number to receive requests on")
1683
parser.add_option("--check", action="store_true",
1684
help="Run self-test")
1685
parser.add_option("--debug", action="store_true",
1686
help="Debug mode; run in foreground and log to"
1687
" terminal")
1688
parser.add_option("--debuglevel", type="string", metavar="LEVEL",
1689
help="Debug level for stdout output")
1690
parser.add_option("--priority", type="string", help="GnuTLS"
1691
" priority string (see GnuTLS documentation)")
1692
parser.add_option("--servicename", type="string",
1693
metavar="NAME", help="Zeroconf service name")
1694
parser.add_option("--configdir", type="string",
1695
default="/etc/mandos", metavar="DIR",
1696
help="Directory to search for configuration"
1697
" files")
1698
parser.add_option("--no-dbus", action="store_false",
1699
dest="use_dbus", help="Do not provide D-Bus"
1700
" system bus interface")
1701
parser.add_option("--no-ipv6", action="store_false",
1702
dest="use_ipv6", help="Do not use IPv6")
1703
options = parser.parse_args()[0]
2182
1704
2183
1705
if options.check:
2184
1706
import doctest
2196
1718
"use_dbus": "True",
2197
1719
"use_ipv6": "True",
2198
1720
"debuglevel": "",
2199
"restore": "True",
2200
"statedir": "/var/lib/mandos"
2201
1721
}
2202
1722
2203
1723
# Parse config file for server-global settings
2220
1740
# options, if set.
2221
1741
for option in ("interface", "address", "port", "debug",
2222
1742
"priority", "servicename", "configdir",
2223
"use_dbus", "use_ipv6", "debuglevel", "restore",
2224
"statedir"):
1743
"use_dbus", "use_ipv6", "debuglevel"):
2225
1744
value = getattr(options, option)
2226
1745
if value is not None:
2227
1746
server_settings[option] = value
2239
1758
debuglevel = server_settings["debuglevel"]
2240
1759
use_dbus = server_settings["use_dbus"]
2241
1760
use_ipv6 = server_settings["use_ipv6"]
2242
stored_state_path = os.path.join(server_settings["statedir"],
2243
stored_state_file)
2244
2245
if debug:
2246
initlogger(debug, logging.DEBUG)
2247
else:
2248
if not debuglevel:
2249
initlogger(debug)
2250
else:
2251
level = getattr(logging, debuglevel.upper())
2252
initlogger(debug, level)
2253
1761
2254
1762
if server_settings["servicename"] != "Mandos":
2255
1763
syslogger.setFormatter(logging.Formatter
2256
('Mandos ({0}) [%(process)d]:'
2257
' %(levelname)s: %(message)s'
2258
.format(server_settings
2259
["servicename"])))
1764
('Mandos (%s) [%%(process)d]:'
1765
' %%(levelname)s: %%(message)s'
1766
% server_settings["servicename"]))
2260
1767
2261
1768
# Parse config file with clients
2262
client_config = configparser.SafeConfigParser(Client
2263
.client_defaults)
1769
client_defaults = { "timeout": "1h",
1770
"interval": "5m",
1771
"checker": "fping -q -- %%(host)s",
1772
"host": "",
1773
"approval_delay": "0s",
1774
"approval_duration": "1s",
1775
}
1776
client_config = configparser.SafeConfigParser(client_defaults)
2264
1777
client_config.read(os.path.join(server_settings["configdir"],
2265
1778
"clients.conf"))
2266
1779
2280
1793
pidfilename = "/var/run/mandos.pid"
2281
1794
try:
2282
1795
pidfile = open(pidfilename, "w")
2283
except IOError as e:
2284
logger.error("Could not open file %r", pidfilename,
2285
exc_info=e)
1796
except IOError:
1797
logger.error("Could not open file %r", pidfilename)
2286
1798
2287
for name in ("_mandos", "mandos", "nobody"):
1799
try:
1800
uid = pwd.getpwnam("_mandos").pw_uid
1801
gid = pwd.getpwnam("_mandos").pw_gid
1802
except KeyError:
2288
1803
try:
2289
uid = pwd.getpwnam(name).pw_uid
2290
gid = pwd.getpwnam(name).pw_gid
2291
break
1804
uid = pwd.getpwnam("mandos").pw_uid
1805
gid = pwd.getpwnam("mandos").pw_gid
2292
1806
except KeyError:
2293
continue
2294
else:
2295
uid = 65534
2296
gid = 65534
1807
try:
1808
uid = pwd.getpwnam("nobody").pw_uid
1809
gid = pwd.getpwnam("nobody").pw_gid
1810
except KeyError:
1811
uid = 65534
1812
gid = 65534
2297
1813
try:
2298
1814
os.setgid(gid)
2299
1815
os.setuid(uid)
2300
except OSError as error:
1816
except OSError, error:
2301
1817
if error[0] != errno.EPERM:
2302
1818
raise error
2303
1819
1820
if not debug and not debuglevel:
1821
syslogger.setLevel(logging.WARNING)
1822
console.setLevel(logging.WARNING)
1823
if debuglevel:
1824
level = getattr(logging, debuglevel.upper())
1825
syslogger.setLevel(level)
1826
console.setLevel(level)
1827
2304
1828
if debug:
2305
1829
# Enable all possible GnuTLS debugging
2306
1830
2316
1840
.gnutls_global_set_log_function(debug_gnutls))
2317
1841
2318
1842
# Redirect stdin so all checkers get /dev/null
2319
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1843
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2320
1844
os.dup2(null, sys.stdin.fileno())
2321
1845
if null > 2:
2322
1846
os.close(null)
1847
else:
1848
# No console logging
1849
logger.removeHandler(console)
2323
1850
2324
1851
# Need to fork before connecting to D-Bus
2325
1852
if not debug:
2326
1853
# Close all input and output, do double fork, etc.
2327
1854
daemon()
2328
1855
2329
gobject.threads_init()
2330
2331
1856
global main_loop
2332
1857
# From the Avahi example code
2333
DBusGMainLoop(set_as_default=True)
1858
DBusGMainLoop(set_as_default=True )
2334
1859
main_loop = gobject.MainLoop()
2335
1860
bus = dbus.SystemBus()
2336
1861
# End of Avahi example code
2337
1862
if use_dbus:
2338
1863
try:
2339
bus_name = dbus.service.BusName("se.recompile.Mandos",
1864
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2340
1865
bus, do_not_queue=True)
2341
old_bus_name = (dbus.service.BusName
2342
("se.bsnet.fukt.Mandos", bus,
2343
do_not_queue=True))
2344
except dbus.exceptions.NameExistsException as e:
2345
logger.error("Disabling D-Bus:", exc_info=e)
1866
except dbus.exceptions.NameExistsException, e:
1867
logger.error(unicode(e) + ", disabling D-Bus")
2346
1868
use_dbus = False
2347
1869
server_settings["use_dbus"] = False
2348
1870
tcp_server.use_dbus = False
2349
1871
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2350
service = AvahiServiceToSyslog(name =
2351
server_settings["servicename"],
2352
servicetype = "_mandos._tcp",
2353
protocol = protocol, bus = bus)
1872
service = AvahiService(name = server_settings["servicename"],
1873
servicetype = "_mandos._tcp",
1874
protocol = protocol, bus = bus)
2354
1875
if server_settings["interface"]:
2355
1876
service.interface = (if_nametoindex
2356
1877
(str(server_settings["interface"])))
2361
1882
client_class = Client
2362
1883
if use_dbus:
2363
1884
client_class = functools.partial(ClientDBus, bus = bus)
2364
2365
client_settings = Client.config_parser(client_config)
2366
old_client_settings = {}
2367
clients_data = {}
2368
2369
# Get client data and settings from last running state.
2370
if server_settings["restore"]:
2371
try:
2372
with open(stored_state_path, "rb") as stored_state:
2373
clients_data, old_client_settings = (pickle.load
2374
(stored_state))
2375
os.remove(stored_state_path)
2376
except IOError as e:
2377
if e.errno == errno.ENOENT:
2378
logger.warning("Could not load persistent state: {0}"
2379
.format(os.strerror(e.errno)))
2380
else:
2381
logger.critical("Could not load persistent state:",
2382
exc_info=e)
2383
raise
2384
except EOFError as e:
2385
logger.warning("Could not load persistent state: "
2386
"EOFError:", exc_info=e)
2387
2388
with PGPEngine() as pgp:
2389
for client_name, client in clients_data.iteritems():
2390
# Decide which value to use after restoring saved state.
2391
# We have three different values: Old config file,
2392
# new config file, and saved state.
2393
# New config value takes precedence if it differs from old
2394
# config value, otherwise use saved state.
2395
for name, value in client_settings[client_name].items():
2396
try:
2397
# For each value in new config, check if it
2398
# differs from the old config value (Except for
2399
# the "secret" attribute)
2400
if (name != "secret" and
2401
value != old_client_settings[client_name]
2402
[name]):
2403
client[name] = value
2404
except KeyError:
2405
pass
2406
2407
# Clients who has passed its expire date can still be
2408
# enabled if its last checker was successful. Clients
2409
# whose checker succeeded before we stored its state is
2410
# assumed to have successfully run all checkers during
2411
# downtime.
2412
if client["enabled"]:
2413
if datetime.datetime.utcnow() >= client["expires"]:
2414
if not client["last_checked_ok"]:
2415
logger.warning(
2416
"disabling client {0} - Client never "
2417
"performed a successful checker"
2418
.format(client_name))
2419
client["enabled"] = False
2420
elif client["last_checker_status"] != 0:
2421
logger.warning(
2422
"disabling client {0} - Client "
2423
"last checker failed with error code {1}"
2424
.format(client_name,
2425
client["last_checker_status"]))
2426
client["enabled"] = False
2427
else:
2428
client["expires"] = (datetime.datetime
2429
.utcnow()
2430
+ client["timeout"])
2431
logger.debug("Last checker succeeded,"
2432
" keeping {0} enabled"
2433
.format(client_name))
1885
def client_config_items(config, section):
1886
special_settings = {
1887
"approved_by_default":
1888
lambda: config.getboolean(section,
1889
"approved_by_default"),
1890
}
1891
for name, value in config.items(section):
2434
1892
try:
2435
client["secret"] = (
2436
pgp.decrypt(client["encrypted_secret"],
2437
client_settings[client_name]
2438
["secret"]))
2439
except PGPError:
2440
# If decryption fails, we use secret from new settings
2441
logger.debug("Failed to decrypt {0} old secret"
2442
.format(client_name))
2443
client["secret"] = (
2444
client_settings[client_name]["secret"])
2445
2446
# Add/remove clients based on new changes made to config
2447
for client_name in (set(old_client_settings)
2448
- set(client_settings)):
2449
del clients_data[client_name]
2450
for client_name in (set(client_settings)
2451
- set(old_client_settings)):
2452
clients_data[client_name] = client_settings[client_name]
2453
2454
# Create all client objects
2455
for client_name, client in clients_data.iteritems():
2456
tcp_server.clients[client_name] = client_class(
2457
name = client_name, settings = client)
2458
1893
yield (name, special_settings[name]())
1894
except KeyError:
1895
yield (name, value)
1896
1897
tcp_server.clients.update(set(
1898
client_class(name = section,
1899
config= dict(client_config_items(
1900
client_config, section)))
1901
for section in client_config.sections()))
2459
1902
if not tcp_server.clients:
2460
1903
logger.warning("No clients defined")
2461
1904
2462
1905
if not debug:
2463
1906
try:
2464
1907
with pidfile:
2472
1915
# "pidfile" was never created
2473
1916
pass
2474
1917
del pidfilename
1918
2475
1919
signal.signal(signal.SIGINT, signal.SIG_IGN)
2476
1920
2477
1921
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2478
1922
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2479
1923
2480
1924
if use_dbus:
2481
@alternate_dbus_interfaces({"se.recompile.Mandos":
2482
"se.bsnet.fukt.Mandos"})
2483
class MandosDBusService(DBusObjectWithProperties):
1925
class MandosDBusService(dbus.service.Object):
2484
1926
"""A D-Bus proxy object"""
2485
1927
def __init__(self):
2486
1928
dbus.service.Object.__init__(self, bus, "/")
2487
_interface = "se.recompile.Mandos"
2488
2489
@dbus_interface_annotations(_interface)
2490
def _foo(self):
2491
return { "org.freedesktop.DBus.Property"
2492
".EmitsChangedSignal":
2493
"false"}
1929
_interface = "se.bsnet.fukt.Mandos"
2494
1930
2495
1931
@dbus.service.signal(_interface, signature="o")
2496
1932
def ClientAdded(self, objpath):
2511
1947
def GetAllClients(self):
2512
1948
"D-Bus method"
2513
1949
return dbus.Array(c.dbus_object_path
2514
for c in
2515
tcp_server.clients.itervalues())
1950
for c in tcp_server.clients)
2516
1951
2517
1952
@dbus.service.method(_interface,
2518
1953
out_signature="a{oa{sv}}")
2520
1955
"D-Bus method"
2521
1956
return dbus.Dictionary(
2522
1957
((c.dbus_object_path, c.GetAll(""))
2523
for c in tcp_server.clients.itervalues()),
1958
for c in tcp_server.clients),
2524
1959
signature="oa{sv}")
2525
1960
2526
1961
@dbus.service.method(_interface, in_signature="o")
2527
1962
def RemoveClient(self, object_path):
2528
1963
"D-Bus method"
2529
for c in tcp_server.clients.itervalues():
1964
for c in tcp_server.clients:
2530
1965
if c.dbus_object_path == object_path:
2531
del tcp_server.clients[c.name]
1966
tcp_server.clients.remove(c)
2532
1967
c.remove_from_connection()
2533
1968
# Don't signal anything except ClientRemoved
2534
1969
c.disable(quiet=True)
2545
1980
"Cleanup function; run on exit"
2546
1981
service.cleanup()
2547
1982
2548
multiprocessing.active_children()
2549
if not (tcp_server.clients or client_settings):
2550
return
2551
2552
# Store client before exiting. Secrets are encrypted with key
2553
# based on what config file has. If config file is
2554
# removed/edited, old secret will thus be unrecovable.
2555
clients = {}
2556
with PGPEngine() as pgp:
2557
for client in tcp_server.clients.itervalues():
2558
key = client_settings[client.name]["secret"]
2559
client.encrypted_secret = pgp.encrypt(client.secret,
2560
key)
2561
client_dict = {}
2562
2563
# A list of attributes that can not be pickled
2564
# + secret.
2565
exclude = set(("bus", "changedstate", "secret",
2566
"checker"))
2567
for name, typ in (inspect.getmembers
2568
(dbus.service.Object)):
2569
exclude.add(name)
2570
2571
client_dict["encrypted_secret"] = (client
2572
.encrypted_secret)
2573
for attr in client.client_structure:
2574
if attr not in exclude:
2575
client_dict[attr] = getattr(client, attr)
2576
2577
clients[client.name] = client_dict
2578
del client_settings[client.name]["secret"]
2579
2580
try:
2581
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2582
prefix="clients-",
2583
dir=os.path.dirname
2584
(stored_state_path))
2585
with os.fdopen(tempfd, "wb") as stored_state:
2586
pickle.dump((clients, client_settings), stored_state)
2587
os.rename(tempname, stored_state_path)
2588
except (IOError, OSError) as e:
2589
if not debug:
2590
try:
2591
os.remove(tempname)
2592
except NameError:
2593
pass
2594
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2595
logger.warning("Could not save persistent state: {0}"
2596
.format(os.strerror(e.errno)))
2597
else:
2598
logger.warning("Could not save persistent state:",
2599
exc_info=e)
2600
raise e
2601
2602
# Delete all clients, and settings from config
2603
1983
while tcp_server.clients:
2604
name, client = tcp_server.clients.popitem()
1984
client = tcp_server.clients.pop()
2605
1985
if use_dbus:
2606
1986
client.remove_from_connection()
1987
client.disable_hook = None
2607
1988
# Don't signal anything except ClientRemoved
2608
1989
client.disable(quiet=True)
2609
1990
if use_dbus:
2610
1991
# Emit D-Bus signal
2611
mandos_dbus_service.ClientRemoved(client
2612
.dbus_object_path,
1992
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2613
1993
client.name)
2614
client_settings.clear()
2615
1994
2616
1995
atexit.register(cleanup)
2617
1996
2618
for client in tcp_server.clients.itervalues():
1997
for client in tcp_server.clients:
2619
1998
if use_dbus:
2620
1999
# Emit D-Bus signal
2621
2000
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2622
# Need to initiate checking of clients
2623
if client.enabled:
2624
client.init_checker()
2001
client.enable()
2625
2002
2626
2003
tcp_server.enable()
2627
2004
tcp_server.server_activate()
2630
2007
service.port = tcp_server.socket.getsockname()[1]
2631
2008
if use_ipv6:
2632
2009
logger.info("Now listening on address %r, port %d,"
2633
" flowinfo %d, scope_id %d",
2634
*tcp_server.socket.getsockname())
2010
" flowinfo %d, scope_id %d"
2011
% tcp_server.socket.getsockname())
2635
2012
else: # IPv4
2636
logger.info("Now listening on address %r, port %d",
2637
*tcp_server.socket.getsockname())
2013
logger.info("Now listening on address %r, port %d"
2014
% tcp_server.socket.getsockname())
2638
2015
2639
2016
#service.interface = tcp_server.socket.getsockname()[3]
2640
2017
2642
2019
# From the Avahi example code
2643
2020
try:
2644
2021
service.activate()
2645
except dbus.exceptions.DBusException as error:
2646
logger.critical("D-Bus Exception", exc_info=error)
2022
except dbus.exceptions.DBusException, error:
2023
logger.critical("DBusException: %s", error)
2647
2024
cleanup()
2648
2025
sys.exit(1)
2649
2026
# End of Avahi example code
2655
2032
2656
2033
logger.debug("Starting main loop")
2657
2034
main_loop.run()
2658
except AvahiError as error:
2659
logger.critical("Avahi Error", exc_info=error)
2035
except AvahiError, error:
2036
logger.critical("AvahiError: %s", error)
2660
2037
cleanup()
2661
2038
sys.exit(1)
2662
2039
except KeyboardInterrupt:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0