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