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