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