To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 403
- compare with another revision
- download diff
- download tarball
- view history from revision 403
- Committer: Teddy Hogeborn
- Date: 2009-11-05 02:12:57 UTC
- Revision ID: teddy@fukt.bsnet.se-20091105021257-l2b5nb1v4pc2tupw
* mandos (ClientDBus.disable): Bug fix: complete rename of "log" and
"signal" to "quiet".
"signal" to "quiet".
- files removed:
- DBUS-API
- debian/source
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@recompile.se>.
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
34
from __future__ import division, with_statement, absolute_import
36
35
37
36
import SocketServer as socketserver
38
37
import socket
39
import argparse
38
import optparse
40
39
import datetime
41
40
import errno
42
41
import gnutls.crypto
56
55
import logging
57
56
import logging.handlers
58
57
import pwd
59
import contextlib
58
from contextlib import closing
60
59
import struct
61
60
import fcntl
62
61
import functools
63
import cPickle as pickle
64
import multiprocessing
65
import types
66
import hashlib
67
62
68
63
import dbus
69
64
import dbus.service
74
69
import ctypes.util
75
70
import xml.dom.minidom
76
71
import inspect
77
import Crypto.Cipher.AES
78
72
79
73
try:
80
74
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
79
SO_BINDTODEVICE = None
86
80
87
81
88
version = "1.4.1"
89
90
logger = logging.getLogger()
91
stored_state_path = "/var/lib/mandos/clients.pickle"
92
82
version = "1.0.14"
83
84
logger = logging.Logger(u'mandos')
93
85
syslogger = (logging.handlers.SysLogHandler
94
86
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
87
address = "/dev/log"))
96
88
syslogger.setFormatter(logging.Formatter
97
('Mandos [%(process)d]: %(levelname)s:'
98
' %(message)s'))
89
(u'Mandos [%(process)d]: %(levelname)s:'
90
u' %(message)s'))
99
91
logger.addHandler(syslogger)
100
92
101
93
console = logging.StreamHandler()
102
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
103
' [%(process)d]:'
104
' %(levelname)s:'
105
' %(message)s'))
94
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
95
u' %(levelname)s:'
96
u' %(message)s'))
106
97
logger.addHandler(console)
107
98
108
109
99
class AvahiError(Exception):
110
100
def __init__(self, value, *args, **kwargs):
111
101
self.value = value
126
116
Attributes:
127
117
interface: integer; avahi.IF_UNSPEC or an interface index.
128
118
Used to optionally bind to the specified interface.
129
name: string; Example: 'Mandos'
130
type: string; Example: '_mandos._tcp'.
119
name: string; Example: u'Mandos'
120
type: string; Example: u'_mandos._tcp'.
131
121
See <http://www.dns-sd.org/ServiceTypes.html>
132
122
port: integer; what port to announce
133
123
TXT: list of strings; TXT record for the service
142
132
"""
143
133
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
144
134
servicetype = None, port = None, TXT = None,
145
domain = "", host = "", max_renames = 32768,
135
domain = u"", host = u"", max_renames = 32768,
146
136
protocol = avahi.PROTO_UNSPEC, bus = None):
147
137
self.interface = interface
148
138
self.name = name
157
147
self.group = None # our entry group
158
148
self.server = None
159
149
self.bus = bus
160
self.entry_group_state_changed_match = None
161
150
def rename(self):
162
151
"""Derived from the Avahi example code"""
163
152
if self.rename_count >= self.max_renames:
164
logger.critical("No suitable Zeroconf service name found"
165
" after %i retries, exiting.",
153
logger.critical(u"No suitable Zeroconf service name found"
154
u" after %i retries, exiting.",
166
155
self.rename_count)
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)
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))
172
164
self.remove()
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)
165
self.add()
179
166
self.rename_count += 1
180
167
def remove(self):
181
168
"""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
185
169
if self.group is not None:
186
170
self.group.Reset()
187
171
def add(self):
188
172
"""Derived from the Avahi example code"""
189
self.remove()
190
173
if self.group is None:
191
174
self.group = dbus.Interface(
192
175
self.bus.get_object(avahi.DBUS_NAME,
193
176
self.server.EntryGroupNew()),
194
177
avahi.DBUS_INTERFACE_ENTRY_GROUP)
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' ...",
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' ...",
199
182
self.name, self.type)
200
183
self.group.AddService(
201
184
self.interface,
208
191
self.group.Commit()
209
192
def entry_group_state_changed(self, state, error):
210
193
"""Derived from the Avahi example code"""
211
logger.debug("Avahi entry group state change: %i", state)
194
logger.debug(u"Avahi state change: %i", state)
212
195
213
196
if state == avahi.ENTRY_GROUP_ESTABLISHED:
214
logger.debug("Zeroconf service established.")
197
logger.debug(u"Zeroconf service established.")
215
198
elif state == avahi.ENTRY_GROUP_COLLISION:
216
logger.info("Zeroconf service name collision.")
199
logger.warning(u"Zeroconf service name collision.")
217
200
self.rename()
218
201
elif state == avahi.ENTRY_GROUP_FAILURE:
219
logger.critical("Avahi: Error in group state changed %s",
202
logger.critical(u"Avahi: Error in group state changed %s",
220
203
unicode(error))
221
raise AvahiGroupError("State changed: %s"
204
raise AvahiGroupError(u"State changed: %s"
222
205
% unicode(error))
223
206
def cleanup(self):
224
207
"""Derived from the Avahi example code"""
225
208
if self.group is not None:
226
try:
227
self.group.Free()
228
except (dbus.exceptions.UnknownMethodException,
229
dbus.exceptions.DBusException) as e:
230
pass
209
self.group.Free()
231
210
self.group = None
232
self.remove()
233
def server_state_changed(self, state, error=None):
211
def server_state_changed(self, state):
234
212
"""Derived from the Avahi example code"""
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()
213
if state == avahi.SERVER_COLLISION:
214
logger.error(u"Zeroconf server name collision")
215
self.remove()
250
216
elif state == avahi.SERVER_RUNNING:
251
217
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)
257
218
def activate(self):
258
219
"""Derived from the Avahi example code"""
259
220
if self.server is None:
260
221
self.server = dbus.Interface(
261
222
self.bus.get_object(avahi.DBUS_NAME,
262
avahi.DBUS_PATH_SERVER,
263
follow_name_owner_changes=True),
223
avahi.DBUS_PATH_SERVER),
264
224
avahi.DBUS_INTERFACE_SERVER)
265
self.server.connect_to_signal("StateChanged",
225
self.server.connect_to_signal(u"StateChanged",
266
226
self.server_state_changed)
267
227
self.server_state_changed(self.server.GetState())
268
228
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
278
229
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
285
230
class Client(object):
286
231
"""A representation of a client host served by this server.
287
232
288
233
Attributes:
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
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)
292
248
checker: subprocess.Popen(); a running checker process used
293
249
to see if the client lives.
294
250
'None' if no process is running.
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
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
298
256
runtime with vars(self) as dict, so that for
299
257
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
304
258
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
326
259
"""
327
260
328
runtime_expansions = ("approval_delay", "approval_duration",
329
"created", "enabled", "fingerprint",
330
"host", "interval", "last_checked_ok",
331
"last_enabled", "name", "timeout")
261
@staticmethod
262
def _timedelta_to_milliseconds(td):
263
"Convert a datetime.timedelta() to milliseconds"
264
return ((td.days * 24 * 60 * 60 * 1000)
265
+ (td.seconds * 1000)
266
+ (td.microseconds // 1000))
332
267
333
268
def timeout_milliseconds(self):
334
269
"Return the 'timeout' attribute in milliseconds"
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)
270
return self._timedelta_to_milliseconds(self.timeout)
340
271
341
272
def interval_milliseconds(self):
342
273
"Return the 'interval' attribute in milliseconds"
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):
274
return self._timedelta_to_milliseconds(self.interval)
275
276
def __init__(self, name = None, disable_hook=None, config=None):
349
277
"""Note: the 'checker' key in 'config' sets the
350
278
'checker_command' attribute and *not* the 'checker'
351
279
attribute."""
352
280
self.name = name
353
281
if config is None:
354
282
config = {}
355
logger.debug("Creating client %r", self.name)
283
logger.debug(u"Creating client %r", self.name)
356
284
# Uppercase and remove spaces from fingerprint for later
357
285
# comparison purposes with return value from the fingerprint()
358
286
# function
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:
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:
368
297
self.secret = secfile.read()
369
298
else:
370
raise TypeError("No secret or secfile for client %s"
299
raise TypeError(u"No secret or secfile for client %s"
371
300
% self.name)
372
self.host = config.get("host", "")
301
self.host = config.get(u"host", u"")
373
302
self.created = datetime.datetime.utcnow()
374
self.enabled = True
375
self.last_approval_request = None
376
self.last_enabled = datetime.datetime.utcnow()
303
self.enabled = False
304
self.last_enabled = None
377
305
self.last_checked_ok = None
378
self.last_checker_status = None
379
self.timeout = string_to_delta(config["timeout"])
380
self.extended_timeout = string_to_delta(config
381
["extended_timeout"])
382
self.interval = string_to_delta(config["interval"])
306
self.timeout = string_to_delta(config[u"timeout"])
307
self.interval = string_to_delta(config[u"interval"])
308
self.disable_hook = disable_hook
383
309
self.checker = None
384
310
self.checker_initiator_tag = None
385
311
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
387
312
self.checker_callback_tag = None
388
self.checker_command = config["checker"]
313
self.checker_command = config[u"checker"]
389
314
self.current_checker_command = 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()
315
self.last_connect = None
414
316
415
317
def enable(self):
416
318
"""Start this client's checker and timeout hooks"""
417
if getattr(self, "enabled", False):
319
if getattr(self, u"enabled", False):
418
320
# Already enabled
419
321
return
420
self.send_changedstate()
421
self.expires = datetime.datetime.utcnow() + self.timeout
322
self.last_enabled = datetime.datetime.utcnow()
323
# Schedule a new checker to be started an 'interval' from now,
324
# and every interval from then on.
325
self.checker_initiator_tag = (gobject.timeout_add
326
(self.interval_milliseconds(),
327
self.start_checker))
328
# Schedule a disable() when 'timeout' has passed
329
self.disable_initiator_tag = (gobject.timeout_add
330
(self.timeout_milliseconds(),
331
self.disable))
422
332
self.enabled = True
423
self.last_enabled = datetime.datetime.utcnow()
424
self.init_checker()
333
# Also start a new checker *right now*.
334
self.start_checker()
425
335
426
336
def disable(self, quiet=True):
427
337
"""Disable this client."""
428
338
if not getattr(self, "enabled", False):
429
339
return False
430
340
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):
341
logger.info(u"Disabling client %s", self.name)
342
if getattr(self, u"disable_initiator_tag", False):
435
343
gobject.source_remove(self.disable_initiator_tag)
436
344
self.disable_initiator_tag = None
437
self.expires = None
438
if getattr(self, "checker_initiator_tag", False):
345
if getattr(self, u"checker_initiator_tag", False):
439
346
gobject.source_remove(self.checker_initiator_tag)
440
347
self.checker_initiator_tag = None
441
348
self.stop_checker()
349
if self.disable_hook:
350
self.disable_hook(self)
442
351
self.enabled = False
443
352
# Do not run this again if called by a gobject.timeout_add
444
353
return False
445
354
446
355
def __del__(self):
356
self.disable_hook = None
447
357
self.disable()
448
449
def init_checker(self):
450
# Schedule a new checker to be started an 'interval' from now,
451
# and every interval from then on.
452
self.checker_initiator_tag = (gobject.timeout_add
453
(self.interval_milliseconds(),
454
self.start_checker))
455
# Schedule a disable() when 'timeout' has passed
456
self.disable_initiator_tag = (gobject.timeout_add
457
(self.timeout_milliseconds(),
458
self.disable))
459
# Also start a new checker *right now*.
460
self.start_checker()
461
462
358
463
359
def checker_callback(self, pid, condition, command):
464
360
"""The checker has completed, so take appropriate actions."""
465
361
self.checker_callback_tag = None
466
362
self.checker = None
467
363
if os.WIFEXITED(condition):
468
self.last_checker_status = os.WEXITSTATUS(condition)
469
if self.last_checker_status == 0:
470
logger.info("Checker for %(name)s succeeded",
364
exitstatus = os.WEXITSTATUS(condition)
365
if exitstatus == 0:
366
logger.info(u"Checker for %(name)s succeeded",
471
367
vars(self))
472
368
self.checked_ok()
473
369
else:
474
logger.info("Checker for %(name)s failed",
370
logger.info(u"Checker for %(name)s failed",
475
371
vars(self))
476
372
else:
477
self.last_checker_status = -1
478
logger.warning("Checker for %(name)s crashed?",
373
logger.warning(u"Checker for %(name)s crashed?",
479
374
vars(self))
480
375
481
def checked_ok(self, timeout=None):
376
def checked_ok(self):
482
377
"""Bump up the timeout for this client.
483
378
484
379
This should only be called when the client has been seen,
485
380
alive and well.
486
381
"""
487
if timeout is None:
488
timeout = self.timeout
489
382
self.last_checked_ok = datetime.datetime.utcnow()
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()
383
gobject.source_remove(self.disable_initiator_tag)
384
self.disable_initiator_tag = (gobject.timeout_add
385
(self.timeout_milliseconds(),
386
self.disable))
500
387
501
388
def start_checker(self):
502
389
"""Start a new checker subprocess if one is not running.
509
396
# client would inevitably timeout, since no checker would get
510
397
# a chance to run to completion. If we instead leave running
511
398
# checkers alone, the checker would have to take more time
512
# than 'timeout' for the client to be disabled, which is as it
513
# should be.
399
# than 'timeout' for the client to be declared invalid, which
400
# is as it should be.
514
401
515
402
# If a checker exists, make sure it is not a zombie
516
403
try:
517
404
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
518
except (AttributeError, OSError) as error:
405
except (AttributeError, OSError), error:
519
406
if (isinstance(error, OSError)
520
407
and error.errno != errno.ECHILD):
521
408
raise error
522
409
else:
523
410
if pid:
524
logger.warning("Checker was a zombie")
411
logger.warning(u"Checker was a zombie")
525
412
gobject.source_remove(self.checker_callback_tag)
526
413
self.checker_callback(pid, status,
527
414
self.current_checker_command)
532
419
command = self.checker_command % self.host
533
420
except TypeError:
534
421
# Escape attributes for the shell
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
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())
543
428
try:
544
429
command = self.checker_command % escaped_attrs
545
except TypeError as error:
546
logger.error('Could not format string "%s":'
547
' %s', self.checker_command, error)
430
except TypeError, error:
431
logger.error(u'Could not format string "%s":'
432
u' %s', self.checker_command, error)
548
433
return True # Try again later
549
434
self.current_checker_command = command
550
435
try:
551
logger.info("Starting checker %r for %s",
436
logger.info(u"Starting checker %r for %s",
552
437
command, self.name)
553
438
# We don't need to redirect stdout and stderr, since
554
439
# in normal mode, that is already done by daemon(),
556
441
# always replaced by /dev/null.)
557
442
self.checker = subprocess.Popen(command,
558
443
close_fds=True,
559
shell=True, cwd="/")
444
shell=True, cwd=u"/")
560
445
self.checker_callback_tag = (gobject.child_watch_add
561
446
(self.checker.pid,
562
447
self.checker_callback,
567
452
if pid:
568
453
gobject.source_remove(self.checker_callback_tag)
569
454
self.checker_callback(pid, status, command)
570
except OSError as error:
571
logger.error("Failed to start subprocess: %s",
455
except OSError, error:
456
logger.error(u"Failed to start subprocess: %s",
572
457
error)
573
458
# Re-run this periodically if run by gobject.timeout_add
574
459
return True
578
463
if self.checker_callback_tag:
579
464
gobject.source_remove(self.checker_callback_tag)
580
465
self.checker_callback_tag = None
581
if getattr(self, "checker", None) is None:
466
if getattr(self, u"checker", None) is None:
582
467
return
583
logger.debug("Stopping checker for %(name)s", vars(self))
468
logger.debug(u"Stopping checker for %(name)s", vars(self))
584
469
try:
585
470
os.kill(self.checker.pid, signal.SIGTERM)
586
471
#time.sleep(0.5)
587
472
#if self.checker.poll() is None:
588
473
# os.kill(self.checker.pid, signal.SIGKILL)
589
except OSError as error:
474
except OSError, error:
590
475
if error.errno != errno.ESRCH: # No such process
591
476
raise
592
477
self.checker = None
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
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)
636
486
else:
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):
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):
643
492
"""Decorators for marking methods of a DBusObjectWithProperties to
644
493
become properties on the D-Bus.
645
494
650
499
dbus.service.method, except there is only "signature", since the
651
500
type from Get() and the type sent to Set() is the same.
652
501
"""
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)
658
502
def decorator(func):
659
503
func._dbus_is_property = True
660
504
func._dbus_interface = dbus_interface
661
505
func._dbus_signature = signature
662
506
func._dbus_access = access
663
507
func._dbus_name = func.__name__
664
if func._dbus_name.endswith("_dbus_property"):
508
if func._dbus_name.endswith(u"_dbus_property"):
665
509
func._dbus_name = func._dbus_name[:-14]
666
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
510
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
667
511
return func
668
512
return decorator
669
513
689
533
690
534
class DBusObjectWithProperties(dbus.service.Object):
691
535
"""A D-Bus object with properties.
692
536
693
537
Classes inheriting from this can use the dbus_service_property
694
538
decorator to expose methods as D-Bus properties. It exposes the
695
539
standard Get(), Set(), and GetAll() methods on the D-Bus.
697
541
698
542
@staticmethod
699
543
def _is_dbus_property(obj):
700
return getattr(obj, "_dbus_is_property", False)
544
return getattr(obj, u"_dbus_is_property", False)
701
545
702
546
def _get_all_dbus_properties(self):
703
547
"""Returns a generator of (name, attribute) pairs
704
548
"""
705
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
706
for cls in self.__class__.__mro__
549
return ((prop._dbus_name, prop)
707
550
for name, prop in
708
inspect.getmembers(cls, self._is_dbus_property))
551
inspect.getmembers(self, self._is_dbus_property))
709
552
710
553
def _get_dbus_property(self, interface_name, property_name):
711
554
"""Returns a bound method if one exists which is a D-Bus
712
555
property with the specified name and interface.
713
556
"""
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
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
721
567
# No such property
722
raise DBusPropertyNotFound(self.dbus_object_path + ":"
723
+ interface_name + "."
568
raise DBusPropertyNotFound(self.dbus_object_path + u":"
569
+ interface_name + u"."
724
570
+ property_name)
725
571
726
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
727
out_signature="v")
572
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
573
out_signature=u"v")
728
574
def Get(self, interface_name, property_name):
729
575
"""Standard D-Bus property Get() method, see D-Bus standard.
730
576
"""
731
577
prop = self._get_dbus_property(interface_name, property_name)
732
if prop._dbus_access == "write":
578
if prop._dbus_access == u"write":
733
579
raise DBusPropertyAccessException(property_name)
734
580
value = prop()
735
if not hasattr(value, "variant_level"):
581
if not hasattr(value, u"variant_level"):
736
582
return value
737
583
return type(value)(value, variant_level=value.variant_level+1)
738
584
739
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
585
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
740
586
def Set(self, interface_name, property_name, value):
741
587
"""Standard D-Bus property Set() method, see D-Bus standard.
742
588
"""
743
589
prop = self._get_dbus_property(interface_name, property_name)
744
if prop._dbus_access == "read":
590
if prop._dbus_access == u"read":
745
591
raise DBusPropertyAccessException(property_name)
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
592
if prop._dbus_get_args_options[u"byte_arrays"]:
751
593
value = dbus.ByteArray(''.join(unichr(byte)
752
594
for byte in value))
753
595
prop(value)
754
596
755
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
756
out_signature="a{sv}")
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
598
out_signature=u"a{sv}")
757
599
def GetAll(self, interface_name):
758
600
"""Standard D-Bus property GetAll() method, see D-Bus
759
601
standard.
760
602
761
603
Note: Will not include properties with access="write".
762
604
"""
763
605
all = {}
767
609
# Interface non-empty but did not match
768
610
continue
769
611
# Ignore write-only properties
770
if prop._dbus_access == "write":
612
if prop._dbus_access == u"write":
771
613
continue
772
614
value = prop()
773
if not hasattr(value, "variant_level"):
615
if not hasattr(value, u"variant_level"):
774
616
all[name] = value
775
617
continue
776
618
all[name] = type(value)(value, variant_level=
777
619
value.variant_level+1)
778
return dbus.Dictionary(all, signature="sv")
620
return dbus.Dictionary(all, signature=u"sv")
779
621
780
622
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
781
out_signature="s",
623
out_signature=u"s",
782
624
path_keyword='object_path',
783
625
connection_keyword='connection')
784
626
def Introspect(self, object_path, connection):
789
631
try:
790
632
document = xml.dom.minidom.parseString(xmlstring)
791
633
def make_tag(document, name, prop):
792
e = document.createElement("property")
793
e.setAttribute("name", name)
794
e.setAttribute("type", prop._dbus_signature)
795
e.setAttribute("access", prop._dbus_access)
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)
796
638
return e
797
for if_tag in document.getElementsByTagName("interface"):
639
for if_tag in document.getElementsByTagName(u"interface"):
798
640
for tag in (make_tag(document, name, prop)
799
641
for name, prop
800
642
in self._get_all_dbus_properties()
801
643
if prop._dbus_interface
802
== if_tag.getAttribute("name")):
644
== if_tag.getAttribute(u"name")):
803
645
if_tag.appendChild(tag)
804
646
# Add the names to the return values for the
805
647
# "org.freedesktop.DBus.Properties" methods
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")
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")
820
662
document.unlink()
821
663
except (AttributeError, xml.dom.DOMException,
822
xml.parsers.expat.ExpatError) as error:
823
logger.error("Failed to override Introspection method",
664
xml.parsers.expat.ExpatError), error:
665
logger.error(u"Failed to override Introspection method",
824
666
error)
825
667
return xmlstring
826
668
827
669
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
932
670
class ClientDBus(Client, DBusObjectWithProperties):
933
671
"""A Client class using D-Bus
934
672
936
674
dbus_object_path: dbus.ObjectPath
937
675
bus: dbus.SystemBus()
938
676
"""
939
940
runtime_expansions = (Client.runtime_expansions
941
+ ("dbus_object_path",))
942
943
677
# dbus.service.Object doesn't use super(), so we can't either.
944
678
945
679
def __init__(self, bus = None, *args, **kwargs):
946
680
self.bus = bus
947
681
Client.__init__(self, *args, **kwargs)
948
949
self._approvals_pending = 0
950
682
# Only now, when this client is initialized, can it show up on
951
683
# the D-Bus
952
client_object_name = unicode(self.name).translate(
953
{ord("."): ord("_"),
954
ord("-"): ord("_")})
955
684
self.dbus_object_path = (dbus.ObjectPath
956
("/clients/" + client_object_name))
685
(u"/clients/"
686
+ self.name.replace(u".", u"_")))
957
687
DBusObjectWithProperties.__init__(self, self.bus,
958
688
self.dbus_object_path)
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
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
1026
717
1027
718
def __del__(self, *args, **kwargs):
1028
719
try:
1029
720
self.remove_from_connection()
1030
721
except LookupError:
1031
722
pass
1032
if hasattr(DBusObjectWithProperties, "__del__"):
723
if hasattr(DBusObjectWithProperties, u"__del__"):
1033
724
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1034
725
Client.__del__(self, *args, **kwargs)
1035
726
1037
728
*args, **kwargs):
1038
729
self.checker_callback_tag = None
1039
730
self.checker = None
731
# Emit D-Bus signal
732
self.PropertyChanged(dbus.String(u"checker_running"),
733
dbus.Boolean(False, variant_level=1))
1040
734
if os.WIFEXITED(condition):
1041
735
exitstatus = os.WEXITSTATUS(condition)
1042
736
# Emit D-Bus signal
1052
746
return Client.checker_callback(self, pid, condition, command,
1053
747
*args, **kwargs)
1054
748
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
1055
758
def start_checker(self, *args, **kwargs):
1056
759
old_checker = self.checker
1057
760
if self.checker is not None:
1064
767
and old_checker_pid != self.checker.pid):
1065
768
# Emit D-Bus signal
1066
769
self.CheckerStarted(self.current_checker_command)
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
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()
1085
791
1086
792
# CheckerCompleted - signal
1087
@dbus.service.signal(_interface, signature="nxs")
793
@dbus.service.signal(_interface, signature=u"nxs")
1088
794
def CheckerCompleted(self, exitcode, waitstatus, command):
1089
795
"D-Bus signal"
1090
796
pass
1091
797
1092
798
# CheckerStarted - signal
1093
@dbus.service.signal(_interface, signature="s")
799
@dbus.service.signal(_interface, signature=u"s")
1094
800
def CheckerStarted(self, command):
1095
801
"D-Bus signal"
1096
802
pass
1097
803
1098
804
# PropertyChanged - signal
1099
@dbus.service.signal(_interface, signature="sv")
805
@dbus.service.signal(_interface, signature=u"sv")
1100
806
def PropertyChanged(self, property, value):
1101
807
"D-Bus signal"
1102
808
pass
1104
810
# GotSecret - signal
1105
811
@dbus.service.signal(_interface)
1106
812
def GotSecret(self):
1107
"""D-Bus signal
1108
Is sent after a successful transfer of secret from the Mandos
1109
server to mandos-client
1110
"""
813
"D-Bus signal"
1111
814
pass
1112
815
1113
816
# Rejected - signal
1114
@dbus.service.signal(_interface, signature="s")
1115
def Rejected(self, reason):
817
@dbus.service.signal(_interface)
818
def Rejected(self):
1116
819
"D-Bus signal"
1117
820
pass
1118
821
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
1137
822
# Enable - method
1138
823
@dbus.service.method(_interface)
1139
824
def Enable(self):
1157
842
def StopChecker(self):
1158
843
self.stop_checker()
1159
844
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):
845
# name - property
846
@dbus_service_property(_interface, signature=u"s", access=u"read")
847
def name_dbus_property(self):
1195
848
return dbus.String(self.name)
1196
849
1197
# Fingerprint - property
1198
@dbus_service_property(_interface, signature="s", access="read")
1199
def Fingerprint_dbus_property(self):
850
# fingerprint - property
851
@dbus_service_property(_interface, signature=u"s", access=u"read")
852
def fingerprint_dbus_property(self):
1200
853
return dbus.String(self.fingerprint)
1201
854
1202
# Host - property
1203
@dbus_service_property(_interface, signature="s",
1204
access="readwrite")
1205
def Host_dbus_property(self, value=None):
855
# host - property
856
@dbus_service_property(_interface, signature=u"s",
857
access=u"readwrite")
858
def host_dbus_property(self, value=None):
1206
859
if value is None: # get
1207
860
return dbus.String(self.host)
1208
861
self.host = value
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):
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):
1224
882
if value is None: # get
1225
883
return dbus.Boolean(self.enabled)
1226
884
if value:
1228
886
else:
1229
887
self.disable()
1230
888
1231
# LastCheckedOK - property
1232
@dbus_service_property(_interface, signature="s",
1233
access="readwrite")
1234
def LastCheckedOK_dbus_property(self, value=None):
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):
1235
893
if value is not None:
1236
894
self.checked_ok()
1237
895
return
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):
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):
1254
905
if value is None: # get
1255
906
return dbus.UInt64(self.timeout_milliseconds())
1256
907
self.timeout = datetime.timedelta(0, 0, 0, value)
1257
if getattr(self, "disable_initiator_tag", None) is None:
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:
1258
912
return
1259
913
# Reschedule timeout
1260
914
gobject.source_remove(self.disable_initiator_tag)
1261
915
self.disable_initiator_tag = None
1262
self.expires = None
1263
time_to_die = _timedelta_to_milliseconds((self
1264
.last_checked_ok
1265
+ self.timeout)
1266
- datetime.datetime
1267
.utcnow())
916
time_to_die = (self.
917
_timedelta_to_milliseconds((self
918
.last_checked_ok
919
+ self.timeout)
920
- datetime.datetime
921
.utcnow()))
1268
922
if time_to_die <= 0:
1269
923
# The timeout has passed
1270
924
self.disable()
1271
925
else:
1272
self.expires = (datetime.datetime.utcnow()
1273
+ datetime.timedelta(milliseconds =
1274
time_to_die))
1275
926
self.disable_initiator_tag = (gobject.timeout_add
1276
927
(time_to_die, self.disable))
1277
928
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):
929
# interval - property
930
@dbus_service_property(_interface, signature=u"t",
931
access=u"readwrite")
932
def interval_dbus_property(self, value=None):
1290
933
if value is None: # get
1291
934
return dbus.UInt64(self.interval_milliseconds())
1292
935
self.interval = datetime.timedelta(0, 0, 0, value)
1293
if getattr(self, "checker_initiator_tag", None) is None:
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:
1294
940
return
1295
941
# Reschedule checker run
1296
942
gobject.source_remove(self.checker_initiator_tag)
1297
943
self.checker_initiator_tag = (gobject.timeout_add
1298
944
(value, self.start_checker))
1299
945
self.start_checker() # Start one now, too
1300
1301
# Checker - property
1302
@dbus_service_property(_interface, signature="s",
1303
access="readwrite")
1304
def Checker_dbus_property(self, value=None):
946
947
# checker - property
948
@dbus_service_property(_interface, signature=u"s",
949
access=u"readwrite")
950
def checker_dbus_property(self, value=None):
1305
951
if value is None: # get
1306
952
return dbus.String(self.checker_command)
1307
953
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))
1308
958
1309
# CheckerRunning - property
1310
@dbus_service_property(_interface, signature="b",
1311
access="readwrite")
1312
def CheckerRunning_dbus_property(self, value=None):
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):
1313
963
if value is None: # get
1314
964
return dbus.Boolean(self.checker is not None)
1315
965
if value:
1317
967
else:
1318
968
self.stop_checker()
1319
969
1320
# ObjectPath - property
1321
@dbus_service_property(_interface, signature="o", access="read")
1322
def ObjectPath_dbus_property(self):
970
# object_path - property
971
@dbus_service_property(_interface, signature=u"o", access=u"read")
972
def object_path_dbus_property(self):
1323
973
return self.dbus_object_path # is already a dbus.ObjectPath
1324
974
1325
# Secret = property
1326
@dbus_service_property(_interface, signature="ay",
1327
access="write", byte_arrays=True)
1328
def Secret_dbus_property(self, value):
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):
1329
979
self.secret = str(value)
1330
980
1331
981
del _interface
1332
982
1333
983
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
1362
984
class ClientHandler(socketserver.BaseRequestHandler, object):
1363
985
"""A class to handle client connections.
1364
986
1366
988
Note: This will run in its own forked process."""
1367
989
1368
990
def handle(self):
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
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:
1375
996
session = (gnutls.connection
1376
997
.ClientSession(self.request,
1377
998
gnutls.connection
1378
999
.X509Credentials()))
1379
1000
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
1380
1010
# Note: gnutls.connection.X509Credentials is really a
1381
1011
# generic GnuTLS certificate credentials object so long as
1382
1012
# no X.509 keys are added to it. Therefore, we can use it
1383
1013
# here despite using OpenPGP certificates.
1384
1014
1385
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1386
# "+AES-256-CBC", "+SHA1",
1387
# "+COMP-NULL", "+CTYPE-OPENPGP",
1388
# "+DHE-DSS"))
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"))
1389
1019
# Use a fallback default, since this MUST be set.
1390
1020
priority = self.server.gnutls_priority
1391
1021
if priority is None:
1392
priority = "NORMAL"
1022
priority = u"NORMAL"
1393
1023
(gnutls.library.functions
1394
1024
.gnutls_priority_set_direct(session._c_object,
1395
1025
priority, None))
1396
1026
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
1409
1027
try:
1410
1028
session.handshake()
1411
except gnutls.errors.GNUTLSError as error:
1412
logger.warning("Handshake failed: %s", error)
1029
except gnutls.errors.GNUTLSError, error:
1030
logger.warning(u"Handshake failed: %s", error)
1413
1031
# Do not run session.bye() here: the session is not
1414
1032
# established. Just abandon the request.
1415
1033
return
1416
logger.debug("Handshake succeeded")
1417
1418
approval_required = False
1034
logger.debug(u"Handshake succeeded")
1419
1035
try:
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()
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)
1508
1042
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")
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()
1516
1068
1517
1069
@staticmethod
1518
1070
def peer_certificate(session):
1528
1080
.gnutls_certificate_get_peers
1529
1081
(session._c_object, ctypes.byref(list_size)))
1530
1082
if not bool(cert_list) and list_size.value != 0:
1531
raise gnutls.errors.GNUTLSError("error getting peer"
1532
" certificate")
1083
raise gnutls.errors.GNUTLSError(u"error getting peer"
1084
u" certificate")
1533
1085
if list_size.value == 0:
1534
1086
return None
1535
1087
cert = cert_list[0]
1561
1113
if crtverify.value != 0:
1562
1114
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1563
1115
raise (gnutls.errors.CertificateSecurityError
1564
("Verify failed"))
1116
(u"Verify failed"))
1565
1117
# New buffer for the fingerprint
1566
1118
buf = ctypes.create_string_buffer(20)
1567
1119
buf_len = ctypes.c_size_t()
1574
1126
# Convert the buffer to a Python bytestring
1575
1127
fpr = ctypes.string_at(buf, buf_len.value)
1576
1128
# Convert the bytestring to hexadecimal notation
1577
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1129
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1578
1130
return hex_fpr
1579
1131
1580
1132
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 """
1133
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1134
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1601
1135
def process_request(self, request, client_address):
1602
1136
"""Overrides and wraps the original process_request().
1603
1137
1604
1138
This function creates a new pipe in self.pipe
1605
1139
"""
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):
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):
1614
1146
"""Dummy function; override as necessary"""
1615
raise NotImplementedError
1616
1617
1618
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1147
os.close(pipe)
1148
1149
1150
class IPv6_TCPServer(ForkingMixInWithPipe,
1619
1151
socketserver.TCPServer, object):
1620
1152
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1621
1153
1637
1169
bind to an address or port if they were not specified."""
1638
1170
if self.interface is not None:
1639
1171
if SO_BINDTODEVICE is None:
1640
logger.error("SO_BINDTODEVICE does not exist;"
1641
" cannot bind to interface %s",
1172
logger.error(u"SO_BINDTODEVICE does not exist;"
1173
u" cannot bind to interface %s",
1642
1174
self.interface)
1643
1175
else:
1644
1176
try:
1645
1177
self.socket.setsockopt(socket.SOL_SOCKET,
1646
1178
SO_BINDTODEVICE,
1647
1179
str(self.interface
1648
+ '\0'))
1649
except socket.error as error:
1180
+ u'\0'))
1181
except socket.error, error:
1650
1182
if error[0] == errno.EPERM:
1651
logger.error("No permission to"
1652
" bind to interface %s",
1183
logger.error(u"No permission to"
1184
u" bind to interface %s",
1653
1185
self.interface)
1654
1186
elif error[0] == errno.ENOPROTOOPT:
1655
logger.error("SO_BINDTODEVICE not available;"
1656
" cannot bind to interface %s",
1187
logger.error(u"SO_BINDTODEVICE not available;"
1188
u" cannot bind to interface %s",
1657
1189
self.interface)
1658
1190
else:
1659
1191
raise
1661
1193
if self.server_address[0] or self.server_address[1]:
1662
1194
if not self.server_address[0]:
1663
1195
if self.address_family == socket.AF_INET6:
1664
any_address = "::" # in6addr_any
1196
any_address = u"::" # in6addr_any
1665
1197
else:
1666
1198
any_address = socket.INADDR_ANY
1667
1199
self.server_address = (any_address,
1694
1226
self.enabled = False
1695
1227
self.clients = clients
1696
1228
if self.clients is None:
1697
self.clients = {}
1229
self.clients = set()
1698
1230
self.use_dbus = use_dbus
1699
1231
self.gnutls_priority = gnutls_priority
1700
1232
IPv6_TCPServer.__init__(self, server_address,
1704
1236
def server_activate(self):
1705
1237
if self.enabled:
1706
1238
return socketserver.TCPServer.server_activate(self)
1707
1708
1239
def enable(self):
1709
1240
self.enabled = True
1710
1711
def add_pipe(self, parent_pipe, proc):
1241
def add_pipe(self, pipe):
1712
1242
# Call "handle_ipc" for both data and EOF events
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):
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={}):
1722
1246
condition_names = {
1723
gobject.IO_IN: "IN", # There is data to read.
1724
gobject.IO_OUT: "OUT", # Data can be written (without
1247
gobject.IO_IN: u"IN", # There is data to read.
1248
gobject.IO_OUT: u"OUT", # Data can be written (without
1725
1249
# blocking).
1726
gobject.IO_PRI: "PRI", # There is urgent data to read.
1727
gobject.IO_ERR: "ERR", # Error condition.
1728
gobject.IO_HUP: "HUP" # Hung up (the connection has been
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
1729
1253
# broken, usually for pipes and
1730
1254
# sockets).
1731
1255
}
1733
1257
for cond, name in
1734
1258
condition_names.iteritems()
1735
1259
if cond & condition)
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
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
logger.warning(u"Client not found for fingerprint: %s",
1284
args)
1285
if self.use_dbus:
1286
# Emit D-Bus signal
1287
mandos_dbus_service.ClientNotFound(args)
1288
elif cmd == u"INVALID":
1289
for client in self.clients:
1290
if client.name == args:
1291
logger.warning(u"Client %s is invalid", args)
1292
if self.use_dbus:
1293
# Emit D-Bus signal
1294
client.Rejected()
1295
break
1296
else:
1297
logger.error(u"Unknown client %s is invalid", args)
1298
elif cmd == u"SENDING":
1299
for client in self.clients:
1300
if client.name == args:
1301
logger.info(u"Sending secret to %s", client.name)
1302
client.checked_ok()
1303
if self.use_dbus:
1304
# Emit D-Bus signal
1305
client.GotSecret()
1306
break
1307
else:
1308
logger.error(u"Sending secret to unknown client %s",
1309
args)
1310
else:
1311
logger.error(u"Unknown IPC command: %r", cmdline)
1312
1313
# Keep calling this function
1798
1314
return True
1799
1315
1800
1316
1801
1317
def string_to_delta(interval):
1802
1318
"""Parse a string and return a datetime.timedelta
1803
1319
1804
>>> string_to_delta('7d')
1320
>>> string_to_delta(u'7d')
1805
1321
datetime.timedelta(7)
1806
>>> string_to_delta('60s')
1322
>>> string_to_delta(u'60s')
1807
1323
datetime.timedelta(0, 60)
1808
>>> string_to_delta('60m')
1324
>>> string_to_delta(u'60m')
1809
1325
datetime.timedelta(0, 3600)
1810
>>> string_to_delta('24h')
1326
>>> string_to_delta(u'24h')
1811
1327
datetime.timedelta(1)
1812
>>> string_to_delta('1w')
1328
>>> string_to_delta(u'1w')
1813
1329
datetime.timedelta(7)
1814
>>> string_to_delta('5m 30s')
1330
>>> string_to_delta(u'5m 30s')
1815
1331
datetime.timedelta(0, 330)
1816
1332
"""
1817
1333
timevalue = datetime.timedelta(0)
1819
1335
try:
1820
1336
suffix = unicode(s[-1])
1821
1337
value = int(s[:-1])
1822
if suffix == "d":
1338
if suffix == u"d":
1823
1339
delta = datetime.timedelta(value)
1824
elif suffix == "s":
1340
elif suffix == u"s":
1825
1341
delta = datetime.timedelta(0, value)
1826
elif suffix == "m":
1342
elif suffix == u"m":
1827
1343
delta = datetime.timedelta(0, 0, 0, 0, value)
1828
elif suffix == "h":
1344
elif suffix == u"h":
1829
1345
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1830
elif suffix == "w":
1346
elif suffix == u"w":
1831
1347
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1832
1348
else:
1833
raise ValueError("Unknown suffix %r" % suffix)
1834
except (ValueError, IndexError) as e:
1835
raise ValueError(*(e.args))
1349
raise ValueError(u"Unknown suffix %r" % suffix)
1350
except (ValueError, IndexError), e:
1351
raise ValueError(e.message)
1836
1352
timevalue += delta
1837
1353
return timevalue
1838
1354
1844
1360
global if_nametoindex
1845
1361
try:
1846
1362
if_nametoindex = (ctypes.cdll.LoadLibrary
1847
(ctypes.util.find_library("c"))
1363
(ctypes.util.find_library(u"c"))
1848
1364
.if_nametoindex)
1849
1365
except (OSError, AttributeError):
1850
logger.warning("Doing if_nametoindex the hard way")
1366
logger.warning(u"Doing if_nametoindex the hard way")
1851
1367
def if_nametoindex(interface):
1852
1368
"Get an interface index the hard way, i.e. using fcntl()"
1853
1369
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1854
with contextlib.closing(socket.socket()) as s:
1370
with closing(socket.socket()) as s:
1855
1371
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1856
struct.pack(str("16s16x"),
1372
struct.pack(str(u"16s16x"),
1857
1373
interface))
1858
interface_index = struct.unpack(str("I"),
1374
interface_index = struct.unpack(str(u"I"),
1859
1375
ifreq[16:20])[0]
1860
1376
return interface_index
1861
1377
return if_nametoindex(interface)
1869
1385
sys.exit()
1870
1386
os.setsid()
1871
1387
if not nochdir:
1872
os.chdir("/")
1388
os.chdir(u"/")
1873
1389
if os.fork():
1874
1390
sys.exit()
1875
1391
if not noclose:
1877
1393
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1878
1394
if not stat.S_ISCHR(os.fstat(null).st_mode):
1879
1395
raise OSError(errno.ENODEV,
1880
"%s not a character device"
1396
u"%s not a character device"
1881
1397
% os.path.devnull)
1882
1398
os.dup2(null, sys.stdin.fileno())
1883
1399
os.dup2(null, sys.stdout.fileno())
1891
1407
##################################################################
1892
1408
# Parsing of options, both command line and config file
1893
1409
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()
1410
parser = optparse.OptionParser(version = "%%prog %s" % version)
1411
parser.add_option("-i", u"--interface", type=u"string",
1412
metavar="IF", help=u"Bind to interface IF")
1413
parser.add_option("-a", u"--address", type=u"string",
1414
help=u"Address to listen for requests on")
1415
parser.add_option("-p", u"--port", type=u"int",
1416
help=u"Port number to receive requests on")
1417
parser.add_option("--check", action=u"store_true",
1418
help=u"Run self-test")
1419
parser.add_option("--debug", action=u"store_true",
1420
help=u"Debug mode; run in foreground and log to"
1421
u" terminal")
1422
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1423
u" priority string (see GnuTLS documentation)")
1424
parser.add_option("--servicename", type=u"string",
1425
metavar=u"NAME", help=u"Zeroconf service name")
1426
parser.add_option("--configdir", type=u"string",
1427
default=u"/etc/mandos", metavar=u"DIR",
1428
help=u"Directory to search for configuration"
1429
u" files")
1430
parser.add_option("--no-dbus", action=u"store_false",
1431
dest=u"use_dbus", help=u"Do not provide D-Bus"
1432
u" system bus interface")
1433
parser.add_option("--no-ipv6", action=u"store_false",
1434
dest=u"use_ipv6", help=u"Do not use IPv6")
1435
options = parser.parse_args()[0]
1929
1436
1930
1437
if options.check:
1931
1438
import doctest
1933
1440
sys.exit()
1934
1441
1935
1442
# Default values for config file for server-global settings
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": "",
1443
server_defaults = { u"interface": u"",
1444
u"address": u"",
1445
u"port": u"",
1446
u"debug": u"False",
1447
u"priority":
1448
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1449
u"servicename": u"Mandos",
1450
u"use_dbus": u"True",
1451
u"use_ipv6": u"True",
1946
1452
}
1947
1453
1948
1454
# Parse config file for server-global settings
1949
1455
server_config = configparser.SafeConfigParser(server_defaults)
1950
1456
del server_defaults
1951
1457
server_config.read(os.path.join(options.configdir,
1952
"mandos.conf"))
1458
u"mandos.conf"))
1953
1459
# Convert the SafeConfigParser object to a dict
1954
1460
server_settings = server_config.defaults()
1955
1461
# Use the appropriate methods on the non-string config options
1956
for option in ("debug", "use_dbus", "use_ipv6"):
1957
server_settings[option] = server_config.getboolean("DEFAULT",
1462
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1463
server_settings[option] = server_config.getboolean(u"DEFAULT",
1958
1464
option)
1959
1465
if server_settings["port"]:
1960
server_settings["port"] = server_config.getint("DEFAULT",
1961
"port")
1466
server_settings["port"] = server_config.getint(u"DEFAULT",
1467
u"port")
1962
1468
del server_config
1963
1469
1964
1470
# Override the settings from the config file with command line
1965
1471
# options, if set.
1966
for option in ("interface", "address", "port", "debug",
1967
"priority", "servicename", "configdir",
1968
"use_dbus", "use_ipv6", "debuglevel", "restore"):
1472
for option in (u"interface", u"address", u"port", u"debug",
1473
u"priority", u"servicename", u"configdir",
1474
u"use_dbus", u"use_ipv6"):
1969
1475
value = getattr(options, option)
1970
1476
if value is not None:
1971
1477
server_settings[option] = value
1979
1485
##################################################################
1980
1486
1981
1487
# For convenience
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":
1488
debug = server_settings[u"debug"]
1489
use_dbus = server_settings[u"use_dbus"]
1490
use_ipv6 = server_settings[u"use_ipv6"]
1491
1492
if not debug:
1493
syslogger.setLevel(logging.WARNING)
1494
console.setLevel(logging.WARNING)
1495
1496
if server_settings[u"servicename"] != u"Mandos":
1988
1497
syslogger.setFormatter(logging.Formatter
1989
('Mandos (%s) [%%(process)d]:'
1990
' %%(levelname)s: %%(message)s'
1991
% server_settings["servicename"]))
1498
(u'Mandos (%s) [%%(process)d]:'
1499
u' %%(levelname)s: %%(message)s'
1500
% server_settings[u"servicename"]))
1992
1501
1993
1502
# Parse config file with clients
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",
1503
client_defaults = { u"timeout": u"1h",
1504
u"interval": u"5m",
1505
u"checker": u"fping -q -- %%(host)s",
1506
u"host": u"",
2001
1507
}
2002
1508
client_config = configparser.SafeConfigParser(client_defaults)
2003
client_config.read(os.path.join(server_settings["configdir"],
2004
"clients.conf"))
1509
client_config.read(os.path.join(server_settings[u"configdir"],
1510
u"clients.conf"))
2005
1511
2006
1512
global mandos_dbus_service
2007
1513
mandos_dbus_service = None
2008
1514
2009
tcp_server = MandosServer((server_settings["address"],
2010
server_settings["port"]),
1515
tcp_server = MandosServer((server_settings[u"address"],
1516
server_settings[u"port"]),
2011
1517
ClientHandler,
2012
interface=(server_settings["interface"]
2013
or None),
1518
interface=server_settings[u"interface"],
2014
1519
use_ipv6=use_ipv6,
2015
1520
gnutls_priority=
2016
server_settings["priority"],
1521
server_settings[u"priority"],
2017
1522
use_dbus=use_dbus)
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)
1523
pidfilename = u"/var/run/mandos.pid"
1524
try:
1525
pidfile = open(pidfilename, u"w")
1526
except IOError:
1527
logger.error(u"Could not open file %r", pidfilename)
2024
1528
2025
1529
try:
2026
uid = pwd.getpwnam("_mandos").pw_uid
2027
gid = pwd.getpwnam("_mandos").pw_gid
1530
uid = pwd.getpwnam(u"_mandos").pw_uid
1531
gid = pwd.getpwnam(u"_mandos").pw_gid
2028
1532
except KeyError:
2029
1533
try:
2030
uid = pwd.getpwnam("mandos").pw_uid
2031
gid = pwd.getpwnam("mandos").pw_gid
1534
uid = pwd.getpwnam(u"mandos").pw_uid
1535
gid = pwd.getpwnam(u"mandos").pw_gid
2032
1536
except KeyError:
2033
1537
try:
2034
uid = pwd.getpwnam("nobody").pw_uid
2035
gid = pwd.getpwnam("nobody").pw_gid
1538
uid = pwd.getpwnam(u"nobody").pw_uid
1539
gid = pwd.getpwnam(u"nobody").pw_gid
2036
1540
except KeyError:
2037
1541
uid = 65534
2038
1542
gid = 65534
2039
1543
try:
2040
1544
os.setgid(gid)
2041
1545
os.setuid(uid)
2042
except OSError as error:
1546
except OSError, error:
2043
1547
if error[0] != errno.EPERM:
2044
1548
raise error
2045
1549
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
1550
# Enable all possible GnuTLS debugging
2052
1551
if debug:
2053
logger.setLevel(logging.DEBUG)
2054
# Enable all possible GnuTLS debugging
2055
2056
1552
# "Use a log level over 10 to enable all debugging options."
2057
1553
# - GnuTLS manual
2058
1554
gnutls.library.functions.gnutls_global_set_log_level(11)
2059
1555
2060
1556
@gnutls.library.types.gnutls_log_func
2061
1557
def debug_gnutls(level, string):
2062
logger.debug("GnuTLS: %s", string[:-1])
1558
logger.debug(u"GnuTLS: %s", string[:-1])
2063
1559
2064
1560
(gnutls.library.functions
2065
1561
.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()
2080
1562
2081
1563
global main_loop
2082
1564
# From the Avahi example code
2086
1568
# End of Avahi example code
2087
1569
if use_dbus:
2088
1570
try:
2089
bus_name = dbus.service.BusName("se.recompile.Mandos",
1571
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2090
1572
bus, do_not_queue=True)
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")
1573
except dbus.exceptions.NameExistsException, e:
1574
logger.error(unicode(e) + u", disabling D-Bus")
2096
1575
use_dbus = False
2097
server_settings["use_dbus"] = False
1576
server_settings[u"use_dbus"] = False
2098
1577
tcp_server.use_dbus = False
2099
1578
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2100
service = AvahiServiceToSyslog(name =
2101
server_settings["servicename"],
2102
servicetype = "_mandos._tcp",
2103
protocol = protocol, bus = bus)
1579
service = AvahiService(name = server_settings[u"servicename"],
1580
servicetype = u"_mandos._tcp",
1581
protocol = protocol, bus = bus)
2104
1582
if server_settings["interface"]:
2105
1583
service.interface = (if_nametoindex
2106
(str(server_settings["interface"])))
2107
2108
global multiprocessing_manager
2109
multiprocessing_manager = multiprocessing.Manager()
1584
(str(server_settings[u"interface"])))
2110
1585
2111
1586
client_class = Client
2112
1587
if use_dbus:
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
1588
client_class = functools.partial(ClientDBus, bus = bus)
1589
tcp_server.clients.update(set(
1590
client_class(name = section,
1591
config= dict(client_config.items(section)))
1592
for section in client_config.sections()))
2211
1593
if not tcp_server.clients:
2212
logger.warning("No clients defined")
2213
1594
logger.warning(u"No clients defined")
1595
1596
if debug:
1597
# Redirect stdin so all checkers get /dev/null
1598
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1599
os.dup2(null, sys.stdin.fileno())
1600
if null > 2:
1601
os.close(null)
1602
else:
1603
# No console logging
1604
logger.removeHandler(console)
1605
# Close all input and output, do double fork, etc.
1606
daemon()
1607
1608
try:
1609
with closing(pidfile):
1610
pid = os.getpid()
1611
pidfile.write(str(pid) + "\n")
1612
del pidfile
1613
except IOError:
1614
logger.error(u"Could not write to file %r with PID %d",
1615
pidfilename, pid)
1616
except NameError:
1617
# "pidfile" was never created
1618
pass
1619
del pidfilename
1620
2214
1621
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
2228
1622
signal.signal(signal.SIGINT, signal.SIG_IGN)
2229
2230
1623
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2231
1624
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2232
1625
2234
1627
class MandosDBusService(dbus.service.Object):
2235
1628
"""A D-Bus proxy object"""
2236
1629
def __init__(self):
2237
dbus.service.Object.__init__(self, bus, "/")
2238
_interface = "se.recompile.Mandos"
2239
2240
@dbus.service.signal(_interface, signature="o")
2241
def ClientAdded(self, objpath):
2242
"D-Bus signal"
2243
pass
2244
2245
@dbus.service.signal(_interface, signature="ss")
2246
def ClientNotFound(self, fingerprint, address):
2247
"D-Bus signal"
2248
pass
2249
2250
@dbus.service.signal(_interface, signature="os")
1630
dbus.service.Object.__init__(self, bus, u"/")
1631
_interface = u"se.bsnet.fukt.Mandos"
1632
1633
@dbus.service.signal(_interface, signature=u"oa{sv}")
1634
def ClientAdded(self, objpath, properties):
1635
"D-Bus signal"
1636
pass
1637
1638
@dbus.service.signal(_interface, signature=u"s")
1639
def ClientNotFound(self, fingerprint):
1640
"D-Bus signal"
1641
pass
1642
1643
@dbus.service.signal(_interface, signature=u"os")
2251
1644
def ClientRemoved(self, objpath, name):
2252
1645
"D-Bus signal"
2253
1646
pass
2254
1647
2255
@dbus.service.method(_interface, out_signature="ao")
1648
@dbus.service.method(_interface, out_signature=u"ao")
2256
1649
def GetAllClients(self):
2257
1650
"D-Bus method"
2258
1651
return dbus.Array(c.dbus_object_path
2259
for c in
2260
tcp_server.clients.itervalues())
1652
for c in tcp_server.clients)
2261
1653
2262
1654
@dbus.service.method(_interface,
2263
out_signature="a{oa{sv}}")
1655
out_signature=u"a{oa{sv}}")
2264
1656
def GetAllClientsWithProperties(self):
2265
1657
"D-Bus method"
2266
1658
return dbus.Dictionary(
2267
((c.dbus_object_path, c.GetAll(""))
2268
for c in tcp_server.clients.itervalues()),
2269
signature="oa{sv}")
1659
((c.dbus_object_path, c.GetAll(u""))
1660
for c in tcp_server.clients),
1661
signature=u"oa{sv}")
2270
1662
2271
@dbus.service.method(_interface, in_signature="o")
1663
@dbus.service.method(_interface, in_signature=u"o")
2272
1664
def RemoveClient(self, object_path):
2273
1665
"D-Bus method"
2274
for c in tcp_server.clients.itervalues():
1666
for c in tcp_server.clients:
2275
1667
if c.dbus_object_path == object_path:
2276
del tcp_server.clients[c.name]
1668
tcp_server.clients.remove(c)
2277
1669
c.remove_from_connection()
2278
1670
# Don't signal anything except ClientRemoved
2279
1671
c.disable(quiet=True)
2284
1676
2285
1677
del _interface
2286
1678
2287
class MandosDBusServiceTransitional(MandosDBusService):
2288
__metaclass__ = AlternateDBusNamesMetaclass
2289
mandos_dbus_service = MandosDBusServiceTransitional()
1679
mandos_dbus_service = MandosDBusService()
2290
1680
2291
1681
def cleanup():
2292
1682
"Cleanup function; run on exit"
2293
1683
service.cleanup()
2294
1684
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
2330
1685
while tcp_server.clients:
2331
name, client = tcp_server.clients.popitem()
1686
client = tcp_server.clients.pop()
2332
1687
if use_dbus:
2333
1688
client.remove_from_connection()
1689
client.disable_hook = None
2334
1690
# Don't signal anything except ClientRemoved
2335
1691
client.disable(quiet=True)
2336
1692
if use_dbus:
2337
1693
# Emit D-Bus signal
2338
mandos_dbus_service.ClientRemoved(client
2339
.dbus_object_path,
1694
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2340
1695
client.name)
2341
client_settings.clear()
2342
1696
2343
1697
atexit.register(cleanup)
2344
1698
2345
for client in tcp_server.clients.itervalues():
1699
for client in tcp_server.clients:
2346
1700
if use_dbus:
2347
1701
# Emit D-Bus signal
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
1702
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1703
client.GetAll(u""))
1704
client.enable()
2353
1705
2354
1706
tcp_server.enable()
2355
1707
tcp_server.server_activate()
2357
1709
# Find out what port we got
2358
1710
service.port = tcp_server.socket.getsockname()[1]
2359
1711
if use_ipv6:
2360
logger.info("Now listening on address %r, port %d,"
1712
logger.info(u"Now listening on address %r, port %d,"
2361
1713
" flowinfo %d, scope_id %d"
2362
1714
% tcp_server.socket.getsockname())
2363
1715
else: # IPv4
2364
logger.info("Now listening on address %r, port %d"
1716
logger.info(u"Now listening on address %r, port %d"
2365
1717
% tcp_server.socket.getsockname())
2366
1718
2367
1719
#service.interface = tcp_server.socket.getsockname()[3]
2370
1722
# From the Avahi example code
2371
1723
try:
2372
1724
service.activate()
2373
except dbus.exceptions.DBusException as error:
2374
logger.critical("DBusException: %s", error)
1725
except dbus.exceptions.DBusException, error:
1726
logger.critical(u"DBusException: %s", error)
2375
1727
cleanup()
2376
1728
sys.exit(1)
2377
1729
# End of Avahi example code
2381
1733
(tcp_server.handle_request
2382
1734
(*args[2:], **kwargs) or True))
2383
1735
2384
logger.debug("Starting main loop")
1736
logger.debug(u"Starting main loop")
2385
1737
main_loop.run()
2386
except AvahiError as error:
2387
logger.critical("AvahiError: %s", error)
1738
except AvahiError, error:
1739
logger.critical(u"AvahiError: %s", error)
2388
1740
cleanup()
2389
1741
sys.exit(1)
2390
1742
except KeyboardInterrupt:
2391
1743
if debug:
2392
print("", file=sys.stderr)
2393
logger.debug("Server received KeyboardInterrupt")
2394
logger.debug("Server exiting")
1744
print >> sys.stderr
1745
logger.debug(u"Server received KeyboardInterrupt")
1746
logger.debug(u"Server exiting")
2395
1747
# Must run before the D-Bus bus name gets deregistered
2396
1748
cleanup()
2397
1749
2398
2399
1750
if __name__ == '__main__':
2400
1751
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0