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