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