To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 505.1.6
- compare with another revision
- download diff
- download tarball
- view history from revision 505.1.6
- Committer: Teddy Hogeborn
- Date: 2011-10-08 17:15:48 UTC
- mto: (505.2.5 mandos-client-network-hooks)
- mto: This revision was merged to the branch mainline in revision 510.
- Revision ID: teddy@recompile.se-20111008171548-1zucnxecqrk4suff
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance
attributes instead of
class attributes.
attributes instead of
class attributes.
- 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
79
83
SO_BINDTODEVICE = None
80
84
81
85
82
version = "1.0.12"
86
version = "1.3.1"
83
87
84
logger = logging.Logger(u'mandos')
88
#logger = logging.getLogger('mandos')
89
logger = logging.Logger('mandos')
85
90
syslogger = (logging.handlers.SysLogHandler
86
91
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
87
address = "/dev/log"))
92
address = str("/dev/log")))
88
93
syslogger.setFormatter(logging.Formatter
89
(u'Mandos [%(process)d]: %(levelname)s:'
90
u' %(message)s'))
94
('Mandos [%(process)d]: %(levelname)s:'
95
' %(message)s'))
91
96
logger.addHandler(syslogger)
92
97
93
98
console = logging.StreamHandler()
94
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
95
u' %(levelname)s:'
96
u' %(message)s'))
99
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
' %(levelname)s:'
101
' %(message)s'))
97
102
logger.addHandler(console)
98
103
99
104
class AvahiError(Exception):
116
121
Attributes:
117
122
interface: integer; avahi.IF_UNSPEC or an interface index.
118
123
Used to optionally bind to the specified interface.
119
name: string; Example: u'Mandos'
120
type: string; Example: u'_mandos._tcp'.
124
name: string; Example: 'Mandos'
125
type: string; Example: '_mandos._tcp'.
121
126
See <http://www.dns-sd.org/ServiceTypes.html>
122
127
port: integer; what port to announce
123
128
TXT: list of strings; TXT record for the service
132
137
"""
133
138
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
134
139
servicetype = None, port = None, TXT = None,
135
domain = u"", host = u"", max_renames = 32768,
140
domain = "", host = "", max_renames = 32768,
136
141
protocol = avahi.PROTO_UNSPEC, bus = None):
137
142
self.interface = interface
138
143
self.name = name
147
152
self.group = None # our entry group
148
153
self.server = None
149
154
self.bus = bus
155
self.entry_group_state_changed_match = None
150
156
def rename(self):
151
157
"""Derived from the Avahi example code"""
152
158
if self.rename_count >= self.max_renames:
153
logger.critical(u"No suitable Zeroconf service name found"
154
u" after %i retries, exiting.",
159
logger.critical("No suitable Zeroconf service name found"
160
" after %i retries, exiting.",
155
161
self.rename_count)
156
raise AvahiServiceError(u"Too many renames")
157
self.name = self.server.GetAlternativeServiceName(self.name)
158
logger.info(u"Changing Zeroconf service name to %r ...",
159
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)
160
167
syslogger.setFormatter(logging.Formatter
161
(u'Mandos (%s) [%%(process)d]:'
162
u' %%(levelname)s: %%(message)s'
168
('Mandos (%s) [%%(process)d]:'
169
' %%(levelname)s: %%(message)s'
163
170
% self.name))
164
171
self.remove()
165
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)
166
178
self.rename_count += 1
167
179
def remove(self):
168
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
169
184
if self.group is not None:
170
185
self.group.Reset()
171
186
def add(self):
172
187
"""Derived from the Avahi example code"""
188
self.remove()
173
189
if self.group is None:
174
190
self.group = dbus.Interface(
175
191
self.bus.get_object(avahi.DBUS_NAME,
176
192
self.server.EntryGroupNew()),
177
193
avahi.DBUS_INTERFACE_ENTRY_GROUP)
178
self.group.connect_to_signal('StateChanged',
179
self
180
.entry_group_state_changed)
181
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' ...",
182
198
self.name, self.type)
183
199
self.group.AddService(
184
200
self.interface,
191
207
self.group.Commit()
192
208
def entry_group_state_changed(self, state, error):
193
209
"""Derived from the Avahi example code"""
194
logger.debug(u"Avahi state change: %i", state)
210
logger.debug("Avahi entry group state change: %i", state)
195
211
196
212
if state == avahi.ENTRY_GROUP_ESTABLISHED:
197
logger.debug(u"Zeroconf service established.")
213
logger.debug("Zeroconf service established.")
198
214
elif state == avahi.ENTRY_GROUP_COLLISION:
199
logger.warning(u"Zeroconf service name collision.")
215
logger.info("Zeroconf service name collision.")
200
216
self.rename()
201
217
elif state == avahi.ENTRY_GROUP_FAILURE:
202
logger.critical(u"Avahi: Error in group state changed %s",
218
logger.critical("Avahi: Error in group state changed %s",
203
219
unicode(error))
204
raise AvahiGroupError(u"State changed: %s"
220
raise AvahiGroupError("State changed: %s"
205
221
% unicode(error))
206
222
def cleanup(self):
207
223
"""Derived from the Avahi example code"""
208
224
if self.group is not None:
209
self.group.Free()
225
try:
226
self.group.Free()
227
except (dbus.exceptions.UnknownMethodException,
228
dbus.exceptions.DBusException) as e:
229
pass
210
230
self.group = None
211
def server_state_changed(self, state):
231
self.remove()
232
def server_state_changed(self, state, error=None):
212
233
"""Derived from the Avahi example code"""
213
if state == avahi.SERVER_COLLISION:
214
logger.error(u"Zeroconf server name collision")
215
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()
216
249
elif state == avahi.SERVER_RUNNING:
217
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)
218
256
def activate(self):
219
257
"""Derived from the Avahi example code"""
220
258
if self.server is None:
221
259
self.server = dbus.Interface(
222
260
self.bus.get_object(avahi.DBUS_NAME,
223
avahi.DBUS_PATH_SERVER),
261
avahi.DBUS_PATH_SERVER,
262
follow_name_owner_changes=True),
224
263
avahi.DBUS_INTERFACE_SERVER)
225
self.server.connect_to_signal(u"StateChanged",
264
self.server.connect_to_signal("StateChanged",
226
265
self.server_state_changed)
227
266
self.server_state_changed(self.server.GetState())
228
267
229
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
230
275
class Client(object):
231
276
"""A representation of a client host served by this server.
232
277
233
278
Attributes:
234
name: string; from the config file, used in log messages and
235
D-Bus identifiers
236
fingerprint: string (40 or 32 hexadecimal digits); used to
237
uniquely identify the client
238
secret: bytestring; sent verbatim (over TLS) to client
239
host: string; available for use by the checker command
240
created: datetime.datetime(); (UTC) object creation
241
last_enabled: datetime.datetime(); (UTC)
242
enabled: bool()
243
last_checked_ok: datetime.datetime(); (UTC) or None
244
timeout: datetime.timedelta(); How long from last_checked_ok
245
until this client is invalid
246
interval: datetime.timedelta(); How often to start a new checker
247
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
248
282
checker: subprocess.Popen(); a running checker process used
249
283
to see if the client lives.
250
284
'None' if no process is running.
251
checker_initiator_tag: a gobject event source tag, or None
252
disable_initiator_tag: - '' -
253
checker_callback_tag: - '' -
254
checker_command: string; External command which is run to check if
255
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
256
288
runtime with vars(self) as dict, so that for
257
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
258
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
259
312
"""
260
313
261
@staticmethod
262
def _timedelta_to_milliseconds(td):
263
"Convert a datetime.timedelta() to milliseconds"
264
return ((td.days * 24 * 60 * 60 * 1000)
265
+ (td.seconds * 1000)
266
+ (td.microseconds // 1000))
314
runtime_expansions = ("approval_delay", "approval_duration",
315
"created", "enabled", "fingerprint",
316
"host", "interval", "last_checked_ok",
317
"last_enabled", "name", "timeout")
267
318
268
319
def timeout_milliseconds(self):
269
320
"Return the 'timeout' attribute in milliseconds"
270
return self._timedelta_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)
271
326
272
327
def interval_milliseconds(self):
273
328
"Return the 'interval' attribute in milliseconds"
274
return self._timedelta_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)
275
333
276
334
def __init__(self, name = None, disable_hook=None, config=None):
277
335
"""Note: the 'checker' key in 'config' sets the
280
338
self.name = name
281
339
if config is None:
282
340
config = {}
283
logger.debug(u"Creating client %r", self.name)
341
logger.debug("Creating client %r", self.name)
284
342
# Uppercase and remove spaces from fingerprint for later
285
343
# comparison purposes with return value from the fingerprint()
286
344
# function
287
self.fingerprint = (config[u"fingerprint"].upper()
288
.replace(u" ", u""))
289
logger.debug(u" Fingerprint: %s", self.fingerprint)
290
if u"secret" in config:
291
self.secret = config[u"secret"].decode(u"base64")
292
elif u"secfile" in config:
293
with closing(open(os.path.expanduser
294
(os.path.expandvars
295
(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:
296
354
self.secret = secfile.read()
297
355
else:
298
raise TypeError(u"No secret or secfile for client %s"
356
raise TypeError("No secret or secfile for client %s"
299
357
% self.name)
300
self.host = config.get(u"host", u"")
358
self.host = config.get("host", "")
301
359
self.created = datetime.datetime.utcnow()
302
360
self.enabled = False
361
self.last_approval_request = None
303
362
self.last_enabled = None
304
363
self.last_checked_ok = None
305
self.timeout = string_to_delta(config[u"timeout"])
306
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"])
307
368
self.disable_hook = disable_hook
308
369
self.checker = None
309
370
self.checker_initiator_tag = None
310
371
self.disable_initiator_tag = None
372
self.expires = None
311
373
self.checker_callback_tag = None
312
self.checker_command = config[u"checker"]
374
self.checker_command = config["checker"]
313
375
self.current_checker_command = None
314
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()
315
393
316
394
def enable(self):
317
395
"""Start this client's checker and timeout hooks"""
318
if getattr(self, u"enabled", False):
396
if getattr(self, "enabled", False):
319
397
# Already enabled
320
398
return
321
self.last_enabled = datetime.datetime.utcnow()
399
self.send_changedstate()
322
400
# Schedule a new checker to be started an 'interval' from now,
323
401
# and every interval from then on.
324
402
self.checker_initiator_tag = (gobject.timeout_add
325
403
(self.interval_milliseconds(),
326
404
self.start_checker))
327
# Also start a new checker *right now*.
328
self.start_checker()
329
405
# Schedule a disable() when 'timeout' has passed
406
self.expires = datetime.datetime.utcnow() + self.timeout
330
407
self.disable_initiator_tag = (gobject.timeout_add
331
408
(self.timeout_milliseconds(),
332
409
self.disable))
333
410
self.enabled = True
411
self.last_enabled = datetime.datetime.utcnow()
412
# Also start a new checker *right now*.
413
self.start_checker()
334
414
335
def disable(self):
415
def disable(self, quiet=True):
336
416
"""Disable this client."""
337
417
if not getattr(self, "enabled", False):
338
418
return False
339
logger.info(u"Disabling client %s", self.name)
340
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):
341
424
gobject.source_remove(self.disable_initiator_tag)
342
425
self.disable_initiator_tag = None
343
if getattr(self, u"checker_initiator_tag", False):
426
self.expires = None
427
if getattr(self, "checker_initiator_tag", False):
344
428
gobject.source_remove(self.checker_initiator_tag)
345
429
self.checker_initiator_tag = None
346
430
self.stop_checker()
361
445
if os.WIFEXITED(condition):
362
446
exitstatus = os.WEXITSTATUS(condition)
363
447
if exitstatus == 0:
364
logger.info(u"Checker for %(name)s succeeded",
448
logger.info("Checker for %(name)s succeeded",
365
449
vars(self))
366
450
self.checked_ok()
367
451
else:
368
logger.info(u"Checker for %(name)s failed",
452
logger.info("Checker for %(name)s failed",
369
453
vars(self))
370
454
else:
371
logger.warning(u"Checker for %(name)s crashed?",
455
logger.warning("Checker for %(name)s crashed?",
372
456
vars(self))
373
457
374
def checked_ok(self):
458
def checked_ok(self, timeout=None):
375
459
"""Bump up the timeout for this client.
376
460
377
461
This should only be called when the client has been seen,
378
462
alive and well.
379
463
"""
464
if timeout is None:
465
timeout = self.timeout
380
466
self.last_checked_ok = datetime.datetime.utcnow()
381
467
gobject.source_remove(self.disable_initiator_tag)
468
self.expires = datetime.datetime.utcnow() + timeout
382
469
self.disable_initiator_tag = (gobject.timeout_add
383
(self.timeout_milliseconds(),
384
self.disable))
470
(_timedelta_to_milliseconds
471
(timeout), self.disable))
472
473
def need_approval(self):
474
self.last_approval_request = datetime.datetime.utcnow()
385
475
386
476
def start_checker(self):
387
477
"""Start a new checker subprocess if one is not running.
394
484
# client would inevitably timeout, since no checker would get
395
485
# a chance to run to completion. If we instead leave running
396
486
# checkers alone, the checker would have to take more time
397
# than 'timeout' for the client to be declared invalid, which
398
# is as it should be.
487
# than 'timeout' for the client to be disabled, which is as it
488
# should be.
399
489
400
490
# If a checker exists, make sure it is not a zombie
401
if self.checker is not None:
491
try:
402
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:
403
498
if pid:
404
logger.warning(u"Checker was a zombie")
499
logger.warning("Checker was a zombie")
405
500
gobject.source_remove(self.checker_callback_tag)
406
501
self.checker_callback(pid, status,
407
502
self.current_checker_command)
412
507
command = self.checker_command % self.host
413
508
except TypeError:
414
509
# Escape attributes for the shell
415
escaped_attrs = dict((key,
416
re.escape(unicode(str(val),
417
errors=
418
u'replace')))
419
for key, val in
420
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
421
518
try:
422
519
command = self.checker_command % escaped_attrs
423
except TypeError, error:
424
logger.error(u'Could not format string "%s":'
425
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)
426
523
return True # Try again later
427
524
self.current_checker_command = command
428
525
try:
429
logger.info(u"Starting checker %r for %s",
526
logger.info("Starting checker %r for %s",
430
527
command, self.name)
431
528
# We don't need to redirect stdout and stderr, since
432
529
# in normal mode, that is already done by daemon(),
434
531
# always replaced by /dev/null.)
435
532
self.checker = subprocess.Popen(command,
436
533
close_fds=True,
437
shell=True, cwd=u"/")
534
shell=True, cwd="/")
438
535
self.checker_callback_tag = (gobject.child_watch_add
439
536
(self.checker.pid,
440
537
self.checker_callback,
445
542
if pid:
446
543
gobject.source_remove(self.checker_callback_tag)
447
544
self.checker_callback(pid, status, command)
448
except OSError, error:
449
logger.error(u"Failed to start subprocess: %s",
545
except OSError as error:
546
logger.error("Failed to start subprocess: %s",
450
547
error)
451
548
# Re-run this periodically if run by gobject.timeout_add
452
549
return True
456
553
if self.checker_callback_tag:
457
554
gobject.source_remove(self.checker_callback_tag)
458
555
self.checker_callback_tag = None
459
if getattr(self, u"checker", None) is None:
556
if getattr(self, "checker", None) is None:
460
557
return
461
logger.debug(u"Stopping checker for %(name)s", vars(self))
558
logger.debug("Stopping checker for %(name)s", vars(self))
462
559
try:
463
560
os.kill(self.checker.pid, signal.SIGTERM)
464
#os.sleep(0.5)
561
#time.sleep(0.5)
465
562
#if self.checker.poll() is None:
466
563
# os.kill(self.checker.pid, signal.SIGKILL)
467
except OSError, error:
564
except OSError as error:
468
565
if error.errno != errno.ESRCH: # No such process
469
566
raise
470
567
self.checker = None
471
472
def still_valid(self):
473
"""Has the timeout not yet passed for this client?"""
474
if not getattr(self, u"enabled", False):
475
return False
476
now = datetime.datetime.utcnow()
477
if self.last_checked_ok is None:
478
return now < (self.created + self.timeout)
479
else:
480
return now < (self.last_checked_ok + self.timeout)
481
482
483
def dbus_service_property(dbus_interface, signature=u"v",
484
access=u"readwrite", byte_arrays=False):
568
569
570
def dbus_service_property(dbus_interface, signature="v",
571
access="readwrite", byte_arrays=False):
485
572
"""Decorators for marking methods of a DBusObjectWithProperties to
486
573
become properties on the D-Bus.
487
574
492
579
dbus.service.method, except there is only "signature", since the
493
580
type from Get() and the type sent to Set() is the same.
494
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)
495
587
def decorator(func):
496
588
func._dbus_is_property = True
497
589
func._dbus_interface = dbus_interface
498
590
func._dbus_signature = signature
499
591
func._dbus_access = access
500
592
func._dbus_name = func.__name__
501
if func._dbus_name.endswith(u"_dbus_property"):
593
if func._dbus_name.endswith("_dbus_property"):
502
594
func._dbus_name = func._dbus_name[:-14]
503
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
595
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
504
596
return func
505
597
return decorator
506
598
526
618
527
619
class DBusObjectWithProperties(dbus.service.Object):
528
620
"""A D-Bus object with properties.
529
621
530
622
Classes inheriting from this can use the dbus_service_property
531
623
decorator to expose methods as D-Bus properties. It exposes the
532
624
standard Get(), Set(), and GetAll() methods on the D-Bus.
534
626
535
627
@staticmethod
536
628
def _is_dbus_property(obj):
537
return getattr(obj, u"_dbus_is_property", False)
629
return getattr(obj, "_dbus_is_property", False)
538
630
539
631
def _get_all_dbus_properties(self):
540
632
"""Returns a generator of (name, attribute) pairs
541
633
"""
542
return ((prop._dbus_name, prop)
634
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
635
for cls in self.__class__.__mro__
543
636
for name, prop in
544
inspect.getmembers(self, self._is_dbus_property))
637
inspect.getmembers(cls, self._is_dbus_property))
545
638
546
639
def _get_dbus_property(self, interface_name, property_name):
547
640
"""Returns a bound method if one exists which is a D-Bus
548
641
property with the specified name and interface.
549
642
"""
550
for name in (property_name,
551
property_name + u"_dbus_property"):
552
prop = getattr(self, name, None)
553
if (prop is None
554
or not self._is_dbus_property(prop)
555
or prop._dbus_name != property_name
556
or (interface_name and prop._dbus_interface
557
and interface_name != prop._dbus_interface)):
558
continue
559
return prop
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
560
650
# No such property
561
raise DBusPropertyNotFound(self.dbus_object_path + u":"
562
+ interface_name + u"."
651
raise DBusPropertyNotFound(self.dbus_object_path + ":"
652
+ interface_name + "."
563
653
+ property_name)
564
654
565
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
566
out_signature=u"v")
655
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
656
out_signature="v")
567
657
def Get(self, interface_name, property_name):
568
658
"""Standard D-Bus property Get() method, see D-Bus standard.
569
659
"""
570
660
prop = self._get_dbus_property(interface_name, property_name)
571
if prop._dbus_access == u"write":
661
if prop._dbus_access == "write":
572
662
raise DBusPropertyAccessException(property_name)
573
663
value = prop()
574
if not hasattr(value, u"variant_level"):
664
if not hasattr(value, "variant_level"):
575
665
return value
576
666
return type(value)(value, variant_level=value.variant_level+1)
577
667
578
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
668
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
579
669
def Set(self, interface_name, property_name, value):
580
670
"""Standard D-Bus property Set() method, see D-Bus standard.
581
671
"""
582
672
prop = self._get_dbus_property(interface_name, property_name)
583
if prop._dbus_access == u"read":
673
if prop._dbus_access == "read":
584
674
raise DBusPropertyAccessException(property_name)
585
if prop._dbus_get_args_options[u"byte_arrays"]:
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
586
680
value = dbus.ByteArray(''.join(unichr(byte)
587
681
for byte in value))
588
682
prop(value)
589
683
590
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
591
out_signature=u"a{sv}")
684
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
685
out_signature="a{sv}")
592
686
def GetAll(self, interface_name):
593
687
"""Standard D-Bus property GetAll() method, see D-Bus
594
688
standard.
595
689
596
690
Note: Will not include properties with access="write".
597
691
"""
598
692
all = {}
602
696
# Interface non-empty but did not match
603
697
continue
604
698
# Ignore write-only properties
605
if prop._dbus_access == u"write":
699
if prop._dbus_access == "write":
606
700
continue
607
701
value = prop()
608
if not hasattr(value, u"variant_level"):
702
if not hasattr(value, "variant_level"):
609
703
all[name] = value
610
704
continue
611
705
all[name] = type(value)(value, variant_level=
612
706
value.variant_level+1)
613
return dbus.Dictionary(all, signature=u"sv")
707
return dbus.Dictionary(all, signature="sv")
614
708
615
709
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
616
out_signature=u"s",
710
out_signature="s",
617
711
path_keyword='object_path',
618
712
connection_keyword='connection')
619
713
def Introspect(self, object_path, connection):
620
714
"""Standard D-Bus method, overloaded to insert property tags.
621
715
"""
622
716
xmlstring = dbus.service.Object.Introspect(self, object_path,
623
connection)
624
document = xml.dom.minidom.parseString(xmlstring)
625
del xmlstring
626
def make_tag(document, name, prop):
627
e = document.createElement(u"property")
628
e.setAttribute(u"name", name)
629
e.setAttribute(u"type", prop._dbus_signature)
630
e.setAttribute(u"access", prop._dbus_access)
631
return e
632
for if_tag in document.getElementsByTagName(u"interface"):
633
for tag in (make_tag(document, name, prop)
634
for name, prop
635
in self._get_all_dbus_properties()
636
if prop._dbus_interface
637
== if_tag.getAttribute(u"name")):
638
if_tag.appendChild(tag)
639
xmlstring = document.toxml(u"utf-8")
640
document.unlink()
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)
641
754
return xmlstring
642
755
643
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
644
861
class ClientDBus(Client, DBusObjectWithProperties):
645
862
"""A Client class using D-Bus
646
863
648
865
dbus_object_path: dbus.ObjectPath
649
866
bus: dbus.SystemBus()
650
867
"""
868
869
runtime_expansions = (Client.runtime_expansions
870
+ ("dbus_object_path",))
871
651
872
# dbus.service.Object doesn't use super(), so we can't either.
652
873
653
874
def __init__(self, bus = None, *args, **kwargs):
875
self._approvals_pending = 0
654
876
self.bus = bus
655
877
Client.__init__(self, *args, **kwargs)
656
878
# Only now, when this client is initialized, can it show up on
657
879
# the D-Bus
880
client_object_name = unicode(self.name).translate(
881
{ord("."): ord("_"),
882
ord("-"): ord("_")})
658
883
self.dbus_object_path = (dbus.ObjectPath
659
(u"/clients/"
660
+ self.name.replace(u".", u"_")))
884
("/clients/" + client_object_name))
661
885
DBusObjectWithProperties.__init__(self, self.bus,
662
886
self.dbus_object_path)
663
664
@staticmethod
665
def _datetime_to_dbus(dt, variant_level=0):
666
"""Convert a UTC datetime.datetime() to a D-Bus type."""
667
return dbus.String(dt.isoformat(),
668
variant_level=variant_level)
669
670
def enable(self):
671
oldstate = getattr(self, u"enabled", False)
672
r = Client.enable(self)
673
if oldstate != self.enabled:
674
# Emit D-Bus signals
675
self.PropertyChanged(dbus.String(u"enabled"),
676
dbus.Boolean(True, variant_level=1))
677
self.PropertyChanged(
678
dbus.String(u"last_enabled"),
679
self._datetime_to_dbus(self.last_enabled,
680
variant_level=1))
681
return r
682
683
def disable(self, signal = True):
684
oldstate = getattr(self, u"enabled", False)
685
r = Client.disable(self)
686
if signal and oldstate != self.enabled:
687
# Emit D-Bus signal
688
self.PropertyChanged(dbus.String(u"enabled"),
689
dbus.Boolean(False, variant_level=1))
690
return r
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
attrname = "_{0}".format(dbus_name)
902
def setter(self, value):
903
if hasattr(self, "dbus_object_path"):
904
if (not hasattr(self, attrname) or
905
type_func(getattr(self, attrname, None))
906
!= type_func(value)):
907
dbus_value = transform_func(type_func(value),
908
variant_level)
909
self.PropertyChanged(dbus.String(dbus_name),
910
dbus_value)
911
setattr(self, attrname, value)
912
913
return property(lambda self: getattr(self, attrname), 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
691
953
692
954
def __del__(self, *args, **kwargs):
693
955
try:
694
956
self.remove_from_connection()
695
957
except LookupError:
696
958
pass
697
if hasattr(DBusObjectWithProperties, u"__del__"):
959
if hasattr(DBusObjectWithProperties, "__del__"):
698
960
DBusObjectWithProperties.__del__(self, *args, **kwargs)
699
961
Client.__del__(self, *args, **kwargs)
700
962
702
964
*args, **kwargs):
703
965
self.checker_callback_tag = None
704
966
self.checker = None
705
# Emit D-Bus signal
706
self.PropertyChanged(dbus.String(u"checker_running"),
707
dbus.Boolean(False, variant_level=1))
708
967
if os.WIFEXITED(condition):
709
968
exitstatus = os.WEXITSTATUS(condition)
710
969
# Emit D-Bus signal
720
979
return Client.checker_callback(self, pid, condition, command,
721
980
*args, **kwargs)
722
981
723
def checked_ok(self, *args, **kwargs):
724
r = Client.checked_ok(self, *args, **kwargs)
725
# Emit D-Bus signal
726
self.PropertyChanged(
727
dbus.String(u"last_checked_ok"),
728
(self._datetime_to_dbus(self.last_checked_ok,
729
variant_level=1)))
730
return r
731
732
982
def start_checker(self, *args, **kwargs):
733
983
old_checker = self.checker
734
984
if self.checker is not None:
741
991
and old_checker_pid != self.checker.pid):
742
992
# Emit D-Bus signal
743
993
self.CheckerStarted(self.current_checker_command)
744
self.PropertyChanged(
745
dbus.String(u"checker_running"),
746
dbus.Boolean(True, variant_level=1))
747
return r
748
749
def stop_checker(self, *args, **kwargs):
750
old_checker = getattr(self, u"checker", None)
751
r = Client.stop_checker(self, *args, **kwargs)
752
if (old_checker is not None
753
and getattr(self, u"checker", None) is None):
754
self.PropertyChanged(dbus.String(u"checker_running"),
755
dbus.Boolean(False, variant_level=1))
756
return r
757
758
## D-Bus methods & signals
759
_interface = u"se.bsnet.fukt.Mandos.Client"
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
760
1012
761
1013
# CheckerCompleted - signal
762
@dbus.service.signal(_interface, signature=u"nxs")
1014
@dbus.service.signal(_interface, signature="nxs")
763
1015
def CheckerCompleted(self, exitcode, waitstatus, command):
764
1016
"D-Bus signal"
765
1017
pass
766
1018
767
1019
# CheckerStarted - signal
768
@dbus.service.signal(_interface, signature=u"s")
1020
@dbus.service.signal(_interface, signature="s")
769
1021
def CheckerStarted(self, command):
770
1022
"D-Bus signal"
771
1023
pass
772
1024
773
1025
# PropertyChanged - signal
774
@dbus.service.signal(_interface, signature=u"sv")
1026
@dbus.service.signal(_interface, signature="sv")
775
1027
def PropertyChanged(self, property, value):
776
1028
"D-Bus signal"
777
1029
pass
778
1030
779
# ReceivedSecret - signal
1031
# GotSecret - signal
780
1032
@dbus.service.signal(_interface)
781
def ReceivedSecret(self):
782
"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
"""
783
1038
pass
784
1039
785
1040
# Rejected - signal
786
@dbus.service.signal(_interface)
787
def Rejected(self):
1041
@dbus.service.signal(_interface, signature="s")
1042
def Rejected(self, reason):
788
1043
"D-Bus signal"
789
1044
pass
790
1045
791
# name - property
792
@dbus_service_property(_interface, signature=u"s", access=u"read")
793
def name_dbus_property(self):
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()
1063
1064
# Enable - method
1065
@dbus.service.method(_interface)
1066
def Enable(self):
1067
"D-Bus method"
1068
self.enable()
1069
1070
# StartChecker - method
1071
@dbus.service.method(_interface)
1072
def StartChecker(self):
1073
"D-Bus method"
1074
self.start_checker()
1075
1076
# Disable - method
1077
@dbus.service.method(_interface)
1078
def Disable(self):
1079
"D-Bus method"
1080
self.disable()
1081
1082
# StopChecker - method
1083
@dbus.service.method(_interface)
1084
def StopChecker(self):
1085
self.stop_checker()
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):
794
1122
return dbus.String(self.name)
795
1123
796
# fingerprint - property
797
@dbus_service_property(_interface, signature=u"s", access=u"read")
798
def fingerprint_dbus_property(self):
1124
# Fingerprint - property
1125
@dbus_service_property(_interface, signature="s", access="read")
1126
def Fingerprint_dbus_property(self):
799
1127
return dbus.String(self.fingerprint)
800
1128
801
# host - property
802
@dbus_service_property(_interface, signature=u"s",
803
access=u"readwrite")
804
def host_dbus_property(self, value=None):
1129
# Host - property
1130
@dbus_service_property(_interface, signature="s",
1131
access="readwrite")
1132
def Host_dbus_property(self, value=None):
805
1133
if value is None: # get
806
1134
return dbus.String(self.host)
807
1135
self.host = value
808
# Emit D-Bus signal
809
self.PropertyChanged(dbus.String(u"host"),
810
dbus.String(value, variant_level=1))
811
812
# created - property
813
@dbus_service_property(_interface, signature=u"s", access=u"read")
814
def created_dbus_property(self):
815
return dbus.String(self._datetime_to_dbus(self.created))
816
817
# last_enabled - property
818
@dbus_service_property(_interface, signature=u"s", access=u"read")
819
def last_enabled_dbus_property(self):
820
if self.last_enabled is None:
821
return dbus.String(u"")
822
return dbus.String(self._datetime_to_dbus(self.last_enabled))
823
824
# enabled - property
825
@dbus_service_property(_interface, signature=u"b",
826
access=u"readwrite")
827
def enabled_dbus_property(self, value=None):
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):
828
1151
if value is None: # get
829
1152
return dbus.Boolean(self.enabled)
830
1153
if value:
832
1155
else:
833
1156
self.disable()
834
1157
835
# last_checked_ok - property
836
@dbus_service_property(_interface, signature=u"s", access=u"read")
837
def last_checked_ok_dbus_property(self):
838
if self.last_checked_ok is None:
839
return dbus.String(u"")
840
return dbus.String(self._datetime_to_dbus(self
841
.last_checked_ok))
842
843
# timeout - property
844
@dbus_service_property(_interface, signature=u"t",
845
access=u"readwrite")
846
def timeout_dbus_property(self, value=None):
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):
847
1181
if value is None: # get
848
1182
return dbus.UInt64(self.timeout_milliseconds())
849
1183
self.timeout = datetime.timedelta(0, 0, 0, value)
850
# Emit D-Bus signal
851
self.PropertyChanged(dbus.String(u"timeout"),
852
dbus.UInt64(value, variant_level=1))
853
if getattr(self, u"disable_initiator_tag", None) is None:
1184
if getattr(self, "disable_initiator_tag", None) is None:
854
1185
return
855
1186
# Reschedule timeout
856
1187
gobject.source_remove(self.disable_initiator_tag)
857
1188
self.disable_initiator_tag = None
1189
self.expires = None
858
1190
time_to_die = (self.
859
1191
_timedelta_to_milliseconds((self
860
1192
.last_checked_ok
865
1197
# The timeout has passed
866
1198
self.disable()
867
1199
else:
1200
self.expires = (datetime.datetime.utcnow()
1201
+ datetime.timedelta(milliseconds =
1202
time_to_die))
868
1203
self.disable_initiator_tag = (gobject.timeout_add
869
1204
(time_to_die, self.disable))
870
1205
871
# interval - property
872
@dbus_service_property(_interface, signature=u"t",
873
access=u"readwrite")
874
def interval_dbus_property(self, value=None):
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):
875
1218
if value is None: # get
876
1219
return dbus.UInt64(self.interval_milliseconds())
877
1220
self.interval = datetime.timedelta(0, 0, 0, value)
878
# Emit D-Bus signal
879
self.PropertyChanged(dbus.String(u"interval"),
880
dbus.UInt64(value, variant_level=1))
881
if getattr(self, u"checker_initiator_tag", None) is None:
1221
if getattr(self, "checker_initiator_tag", None) is None:
882
1222
return
883
1223
# Reschedule checker run
884
1224
gobject.source_remove(self.checker_initiator_tag)
885
1225
self.checker_initiator_tag = (gobject.timeout_add
886
1226
(value, self.start_checker))
887
1227
self.start_checker() # Start one now, too
888
889
# checker - property
890
@dbus_service_property(_interface, signature=u"s",
891
access=u"readwrite")
892
def checker_dbus_property(self, value=None):
1228
1229
# Checker - property
1230
@dbus_service_property(_interface, signature="s",
1231
access="readwrite")
1232
def Checker_dbus_property(self, value=None):
893
1233
if value is None: # get
894
1234
return dbus.String(self.checker_command)
895
1235
self.checker_command = value
896
# Emit D-Bus signal
897
self.PropertyChanged(dbus.String(u"checker"),
898
dbus.String(self.checker_command,
899
variant_level=1))
900
1236
901
# checker_running - property
902
@dbus_service_property(_interface, signature=u"b",
903
access=u"readwrite")
904
def checker_running_dbus_property(self, value=None):
1237
# CheckerRunning - property
1238
@dbus_service_property(_interface, signature="b",
1239
access="readwrite")
1240
def CheckerRunning_dbus_property(self, value=None):
905
1241
if value is None: # get
906
1242
return dbus.Boolean(self.checker is not None)
907
1243
if value:
909
1245
else:
910
1246
self.stop_checker()
911
1247
912
# object_path - property
913
@dbus_service_property(_interface, signature=u"o", access=u"read")
914
def object_path_dbus_property(self):
1248
# ObjectPath - property
1249
@dbus_service_property(_interface, signature="o", access="read")
1250
def ObjectPath_dbus_property(self):
915
1251
return self.dbus_object_path # is already a dbus.ObjectPath
916
1252
917
# secret = property xxx
918
@dbus_service_property(_interface, signature=u"ay",
919
access=u"write", byte_arrays=True)
920
def secret_dbus_property(self, value):
1253
# Secret = property
1254
@dbus_service_property(_interface, signature="ay",
1255
access="write", byte_arrays=True)
1256
def Secret_dbus_property(self, value):
921
1257
self.secret = str(value)
922
1258
923
1259
del _interface
924
1260
925
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
926
1290
class ClientHandler(socketserver.BaseRequestHandler, object):
927
1291
"""A class to handle client connections.
928
1292
930
1294
Note: This will run in its own forked process."""
931
1295
932
1296
def handle(self):
933
logger.info(u"TCP connection from: %s",
934
unicode(self.client_address))
935
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
936
# Open IPC pipe to parent process
937
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
938
1303
session = (gnutls.connection
939
1304
.ClientSession(self.request,
940
1305
gnutls.connection
941
1306
.X509Credentials()))
942
1307
943
line = self.request.makefile().readline()
944
logger.debug(u"Protocol version: %r", line)
945
try:
946
if int(line.strip().split()[0]) > 1:
947
raise RuntimeError
948
except (ValueError, IndexError, RuntimeError), error:
949
logger.error(u"Unknown protocol version: %s", error)
950
return
951
952
1308
# Note: gnutls.connection.X509Credentials is really a
953
1309
# generic GnuTLS certificate credentials object so long as
954
1310
# no X.509 keys are added to it. Therefore, we can use it
955
1311
# here despite using OpenPGP certificates.
956
1312
957
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
958
# u"+AES-256-CBC", u"+SHA1",
959
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
960
# u"+DHE-DSS"))
1313
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1314
# "+AES-256-CBC", "+SHA1",
1315
# "+COMP-NULL", "+CTYPE-OPENPGP",
1316
# "+DHE-DSS"))
961
1317
# Use a fallback default, since this MUST be set.
962
1318
priority = self.server.gnutls_priority
963
1319
if priority is None:
964
priority = u"NORMAL"
1320
priority = "NORMAL"
965
1321
(gnutls.library.functions
966
1322
.gnutls_priority_set_direct(session._c_object,
967
1323
priority, None))
968
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
969
1337
try:
970
1338
session.handshake()
971
except gnutls.errors.GNUTLSError, error:
972
logger.warning(u"Handshake failed: %s", error)
1339
except gnutls.errors.GNUTLSError as error:
1340
logger.warning("Handshake failed: %s", error)
973
1341
# Do not run session.bye() here: the session is not
974
1342
# established. Just abandon the request.
975
1343
return
976
logger.debug(u"Handshake succeeded")
1344
logger.debug("Handshake succeeded")
1345
1346
approval_required = False
977
1347
try:
978
fpr = self.fingerprint(self.peer_certificate(session))
979
except (TypeError, gnutls.errors.GNUTLSError), error:
980
logger.warning(u"Bad certificate: %s", error)
981
session.bye()
982
return
983
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()
984
1438
985
for c in self.server.clients:
986
if c.fingerprint == fpr:
987
client = c
988
break
989
else:
990
ipc.write(u"NOTFOUND %s %s\n"
991
% (fpr, unicode(self.client_address)))
992
session.bye()
993
return
994
# Have to check if client.still_valid(), since it is
995
# possible that the client timed out while establishing
996
# the GnuTLS session.
997
if not client.still_valid():
998
ipc.write(u"INVALID %s\n" % client.name)
999
session.bye()
1000
return
1001
ipc.write(u"SENDING %s\n" % client.name)
1002
sent_size = 0
1003
while sent_size < len(client.secret):
1004
sent = session.send(client.secret[sent_size:])
1005
logger.debug(u"Sent: %d, remaining: %d",
1006
sent, len(client.secret)
1007
- (sent_size + sent))
1008
sent_size += sent
1009
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")
1010
1446
1011
1447
@staticmethod
1012
1448
def peer_certificate(session):
1022
1458
.gnutls_certificate_get_peers
1023
1459
(session._c_object, ctypes.byref(list_size)))
1024
1460
if not bool(cert_list) and list_size.value != 0:
1025
raise gnutls.errors.GNUTLSError(u"error getting peer"
1026
u" certificate")
1461
raise gnutls.errors.GNUTLSError("error getting peer"
1462
" certificate")
1027
1463
if list_size.value == 0:
1028
1464
return None
1029
1465
cert = cert_list[0]
1055
1491
if crtverify.value != 0:
1056
1492
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1057
1493
raise (gnutls.errors.CertificateSecurityError
1058
(u"Verify failed"))
1494
("Verify failed"))
1059
1495
# New buffer for the fingerprint
1060
1496
buf = ctypes.create_string_buffer(20)
1061
1497
buf_len = ctypes.c_size_t()
1068
1504
# Convert the buffer to a Python bytestring
1069
1505
fpr = ctypes.string_at(buf, buf_len.value)
1070
1506
# Convert the bytestring to hexadecimal notation
1071
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1507
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1072
1508
return hex_fpr
1073
1509
1074
1510
1075
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1076
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
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 """
1077
1528
def process_request(self, request, client_address):
1078
1529
"""Overrides and wraps the original process_request().
1079
1530
1080
1531
This function creates a new pipe in self.pipe
1081
1532
"""
1082
self.pipe = os.pipe()
1083
super(ForkingMixInWithPipe,
1533
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1534
1535
super(MultiprocessingMixInWithPipe,
1084
1536
self).process_request(request, client_address)
1085
os.close(self.pipe[1]) # close write end
1086
self.add_pipe(self.pipe[0])
1087
def add_pipe(self, pipe):
1537
self.child_pipe.close()
1538
self.add_pipe(parent_pipe)
1539
1540
def add_pipe(self, parent_pipe):
1088
1541
"""Dummy function; override as necessary"""
1089
os.close(pipe)
1090
1091
1092
class IPv6_TCPServer(ForkingMixInWithPipe,
1542
raise NotImplementedError
1543
1544
1545
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1093
1546
socketserver.TCPServer, object):
1094
1547
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1095
1548
1111
1564
bind to an address or port if they were not specified."""
1112
1565
if self.interface is not None:
1113
1566
if SO_BINDTODEVICE is None:
1114
logger.error(u"SO_BINDTODEVICE does not exist;"
1115
u" cannot bind to interface %s",
1567
logger.error("SO_BINDTODEVICE does not exist;"
1568
" cannot bind to interface %s",
1116
1569
self.interface)
1117
1570
else:
1118
1571
try:
1119
1572
self.socket.setsockopt(socket.SOL_SOCKET,
1120
1573
SO_BINDTODEVICE,
1121
1574
str(self.interface
1122
+ u'\0'))
1123
except socket.error, error:
1575
+ '\0'))
1576
except socket.error as error:
1124
1577
if error[0] == errno.EPERM:
1125
logger.error(u"No permission to"
1126
u" bind to interface %s",
1578
logger.error("No permission to"
1579
" bind to interface %s",
1127
1580
self.interface)
1128
1581
elif error[0] == errno.ENOPROTOOPT:
1129
logger.error(u"SO_BINDTODEVICE not available;"
1130
u" cannot bind to interface %s",
1582
logger.error("SO_BINDTODEVICE not available;"
1583
" cannot bind to interface %s",
1131
1584
self.interface)
1132
1585
else:
1133
1586
raise
1135
1588
if self.server_address[0] or self.server_address[1]:
1136
1589
if not self.server_address[0]:
1137
1590
if self.address_family == socket.AF_INET6:
1138
any_address = u"::" # in6addr_any
1591
any_address = "::" # in6addr_any
1139
1592
else:
1140
1593
any_address = socket.INADDR_ANY
1141
1594
self.server_address = (any_address,
1180
1633
return socketserver.TCPServer.server_activate(self)
1181
1634
def enable(self):
1182
1635
self.enabled = True
1183
def add_pipe(self, pipe):
1636
def add_pipe(self, parent_pipe):
1184
1637
# Call "handle_ipc" for both data and EOF events
1185
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1186
self.handle_ipc)
1187
def handle_ipc(self, source, condition, file_objects={}):
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):
1188
1646
condition_names = {
1189
gobject.IO_IN: u"IN", # There is data to read.
1190
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
1191
1649
# blocking).
1192
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1193
gobject.IO_ERR: u"ERR", # Error condition.
1194
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
1195
1653
# broken, usually for pipes and
1196
1654
# sockets).
1197
1655
}
1199
1657
for cond, name in
1200
1658
condition_names.iteritems()
1201
1659
if cond & condition)
1202
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1203
conditions_string)
1204
1205
# Turn the pipe file descriptor into a Python file object
1206
if source not in file_objects:
1207
file_objects[source] = os.fdopen(source, u"r", 1)
1208
1209
# Read a line from the file object
1210
cmdline = file_objects[source].readline()
1211
if not cmdline: # Empty line means end of file
1212
# close the IPC pipe
1213
file_objects[source].close()
1214
del file_objects[source]
1215
1216
# Stop calling this function
1217
return False
1218
1219
logger.debug(u"IPC command: %r", cmdline)
1220
1221
# Parse and act on command
1222
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1223
1224
if cmd == u"NOTFOUND":
1225
logger.warning(u"Client not found for fingerprint: %s",
1226
args)
1227
if self.use_dbus:
1228
# Emit D-Bus signal
1229
mandos_dbus_service.ClientNotFound(args)
1230
elif cmd == u"INVALID":
1231
for client in self.clients:
1232
if client.name == args:
1233
logger.warning(u"Client %s is invalid", args)
1234
if self.use_dbus:
1235
# Emit D-Bus signal
1236
client.Rejected()
1237
break
1238
else:
1239
logger.error(u"Unknown client %s is invalid", args)
1240
elif cmd == u"SENDING":
1241
for client in self.clients:
1242
if client.name == args:
1243
logger.info(u"Sending secret to %s", client.name)
1244
client.checked_ok()
1245
if self.use_dbus:
1246
# Emit D-Bus signal
1247
client.ReceivedSecret()
1248
break
1249
else:
1250
logger.error(u"Sending secret to unknown client %s",
1251
args)
1252
else:
1253
logger.error(u"Unknown IPC command: %r", cmdline)
1254
1255
# 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
1256
1719
return True
1257
1720
1258
1721
1259
1722
def string_to_delta(interval):
1260
1723
"""Parse a string and return a datetime.timedelta
1261
1724
1262
>>> string_to_delta(u'7d')
1725
>>> string_to_delta('7d')
1263
1726
datetime.timedelta(7)
1264
>>> string_to_delta(u'60s')
1727
>>> string_to_delta('60s')
1265
1728
datetime.timedelta(0, 60)
1266
>>> string_to_delta(u'60m')
1729
>>> string_to_delta('60m')
1267
1730
datetime.timedelta(0, 3600)
1268
>>> string_to_delta(u'24h')
1731
>>> string_to_delta('24h')
1269
1732
datetime.timedelta(1)
1270
>>> string_to_delta(u'1w')
1733
>>> string_to_delta('1w')
1271
1734
datetime.timedelta(7)
1272
>>> string_to_delta(u'5m 30s')
1735
>>> string_to_delta('5m 30s')
1273
1736
datetime.timedelta(0, 330)
1274
1737
"""
1275
1738
timevalue = datetime.timedelta(0)
1277
1740
try:
1278
1741
suffix = unicode(s[-1])
1279
1742
value = int(s[:-1])
1280
if suffix == u"d":
1743
if suffix == "d":
1281
1744
delta = datetime.timedelta(value)
1282
elif suffix == u"s":
1745
elif suffix == "s":
1283
1746
delta = datetime.timedelta(0, value)
1284
elif suffix == u"m":
1747
elif suffix == "m":
1285
1748
delta = datetime.timedelta(0, 0, 0, 0, value)
1286
elif suffix == u"h":
1749
elif suffix == "h":
1287
1750
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1288
elif suffix == u"w":
1751
elif suffix == "w":
1289
1752
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1290
1753
else:
1291
raise ValueError
1292
except (ValueError, IndexError):
1293
raise ValueError
1754
raise ValueError("Unknown suffix %r" % suffix)
1755
except (ValueError, IndexError) as e:
1756
raise ValueError(*(e.args))
1294
1757
timevalue += delta
1295
1758
return timevalue
1296
1759
1302
1765
global if_nametoindex
1303
1766
try:
1304
1767
if_nametoindex = (ctypes.cdll.LoadLibrary
1305
(ctypes.util.find_library(u"c"))
1768
(ctypes.util.find_library("c"))
1306
1769
.if_nametoindex)
1307
1770
except (OSError, AttributeError):
1308
logger.warning(u"Doing if_nametoindex the hard way")
1771
logger.warning("Doing if_nametoindex the hard way")
1309
1772
def if_nametoindex(interface):
1310
1773
"Get an interface index the hard way, i.e. using fcntl()"
1311
1774
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1312
with closing(socket.socket()) as s:
1775
with contextlib.closing(socket.socket()) as s:
1313
1776
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1314
struct.pack(str(u"16s16x"),
1777
struct.pack(str("16s16x"),
1315
1778
interface))
1316
interface_index = struct.unpack(str(u"I"),
1779
interface_index = struct.unpack(str("I"),
1317
1780
ifreq[16:20])[0]
1318
1781
return interface_index
1319
1782
return if_nametoindex(interface)
1327
1790
sys.exit()
1328
1791
os.setsid()
1329
1792
if not nochdir:
1330
os.chdir(u"/")
1793
os.chdir("/")
1331
1794
if os.fork():
1332
1795
sys.exit()
1333
1796
if not noclose:
1335
1798
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1336
1799
if not stat.S_ISCHR(os.fstat(null).st_mode):
1337
1800
raise OSError(errno.ENODEV,
1338
u"/dev/null not a character device")
1801
"%s not a character device"
1802
% os.path.devnull)
1339
1803
os.dup2(null, sys.stdin.fileno())
1340
1804
os.dup2(null, sys.stdout.fileno())
1341
1805
os.dup2(null, sys.stderr.fileno())
1348
1812
##################################################################
1349
1813
# Parsing of options, both command line and config file
1350
1814
1351
parser = optparse.OptionParser(version = "%%prog %s" % version)
1352
parser.add_option("-i", u"--interface", type=u"string",
1353
metavar="IF", help=u"Bind to interface IF")
1354
parser.add_option("-a", u"--address", type=u"string",
1355
help=u"Address to listen for requests on")
1356
parser.add_option("-p", u"--port", type=u"int",
1357
help=u"Port number to receive requests on")
1358
parser.add_option("--check", action=u"store_true",
1359
help=u"Run self-test")
1360
parser.add_option("--debug", action=u"store_true",
1361
help=u"Debug mode; run in foreground and log to"
1362
u" terminal")
1363
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1364
u" priority string (see GnuTLS documentation)")
1365
parser.add_option("--servicename", type=u"string",
1366
metavar=u"NAME", help=u"Zeroconf service name")
1367
parser.add_option("--configdir", type=u"string",
1368
default=u"/etc/mandos", metavar=u"DIR",
1369
help=u"Directory to search for configuration"
1370
u" files")
1371
parser.add_option("--no-dbus", action=u"store_false",
1372
dest=u"use_dbus", help=u"Do not provide D-Bus"
1373
u" system bus interface")
1374
parser.add_option("--no-ipv6", action=u"store_false",
1375
dest=u"use_ipv6", help=u"Do not use IPv6")
1376
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()
1377
1846
1378
1847
if options.check:
1379
1848
import doctest
1381
1850
sys.exit()
1382
1851
1383
1852
# Default values for config file for server-global settings
1384
server_defaults = { u"interface": u"",
1385
u"address": u"",
1386
u"port": u"",
1387
u"debug": u"False",
1388
u"priority":
1389
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1390
u"servicename": u"Mandos",
1391
u"use_dbus": u"True",
1392
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": "",
1393
1863
}
1394
1864
1395
1865
# Parse config file for server-global settings
1396
1866
server_config = configparser.SafeConfigParser(server_defaults)
1397
1867
del server_defaults
1398
1868
server_config.read(os.path.join(options.configdir,
1399
u"mandos.conf"))
1869
"mandos.conf"))
1400
1870
# Convert the SafeConfigParser object to a dict
1401
1871
server_settings = server_config.defaults()
1402
1872
# Use the appropriate methods on the non-string config options
1403
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1404
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",
1405
1875
option)
1406
1876
if server_settings["port"]:
1407
server_settings["port"] = server_config.getint(u"DEFAULT",
1408
u"port")
1877
server_settings["port"] = server_config.getint("DEFAULT",
1878
"port")
1409
1879
del server_config
1410
1880
1411
1881
# Override the settings from the config file with command line
1412
1882
# options, if set.
1413
for option in (u"interface", u"address", u"port", u"debug",
1414
u"priority", u"servicename", u"configdir",
1415
u"use_dbus", u"use_ipv6"):
1883
for option in ("interface", "address", "port", "debug",
1884
"priority", "servicename", "configdir",
1885
"use_dbus", "use_ipv6", "debuglevel"):
1416
1886
value = getattr(options, option)
1417
1887
if value is not None:
1418
1888
server_settings[option] = value
1426
1896
##################################################################
1427
1897
1428
1898
# For convenience
1429
debug = server_settings[u"debug"]
1430
use_dbus = server_settings[u"use_dbus"]
1431
use_ipv6 = server_settings[u"use_ipv6"]
1432
1433
if not debug:
1434
syslogger.setLevel(logging.WARNING)
1435
console.setLevel(logging.WARNING)
1436
1437
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":
1438
1905
syslogger.setFormatter(logging.Formatter
1439
(u'Mandos (%s) [%%(process)d]:'
1440
u' %%(levelname)s: %%(message)s'
1441
% server_settings[u"servicename"]))
1906
('Mandos (%s) [%%(process)d]:'
1907
' %%(levelname)s: %%(message)s'
1908
% server_settings["servicename"]))
1442
1909
1443
1910
# Parse config file with clients
1444
client_defaults = { u"timeout": u"1h",
1445
u"interval": u"5m",
1446
u"checker": u"fping -q -- %%(host)s",
1447
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",
1448
1918
}
1449
1919
client_config = configparser.SafeConfigParser(client_defaults)
1450
client_config.read(os.path.join(server_settings[u"configdir"],
1451
u"clients.conf"))
1920
client_config.read(os.path.join(server_settings["configdir"],
1921
"clients.conf"))
1452
1922
1453
1923
global mandos_dbus_service
1454
1924
mandos_dbus_service = None
1455
1925
1456
tcp_server = MandosServer((server_settings[u"address"],
1457
server_settings[u"port"]),
1926
tcp_server = MandosServer((server_settings["address"],
1927
server_settings["port"]),
1458
1928
ClientHandler,
1459
interface=server_settings[u"interface"],
1929
interface=(server_settings["interface"]
1930
or None),
1460
1931
use_ipv6=use_ipv6,
1461
1932
gnutls_priority=
1462
server_settings[u"priority"],
1933
server_settings["priority"],
1463
1934
use_dbus=use_dbus)
1464
pidfilename = u"/var/run/mandos.pid"
1465
try:
1466
pidfile = open(pidfilename, u"w")
1467
except IOError:
1468
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)
1469
1941
1470
1942
try:
1471
uid = pwd.getpwnam(u"_mandos").pw_uid
1472
gid = pwd.getpwnam(u"_mandos").pw_gid
1943
uid = pwd.getpwnam("_mandos").pw_uid
1944
gid = pwd.getpwnam("_mandos").pw_gid
1473
1945
except KeyError:
1474
1946
try:
1475
uid = pwd.getpwnam(u"mandos").pw_uid
1476
gid = pwd.getpwnam(u"mandos").pw_gid
1947
uid = pwd.getpwnam("mandos").pw_uid
1948
gid = pwd.getpwnam("mandos").pw_gid
1477
1949
except KeyError:
1478
1950
try:
1479
uid = pwd.getpwnam(u"nobody").pw_uid
1480
gid = pwd.getpwnam(u"nobody").pw_gid
1951
uid = pwd.getpwnam("nobody").pw_uid
1952
gid = pwd.getpwnam("nobody").pw_gid
1481
1953
except KeyError:
1482
1954
uid = 65534
1483
1955
gid = 65534
1484
1956
try:
1485
1957
os.setgid(gid)
1486
1958
os.setuid(uid)
1487
except OSError, error:
1959
except OSError as error:
1488
1960
if error[0] != errno.EPERM:
1489
1961
raise error
1490
1962
1491
# 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
1492
1971
if debug:
1972
# Enable all possible GnuTLS debugging
1973
1493
1974
# "Use a log level over 10 to enable all debugging options."
1494
1975
# - GnuTLS manual
1495
1976
gnutls.library.functions.gnutls_global_set_log_level(11)
1496
1977
1497
1978
@gnutls.library.types.gnutls_log_func
1498
1979
def debug_gnutls(level, string):
1499
logger.debug(u"GnuTLS: %s", string[:-1])
1980
logger.debug("GnuTLS: %s", string[:-1])
1500
1981
1501
1982
(gnutls.library.functions
1502
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()
1503
1998
1504
1999
global main_loop
1505
2000
# From the Avahi example code
1508
2003
bus = dbus.SystemBus()
1509
2004
# End of Avahi example code
1510
2005
if use_dbus:
1511
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
1512
2017
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1513
service = AvahiService(name = server_settings[u"servicename"],
1514
servicetype = u"_mandos._tcp",
2018
service = AvahiService(name = server_settings["servicename"],
2019
servicetype = "_mandos._tcp",
1515
2020
protocol = protocol, bus = bus)
1516
2021
if server_settings["interface"]:
1517
2022
service.interface = (if_nametoindex
1518
(str(server_settings[u"interface"])))
2023
(str(server_settings["interface"])))
2024
2025
global multiprocessing_manager
2026
multiprocessing_manager = multiprocessing.Manager()
1519
2027
1520
2028
client_class = Client
1521
2029
if use_dbus:
1522
client_class = functools.partial(ClientDBus, bus = bus)
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
1523
2044
tcp_server.clients.update(set(
1524
2045
client_class(name = section,
1525
config= dict(client_config.items(section)))
2046
config= dict(client_config_items(
2047
client_config, section)))
1526
2048
for section in client_config.sections()))
1527
2049
if not tcp_server.clients:
1528
logger.warning(u"No clients defined")
1529
1530
if debug:
1531
# Redirect stdin so all checkers get /dev/null
1532
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1533
os.dup2(null, sys.stdin.fileno())
1534
if null > 2:
1535
os.close(null)
1536
else:
1537
# No console logging
1538
logger.removeHandler(console)
1539
# Close all input and output, do double fork, etc.
1540
daemon()
1541
1542
try:
1543
with closing(pidfile):
1544
pid = os.getpid()
1545
pidfile.write(str(pid) + "\n")
1546
del pidfile
1547
except IOError:
1548
logger.error(u"Could not write to file %r with PID %d",
1549
pidfilename, pid)
1550
except NameError:
1551
# "pidfile" was never created
1552
pass
1553
del pidfilename
1554
1555
def cleanup():
1556
"Cleanup function; run on exit"
1557
service.cleanup()
2050
logger.warning("No clients defined")
1558
2051
1559
while tcp_server.clients:
1560
client = tcp_server.clients.pop()
1561
client.disable_hook = None
1562
client.disable()
1563
1564
atexit.register(cleanup)
1565
1566
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
1567
2066
signal.signal(signal.SIGINT, signal.SIG_IGN)
2067
1568
2068
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1569
2069
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1570
2070
1572
2072
class MandosDBusService(dbus.service.Object):
1573
2073
"""A D-Bus proxy object"""
1574
2074
def __init__(self):
1575
dbus.service.Object.__init__(self, bus, u"/")
1576
_interface = u"se.bsnet.fukt.Mandos"
1577
1578
@dbus.service.signal(_interface, signature=u"oa{sv}")
1579
def ClientAdded(self, objpath, properties):
1580
"D-Bus signal"
1581
pass
1582
1583
@dbus.service.signal(_interface, signature=u"s")
1584
def ClientNotFound(self, fingerprint):
1585
"D-Bus signal"
1586
pass
1587
1588
@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")
1589
2089
def ClientRemoved(self, objpath, name):
1590
2090
"D-Bus signal"
1591
2091
pass
1592
2092
1593
@dbus.service.method(_interface, out_signature=u"ao")
2093
@dbus.service.method(_interface, out_signature="ao")
1594
2094
def GetAllClients(self):
1595
2095
"D-Bus method"
1596
2096
return dbus.Array(c.dbus_object_path
1597
2097
for c in tcp_server.clients)
1598
2098
1599
2099
@dbus.service.method(_interface,
1600
out_signature=u"a{oa{sv}}")
2100
out_signature="a{oa{sv}}")
1601
2101
def GetAllClientsWithProperties(self):
1602
2102
"D-Bus method"
1603
2103
return dbus.Dictionary(
1604
((c.dbus_object_path, c.GetAll(u""))
2104
((c.dbus_object_path, c.GetAll(""))
1605
2105
for c in tcp_server.clients),
1606
signature=u"oa{sv}")
2106
signature="oa{sv}")
1607
2107
1608
@dbus.service.method(_interface, in_signature=u"o")
2108
@dbus.service.method(_interface, in_signature="o")
1609
2109
def RemoveClient(self, object_path):
1610
2110
"D-Bus method"
1611
2111
for c in tcp_server.clients:
1613
2113
tcp_server.clients.remove(c)
1614
2114
c.remove_from_connection()
1615
2115
# Don't signal anything except ClientRemoved
1616
c.disable(signal=False)
2116
c.disable(quiet=True)
1617
2117
# Emit D-Bus signal
1618
2118
self.ClientRemoved(object_path, c.name)
1619
2119
return
1620
raise KeyError
2120
raise KeyError(object_path)
1621
2121
1622
2122
del _interface
1623
2123
1624
mandos_dbus_service = MandosDBusService()
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)
1625
2146
1626
2147
for client in tcp_server.clients:
1627
2148
if use_dbus:
1628
2149
# Emit D-Bus signal
1629
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1630
client.GetAll(u""))
2150
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1631
2151
client.enable()
1632
2152
1633
2153
tcp_server.enable()
1636
2156
# Find out what port we got
1637
2157
service.port = tcp_server.socket.getsockname()[1]
1638
2158
if use_ipv6:
1639
logger.info(u"Now listening on address %r, port %d,"
2159
logger.info("Now listening on address %r, port %d,"
1640
2160
" flowinfo %d, scope_id %d"
1641
2161
% tcp_server.socket.getsockname())
1642
2162
else: # IPv4
1643
logger.info(u"Now listening on address %r, port %d"
2163
logger.info("Now listening on address %r, port %d"
1644
2164
% tcp_server.socket.getsockname())
1645
2165
1646
2166
#service.interface = tcp_server.socket.getsockname()[3]
1649
2169
# From the Avahi example code
1650
2170
try:
1651
2171
service.activate()
1652
except dbus.exceptions.DBusException, error:
1653
logger.critical(u"DBusException: %s", error)
2172
except dbus.exceptions.DBusException as error:
2173
logger.critical("DBusException: %s", error)
2174
cleanup()
1654
2175
sys.exit(1)
1655
2176
# End of Avahi example code
1656
2177
1659
2180
(tcp_server.handle_request
1660
2181
(*args[2:], **kwargs) or True))
1661
2182
1662
logger.debug(u"Starting main loop")
2183
logger.debug("Starting main loop")
1663
2184
main_loop.run()
1664
except AvahiError, error:
1665
logger.critical(u"AvahiError: %s", error)
2185
except AvahiError as error:
2186
logger.critical("AvahiError: %s", error)
2187
cleanup()
1666
2188
sys.exit(1)
1667
2189
except KeyboardInterrupt:
1668
2190
if debug:
1669
print >> sys.stderr
1670
logger.debug(u"Server received KeyboardInterrupt")
1671
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
1672
2197
1673
2198
if __name__ == '__main__':
1674
2199
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0