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