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