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