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 504
- compare with another revision
- download diff
- download tarball
- view history from revision 504
- Committer: Teddy Hogeborn
- Date: 2011-10-02 13:47:52 UTC
- Revision ID: teddy@fukt.bsnet.se-20111002134752-c5g5ibcga4biz7ob
* plugins.d/plymouth.c (plymouth_pid): Changed to
"/run/initramfs/plymouth.pid".
(plymouth_old_pid): New; set to "/dev/.initramfs/plymouth.pid".
(get_pid): Try both 'plymouth_pid' and 'plymouth_old_pid'.
"/run/initramfs/plymouth.pid".
(plymouth_old_pid): New; set to "/dev/.initramfs/plymouth.pid".
(get_pid): Try both 'plymouth_pid' and 'plymouth_old_pid'.
- files added:
- DBUS-API
- debian/source
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 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
31
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
from __future__ import division, with_statement, absolute_import
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
35
36
36
37
import SocketServer as socketserver
37
38
import socket
38
import optparse
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
58
from contextlib import closing
59
import contextlib
59
60
import struct
60
61
import fcntl
61
62
import functools
63
import cPickle as pickle
64
import multiprocessing
62
65
63
66
import dbus
64
67
import dbus.service
79
82
SO_BINDTODEVICE = None
80
83
81
84
82
version = "1.0.12"
85
version = "1.3.1"
83
86
84
logger = logging.Logger(u'mandos')
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
85
89
syslogger = (logging.handlers.SysLogHandler
86
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
87
address = "/dev/log"))
91
address = str("/dev/log")))
88
92
syslogger.setFormatter(logging.Formatter
89
(u'Mandos [%(process)d]: %(levelname)s:'
90
u' %(message)s'))
93
('Mandos [%(process)d]: %(levelname)s:'
94
' %(message)s'))
91
95
logger.addHandler(syslogger)
92
96
93
97
console = logging.StreamHandler()
94
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
95
u' %(levelname)s:'
96
u' %(message)s'))
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
' %(levelname)s:'
100
' %(message)s'))
97
101
logger.addHandler(console)
98
102
99
103
class AvahiError(Exception):
116
120
Attributes:
117
121
interface: integer; avahi.IF_UNSPEC or an interface index.
118
122
Used to optionally bind to the specified interface.
119
name: string; Example: u'Mandos'
120
type: string; Example: u'_mandos._tcp'.
123
name: string; Example: 'Mandos'
124
type: string; Example: '_mandos._tcp'.
121
125
See <http://www.dns-sd.org/ServiceTypes.html>
122
126
port: integer; what port to announce
123
127
TXT: list of strings; TXT record for the service
132
136
"""
133
137
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
134
138
servicetype = None, port = None, TXT = None,
135
domain = u"", host = u"", max_renames = 32768,
139
domain = "", host = "", max_renames = 32768,
136
140
protocol = avahi.PROTO_UNSPEC, bus = None):
137
141
self.interface = interface
138
142
self.name = name
147
151
self.group = None # our entry group
148
152
self.server = None
149
153
self.bus = bus
154
self.entry_group_state_changed_match = None
150
155
def rename(self):
151
156
"""Derived from the Avahi example code"""
152
157
if self.rename_count >= self.max_renames:
153
logger.critical(u"No suitable Zeroconf service name found"
154
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
155
160
self.rename_count)
156
raise AvahiServiceError(u"Too many renames")
157
self.name = self.server.GetAlternativeServiceName(self.name)
158
logger.info(u"Changing Zeroconf service name to %r ...",
159
unicode(self.name))
161
raise AvahiServiceError("Too many renames")
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
logger.info("Changing Zeroconf service name to %r ...",
164
self.name)
160
165
syslogger.setFormatter(logging.Formatter
161
(u'Mandos (%s) [%%(process)d]:'
162
u' %%(levelname)s: %%(message)s'
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
163
168
% self.name))
164
169
self.remove()
165
self.add()
170
try:
171
self.add()
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
174
self.cleanup()
175
os._exit(1)
166
176
self.rename_count += 1
167
177
def remove(self):
168
178
"""Derived from the Avahi example code"""
179
if self.entry_group_state_changed_match is not None:
180
self.entry_group_state_changed_match.remove()
181
self.entry_group_state_changed_match = None
169
182
if self.group is not None:
170
183
self.group.Reset()
171
184
def add(self):
172
185
"""Derived from the Avahi example code"""
186
self.remove()
173
187
if self.group is None:
174
188
self.group = dbus.Interface(
175
189
self.bus.get_object(avahi.DBUS_NAME,
176
190
self.server.EntryGroupNew()),
177
191
avahi.DBUS_INTERFACE_ENTRY_GROUP)
178
self.group.connect_to_signal('StateChanged',
179
self
180
.entry_group_state_changed)
181
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
192
self.entry_group_state_changed_match = (
193
self.group.connect_to_signal(
194
'StateChanged', self .entry_group_state_changed))
195
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
182
196
self.name, self.type)
183
197
self.group.AddService(
184
198
self.interface,
191
205
self.group.Commit()
192
206
def entry_group_state_changed(self, state, error):
193
207
"""Derived from the Avahi example code"""
194
logger.debug(u"Avahi state change: %i", state)
208
logger.debug("Avahi entry group state change: %i", state)
195
209
196
210
if state == avahi.ENTRY_GROUP_ESTABLISHED:
197
logger.debug(u"Zeroconf service established.")
211
logger.debug("Zeroconf service established.")
198
212
elif state == avahi.ENTRY_GROUP_COLLISION:
199
logger.warning(u"Zeroconf service name collision.")
213
logger.info("Zeroconf service name collision.")
200
214
self.rename()
201
215
elif state == avahi.ENTRY_GROUP_FAILURE:
202
logger.critical(u"Avahi: Error in group state changed %s",
216
logger.critical("Avahi: Error in group state changed %s",
203
217
unicode(error))
204
raise AvahiGroupError(u"State changed: %s"
218
raise AvahiGroupError("State changed: %s"
205
219
% unicode(error))
206
220
def cleanup(self):
207
221
"""Derived from the Avahi example code"""
208
222
if self.group is not None:
209
self.group.Free()
223
try:
224
self.group.Free()
225
except (dbus.exceptions.UnknownMethodException,
226
dbus.exceptions.DBusException) as e:
227
pass
210
228
self.group = None
211
def server_state_changed(self, state):
229
self.remove()
230
def server_state_changed(self, state, error=None):
212
231
"""Derived from the Avahi example code"""
213
if state == avahi.SERVER_COLLISION:
214
logger.error(u"Zeroconf server name collision")
215
self.remove()
232
logger.debug("Avahi server state change: %i", state)
233
bad_states = { avahi.SERVER_INVALID:
234
"Zeroconf server invalid",
235
avahi.SERVER_REGISTERING: None,
236
avahi.SERVER_COLLISION:
237
"Zeroconf server name collision",
238
avahi.SERVER_FAILURE:
239
"Zeroconf server failure" }
240
if state in bad_states:
241
if bad_states[state] is not None:
242
if error is None:
243
logger.error(bad_states[state])
244
else:
245
logger.error(bad_states[state] + ": %r", error)
246
self.cleanup()
216
247
elif state == avahi.SERVER_RUNNING:
217
248
self.add()
249
else:
250
if error is None:
251
logger.debug("Unknown state: %r", state)
252
else:
253
logger.debug("Unknown state: %r: %r", state, error)
218
254
def activate(self):
219
255
"""Derived from the Avahi example code"""
220
256
if self.server is None:
221
257
self.server = dbus.Interface(
222
258
self.bus.get_object(avahi.DBUS_NAME,
223
avahi.DBUS_PATH_SERVER),
259
avahi.DBUS_PATH_SERVER,
260
follow_name_owner_changes=True),
224
261
avahi.DBUS_INTERFACE_SERVER)
225
self.server.connect_to_signal(u"StateChanged",
262
self.server.connect_to_signal("StateChanged",
226
263
self.server_state_changed)
227
264
self.server_state_changed(self.server.GetState())
228
265
229
266
267
def _timedelta_to_milliseconds(td):
268
"Convert a datetime.timedelta() to milliseconds"
269
return ((td.days * 24 * 60 * 60 * 1000)
270
+ (td.seconds * 1000)
271
+ (td.microseconds // 1000))
272
230
273
class Client(object):
231
274
"""A representation of a client host served by this server.
232
275
233
276
Attributes:
234
name: string; from the config file, used in log messages and
235
D-Bus identifiers
236
fingerprint: string (40 or 32 hexadecimal digits); used to
237
uniquely identify the client
238
secret: bytestring; sent verbatim (over TLS) to client
239
host: string; available for use by the checker command
240
created: datetime.datetime(); (UTC) object creation
241
last_enabled: datetime.datetime(); (UTC)
242
enabled: bool()
243
last_checked_ok: datetime.datetime(); (UTC) or None
244
timeout: datetime.timedelta(); How long from last_checked_ok
245
until this client is invalid
246
interval: datetime.timedelta(); How often to start a new checker
247
disable_hook: If set, called by disable() as disable_hook(self)
277
_approved: bool(); 'None' if not yet approved/disapproved
278
approval_delay: datetime.timedelta(); Time to wait for approval
279
approval_duration: datetime.timedelta(); Duration of one approval
248
280
checker: subprocess.Popen(); a running checker process used
249
281
to see if the client lives.
250
282
'None' if no process is running.
251
checker_initiator_tag: a gobject event source tag, or None
252
disable_initiator_tag: - '' -
253
checker_callback_tag: - '' -
254
checker_command: string; External command which is run to check if
255
client lives. %() expansions are done at
283
checker_callback_tag: a gobject event source tag, or None
284
checker_command: string; External command which is run to check
285
if client lives. %() expansions are done at
256
286
runtime with vars(self) as dict, so that for
257
287
instance %(name)s can be used in the command.
288
checker_initiator_tag: a gobject event source tag, or None
289
created: datetime.datetime(); (UTC) object creation
258
290
current_checker_command: string; current running checker_command
291
disable_hook: If set, called by disable() as disable_hook(self)
292
disable_initiator_tag: a gobject event source tag, or None
293
enabled: bool()
294
fingerprint: string (40 or 32 hexadecimal digits); used to
295
uniquely identify the client
296
host: string; available for use by the checker command
297
interval: datetime.timedelta(); How often to start a new checker
298
last_approval_request: datetime.datetime(); (UTC) or None
299
last_checked_ok: datetime.datetime(); (UTC) or None
300
last_enabled: datetime.datetime(); (UTC)
301
name: string; from the config file, used in log messages and
302
D-Bus identifiers
303
secret: bytestring; sent verbatim (over TLS) to client
304
timeout: datetime.timedelta(); How long from last_checked_ok
305
until this client is disabled
306
extended_timeout: extra long timeout when password has been sent
307
runtime_expansions: Allowed attributes for runtime expansion.
308
expires: datetime.datetime(); time (UTC) when a client will be
309
disabled, or None
259
310
"""
260
311
261
@staticmethod
262
def _timedelta_to_milliseconds(td):
263
"Convert a datetime.timedelta() to milliseconds"
264
return ((td.days * 24 * 60 * 60 * 1000)
265
+ (td.seconds * 1000)
266
+ (td.microseconds // 1000))
312
runtime_expansions = ("approval_delay", "approval_duration",
313
"created", "enabled", "fingerprint",
314
"host", "interval", "last_checked_ok",
315
"last_enabled", "name", "timeout")
267
316
268
317
def timeout_milliseconds(self):
269
318
"Return the 'timeout' attribute in milliseconds"
270
return self._timedelta_to_milliseconds(self.timeout)
319
return _timedelta_to_milliseconds(self.timeout)
320
321
def extended_timeout_milliseconds(self):
322
"Return the 'extended_timeout' attribute in milliseconds"
323
return _timedelta_to_milliseconds(self.extended_timeout)
271
324
272
325
def interval_milliseconds(self):
273
326
"Return the 'interval' attribute in milliseconds"
274
return self._timedelta_to_milliseconds(self.interval)
327
return _timedelta_to_milliseconds(self.interval)
328
329
def approval_delay_milliseconds(self):
330
return _timedelta_to_milliseconds(self.approval_delay)
275
331
276
332
def __init__(self, name = None, disable_hook=None, config=None):
277
333
"""Note: the 'checker' key in 'config' sets the
280
336
self.name = name
281
337
if config is None:
282
338
config = {}
283
logger.debug(u"Creating client %r", self.name)
339
logger.debug("Creating client %r", self.name)
284
340
# Uppercase and remove spaces from fingerprint for later
285
341
# comparison purposes with return value from the fingerprint()
286
342
# function
287
self.fingerprint = (config[u"fingerprint"].upper()
288
.replace(u" ", u""))
289
logger.debug(u" Fingerprint: %s", self.fingerprint)
290
if u"secret" in config:
291
self.secret = config[u"secret"].decode(u"base64")
292
elif u"secfile" in config:
293
with closing(open(os.path.expanduser
294
(os.path.expandvars
295
(config[u"secfile"])))) as secfile:
343
self.fingerprint = (config["fingerprint"].upper()
344
.replace(" ", ""))
345
logger.debug(" Fingerprint: %s", self.fingerprint)
346
if "secret" in config:
347
self.secret = config["secret"].decode("base64")
348
elif "secfile" in config:
349
with open(os.path.expanduser(os.path.expandvars
350
(config["secfile"])),
351
"rb") as secfile:
296
352
self.secret = secfile.read()
297
353
else:
298
raise TypeError(u"No secret or secfile for client %s"
354
raise TypeError("No secret or secfile for client %s"
299
355
% self.name)
300
self.host = config.get(u"host", u"")
356
self.host = config.get("host", "")
301
357
self.created = datetime.datetime.utcnow()
302
358
self.enabled = False
359
self.last_approval_request = None
303
360
self.last_enabled = None
304
361
self.last_checked_ok = None
305
self.timeout = string_to_delta(config[u"timeout"])
306
self.interval = string_to_delta(config[u"interval"])
362
self.timeout = string_to_delta(config["timeout"])
363
self.extended_timeout = string_to_delta(config["extended_timeout"])
364
self.interval = string_to_delta(config["interval"])
307
365
self.disable_hook = disable_hook
308
366
self.checker = None
309
367
self.checker_initiator_tag = None
310
368
self.disable_initiator_tag = None
369
self.expires = None
311
370
self.checker_callback_tag = None
312
self.checker_command = config[u"checker"]
371
self.checker_command = config["checker"]
313
372
self.current_checker_command = None
314
373
self.last_connect = None
374
self._approved = None
375
self.approved_by_default = config.get("approved_by_default",
376
True)
377
self.approvals_pending = 0
378
self.approval_delay = string_to_delta(
379
config["approval_delay"])
380
self.approval_duration = string_to_delta(
381
config["approval_duration"])
382
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
315
383
384
def send_changedstate(self):
385
self.changedstate.acquire()
386
self.changedstate.notify_all()
387
self.changedstate.release()
388
316
389
def enable(self):
317
390
"""Start this client's checker and timeout hooks"""
318
if getattr(self, u"enabled", False):
391
if getattr(self, "enabled", False):
319
392
# Already enabled
320
393
return
321
self.last_enabled = datetime.datetime.utcnow()
394
self.send_changedstate()
322
395
# Schedule a new checker to be started an 'interval' from now,
323
396
# and every interval from then on.
324
397
self.checker_initiator_tag = (gobject.timeout_add
325
398
(self.interval_milliseconds(),
326
399
self.start_checker))
327
# Also start a new checker *right now*.
328
self.start_checker()
329
400
# Schedule a disable() when 'timeout' has passed
401
self.expires = datetime.datetime.utcnow() + self.timeout
330
402
self.disable_initiator_tag = (gobject.timeout_add
331
403
(self.timeout_milliseconds(),
332
404
self.disable))
333
405
self.enabled = True
406
self.last_enabled = datetime.datetime.utcnow()
407
# Also start a new checker *right now*.
408
self.start_checker()
334
409
335
def disable(self):
410
def disable(self, quiet=True):
336
411
"""Disable this client."""
337
412
if not getattr(self, "enabled", False):
338
413
return False
339
logger.info(u"Disabling client %s", self.name)
340
if getattr(self, u"disable_initiator_tag", False):
414
if not quiet:
415
self.send_changedstate()
416
if not quiet:
417
logger.info("Disabling client %s", self.name)
418
if getattr(self, "disable_initiator_tag", False):
341
419
gobject.source_remove(self.disable_initiator_tag)
342
420
self.disable_initiator_tag = None
343
if getattr(self, u"checker_initiator_tag", False):
421
self.expires = None
422
if getattr(self, "checker_initiator_tag", False):
344
423
gobject.source_remove(self.checker_initiator_tag)
345
424
self.checker_initiator_tag = None
346
425
self.stop_checker()
361
440
if os.WIFEXITED(condition):
362
441
exitstatus = os.WEXITSTATUS(condition)
363
442
if exitstatus == 0:
364
logger.info(u"Checker for %(name)s succeeded",
443
logger.info("Checker for %(name)s succeeded",
365
444
vars(self))
366
445
self.checked_ok()
367
446
else:
368
logger.info(u"Checker for %(name)s failed",
447
logger.info("Checker for %(name)s failed",
369
448
vars(self))
370
449
else:
371
logger.warning(u"Checker for %(name)s crashed?",
450
logger.warning("Checker for %(name)s crashed?",
372
451
vars(self))
373
452
374
def checked_ok(self):
453
def checked_ok(self, timeout=None):
375
454
"""Bump up the timeout for this client.
376
455
377
456
This should only be called when the client has been seen,
378
457
alive and well.
379
458
"""
459
if timeout is None:
460
timeout = self.timeout
380
461
self.last_checked_ok = datetime.datetime.utcnow()
381
462
gobject.source_remove(self.disable_initiator_tag)
463
self.expires = datetime.datetime.utcnow() + timeout
382
464
self.disable_initiator_tag = (gobject.timeout_add
383
(self.timeout_milliseconds(),
465
(_timedelta_to_milliseconds(timeout),
384
466
self.disable))
385
467
468
def need_approval(self):
469
self.last_approval_request = datetime.datetime.utcnow()
470
386
471
def start_checker(self):
387
472
"""Start a new checker subprocess if one is not running.
388
473
394
479
# client would inevitably timeout, since no checker would get
395
480
# a chance to run to completion. If we instead leave running
396
481
# checkers alone, the checker would have to take more time
397
# than 'timeout' for the client to be declared invalid, which
398
# is as it should be.
482
# than 'timeout' for the client to be disabled, which is as it
483
# should be.
399
484
400
485
# If a checker exists, make sure it is not a zombie
401
if self.checker is not None:
486
try:
402
487
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
488
except (AttributeError, OSError) as error:
489
if (isinstance(error, OSError)
490
and error.errno != errno.ECHILD):
491
raise error
492
else:
403
493
if pid:
404
logger.warning(u"Checker was a zombie")
494
logger.warning("Checker was a zombie")
405
495
gobject.source_remove(self.checker_callback_tag)
406
496
self.checker_callback(pid, status,
407
497
self.current_checker_command)
412
502
command = self.checker_command % self.host
413
503
except TypeError:
414
504
# Escape attributes for the shell
415
escaped_attrs = dict((key,
416
re.escape(unicode(str(val),
417
errors=
418
u'replace')))
419
for key, val in
420
vars(self).iteritems())
505
escaped_attrs = dict(
506
(attr,
507
re.escape(unicode(str(getattr(self, attr, "")),
508
errors=
509
'replace')))
510
for attr in
511
self.runtime_expansions)
512
421
513
try:
422
514
command = self.checker_command % escaped_attrs
423
except TypeError, error:
424
logger.error(u'Could not format string "%s":'
425
u' %s', self.checker_command, error)
515
except TypeError as error:
516
logger.error('Could not format string "%s":'
517
' %s', self.checker_command, error)
426
518
return True # Try again later
427
519
self.current_checker_command = command
428
520
try:
429
logger.info(u"Starting checker %r for %s",
521
logger.info("Starting checker %r for %s",
430
522
command, self.name)
431
523
# We don't need to redirect stdout and stderr, since
432
524
# in normal mode, that is already done by daemon(),
434
526
# always replaced by /dev/null.)
435
527
self.checker = subprocess.Popen(command,
436
528
close_fds=True,
437
shell=True, cwd=u"/")
529
shell=True, cwd="/")
438
530
self.checker_callback_tag = (gobject.child_watch_add
439
531
(self.checker.pid,
440
532
self.checker_callback,
445
537
if pid:
446
538
gobject.source_remove(self.checker_callback_tag)
447
539
self.checker_callback(pid, status, command)
448
except OSError, error:
449
logger.error(u"Failed to start subprocess: %s",
540
except OSError as error:
541
logger.error("Failed to start subprocess: %s",
450
542
error)
451
543
# Re-run this periodically if run by gobject.timeout_add
452
544
return True
456
548
if self.checker_callback_tag:
457
549
gobject.source_remove(self.checker_callback_tag)
458
550
self.checker_callback_tag = None
459
if getattr(self, u"checker", None) is None:
551
if getattr(self, "checker", None) is None:
460
552
return
461
logger.debug(u"Stopping checker for %(name)s", vars(self))
553
logger.debug("Stopping checker for %(name)s", vars(self))
462
554
try:
463
555
os.kill(self.checker.pid, signal.SIGTERM)
464
#os.sleep(0.5)
556
#time.sleep(0.5)
465
557
#if self.checker.poll() is None:
466
558
# os.kill(self.checker.pid, signal.SIGKILL)
467
except OSError, error:
559
except OSError as error:
468
560
if error.errno != errno.ESRCH: # No such process
469
561
raise
470
562
self.checker = None
471
472
def still_valid(self):
473
"""Has the timeout not yet passed for this client?"""
474
if not getattr(self, u"enabled", False):
475
return False
476
now = datetime.datetime.utcnow()
477
if self.last_checked_ok is None:
478
return now < (self.created + self.timeout)
479
else:
480
return now < (self.last_checked_ok + self.timeout)
481
482
483
def dbus_service_property(dbus_interface, signature=u"v",
484
access=u"readwrite", byte_arrays=False):
563
564
565
def dbus_service_property(dbus_interface, signature="v",
566
access="readwrite", byte_arrays=False):
485
567
"""Decorators for marking methods of a DBusObjectWithProperties to
486
568
become properties on the D-Bus.
487
569
492
574
dbus.service.method, except there is only "signature", since the
493
575
type from Get() and the type sent to Set() is the same.
494
576
"""
577
# Encoding deeply encoded byte arrays is not supported yet by the
578
# "Set" method, so we fail early here:
579
if byte_arrays and signature != "ay":
580
raise ValueError("Byte arrays not supported for non-'ay'"
581
" signature %r" % signature)
495
582
def decorator(func):
496
583
func._dbus_is_property = True
497
584
func._dbus_interface = dbus_interface
498
585
func._dbus_signature = signature
499
586
func._dbus_access = access
500
587
func._dbus_name = func.__name__
501
if func._dbus_name.endswith(u"_dbus_property"):
588
if func._dbus_name.endswith("_dbus_property"):
502
589
func._dbus_name = func._dbus_name[:-14]
503
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
590
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
504
591
return func
505
592
return decorator
506
593
526
613
527
614
class DBusObjectWithProperties(dbus.service.Object):
528
615
"""A D-Bus object with properties.
529
616
530
617
Classes inheriting from this can use the dbus_service_property
531
618
decorator to expose methods as D-Bus properties. It exposes the
532
619
standard Get(), Set(), and GetAll() methods on the D-Bus.
534
621
535
622
@staticmethod
536
623
def _is_dbus_property(obj):
537
return getattr(obj, u"_dbus_is_property", False)
624
return getattr(obj, "_dbus_is_property", False)
538
625
539
626
def _get_all_dbus_properties(self):
540
627
"""Returns a generator of (name, attribute) pairs
548
635
property with the specified name and interface.
549
636
"""
550
637
for name in (property_name,
551
property_name + u"_dbus_property"):
638
property_name + "_dbus_property"):
552
639
prop = getattr(self, name, None)
553
640
if (prop is None
554
641
or not self._is_dbus_property(prop)
558
645
continue
559
646
return prop
560
647
# No such property
561
raise DBusPropertyNotFound(self.dbus_object_path + u":"
562
+ interface_name + u"."
648
raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
+ interface_name + "."
563
650
+ property_name)
564
651
565
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
566
out_signature=u"v")
652
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
653
out_signature="v")
567
654
def Get(self, interface_name, property_name):
568
655
"""Standard D-Bus property Get() method, see D-Bus standard.
569
656
"""
570
657
prop = self._get_dbus_property(interface_name, property_name)
571
if prop._dbus_access == u"write":
658
if prop._dbus_access == "write":
572
659
raise DBusPropertyAccessException(property_name)
573
660
value = prop()
574
if not hasattr(value, u"variant_level"):
661
if not hasattr(value, "variant_level"):
575
662
return value
576
663
return type(value)(value, variant_level=value.variant_level+1)
577
664
578
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
665
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
579
666
def Set(self, interface_name, property_name, value):
580
667
"""Standard D-Bus property Set() method, see D-Bus standard.
581
668
"""
582
669
prop = self._get_dbus_property(interface_name, property_name)
583
if prop._dbus_access == u"read":
670
if prop._dbus_access == "read":
584
671
raise DBusPropertyAccessException(property_name)
585
if prop._dbus_get_args_options[u"byte_arrays"]:
672
if prop._dbus_get_args_options["byte_arrays"]:
673
# The byte_arrays option is not supported yet on
674
# signatures other than "ay".
675
if prop._dbus_signature != "ay":
676
raise ValueError
586
677
value = dbus.ByteArray(''.join(unichr(byte)
587
678
for byte in value))
588
679
prop(value)
589
680
590
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
591
out_signature=u"a{sv}")
681
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
682
out_signature="a{sv}")
592
683
def GetAll(self, interface_name):
593
684
"""Standard D-Bus property GetAll() method, see D-Bus
594
685
standard.
595
686
596
687
Note: Will not include properties with access="write".
597
688
"""
598
689
all = {}
602
693
# Interface non-empty but did not match
603
694
continue
604
695
# Ignore write-only properties
605
if prop._dbus_access == u"write":
696
if prop._dbus_access == "write":
606
697
continue
607
698
value = prop()
608
if not hasattr(value, u"variant_level"):
699
if not hasattr(value, "variant_level"):
609
700
all[name] = value
610
701
continue
611
702
all[name] = type(value)(value, variant_level=
612
703
value.variant_level+1)
613
return dbus.Dictionary(all, signature=u"sv")
704
return dbus.Dictionary(all, signature="sv")
614
705
615
706
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
616
out_signature=u"s",
707
out_signature="s",
617
708
path_keyword='object_path',
618
709
connection_keyword='connection')
619
710
def Introspect(self, object_path, connection):
620
711
"""Standard D-Bus method, overloaded to insert property tags.
621
712
"""
622
713
xmlstring = dbus.service.Object.Introspect(self, object_path,
623
connection)
624
document = xml.dom.minidom.parseString(xmlstring)
625
del xmlstring
626
def make_tag(document, name, prop):
627
e = document.createElement(u"property")
628
e.setAttribute(u"name", name)
629
e.setAttribute(u"type", prop._dbus_signature)
630
e.setAttribute(u"access", prop._dbus_access)
631
return e
632
for if_tag in document.getElementsByTagName(u"interface"):
633
for tag in (make_tag(document, name, prop)
634
for name, prop
635
in self._get_all_dbus_properties()
636
if prop._dbus_interface
637
== if_tag.getAttribute(u"name")):
638
if_tag.appendChild(tag)
639
xmlstring = document.toxml(u"utf-8")
640
document.unlink()
714
connection)
715
try:
716
document = xml.dom.minidom.parseString(xmlstring)
717
def make_tag(document, name, prop):
718
e = document.createElement("property")
719
e.setAttribute("name", name)
720
e.setAttribute("type", prop._dbus_signature)
721
e.setAttribute("access", prop._dbus_access)
722
return e
723
for if_tag in document.getElementsByTagName("interface"):
724
for tag in (make_tag(document, name, prop)
725
for name, prop
726
in self._get_all_dbus_properties()
727
if prop._dbus_interface
728
== if_tag.getAttribute("name")):
729
if_tag.appendChild(tag)
730
# Add the names to the return values for the
731
# "org.freedesktop.DBus.Properties" methods
732
if (if_tag.getAttribute("name")
733
== "org.freedesktop.DBus.Properties"):
734
for cn in if_tag.getElementsByTagName("method"):
735
if cn.getAttribute("name") == "Get":
736
for arg in cn.getElementsByTagName("arg"):
737
if (arg.getAttribute("direction")
738
== "out"):
739
arg.setAttribute("name", "value")
740
elif cn.getAttribute("name") == "GetAll":
741
for arg in cn.getElementsByTagName("arg"):
742
if (arg.getAttribute("direction")
743
== "out"):
744
arg.setAttribute("name", "props")
745
xmlstring = document.toxml("utf-8")
746
document.unlink()
747
except (AttributeError, xml.dom.DOMException,
748
xml.parsers.expat.ExpatError) as error:
749
logger.error("Failed to override Introspection method",
750
error)
641
751
return xmlstring
642
752
643
753
754
def datetime_to_dbus (dt, variant_level=0):
755
"""Convert a UTC datetime.datetime() to a D-Bus type."""
756
if dt is None:
757
return dbus.String("", variant_level = variant_level)
758
return dbus.String(dt.isoformat(),
759
variant_level=variant_level)
760
761
644
762
class ClientDBus(Client, DBusObjectWithProperties):
645
763
"""A Client class using D-Bus
646
764
648
766
dbus_object_path: dbus.ObjectPath
649
767
bus: dbus.SystemBus()
650
768
"""
769
770
runtime_expansions = (Client.runtime_expansions
771
+ ("dbus_object_path",))
772
651
773
# dbus.service.Object doesn't use super(), so we can't either.
652
774
653
775
def __init__(self, bus = None, *args, **kwargs):
776
self._approvals_pending = 0
654
777
self.bus = bus
655
778
Client.__init__(self, *args, **kwargs)
656
779
# Only now, when this client is initialized, can it show up on
657
780
# the D-Bus
781
client_object_name = unicode(self.name).translate(
782
{ord("."): ord("_"),
783
ord("-"): ord("_")})
658
784
self.dbus_object_path = (dbus.ObjectPath
659
(u"/clients/"
660
+ self.name.replace(u".", u"_")))
785
("/clients/" + client_object_name))
661
786
DBusObjectWithProperties.__init__(self, self.bus,
662
787
self.dbus_object_path)
663
664
@staticmethod
665
def _datetime_to_dbus(dt, variant_level=0):
666
"""Convert a UTC datetime.datetime() to a D-Bus type."""
667
return dbus.String(dt.isoformat(),
668
variant_level=variant_level)
669
670
def enable(self):
671
oldstate = getattr(self, u"enabled", False)
672
r = Client.enable(self)
673
if oldstate != self.enabled:
674
# Emit D-Bus signals
675
self.PropertyChanged(dbus.String(u"enabled"),
676
dbus.Boolean(True, variant_level=1))
677
self.PropertyChanged(
678
dbus.String(u"last_enabled"),
679
self._datetime_to_dbus(self.last_enabled,
680
variant_level=1))
681
return r
682
683
def disable(self, signal = True):
684
oldstate = getattr(self, u"enabled", False)
685
r = Client.disable(self)
686
if signal and oldstate != self.enabled:
687
# Emit D-Bus signal
688
self.PropertyChanged(dbus.String(u"enabled"),
689
dbus.Boolean(False, variant_level=1))
690
return r
788
789
def notifychangeproperty(transform_func,
790
dbus_name, type_func=lambda x: x,
791
variant_level=1):
792
""" Modify a variable so that its a property that announce its
793
changes to DBus.
794
transform_fun: Function that takes a value and transform it to
795
DBus type.
796
dbus_name: DBus name of the variable
797
type_func: Function that transform the value before sending it
798
to DBus
799
variant_level: DBus variant level. default: 1
800
"""
801
real_value = [None,]
802
def setter(self, value):
803
old_value = real_value[0]
804
real_value[0] = value
805
if hasattr(self, "dbus_object_path"):
806
if type_func(old_value) != type_func(real_value[0]):
807
dbus_value = transform_func(type_func(real_value[0]),
808
variant_level)
809
self.PropertyChanged(dbus.String(dbus_name),
810
dbus_value)
811
812
return property(lambda self: real_value[0], setter)
813
814
815
expires = notifychangeproperty(datetime_to_dbus, "Expires")
816
approvals_pending = notifychangeproperty(dbus.Boolean,
817
"ApprovalPending",
818
type_func = bool)
819
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
820
last_enabled = notifychangeproperty(datetime_to_dbus,
821
"LastEnabled")
822
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
823
type_func = lambda checker: checker is not None)
824
last_checked_ok = notifychangeproperty(datetime_to_dbus,
825
"LastCheckedOK")
826
last_approval_request = notifychangeproperty(datetime_to_dbus,
827
"LastApprovalRequest")
828
approved_by_default = notifychangeproperty(dbus.Boolean,
829
"ApprovedByDefault")
830
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
831
type_func = _timedelta_to_milliseconds)
832
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
833
type_func = _timedelta_to_milliseconds)
834
host = notifychangeproperty(dbus.String, "Host")
835
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
836
type_func = _timedelta_to_milliseconds)
837
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
838
type_func = _timedelta_to_milliseconds)
839
interval = notifychangeproperty(dbus.UInt16, "Interval",
840
type_func = _timedelta_to_milliseconds)
841
checker_command = notifychangeproperty(dbus.String, "Checker")
842
843
del notifychangeproperty
691
844
692
845
def __del__(self, *args, **kwargs):
693
846
try:
694
847
self.remove_from_connection()
695
848
except LookupError:
696
849
pass
697
if hasattr(DBusObjectWithProperties, u"__del__"):
850
if hasattr(DBusObjectWithProperties, "__del__"):
698
851
DBusObjectWithProperties.__del__(self, *args, **kwargs)
699
852
Client.__del__(self, *args, **kwargs)
700
853
702
855
*args, **kwargs):
703
856
self.checker_callback_tag = None
704
857
self.checker = None
705
# Emit D-Bus signal
706
self.PropertyChanged(dbus.String(u"checker_running"),
707
dbus.Boolean(False, variant_level=1))
708
858
if os.WIFEXITED(condition):
709
859
exitstatus = os.WEXITSTATUS(condition)
710
860
# Emit D-Bus signal
720
870
return Client.checker_callback(self, pid, condition, command,
721
871
*args, **kwargs)
722
872
723
def checked_ok(self, *args, **kwargs):
724
r = Client.checked_ok(self, *args, **kwargs)
725
# Emit D-Bus signal
726
self.PropertyChanged(
727
dbus.String(u"last_checked_ok"),
728
(self._datetime_to_dbus(self.last_checked_ok,
729
variant_level=1)))
730
return r
731
732
873
def start_checker(self, *args, **kwargs):
733
874
old_checker = self.checker
734
875
if self.checker is not None:
741
882
and old_checker_pid != self.checker.pid):
742
883
# Emit D-Bus signal
743
884
self.CheckerStarted(self.current_checker_command)
744
self.PropertyChanged(
745
dbus.String(u"checker_running"),
746
dbus.Boolean(True, variant_level=1))
747
return r
748
749
def stop_checker(self, *args, **kwargs):
750
old_checker = getattr(self, u"checker", None)
751
r = Client.stop_checker(self, *args, **kwargs)
752
if (old_checker is not None
753
and getattr(self, u"checker", None) is None):
754
self.PropertyChanged(dbus.String(u"checker_running"),
755
dbus.Boolean(False, variant_level=1))
756
return r
757
758
## D-Bus methods & signals
759
_interface = u"se.bsnet.fukt.Mandos.Client"
885
return r
886
887
def _reset_approved(self):
888
self._approved = None
889
return False
890
891
def approve(self, value=True):
892
self.send_changedstate()
893
self._approved = value
894
gobject.timeout_add(_timedelta_to_milliseconds
895
(self.approval_duration),
896
self._reset_approved)
897
898
899
## D-Bus methods, signals & properties
900
_interface = "se.bsnet.fukt.Mandos.Client"
901
902
## Signals
760
903
761
904
# CheckerCompleted - signal
762
@dbus.service.signal(_interface, signature=u"nxs")
905
@dbus.service.signal(_interface, signature="nxs")
763
906
def CheckerCompleted(self, exitcode, waitstatus, command):
764
907
"D-Bus signal"
765
908
pass
766
909
767
910
# CheckerStarted - signal
768
@dbus.service.signal(_interface, signature=u"s")
911
@dbus.service.signal(_interface, signature="s")
769
912
def CheckerStarted(self, command):
770
913
"D-Bus signal"
771
914
pass
772
915
773
916
# PropertyChanged - signal
774
@dbus.service.signal(_interface, signature=u"sv")
917
@dbus.service.signal(_interface, signature="sv")
775
918
def PropertyChanged(self, property, value):
776
919
"D-Bus signal"
777
920
pass
778
921
779
# ReceivedSecret - signal
922
# GotSecret - signal
780
923
@dbus.service.signal(_interface)
781
def ReceivedSecret(self):
782
"D-Bus signal"
924
def GotSecret(self):
925
"""D-Bus signal
926
Is sent after a successful transfer of secret from the Mandos
927
server to mandos-client
928
"""
783
929
pass
784
930
785
931
# Rejected - signal
786
@dbus.service.signal(_interface)
787
def Rejected(self):
932
@dbus.service.signal(_interface, signature="s")
933
def Rejected(self, reason):
788
934
"D-Bus signal"
789
935
pass
790
936
791
# name - property
792
@dbus_service_property(_interface, signature=u"s", access=u"read")
793
def name_dbus_property(self):
937
# NeedApproval - signal
938
@dbus.service.signal(_interface, signature="tb")
939
def NeedApproval(self, timeout, default):
940
"D-Bus signal"
941
return self.need_approval()
942
943
## Methods
944
945
# Approve - method
946
@dbus.service.method(_interface, in_signature="b")
947
def Approve(self, value):
948
self.approve(value)
949
950
# CheckedOK - method
951
@dbus.service.method(_interface)
952
def CheckedOK(self):
953
self.checked_ok()
954
955
# Enable - method
956
@dbus.service.method(_interface)
957
def Enable(self):
958
"D-Bus method"
959
self.enable()
960
961
# StartChecker - method
962
@dbus.service.method(_interface)
963
def StartChecker(self):
964
"D-Bus method"
965
self.start_checker()
966
967
# Disable - method
968
@dbus.service.method(_interface)
969
def Disable(self):
970
"D-Bus method"
971
self.disable()
972
973
# StopChecker - method
974
@dbus.service.method(_interface)
975
def StopChecker(self):
976
self.stop_checker()
977
978
## Properties
979
980
# ApprovalPending - property
981
@dbus_service_property(_interface, signature="b", access="read")
982
def ApprovalPending_dbus_property(self):
983
return dbus.Boolean(bool(self.approvals_pending))
984
985
# ApprovedByDefault - property
986
@dbus_service_property(_interface, signature="b",
987
access="readwrite")
988
def ApprovedByDefault_dbus_property(self, value=None):
989
if value is None: # get
990
return dbus.Boolean(self.approved_by_default)
991
self.approved_by_default = bool(value)
992
993
# ApprovalDelay - property
994
@dbus_service_property(_interface, signature="t",
995
access="readwrite")
996
def ApprovalDelay_dbus_property(self, value=None):
997
if value is None: # get
998
return dbus.UInt64(self.approval_delay_milliseconds())
999
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1000
1001
# ApprovalDuration - property
1002
@dbus_service_property(_interface, signature="t",
1003
access="readwrite")
1004
def ApprovalDuration_dbus_property(self, value=None):
1005
if value is None: # get
1006
return dbus.UInt64(_timedelta_to_milliseconds(
1007
self.approval_duration))
1008
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1009
1010
# Name - property
1011
@dbus_service_property(_interface, signature="s", access="read")
1012
def Name_dbus_property(self):
794
1013
return dbus.String(self.name)
795
1014
796
# fingerprint - property
797
@dbus_service_property(_interface, signature=u"s", access=u"read")
798
def fingerprint_dbus_property(self):
1015
# Fingerprint - property
1016
@dbus_service_property(_interface, signature="s", access="read")
1017
def Fingerprint_dbus_property(self):
799
1018
return dbus.String(self.fingerprint)
800
1019
801
# host - property
802
@dbus_service_property(_interface, signature=u"s",
803
access=u"readwrite")
804
def host_dbus_property(self, value=None):
1020
# Host - property
1021
@dbus_service_property(_interface, signature="s",
1022
access="readwrite")
1023
def Host_dbus_property(self, value=None):
805
1024
if value is None: # get
806
1025
return dbus.String(self.host)
807
1026
self.host = value
808
# Emit D-Bus signal
809
self.PropertyChanged(dbus.String(u"host"),
810
dbus.String(value, variant_level=1))
811
812
# created - property
813
@dbus_service_property(_interface, signature=u"s", access=u"read")
814
def created_dbus_property(self):
815
return dbus.String(self._datetime_to_dbus(self.created))
816
817
# last_enabled - property
818
@dbus_service_property(_interface, signature=u"s", access=u"read")
819
def last_enabled_dbus_property(self):
820
if self.last_enabled is None:
821
return dbus.String(u"")
822
return dbus.String(self._datetime_to_dbus(self.last_enabled))
823
824
# enabled - property
825
@dbus_service_property(_interface, signature=u"b",
826
access=u"readwrite")
827
def enabled_dbus_property(self, value=None):
1027
1028
# Created - property
1029
@dbus_service_property(_interface, signature="s", access="read")
1030
def Created_dbus_property(self):
1031
return dbus.String(datetime_to_dbus(self.created))
1032
1033
# LastEnabled - property
1034
@dbus_service_property(_interface, signature="s", access="read")
1035
def LastEnabled_dbus_property(self):
1036
return datetime_to_dbus(self.last_enabled)
1037
1038
# Enabled - property
1039
@dbus_service_property(_interface, signature="b",
1040
access="readwrite")
1041
def Enabled_dbus_property(self, value=None):
828
1042
if value is None: # get
829
1043
return dbus.Boolean(self.enabled)
830
1044
if value:
832
1046
else:
833
1047
self.disable()
834
1048
835
# last_checked_ok - property
836
@dbus_service_property(_interface, signature=u"s", access=u"read")
837
def last_checked_ok_dbus_property(self):
838
if self.last_checked_ok is None:
839
return dbus.String(u"")
840
return dbus.String(self._datetime_to_dbus(self
841
.last_checked_ok))
842
843
# timeout - property
844
@dbus_service_property(_interface, signature=u"t",
845
access=u"readwrite")
846
def timeout_dbus_property(self, value=None):
1049
# LastCheckedOK - property
1050
@dbus_service_property(_interface, signature="s",
1051
access="readwrite")
1052
def LastCheckedOK_dbus_property(self, value=None):
1053
if value is not None:
1054
self.checked_ok()
1055
return
1056
return datetime_to_dbus(self.last_checked_ok)
1057
1058
# Expires - property
1059
@dbus_service_property(_interface, signature="s", access="read")
1060
def Expires_dbus_property(self):
1061
return datetime_to_dbus(self.expires)
1062
1063
# LastApprovalRequest - property
1064
@dbus_service_property(_interface, signature="s", access="read")
1065
def LastApprovalRequest_dbus_property(self):
1066
return datetime_to_dbus(self.last_approval_request)
1067
1068
# Timeout - property
1069
@dbus_service_property(_interface, signature="t",
1070
access="readwrite")
1071
def Timeout_dbus_property(self, value=None):
847
1072
if value is None: # get
848
1073
return dbus.UInt64(self.timeout_milliseconds())
849
1074
self.timeout = datetime.timedelta(0, 0, 0, value)
850
# Emit D-Bus signal
851
self.PropertyChanged(dbus.String(u"timeout"),
852
dbus.UInt64(value, variant_level=1))
853
if getattr(self, u"disable_initiator_tag", None) is None:
1075
if getattr(self, "disable_initiator_tag", None) is None:
854
1076
return
855
1077
# Reschedule timeout
856
1078
gobject.source_remove(self.disable_initiator_tag)
857
1079
self.disable_initiator_tag = None
1080
self.expires = None
858
1081
time_to_die = (self.
859
1082
_timedelta_to_milliseconds((self
860
1083
.last_checked_ok
865
1088
# The timeout has passed
866
1089
self.disable()
867
1090
else:
1091
self.expires = (datetime.datetime.utcnow()
1092
+ datetime.timedelta(milliseconds = time_to_die))
868
1093
self.disable_initiator_tag = (gobject.timeout_add
869
1094
(time_to_die, self.disable))
870
1095
871
# interval - property
872
@dbus_service_property(_interface, signature=u"t",
873
access=u"readwrite")
874
def interval_dbus_property(self, value=None):
1096
# ExtendedTimeout - property
1097
@dbus_service_property(_interface, signature="t",
1098
access="readwrite")
1099
def ExtendedTimeout_dbus_property(self, value=None):
1100
if value is None: # get
1101
return dbus.UInt64(self.extended_timeout_milliseconds())
1102
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1103
1104
# Interval - property
1105
@dbus_service_property(_interface, signature="t",
1106
access="readwrite")
1107
def Interval_dbus_property(self, value=None):
875
1108
if value is None: # get
876
1109
return dbus.UInt64(self.interval_milliseconds())
877
1110
self.interval = datetime.timedelta(0, 0, 0, value)
878
# Emit D-Bus signal
879
self.PropertyChanged(dbus.String(u"interval"),
880
dbus.UInt64(value, variant_level=1))
881
if getattr(self, u"checker_initiator_tag", None) is None:
1111
if getattr(self, "checker_initiator_tag", None) is None:
882
1112
return
883
1113
# Reschedule checker run
884
1114
gobject.source_remove(self.checker_initiator_tag)
885
1115
self.checker_initiator_tag = (gobject.timeout_add
886
1116
(value, self.start_checker))
887
1117
self.start_checker() # Start one now, too
888
889
# checker - property
890
@dbus_service_property(_interface, signature=u"s",
891
access=u"readwrite")
892
def checker_dbus_property(self, value=None):
1118
1119
# Checker - property
1120
@dbus_service_property(_interface, signature="s",
1121
access="readwrite")
1122
def Checker_dbus_property(self, value=None):
893
1123
if value is None: # get
894
1124
return dbus.String(self.checker_command)
895
1125
self.checker_command = value
896
# Emit D-Bus signal
897
self.PropertyChanged(dbus.String(u"checker"),
898
dbus.String(self.checker_command,
899
variant_level=1))
900
1126
901
# checker_running - property
902
@dbus_service_property(_interface, signature=u"b",
903
access=u"readwrite")
904
def checker_running_dbus_property(self, value=None):
1127
# CheckerRunning - property
1128
@dbus_service_property(_interface, signature="b",
1129
access="readwrite")
1130
def CheckerRunning_dbus_property(self, value=None):
905
1131
if value is None: # get
906
1132
return dbus.Boolean(self.checker is not None)
907
1133
if value:
909
1135
else:
910
1136
self.stop_checker()
911
1137
912
# object_path - property
913
@dbus_service_property(_interface, signature=u"o", access=u"read")
914
def object_path_dbus_property(self):
1138
# ObjectPath - property
1139
@dbus_service_property(_interface, signature="o", access="read")
1140
def ObjectPath_dbus_property(self):
915
1141
return self.dbus_object_path # is already a dbus.ObjectPath
916
1142
917
# secret = property xxx
918
@dbus_service_property(_interface, signature=u"ay",
919
access=u"write", byte_arrays=True)
920
def secret_dbus_property(self, value):
1143
# Secret = property
1144
@dbus_service_property(_interface, signature="ay",
1145
access="write", byte_arrays=True)
1146
def Secret_dbus_property(self, value):
921
1147
self.secret = str(value)
922
1148
923
1149
del _interface
924
1150
925
1151
1152
class ProxyClient(object):
1153
def __init__(self, child_pipe, fpr, address):
1154
self._pipe = child_pipe
1155
self._pipe.send(('init', fpr, address))
1156
if not self._pipe.recv():
1157
raise KeyError()
1158
1159
def __getattribute__(self, name):
1160
if(name == '_pipe'):
1161
return super(ProxyClient, self).__getattribute__(name)
1162
self._pipe.send(('getattr', name))
1163
data = self._pipe.recv()
1164
if data[0] == 'data':
1165
return data[1]
1166
if data[0] == 'function':
1167
def func(*args, **kwargs):
1168
self._pipe.send(('funcall', name, args, kwargs))
1169
return self._pipe.recv()[1]
1170
return func
1171
1172
def __setattr__(self, name, value):
1173
if(name == '_pipe'):
1174
return super(ProxyClient, self).__setattr__(name, value)
1175
self._pipe.send(('setattr', name, value))
1176
1177
926
1178
class ClientHandler(socketserver.BaseRequestHandler, object):
927
1179
"""A class to handle client connections.
928
1180
930
1182
Note: This will run in its own forked process."""
931
1183
932
1184
def handle(self):
933
logger.info(u"TCP connection from: %s",
934
unicode(self.client_address))
935
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
936
# Open IPC pipe to parent process
937
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1185
with contextlib.closing(self.server.child_pipe) as child_pipe:
1186
logger.info("TCP connection from: %s",
1187
unicode(self.client_address))
1188
logger.debug("Pipe FD: %d",
1189
self.server.child_pipe.fileno())
1190
938
1191
session = (gnutls.connection
939
1192
.ClientSession(self.request,
940
1193
gnutls.connection
941
1194
.X509Credentials()))
942
1195
943
line = self.request.makefile().readline()
944
logger.debug(u"Protocol version: %r", line)
945
try:
946
if int(line.strip().split()[0]) > 1:
947
raise RuntimeError
948
except (ValueError, IndexError, RuntimeError), error:
949
logger.error(u"Unknown protocol version: %s", error)
950
return
951
952
1196
# Note: gnutls.connection.X509Credentials is really a
953
1197
# generic GnuTLS certificate credentials object so long as
954
1198
# no X.509 keys are added to it. Therefore, we can use it
955
1199
# here despite using OpenPGP certificates.
956
1200
957
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
958
# u"+AES-256-CBC", u"+SHA1",
959
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
960
# u"+DHE-DSS"))
1201
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1202
# "+AES-256-CBC", "+SHA1",
1203
# "+COMP-NULL", "+CTYPE-OPENPGP",
1204
# "+DHE-DSS"))
961
1205
# Use a fallback default, since this MUST be set.
962
1206
priority = self.server.gnutls_priority
963
1207
if priority is None:
964
priority = u"NORMAL"
1208
priority = "NORMAL"
965
1209
(gnutls.library.functions
966
1210
.gnutls_priority_set_direct(session._c_object,
967
1211
priority, None))
968
1212
1213
# Start communication using the Mandos protocol
1214
# Get protocol number
1215
line = self.request.makefile().readline()
1216
logger.debug("Protocol version: %r", line)
1217
try:
1218
if int(line.strip().split()[0]) > 1:
1219
raise RuntimeError
1220
except (ValueError, IndexError, RuntimeError) as error:
1221
logger.error("Unknown protocol version: %s", error)
1222
return
1223
1224
# Start GnuTLS connection
969
1225
try:
970
1226
session.handshake()
971
except gnutls.errors.GNUTLSError, error:
972
logger.warning(u"Handshake failed: %s", error)
1227
except gnutls.errors.GNUTLSError as error:
1228
logger.warning("Handshake failed: %s", error)
973
1229
# Do not run session.bye() here: the session is not
974
1230
# established. Just abandon the request.
975
1231
return
976
logger.debug(u"Handshake succeeded")
1232
logger.debug("Handshake succeeded")
1233
1234
approval_required = False
977
1235
try:
978
fpr = self.fingerprint(self.peer_certificate(session))
979
except (TypeError, gnutls.errors.GNUTLSError), error:
980
logger.warning(u"Bad certificate: %s", error)
981
session.bye()
982
return
983
logger.debug(u"Fingerprint: %s", fpr)
1236
try:
1237
fpr = self.fingerprint(self.peer_certificate
1238
(session))
1239
except (TypeError,
1240
gnutls.errors.GNUTLSError) as error:
1241
logger.warning("Bad certificate: %s", error)
1242
return
1243
logger.debug("Fingerprint: %s", fpr)
1244
1245
try:
1246
client = ProxyClient(child_pipe, fpr,
1247
self.client_address)
1248
except KeyError:
1249
return
1250
1251
if client.approval_delay:
1252
delay = client.approval_delay
1253
client.approvals_pending += 1
1254
approval_required = True
1255
1256
while True:
1257
if not client.enabled:
1258
logger.info("Client %s is disabled",
1259
client.name)
1260
if self.server.use_dbus:
1261
# Emit D-Bus signal
1262
client.Rejected("Disabled")
1263
return
1264
1265
if client._approved or not client.approval_delay:
1266
#We are approved or approval is disabled
1267
break
1268
elif client._approved is None:
1269
logger.info("Client %s needs approval",
1270
client.name)
1271
if self.server.use_dbus:
1272
# Emit D-Bus signal
1273
client.NeedApproval(
1274
client.approval_delay_milliseconds(),
1275
client.approved_by_default)
1276
else:
1277
logger.warning("Client %s was not approved",
1278
client.name)
1279
if self.server.use_dbus:
1280
# Emit D-Bus signal
1281
client.Rejected("Denied")
1282
return
1283
1284
#wait until timeout or approved
1285
#x = float(client._timedelta_to_milliseconds(delay))
1286
time = datetime.datetime.now()
1287
client.changedstate.acquire()
1288
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1289
client.changedstate.release()
1290
time2 = datetime.datetime.now()
1291
if (time2 - time) >= delay:
1292
if not client.approved_by_default:
1293
logger.warning("Client %s timed out while"
1294
" waiting for approval",
1295
client.name)
1296
if self.server.use_dbus:
1297
# Emit D-Bus signal
1298
client.Rejected("Approval timed out")
1299
return
1300
else:
1301
break
1302
else:
1303
delay -= time2 - time
1304
1305
sent_size = 0
1306
while sent_size < len(client.secret):
1307
try:
1308
sent = session.send(client.secret[sent_size:])
1309
except gnutls.errors.GNUTLSError as error:
1310
logger.warning("gnutls send failed")
1311
return
1312
logger.debug("Sent: %d, remaining: %d",
1313
sent, len(client.secret)
1314
- (sent_size + sent))
1315
sent_size += sent
1316
1317
logger.info("Sending secret to %s", client.name)
1318
# bump the timeout as if seen
1319
client.checked_ok(client.extended_timeout)
1320
if self.server.use_dbus:
1321
# Emit D-Bus signal
1322
client.GotSecret()
984
1323
985
for c in self.server.clients:
986
if c.fingerprint == fpr:
987
client = c
988
break
989
else:
990
ipc.write(u"NOTFOUND %s %s\n"
991
% (fpr, unicode(self.client_address)))
992
session.bye()
993
return
994
# Have to check if client.still_valid(), since it is
995
# possible that the client timed out while establishing
996
# the GnuTLS session.
997
if not client.still_valid():
998
ipc.write(u"INVALID %s\n" % client.name)
999
session.bye()
1000
return
1001
ipc.write(u"SENDING %s\n" % client.name)
1002
sent_size = 0
1003
while sent_size < len(client.secret):
1004
sent = session.send(client.secret[sent_size:])
1005
logger.debug(u"Sent: %d, remaining: %d",
1006
sent, len(client.secret)
1007
- (sent_size + sent))
1008
sent_size += sent
1009
session.bye()
1324
finally:
1325
if approval_required:
1326
client.approvals_pending -= 1
1327
try:
1328
session.bye()
1329
except gnutls.errors.GNUTLSError as error:
1330
logger.warning("GnuTLS bye failed")
1010
1331
1011
1332
@staticmethod
1012
1333
def peer_certificate(session):
1022
1343
.gnutls_certificate_get_peers
1023
1344
(session._c_object, ctypes.byref(list_size)))
1024
1345
if not bool(cert_list) and list_size.value != 0:
1025
raise gnutls.errors.GNUTLSError(u"error getting peer"
1026
u" certificate")
1346
raise gnutls.errors.GNUTLSError("error getting peer"
1347
" certificate")
1027
1348
if list_size.value == 0:
1028
1349
return None
1029
1350
cert = cert_list[0]
1055
1376
if crtverify.value != 0:
1056
1377
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1057
1378
raise (gnutls.errors.CertificateSecurityError
1058
(u"Verify failed"))
1379
("Verify failed"))
1059
1380
# New buffer for the fingerprint
1060
1381
buf = ctypes.create_string_buffer(20)
1061
1382
buf_len = ctypes.c_size_t()
1068
1389
# Convert the buffer to a Python bytestring
1069
1390
fpr = ctypes.string_at(buf, buf_len.value)
1070
1391
# Convert the bytestring to hexadecimal notation
1071
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1392
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1072
1393
return hex_fpr
1073
1394
1074
1395
1075
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1076
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1396
class MultiprocessingMixIn(object):
1397
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1398
def sub_process_main(self, request, address):
1399
try:
1400
self.finish_request(request, address)
1401
except:
1402
self.handle_error(request, address)
1403
self.close_request(request)
1404
1405
def process_request(self, request, address):
1406
"""Start a new process to process the request."""
1407
multiprocessing.Process(target = self.sub_process_main,
1408
args = (request, address)).start()
1409
1410
1411
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1412
""" adds a pipe to the MixIn """
1077
1413
def process_request(self, request, client_address):
1078
1414
"""Overrides and wraps the original process_request().
1079
1415
1080
1416
This function creates a new pipe in self.pipe
1081
1417
"""
1082
self.pipe = os.pipe()
1083
super(ForkingMixInWithPipe,
1418
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1419
1420
super(MultiprocessingMixInWithPipe,
1084
1421
self).process_request(request, client_address)
1085
os.close(self.pipe[1]) # close write end
1086
self.add_pipe(self.pipe[0])
1087
def add_pipe(self, pipe):
1422
self.child_pipe.close()
1423
self.add_pipe(parent_pipe)
1424
1425
def add_pipe(self, parent_pipe):
1088
1426
"""Dummy function; override as necessary"""
1089
os.close(pipe)
1090
1091
1092
class IPv6_TCPServer(ForkingMixInWithPipe,
1427
raise NotImplementedError
1428
1429
1430
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1093
1431
socketserver.TCPServer, object):
1094
1432
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1095
1433
1111
1449
bind to an address or port if they were not specified."""
1112
1450
if self.interface is not None:
1113
1451
if SO_BINDTODEVICE is None:
1114
logger.error(u"SO_BINDTODEVICE does not exist;"
1115
u" cannot bind to interface %s",
1452
logger.error("SO_BINDTODEVICE does not exist;"
1453
" cannot bind to interface %s",
1116
1454
self.interface)
1117
1455
else:
1118
1456
try:
1119
1457
self.socket.setsockopt(socket.SOL_SOCKET,
1120
1458
SO_BINDTODEVICE,
1121
1459
str(self.interface
1122
+ u'\0'))
1123
except socket.error, error:
1460
+ '\0'))
1461
except socket.error as error:
1124
1462
if error[0] == errno.EPERM:
1125
logger.error(u"No permission to"
1126
u" bind to interface %s",
1463
logger.error("No permission to"
1464
" bind to interface %s",
1127
1465
self.interface)
1128
1466
elif error[0] == errno.ENOPROTOOPT:
1129
logger.error(u"SO_BINDTODEVICE not available;"
1130
u" cannot bind to interface %s",
1467
logger.error("SO_BINDTODEVICE not available;"
1468
" cannot bind to interface %s",
1131
1469
self.interface)
1132
1470
else:
1133
1471
raise
1135
1473
if self.server_address[0] or self.server_address[1]:
1136
1474
if not self.server_address[0]:
1137
1475
if self.address_family == socket.AF_INET6:
1138
any_address = u"::" # in6addr_any
1476
any_address = "::" # in6addr_any
1139
1477
else:
1140
1478
any_address = socket.INADDR_ANY
1141
1479
self.server_address = (any_address,
1180
1518
return socketserver.TCPServer.server_activate(self)
1181
1519
def enable(self):
1182
1520
self.enabled = True
1183
def add_pipe(self, pipe):
1521
def add_pipe(self, parent_pipe):
1184
1522
# Call "handle_ipc" for both data and EOF events
1185
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1186
self.handle_ipc)
1187
def handle_ipc(self, source, condition, file_objects={}):
1523
gobject.io_add_watch(parent_pipe.fileno(),
1524
gobject.IO_IN | gobject.IO_HUP,
1525
functools.partial(self.handle_ipc,
1526
parent_pipe = parent_pipe))
1527
1528
def handle_ipc(self, source, condition, parent_pipe=None,
1529
client_object=None):
1188
1530
condition_names = {
1189
gobject.IO_IN: u"IN", # There is data to read.
1190
gobject.IO_OUT: u"OUT", # Data can be written (without
1531
gobject.IO_IN: "IN", # There is data to read.
1532
gobject.IO_OUT: "OUT", # Data can be written (without
1191
1533
# blocking).
1192
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1193
gobject.IO_ERR: u"ERR", # Error condition.
1194
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1534
gobject.IO_PRI: "PRI", # There is urgent data to read.
1535
gobject.IO_ERR: "ERR", # Error condition.
1536
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1195
1537
# broken, usually for pipes and
1196
1538
# sockets).
1197
1539
}
1199
1541
for cond, name in
1200
1542
condition_names.iteritems()
1201
1543
if cond & condition)
1202
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1203
conditions_string)
1204
1205
# Turn the pipe file descriptor into a Python file object
1206
if source not in file_objects:
1207
file_objects[source] = os.fdopen(source, u"r", 1)
1208
1209
# Read a line from the file object
1210
cmdline = file_objects[source].readline()
1211
if not cmdline: # Empty line means end of file
1212
# close the IPC pipe
1213
file_objects[source].close()
1214
del file_objects[source]
1215
1216
# Stop calling this function
1217
return False
1218
1219
logger.debug(u"IPC command: %r", cmdline)
1220
1221
# Parse and act on command
1222
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1223
1224
if cmd == u"NOTFOUND":
1225
logger.warning(u"Client not found for fingerprint: %s",
1226
args)
1227
if self.use_dbus:
1228
# Emit D-Bus signal
1229
mandos_dbus_service.ClientNotFound(args)
1230
elif cmd == u"INVALID":
1231
for client in self.clients:
1232
if client.name == args:
1233
logger.warning(u"Client %s is invalid", args)
1234
if self.use_dbus:
1235
# Emit D-Bus signal
1236
client.Rejected()
1237
break
1238
else:
1239
logger.error(u"Unknown client %s is invalid", args)
1240
elif cmd == u"SENDING":
1241
for client in self.clients:
1242
if client.name == args:
1243
logger.info(u"Sending secret to %s", client.name)
1244
client.checked_ok()
1245
if self.use_dbus:
1246
# Emit D-Bus signal
1247
client.ReceivedSecret()
1248
break
1249
else:
1250
logger.error(u"Sending secret to unknown client %s",
1251
args)
1252
else:
1253
logger.error(u"Unknown IPC command: %r", cmdline)
1254
1255
# Keep calling this function
1544
# error or the other end of multiprocessing.Pipe has closed
1545
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1546
return False
1547
1548
# Read a request from the child
1549
request = parent_pipe.recv()
1550
command = request[0]
1551
1552
if command == 'init':
1553
fpr = request[1]
1554
address = request[2]
1555
1556
for c in self.clients:
1557
if c.fingerprint == fpr:
1558
client = c
1559
break
1560
else:
1561
logger.info("Client not found for fingerprint: %s, ad"
1562
"dress: %s", fpr, address)
1563
if self.use_dbus:
1564
# Emit D-Bus signal
1565
mandos_dbus_service.ClientNotFound(fpr, address[0])
1566
parent_pipe.send(False)
1567
return False
1568
1569
gobject.io_add_watch(parent_pipe.fileno(),
1570
gobject.IO_IN | gobject.IO_HUP,
1571
functools.partial(self.handle_ipc,
1572
parent_pipe = parent_pipe,
1573
client_object = client))
1574
parent_pipe.send(True)
1575
# remove the old hook in favor of the new above hook on same fileno
1576
return False
1577
if command == 'funcall':
1578
funcname = request[1]
1579
args = request[2]
1580
kwargs = request[3]
1581
1582
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1583
1584
if command == 'getattr':
1585
attrname = request[1]
1586
if callable(client_object.__getattribute__(attrname)):
1587
parent_pipe.send(('function',))
1588
else:
1589
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1590
1591
if command == 'setattr':
1592
attrname = request[1]
1593
value = request[2]
1594
setattr(client_object, attrname, value)
1595
1256
1596
return True
1257
1597
1258
1598
1259
1599
def string_to_delta(interval):
1260
1600
"""Parse a string and return a datetime.timedelta
1261
1601
1262
>>> string_to_delta(u'7d')
1602
>>> string_to_delta('7d')
1263
1603
datetime.timedelta(7)
1264
>>> string_to_delta(u'60s')
1604
>>> string_to_delta('60s')
1265
1605
datetime.timedelta(0, 60)
1266
>>> string_to_delta(u'60m')
1606
>>> string_to_delta('60m')
1267
1607
datetime.timedelta(0, 3600)
1268
>>> string_to_delta(u'24h')
1608
>>> string_to_delta('24h')
1269
1609
datetime.timedelta(1)
1270
>>> string_to_delta(u'1w')
1610
>>> string_to_delta('1w')
1271
1611
datetime.timedelta(7)
1272
>>> string_to_delta(u'5m 30s')
1612
>>> string_to_delta('5m 30s')
1273
1613
datetime.timedelta(0, 330)
1274
1614
"""
1275
1615
timevalue = datetime.timedelta(0)
1277
1617
try:
1278
1618
suffix = unicode(s[-1])
1279
1619
value = int(s[:-1])
1280
if suffix == u"d":
1620
if suffix == "d":
1281
1621
delta = datetime.timedelta(value)
1282
elif suffix == u"s":
1622
elif suffix == "s":
1283
1623
delta = datetime.timedelta(0, value)
1284
elif suffix == u"m":
1624
elif suffix == "m":
1285
1625
delta = datetime.timedelta(0, 0, 0, 0, value)
1286
elif suffix == u"h":
1626
elif suffix == "h":
1287
1627
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1288
elif suffix == u"w":
1628
elif suffix == "w":
1289
1629
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1290
1630
else:
1291
raise ValueError
1292
except (ValueError, IndexError):
1293
raise ValueError
1631
raise ValueError("Unknown suffix %r" % suffix)
1632
except (ValueError, IndexError) as e:
1633
raise ValueError(*(e.args))
1294
1634
timevalue += delta
1295
1635
return timevalue
1296
1636
1302
1642
global if_nametoindex
1303
1643
try:
1304
1644
if_nametoindex = (ctypes.cdll.LoadLibrary
1305
(ctypes.util.find_library(u"c"))
1645
(ctypes.util.find_library("c"))
1306
1646
.if_nametoindex)
1307
1647
except (OSError, AttributeError):
1308
logger.warning(u"Doing if_nametoindex the hard way")
1648
logger.warning("Doing if_nametoindex the hard way")
1309
1649
def if_nametoindex(interface):
1310
1650
"Get an interface index the hard way, i.e. using fcntl()"
1311
1651
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1312
with closing(socket.socket()) as s:
1652
with contextlib.closing(socket.socket()) as s:
1313
1653
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1314
struct.pack(str(u"16s16x"),
1654
struct.pack(str("16s16x"),
1315
1655
interface))
1316
interface_index = struct.unpack(str(u"I"),
1656
interface_index = struct.unpack(str("I"),
1317
1657
ifreq[16:20])[0]
1318
1658
return interface_index
1319
1659
return if_nametoindex(interface)
1327
1667
sys.exit()
1328
1668
os.setsid()
1329
1669
if not nochdir:
1330
os.chdir(u"/")
1670
os.chdir("/")
1331
1671
if os.fork():
1332
1672
sys.exit()
1333
1673
if not noclose:
1335
1675
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1336
1676
if not stat.S_ISCHR(os.fstat(null).st_mode):
1337
1677
raise OSError(errno.ENODEV,
1338
u"/dev/null not a character device")
1678
"%s not a character device"
1679
% os.path.devnull)
1339
1680
os.dup2(null, sys.stdin.fileno())
1340
1681
os.dup2(null, sys.stdout.fileno())
1341
1682
os.dup2(null, sys.stderr.fileno())
1348
1689
##################################################################
1349
1690
# Parsing of options, both command line and config file
1350
1691
1351
parser = optparse.OptionParser(version = "%%prog %s" % version)
1352
parser.add_option("-i", u"--interface", type=u"string",
1353
metavar="IF", help=u"Bind to interface IF")
1354
parser.add_option("-a", u"--address", type=u"string",
1355
help=u"Address to listen for requests on")
1356
parser.add_option("-p", u"--port", type=u"int",
1357
help=u"Port number to receive requests on")
1358
parser.add_option("--check", action=u"store_true",
1359
help=u"Run self-test")
1360
parser.add_option("--debug", action=u"store_true",
1361
help=u"Debug mode; run in foreground and log to"
1362
u" terminal")
1363
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1364
u" priority string (see GnuTLS documentation)")
1365
parser.add_option("--servicename", type=u"string",
1366
metavar=u"NAME", help=u"Zeroconf service name")
1367
parser.add_option("--configdir", type=u"string",
1368
default=u"/etc/mandos", metavar=u"DIR",
1369
help=u"Directory to search for configuration"
1370
u" files")
1371
parser.add_option("--no-dbus", action=u"store_false",
1372
dest=u"use_dbus", help=u"Do not provide D-Bus"
1373
u" system bus interface")
1374
parser.add_option("--no-ipv6", action=u"store_false",
1375
dest=u"use_ipv6", help=u"Do not use IPv6")
1376
options = parser.parse_args()[0]
1692
parser = argparse.ArgumentParser()
1693
parser.add_argument("-v", "--version", action="version",
1694
version = "%%(prog)s %s" % version,
1695
help="show version number and exit")
1696
parser.add_argument("-i", "--interface", metavar="IF",
1697
help="Bind to interface IF")
1698
parser.add_argument("-a", "--address",
1699
help="Address to listen for requests on")
1700
parser.add_argument("-p", "--port", type=int,
1701
help="Port number to receive requests on")
1702
parser.add_argument("--check", action="store_true",
1703
help="Run self-test")
1704
parser.add_argument("--debug", action="store_true",
1705
help="Debug mode; run in foreground and log"
1706
" to terminal")
1707
parser.add_argument("--debuglevel", metavar="LEVEL",
1708
help="Debug level for stdout output")
1709
parser.add_argument("--priority", help="GnuTLS"
1710
" priority string (see GnuTLS documentation)")
1711
parser.add_argument("--servicename",
1712
metavar="NAME", help="Zeroconf service name")
1713
parser.add_argument("--configdir",
1714
default="/etc/mandos", metavar="DIR",
1715
help="Directory to search for configuration"
1716
" files")
1717
parser.add_argument("--no-dbus", action="store_false",
1718
dest="use_dbus", help="Do not provide D-Bus"
1719
" system bus interface")
1720
parser.add_argument("--no-ipv6", action="store_false",
1721
dest="use_ipv6", help="Do not use IPv6")
1722
options = parser.parse_args()
1377
1723
1378
1724
if options.check:
1379
1725
import doctest
1381
1727
sys.exit()
1382
1728
1383
1729
# Default values for config file for server-global settings
1384
server_defaults = { u"interface": u"",
1385
u"address": u"",
1386
u"port": u"",
1387
u"debug": u"False",
1388
u"priority":
1389
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1390
u"servicename": u"Mandos",
1391
u"use_dbus": u"True",
1392
u"use_ipv6": u"True",
1730
server_defaults = { "interface": "",
1731
"address": "",
1732
"port": "",
1733
"debug": "False",
1734
"priority":
1735
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1736
"servicename": "Mandos",
1737
"use_dbus": "True",
1738
"use_ipv6": "True",
1739
"debuglevel": "",
1393
1740
}
1394
1741
1395
1742
# Parse config file for server-global settings
1396
1743
server_config = configparser.SafeConfigParser(server_defaults)
1397
1744
del server_defaults
1398
1745
server_config.read(os.path.join(options.configdir,
1399
u"mandos.conf"))
1746
"mandos.conf"))
1400
1747
# Convert the SafeConfigParser object to a dict
1401
1748
server_settings = server_config.defaults()
1402
1749
# Use the appropriate methods on the non-string config options
1403
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1404
server_settings[option] = server_config.getboolean(u"DEFAULT",
1750
for option in ("debug", "use_dbus", "use_ipv6"):
1751
server_settings[option] = server_config.getboolean("DEFAULT",
1405
1752
option)
1406
1753
if server_settings["port"]:
1407
server_settings["port"] = server_config.getint(u"DEFAULT",
1408
u"port")
1754
server_settings["port"] = server_config.getint("DEFAULT",
1755
"port")
1409
1756
del server_config
1410
1757
1411
1758
# Override the settings from the config file with command line
1412
1759
# options, if set.
1413
for option in (u"interface", u"address", u"port", u"debug",
1414
u"priority", u"servicename", u"configdir",
1415
u"use_dbus", u"use_ipv6"):
1760
for option in ("interface", "address", "port", "debug",
1761
"priority", "servicename", "configdir",
1762
"use_dbus", "use_ipv6", "debuglevel"):
1416
1763
value = getattr(options, option)
1417
1764
if value is not None:
1418
1765
server_settings[option] = value
1426
1773
##################################################################
1427
1774
1428
1775
# For convenience
1429
debug = server_settings[u"debug"]
1430
use_dbus = server_settings[u"use_dbus"]
1431
use_ipv6 = server_settings[u"use_ipv6"]
1432
1433
if not debug:
1434
syslogger.setLevel(logging.WARNING)
1435
console.setLevel(logging.WARNING)
1436
1437
if server_settings[u"servicename"] != u"Mandos":
1776
debug = server_settings["debug"]
1777
debuglevel = server_settings["debuglevel"]
1778
use_dbus = server_settings["use_dbus"]
1779
use_ipv6 = server_settings["use_ipv6"]
1780
1781
if server_settings["servicename"] != "Mandos":
1438
1782
syslogger.setFormatter(logging.Formatter
1439
(u'Mandos (%s) [%%(process)d]:'
1440
u' %%(levelname)s: %%(message)s'
1441
% server_settings[u"servicename"]))
1783
('Mandos (%s) [%%(process)d]:'
1784
' %%(levelname)s: %%(message)s'
1785
% server_settings["servicename"]))
1442
1786
1443
1787
# Parse config file with clients
1444
client_defaults = { u"timeout": u"1h",
1445
u"interval": u"5m",
1446
u"checker": u"fping -q -- %%(host)s",
1447
u"host": u"",
1788
client_defaults = { "timeout": "5m",
1789
"extended_timeout": "15m",
1790
"interval": "2m",
1791
"checker": "fping -q -- %%(host)s",
1792
"host": "",
1793
"approval_delay": "0s",
1794
"approval_duration": "1s",
1448
1795
}
1449
1796
client_config = configparser.SafeConfigParser(client_defaults)
1450
client_config.read(os.path.join(server_settings[u"configdir"],
1451
u"clients.conf"))
1797
client_config.read(os.path.join(server_settings["configdir"],
1798
"clients.conf"))
1452
1799
1453
1800
global mandos_dbus_service
1454
1801
mandos_dbus_service = None
1455
1802
1456
tcp_server = MandosServer((server_settings[u"address"],
1457
server_settings[u"port"]),
1803
tcp_server = MandosServer((server_settings["address"],
1804
server_settings["port"]),
1458
1805
ClientHandler,
1459
interface=server_settings[u"interface"],
1806
interface=(server_settings["interface"]
1807
or None),
1460
1808
use_ipv6=use_ipv6,
1461
1809
gnutls_priority=
1462
server_settings[u"priority"],
1810
server_settings["priority"],
1463
1811
use_dbus=use_dbus)
1464
pidfilename = u"/var/run/mandos.pid"
1465
try:
1466
pidfile = open(pidfilename, u"w")
1467
except IOError:
1468
logger.error(u"Could not open file %r", pidfilename)
1812
if not debug:
1813
pidfilename = "/var/run/mandos.pid"
1814
try:
1815
pidfile = open(pidfilename, "w")
1816
except IOError:
1817
logger.error("Could not open file %r", pidfilename)
1469
1818
1470
1819
try:
1471
uid = pwd.getpwnam(u"_mandos").pw_uid
1472
gid = pwd.getpwnam(u"_mandos").pw_gid
1820
uid = pwd.getpwnam("_mandos").pw_uid
1821
gid = pwd.getpwnam("_mandos").pw_gid
1473
1822
except KeyError:
1474
1823
try:
1475
uid = pwd.getpwnam(u"mandos").pw_uid
1476
gid = pwd.getpwnam(u"mandos").pw_gid
1824
uid = pwd.getpwnam("mandos").pw_uid
1825
gid = pwd.getpwnam("mandos").pw_gid
1477
1826
except KeyError:
1478
1827
try:
1479
uid = pwd.getpwnam(u"nobody").pw_uid
1480
gid = pwd.getpwnam(u"nobody").pw_gid
1828
uid = pwd.getpwnam("nobody").pw_uid
1829
gid = pwd.getpwnam("nobody").pw_gid
1481
1830
except KeyError:
1482
1831
uid = 65534
1483
1832
gid = 65534
1484
1833
try:
1485
1834
os.setgid(gid)
1486
1835
os.setuid(uid)
1487
except OSError, error:
1836
except OSError as error:
1488
1837
if error[0] != errno.EPERM:
1489
1838
raise error
1490
1839
1491
# Enable all possible GnuTLS debugging
1840
if not debug and not debuglevel:
1841
syslogger.setLevel(logging.WARNING)
1842
console.setLevel(logging.WARNING)
1843
if debuglevel:
1844
level = getattr(logging, debuglevel.upper())
1845
syslogger.setLevel(level)
1846
console.setLevel(level)
1847
1492
1848
if debug:
1849
# Enable all possible GnuTLS debugging
1850
1493
1851
# "Use a log level over 10 to enable all debugging options."
1494
1852
# - GnuTLS manual
1495
1853
gnutls.library.functions.gnutls_global_set_log_level(11)
1496
1854
1497
1855
@gnutls.library.types.gnutls_log_func
1498
1856
def debug_gnutls(level, string):
1499
logger.debug(u"GnuTLS: %s", string[:-1])
1857
logger.debug("GnuTLS: %s", string[:-1])
1500
1858
1501
1859
(gnutls.library.functions
1502
1860
.gnutls_global_set_log_function(debug_gnutls))
1861
1862
# Redirect stdin so all checkers get /dev/null
1863
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1864
os.dup2(null, sys.stdin.fileno())
1865
if null > 2:
1866
os.close(null)
1867
else:
1868
# No console logging
1869
logger.removeHandler(console)
1870
1871
# Need to fork before connecting to D-Bus
1872
if not debug:
1873
# Close all input and output, do double fork, etc.
1874
daemon()
1503
1875
1504
1876
global main_loop
1505
1877
# From the Avahi example code
1508
1880
bus = dbus.SystemBus()
1509
1881
# End of Avahi example code
1510
1882
if use_dbus:
1511
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1883
try:
1884
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1885
bus, do_not_queue=True)
1886
except dbus.exceptions.NameExistsException as e:
1887
logger.error(unicode(e) + ", disabling D-Bus")
1888
use_dbus = False
1889
server_settings["use_dbus"] = False
1890
tcp_server.use_dbus = False
1512
1891
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1513
service = AvahiService(name = server_settings[u"servicename"],
1514
servicetype = u"_mandos._tcp",
1892
service = AvahiService(name = server_settings["servicename"],
1893
servicetype = "_mandos._tcp",
1515
1894
protocol = protocol, bus = bus)
1516
1895
if server_settings["interface"]:
1517
1896
service.interface = (if_nametoindex
1518
(str(server_settings[u"interface"])))
1897
(str(server_settings["interface"])))
1898
1899
global multiprocessing_manager
1900
multiprocessing_manager = multiprocessing.Manager()
1519
1901
1520
1902
client_class = Client
1521
1903
if use_dbus:
1522
1904
client_class = functools.partial(ClientDBus, bus = bus)
1905
def client_config_items(config, section):
1906
special_settings = {
1907
"approved_by_default":
1908
lambda: config.getboolean(section,
1909
"approved_by_default"),
1910
}
1911
for name, value in config.items(section):
1912
try:
1913
yield (name, special_settings[name]())
1914
except KeyError:
1915
yield (name, value)
1916
1523
1917
tcp_server.clients.update(set(
1524
1918
client_class(name = section,
1525
config= dict(client_config.items(section)))
1919
config= dict(client_config_items(
1920
client_config, section)))
1526
1921
for section in client_config.sections()))
1527
1922
if not tcp_server.clients:
1528
logger.warning(u"No clients defined")
1529
1530
if debug:
1531
# Redirect stdin so all checkers get /dev/null
1532
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1533
os.dup2(null, sys.stdin.fileno())
1534
if null > 2:
1535
os.close(null)
1536
else:
1537
# No console logging
1538
logger.removeHandler(console)
1539
# Close all input and output, do double fork, etc.
1540
daemon()
1541
1542
try:
1543
with closing(pidfile):
1544
pid = os.getpid()
1545
pidfile.write(str(pid) + "\n")
1546
del pidfile
1547
except IOError:
1548
logger.error(u"Could not write to file %r with PID %d",
1549
pidfilename, pid)
1550
except NameError:
1551
# "pidfile" was never created
1552
pass
1553
del pidfilename
1554
1555
def cleanup():
1556
"Cleanup function; run on exit"
1557
service.cleanup()
1923
logger.warning("No clients defined")
1558
1924
1559
while tcp_server.clients:
1560
client = tcp_server.clients.pop()
1561
client.disable_hook = None
1562
client.disable()
1563
1564
atexit.register(cleanup)
1565
1566
1925
if not debug:
1926
try:
1927
with pidfile:
1928
pid = os.getpid()
1929
pidfile.write(str(pid) + "\n".encode("utf-8"))
1930
del pidfile
1931
except IOError:
1932
logger.error("Could not write to file %r with PID %d",
1933
pidfilename, pid)
1934
except NameError:
1935
# "pidfile" was never created
1936
pass
1937
del pidfilename
1938
1567
1939
signal.signal(signal.SIGINT, signal.SIG_IGN)
1940
1568
1941
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1569
1942
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1570
1943
1572
1945
class MandosDBusService(dbus.service.Object):
1573
1946
"""A D-Bus proxy object"""
1574
1947
def __init__(self):
1575
dbus.service.Object.__init__(self, bus, u"/")
1576
_interface = u"se.bsnet.fukt.Mandos"
1577
1578
@dbus.service.signal(_interface, signature=u"oa{sv}")
1579
def ClientAdded(self, objpath, properties):
1580
"D-Bus signal"
1581
pass
1582
1583
@dbus.service.signal(_interface, signature=u"s")
1584
def ClientNotFound(self, fingerprint):
1585
"D-Bus signal"
1586
pass
1587
1588
@dbus.service.signal(_interface, signature=u"os")
1948
dbus.service.Object.__init__(self, bus, "/")
1949
_interface = "se.bsnet.fukt.Mandos"
1950
1951
@dbus.service.signal(_interface, signature="o")
1952
def ClientAdded(self, objpath):
1953
"D-Bus signal"
1954
pass
1955
1956
@dbus.service.signal(_interface, signature="ss")
1957
def ClientNotFound(self, fingerprint, address):
1958
"D-Bus signal"
1959
pass
1960
1961
@dbus.service.signal(_interface, signature="os")
1589
1962
def ClientRemoved(self, objpath, name):
1590
1963
"D-Bus signal"
1591
1964
pass
1592
1965
1593
@dbus.service.method(_interface, out_signature=u"ao")
1966
@dbus.service.method(_interface, out_signature="ao")
1594
1967
def GetAllClients(self):
1595
1968
"D-Bus method"
1596
1969
return dbus.Array(c.dbus_object_path
1597
1970
for c in tcp_server.clients)
1598
1971
1599
1972
@dbus.service.method(_interface,
1600
out_signature=u"a{oa{sv}}")
1973
out_signature="a{oa{sv}}")
1601
1974
def GetAllClientsWithProperties(self):
1602
1975
"D-Bus method"
1603
1976
return dbus.Dictionary(
1604
((c.dbus_object_path, c.GetAll(u""))
1977
((c.dbus_object_path, c.GetAll(""))
1605
1978
for c in tcp_server.clients),
1606
signature=u"oa{sv}")
1979
signature="oa{sv}")
1607
1980
1608
@dbus.service.method(_interface, in_signature=u"o")
1981
@dbus.service.method(_interface, in_signature="o")
1609
1982
def RemoveClient(self, object_path):
1610
1983
"D-Bus method"
1611
1984
for c in tcp_server.clients:
1613
1986
tcp_server.clients.remove(c)
1614
1987
c.remove_from_connection()
1615
1988
# Don't signal anything except ClientRemoved
1616
c.disable(signal=False)
1989
c.disable(quiet=True)
1617
1990
# Emit D-Bus signal
1618
1991
self.ClientRemoved(object_path, c.name)
1619
1992
return
1620
raise KeyError
1993
raise KeyError(object_path)
1621
1994
1622
1995
del _interface
1623
1996
1624
1997
mandos_dbus_service = MandosDBusService()
1625
1998
1999
def cleanup():
2000
"Cleanup function; run on exit"
2001
service.cleanup()
2002
2003
while tcp_server.clients:
2004
client = tcp_server.clients.pop()
2005
if use_dbus:
2006
client.remove_from_connection()
2007
client.disable_hook = None
2008
# Don't signal anything except ClientRemoved
2009
client.disable(quiet=True)
2010
if use_dbus:
2011
# Emit D-Bus signal
2012
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2013
client.name)
2014
2015
atexit.register(cleanup)
2016
1626
2017
for client in tcp_server.clients:
1627
2018
if use_dbus:
1628
2019
# Emit D-Bus signal
1629
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1630
client.GetAll(u""))
2020
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1631
2021
client.enable()
1632
2022
1633
2023
tcp_server.enable()
1636
2026
# Find out what port we got
1637
2027
service.port = tcp_server.socket.getsockname()[1]
1638
2028
if use_ipv6:
1639
logger.info(u"Now listening on address %r, port %d,"
2029
logger.info("Now listening on address %r, port %d,"
1640
2030
" flowinfo %d, scope_id %d"
1641
2031
% tcp_server.socket.getsockname())
1642
2032
else: # IPv4
1643
logger.info(u"Now listening on address %r, port %d"
2033
logger.info("Now listening on address %r, port %d"
1644
2034
% tcp_server.socket.getsockname())
1645
2035
1646
2036
#service.interface = tcp_server.socket.getsockname()[3]
1649
2039
# From the Avahi example code
1650
2040
try:
1651
2041
service.activate()
1652
except dbus.exceptions.DBusException, error:
1653
logger.critical(u"DBusException: %s", error)
2042
except dbus.exceptions.DBusException as error:
2043
logger.critical("DBusException: %s", error)
2044
cleanup()
1654
2045
sys.exit(1)
1655
2046
# End of Avahi example code
1656
2047
1659
2050
(tcp_server.handle_request
1660
2051
(*args[2:], **kwargs) or True))
1661
2052
1662
logger.debug(u"Starting main loop")
2053
logger.debug("Starting main loop")
1663
2054
main_loop.run()
1664
except AvahiError, error:
1665
logger.critical(u"AvahiError: %s", error)
2055
except AvahiError as error:
2056
logger.critical("AvahiError: %s", error)
2057
cleanup()
1666
2058
sys.exit(1)
1667
2059
except KeyboardInterrupt:
1668
2060
if debug:
1669
print >> sys.stderr
1670
logger.debug(u"Server received KeyboardInterrupt")
1671
logger.debug(u"Server exiting")
2061
print("", file=sys.stderr)
2062
logger.debug("Server received KeyboardInterrupt")
2063
logger.debug("Server exiting")
2064
# Must run before the D-Bus bus name gets deregistered
2065
cleanup()
2066
1672
2067
1673
2068
if __name__ == '__main__':
1674
2069
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0