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