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