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