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