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