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