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