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