To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 24.1.32
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.32
- Committer: Björn Påhlsson
- Date: 2008-08-09 20:11:07 UTC
- mto: (24.1.154 mandos) (237.4.3 mandos-release)
- mto: This revision was merged to the branch mainline in revision 56.
- Revision ID: belorn@braxen-20080809201107-81j2nuz9p0u7x51v
removed * [[http://en.tldp.org/HOWTO/Software-Release-Practice-HOWTO/][Software Release Practice HOWTO]]
- files added:
- network-protocol.txt
- files removed:
- .bzr-builddeb
- debian
- debian/po
- files renamed:
- plugin-runner.c => mandos-client.c
- plugin-runner.xml => mandos-client.xml
- plugins.d/mandos-client.c => plugins.d/password-request.c
- plugins.d/mandos-client.xml => plugins.d/password-request.xml
- files modified:
- Makefile
added
removed
mandos
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
# methods "add", "remove", "server_state_changed",
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
# "AvahiService" class, and some lines in "main".
9
# methods "add" and "remove" in the "AvahiService" class, the
10
# "server_state_changed" and "entry_group_state_changed" functions,
11
# 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 © 2007-2008 Teddy Hogeborn & Björn Påhlsson
16
15
#
17
16
# This program is free software: you can redistribute it and/or modify
18
17
# it under the terms of the GNU General Public License as published by
25
24
# GNU General Public License for more details.
26
25
#
27
26
# You should have received a copy of the GNU General Public License
28
# along with this program. If not, see
29
# <http://www.gnu.org/licenses/>.
27
# along with this program. If not, see <http://www.gnu.org/licenses/>.
30
28
#
31
29
# Contact the authors at <mandos@fukt.bsnet.se>.
32
30
#
33
31
34
from __future__ import division, with_statement, absolute_import
32
from __future__ import division
35
33
36
import SocketServer as socketserver
34
import SocketServer
37
35
import socket
38
import optparse
36
import select
37
from optparse import OptionParser
39
38
import datetime
40
39
import errno
41
40
import gnutls.crypto
44
43
import gnutls.library.functions
45
44
import gnutls.library.constants
46
45
import gnutls.library.types
47
import ConfigParser as configparser
46
import ConfigParser
48
47
import sys
49
48
import re
50
49
import os
51
50
import signal
51
from sets import Set
52
52
import subprocess
53
53
import atexit
54
54
import stat
55
55
import logging
56
56
import logging.handlers
57
import pwd
58
from contextlib import closing
59
import struct
60
import fcntl
61
import functools
62
57
63
58
import dbus
64
import dbus.service
65
59
import gobject
66
60
import avahi
67
61
from dbus.mainloop.glib import DBusGMainLoop
68
62
import ctypes
69
import ctypes.util
70
71
try:
72
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
73
except AttributeError:
74
try:
75
from IN import SO_BINDTODEVICE
76
except ImportError:
77
SO_BINDTODEVICE = None
78
79
80
version = "1.0.8"
81
82
logger = logging.Logger(u'mandos')
83
syslogger = (logging.handlers.SysLogHandler
84
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
85
address = "/dev/log"))
86
syslogger.setFormatter(logging.Formatter
87
(u'Mandos [%(process)d]: %(levelname)s:'
88
u' %(message)s'))
63
64
65
logger = logging.Logger('mandos')
66
syslogger = logging.handlers.SysLogHandler\
67
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
68
address = "/dev/log")
69
syslogger.setFormatter(logging.Formatter\
70
('Mandos: %(levelname)s: %(message)s'))
89
71
logger.addHandler(syslogger)
90
72
91
console = logging.StreamHandler()
92
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
93
u' %(levelname)s:'
94
u' %(message)s'))
95
logger.addHandler(console)
96
73
97
74
class AvahiError(Exception):
98
def __init__(self, value, *args, **kwargs):
75
def __init__(self, value):
99
76
self.value = value
100
super(AvahiError, self).__init__(value, *args, **kwargs)
101
def __unicode__(self):
102
return unicode(repr(self.value))
77
def __str__(self):
78
return repr(self.value)
103
79
104
80
class AvahiServiceError(AvahiError):
105
81
pass
110
86
111
87
class AvahiService(object):
112
88
"""An Avahi (Zeroconf) service.
113
114
89
Attributes:
115
90
interface: integer; avahi.IF_UNSPEC or an interface index.
116
91
Used to optionally bind to the specified interface.
117
name: string; Example: u'Mandos'
118
type: string; Example: u'_mandos._tcp'.
92
name: string; Example: 'Mandos'
93
type: string; Example: '_mandos._tcp'.
119
94
See <http://www.dns-sd.org/ServiceTypes.html>
120
95
port: integer; what port to announce
121
96
TXT: list of strings; TXT record for the service
124
99
max_renames: integer; maximum number of renames
125
100
rename_count: integer; counter so we only rename after collisions
126
101
a sensible number of times
127
group: D-Bus Entry Group
128
server: D-Bus Server
129
bus: dbus.SystemBus()
130
102
"""
131
103
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
132
servicetype = None, port = None, TXT = None,
133
domain = u"", host = u"", max_renames = 32768,
134
protocol = avahi.PROTO_UNSPEC, bus = None):
104
type = None, port = None, TXT = None, domain = "",
105
host = "", max_renames = 32768):
135
106
self.interface = interface
136
107
self.name = name
137
self.type = servicetype
108
self.type = type
138
109
self.port = port
139
self.TXT = TXT if TXT is not None else []
110
if TXT is None:
111
self.TXT = []
112
else:
113
self.TXT = TXT
140
114
self.domain = domain
141
115
self.host = host
142
116
self.rename_count = 0
143
self.max_renames = max_renames
144
self.protocol = protocol
145
self.group = None # our entry group
146
self.server = None
147
self.bus = bus
148
117
def rename(self):
149
118
"""Derived from the Avahi example code"""
150
119
if self.rename_count >= self.max_renames:
151
logger.critical(u"No suitable Zeroconf service name found"
152
u" after %i retries, exiting.",
153
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))
158
syslogger.setFormatter(logging.Formatter
159
(u'Mandos (%s) [%%(process)d]:'
160
u' %%(levelname)s: %%(message)s'
161
% self.name))
120
logger.critical(u"No suitable service name found after %i"
121
u" retries, exiting.", rename_count)
122
raise AvahiServiceError("Too many renames")
123
name = server.GetAlternativeServiceName(name)
124
logger.error(u"Changing name to %r ...", name)
125
syslogger.setFormatter(logging.Formatter\
126
('Mandos (%s): %%(levelname)s:'
127
' %%(message)s' % name))
162
128
self.remove()
163
129
self.add()
164
130
self.rename_count += 1
165
131
def remove(self):
166
132
"""Derived from the Avahi example code"""
167
if self.group is not None:
168
self.group.Reset()
133
if group is not None:
134
group.Reset()
169
135
def add(self):
170
136
"""Derived from the Avahi example code"""
171
if self.group is None:
172
self.group = dbus.Interface(
173
self.bus.get_object(avahi.DBUS_NAME,
174
self.server.EntryGroupNew()),
175
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' ...",
179
self.name, self.type)
180
self.group.AddService(
181
self.interface,
182
self.protocol,
183
dbus.UInt32(0), # flags
184
self.name, self.type,
185
self.domain, self.host,
186
dbus.UInt16(self.port),
187
avahi.string_array_to_txt_array(self.TXT))
188
self.group.Commit()
189
def entry_group_state_changed(self, state, error):
190
"""Derived from the Avahi example code"""
191
logger.debug(u"Avahi state change: %i", state)
192
193
if state == avahi.ENTRY_GROUP_ESTABLISHED:
194
logger.debug(u"Zeroconf service established.")
195
elif state == avahi.ENTRY_GROUP_COLLISION:
196
logger.warning(u"Zeroconf service name collision.")
197
self.rename()
198
elif state == avahi.ENTRY_GROUP_FAILURE:
199
logger.critical(u"Avahi: Error in group state changed %s",
200
unicode(error))
201
raise AvahiGroupError(u"State changed: %s"
202
% unicode(error))
203
def cleanup(self):
204
"""Derived from the Avahi example code"""
205
if self.group is not None:
206
self.group.Free()
207
self.group = None
208
def server_state_changed(self, state):
209
"""Derived from the Avahi example code"""
210
if state == avahi.SERVER_COLLISION:
211
logger.error(u"Zeroconf server name collision")
212
self.remove()
213
elif state == avahi.SERVER_RUNNING:
214
self.add()
215
def activate(self):
216
"""Derived from the Avahi example code"""
217
if self.server is None:
218
self.server = dbus.Interface(
219
self.bus.get_object(avahi.DBUS_NAME,
220
avahi.DBUS_PATH_SERVER),
221
avahi.DBUS_INTERFACE_SERVER)
222
self.server.connect_to_signal(u"StateChanged",
223
self.server_state_changed)
224
self.server_state_changed(self.server.GetState())
137
global group
138
if group is None:
139
group = dbus.Interface\
140
(bus.get_object(avahi.DBUS_NAME,
141
server.EntryGroupNew()),
142
avahi.DBUS_INTERFACE_ENTRY_GROUP)
143
group.connect_to_signal('StateChanged',
144
entry_group_state_changed)
145
logger.debug(u"Adding service '%s' of type '%s' ...",
146
service.name, service.type)
147
group.AddService(
148
self.interface, # interface
149
avahi.PROTO_INET6, # protocol
150
dbus.UInt32(0), # flags
151
self.name, self.type,
152
self.domain, self.host,
153
dbus.UInt16(self.port),
154
avahi.string_array_to_txt_array(self.TXT))
155
group.Commit()
156
157
# From the Avahi example code:
158
group = None # our entry group
159
# End of Avahi example code
225
160
226
161
227
162
class Client(object):
228
163
"""A representation of a client host served by this server.
229
230
164
Attributes:
231
name: string; from the config file, used in log messages and
232
D-Bus identifiers
165
name: string; from the config file, used in log messages
233
166
fingerprint: string (40 or 32 hexadecimal digits); used to
234
167
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)
245
checker: subprocess.Popen(); a running checker process used
246
to see if the client lives.
247
'None' if no process is running.
168
secret: bytestring; sent verbatim (over TLS) to client
169
host: string; available for use by the checker command
170
created: datetime.datetime(); object creation, not client host
171
last_checked_ok: datetime.datetime() or None if not yet checked OK
172
timeout: datetime.timedelta(); How long from last_checked_ok
173
until this client is invalid
174
interval: datetime.timedelta(); How often to start a new checker
175
stop_hook: If set, called by stop() as stop_hook(self)
176
checker: subprocess.Popen(); a running checker process used
177
to see if the client lives.
178
'None' if no process is running.
248
179
checker_initiator_tag: a gobject event source tag, or None
249
disable_initiator_tag: - '' -
180
stop_initiator_tag: - '' -
250
181
checker_callback_tag: - '' -
251
182
checker_command: string; External command which is run to check if
252
183
client lives. %() expansions are done at
253
184
runtime with vars(self) as dict, so that for
254
185
instance %(name)s can be used in the command.
255
current_checker_command: string; current running checker_command
186
Private attibutes:
187
_timeout: Real variable for 'timeout'
188
_interval: Real variable for 'interval'
189
_timeout_milliseconds: Used when calling gobject.timeout_add()
190
_interval_milliseconds: - '' -
256
191
"""
257
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))
264
265
def timeout_milliseconds(self):
266
"Return the 'timeout' attribute in milliseconds"
267
return self._datetime_to_milliseconds(self.timeout)
268
269
def interval_milliseconds(self):
270
"Return the 'interval' attribute in milliseconds"
271
return self._datetime_to_milliseconds(self.interval)
272
273
def __init__(self, name = None, disable_hook=None, config=None):
192
def _set_timeout(self, timeout):
193
"Setter function for 'timeout' attribute"
194
self._timeout = timeout
195
self._timeout_milliseconds = ((self.timeout.days
196
* 24 * 60 * 60 * 1000)
197
+ (self.timeout.seconds * 1000)
198
+ (self.timeout.microseconds
199
// 1000))
200
timeout = property(lambda self: self._timeout,
201
_set_timeout)
202
del _set_timeout
203
def _set_interval(self, interval):
204
"Setter function for 'interval' attribute"
205
self._interval = interval
206
self._interval_milliseconds = ((self.interval.days
207
* 24 * 60 * 60 * 1000)
208
+ (self.interval.seconds
209
* 1000)
210
+ (self.interval.microseconds
211
// 1000))
212
interval = property(lambda self: self._interval,
213
_set_interval)
214
del _set_interval
215
def __init__(self, name = None, stop_hook=None, config={}):
274
216
"""Note: the 'checker' key in 'config' sets the
275
217
'checker_command' attribute and *not* the 'checker'
276
218
attribute."""
277
219
self.name = name
278
if config is None:
279
config = {}
280
220
logger.debug(u"Creating client %r", self.name)
281
221
# Uppercase and remove spaces from fingerprint for later
282
222
# comparison purposes with return value from the fingerprint()
283
223
# function
284
self.fingerprint = (config[u"fingerprint"].upper()
285
.replace(u" ", u""))
224
self.fingerprint = config["fingerprint"].upper()\
225
.replace(u" ", u"")
286
226
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:
293
self.secret = secfile.read()
227
if "secret" in config:
228
self.secret = config["secret"].decode(u"base64")
229
elif "secfile" in config:
230
sf = open(config["secfile"])
231
self.secret = sf.read()
232
sf.close()
294
233
else:
295
234
raise TypeError(u"No secret or secfile for client %s"
296
235
% self.name)
297
self.host = config.get(u"host", u"")
298
self.created = datetime.datetime.utcnow()
299
self.enabled = False
300
self.last_enabled = None
236
self.host = config.get("host", "")
237
self.created = datetime.datetime.now()
301
238
self.last_checked_ok = None
302
self.timeout = string_to_delta(config[u"timeout"])
303
self.interval = string_to_delta(config[u"interval"])
304
self.disable_hook = disable_hook
239
self.timeout = string_to_delta(config["timeout"])
240
self.interval = string_to_delta(config["interval"])
241
self.stop_hook = stop_hook
305
242
self.checker = None
306
243
self.checker_initiator_tag = None
307
self.disable_initiator_tag = None
244
self.stop_initiator_tag = None
308
245
self.checker_callback_tag = None
309
self.checker_command = config[u"checker"]
310
self.current_checker_command = None
311
self.last_connect = None
312
313
def enable(self):
246
self.check_command = config["checker"]
247
def start(self):
314
248
"""Start this client's checker and timeout hooks"""
315
self.last_enabled = datetime.datetime.utcnow()
316
249
# Schedule a new checker to be started an 'interval' from now,
317
250
# and every interval from then on.
318
self.checker_initiator_tag = (gobject.timeout_add
319
(self.interval_milliseconds(),
320
self.start_checker))
251
self.checker_initiator_tag = gobject.timeout_add\
252
(self._interval_milliseconds,
253
self.start_checker)
321
254
# Also start a new checker *right now*.
322
255
self.start_checker()
323
# Schedule a disable() when 'timeout' has passed
324
self.disable_initiator_tag = (gobject.timeout_add
325
(self.timeout_milliseconds(),
326
self.disable))
327
self.enabled = True
328
329
def disable(self):
330
"""Disable this client."""
331
if not getattr(self, "enabled", False):
256
# Schedule a stop() when 'timeout' has passed
257
self.stop_initiator_tag = gobject.timeout_add\
258
(self._timeout_milliseconds,
259
self.stop)
260
def stop(self):
261
"""Stop this client.
262
The possibility that a client might be restarted is left open,
263
but not currently used."""
264
# If this client doesn't have a secret, it is already stopped.
265
if hasattr(self, "secret") and self.secret:
266
logger.info(u"Stopping client %s", self.name)
267
self.secret = None
268
else:
332
269
return False
333
logger.info(u"Disabling client %s", self.name)
334
if getattr(self, u"disable_initiator_tag", False):
335
gobject.source_remove(self.disable_initiator_tag)
336
self.disable_initiator_tag = None
337
if getattr(self, u"checker_initiator_tag", False):
270
if getattr(self, "stop_initiator_tag", False):
271
gobject.source_remove(self.stop_initiator_tag)
272
self.stop_initiator_tag = None
273
if getattr(self, "checker_initiator_tag", False):
338
274
gobject.source_remove(self.checker_initiator_tag)
339
275
self.checker_initiator_tag = None
340
276
self.stop_checker()
341
if self.disable_hook:
342
self.disable_hook(self)
343
self.enabled = False
277
if self.stop_hook:
278
self.stop_hook(self)
344
279
# Do not run this again if called by a gobject.timeout_add
345
280
return False
346
347
281
def __del__(self):
348
self.disable_hook = None
349
self.disable()
350
351
def checker_callback(self, pid, condition, command):
282
self.stop_hook = None
283
self.stop()
284
def checker_callback(self, pid, condition):
352
285
"""The checker has completed, so take appropriate actions."""
286
now = datetime.datetime.now()
353
287
self.checker_callback_tag = None
354
288
self.checker = None
355
if os.WIFEXITED(condition):
356
exitstatus = os.WEXITSTATUS(condition)
357
if exitstatus == 0:
358
logger.info(u"Checker for %(name)s succeeded",
359
vars(self))
360
self.checked_ok()
361
else:
362
logger.info(u"Checker for %(name)s failed",
363
vars(self))
364
else:
289
if os.WIFEXITED(condition) \
290
and (os.WEXITSTATUS(condition) == 0):
291
logger.info(u"Checker for %(name)s succeeded",
292
vars(self))
293
self.last_checked_ok = now
294
gobject.source_remove(self.stop_initiator_tag)
295
self.stop_initiator_tag = gobject.timeout_add\
296
(self._timeout_milliseconds,
297
self.stop)
298
elif not os.WIFEXITED(condition):
365
299
logger.warning(u"Checker for %(name)s crashed?",
366
300
vars(self))
367
368
def checked_ok(self):
369
"""Bump up the timeout for this client.
370
371
This should only be called when the client has been seen,
372
alive and well.
373
"""
374
self.last_checked_ok = datetime.datetime.utcnow()
375
gobject.source_remove(self.disable_initiator_tag)
376
self.disable_initiator_tag = (gobject.timeout_add
377
(self.timeout_milliseconds(),
378
self.disable))
379
301
else:
302
logger.info(u"Checker for %(name)s failed",
303
vars(self))
380
304
def start_checker(self):
381
305
"""Start a new checker subprocess if one is not running.
382
383
306
If a checker already exists, leave it running and do
384
307
nothing."""
385
308
# The reason for not killing a running checker is that if we
390
313
# checkers alone, the checker would have to take more time
391
314
# than 'timeout' for the client to be declared invalid, which
392
315
# is as it should be.
393
394
# If a checker exists, make sure it is not a zombie
395
if self.checker is not None:
396
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
397
if pid:
398
logger.warning(u"Checker was a zombie")
399
gobject.source_remove(self.checker_callback_tag)
400
self.checker_callback(pid, status,
401
self.current_checker_command)
402
# Start a new checker if needed
403
316
if self.checker is None:
404
317
try:
405
# In case checker_command has exactly one % operator
406
command = self.checker_command % self.host
318
# In case check_command has exactly one % operator
319
command = self.check_command % self.host
407
320
except TypeError:
408
321
# Escape attributes for the shell
409
escaped_attrs = dict((key,
410
re.escape(unicode(str(val),
411
errors=
412
u'replace')))
322
escaped_attrs = dict((key, re.escape(str(val)))
413
323
for key, val in
414
324
vars(self).iteritems())
415
325
try:
416
command = self.checker_command % escaped_attrs
326
command = self.check_command % escaped_attrs
417
327
except TypeError, error:
418
328
logger.error(u'Could not format string "%s":'
419
u' %s', self.checker_command, error)
329
u' %s', self.check_command, error)
420
330
return True # Try again later
421
self.current_checker_command = command
422
331
try:
423
332
logger.info(u"Starting checker %r for %s",
424
333
command, self.name)
425
# We don't need to redirect stdout and stderr, since
426
# in normal mode, that is already done by daemon(),
427
# and in debug mode we don't want to. (Stdin is
428
# always replaced by /dev/null.)
429
334
self.checker = subprocess.Popen(command,
430
335
close_fds=True,
431
shell=True, cwd=u"/")
432
self.checker_callback_tag = (gobject.child_watch_add
433
(self.checker.pid,
434
self.checker_callback,
435
data=command))
436
# The checker may have completed before the gobject
437
# watch was added. Check for this.
438
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
439
if pid:
440
gobject.source_remove(self.checker_callback_tag)
441
self.checker_callback(pid, status, command)
442
except OSError, error:
336
shell=True, cwd="/")
337
self.checker_callback_tag = gobject.child_watch_add\
338
(self.checker.pid,
339
self.checker_callback)
340
except subprocess.OSError, error:
443
341
logger.error(u"Failed to start subprocess: %s",
444
342
error)
445
343
# Re-run this periodically if run by gobject.timeout_add
446
344
return True
447
448
345
def stop_checker(self):
449
346
"""Force the checker process, if any, to stop."""
450
347
if self.checker_callback_tag:
451
348
gobject.source_remove(self.checker_callback_tag)
452
349
self.checker_callback_tag = None
453
if getattr(self, u"checker", None) is None:
350
if getattr(self, "checker", None) is None:
454
351
return
455
352
logger.debug(u"Stopping checker for %(name)s", vars(self))
456
353
try:
462
359
if error.errno != errno.ESRCH: # No such process
463
360
raise
464
361
self.checker = None
465
466
362
def still_valid(self):
467
363
"""Has the timeout not yet passed for this client?"""
468
if not getattr(self, u"enabled", False):
469
return False
470
now = datetime.datetime.utcnow()
364
now = datetime.datetime.now()
471
365
if self.last_checked_ok is None:
472
366
return now < (self.created + self.timeout)
473
367
else:
474
368
return now < (self.last_checked_ok + self.timeout)
475
369
476
370
477
class ClientDBus(Client, dbus.service.Object):
478
"""A Client class using D-Bus
479
480
Attributes:
481
dbus_object_path: dbus.ObjectPath
482
bus: dbus.SystemBus()
483
"""
484
# dbus.service.Object doesn't use super(), so we can't either.
485
486
def __init__(self, bus = None, *args, **kwargs):
487
self.bus = bus
488
Client.__init__(self, *args, **kwargs)
489
# Only now, when this client is initialized, can it show up on
490
# the D-Bus
491
self.dbus_object_path = (dbus.ObjectPath
492
(u"/clients/"
493
+ self.name.replace(u".", u"_")))
494
dbus.service.Object.__init__(self, self.bus,
495
self.dbus_object_path)
496
497
@staticmethod
498
def _datetime_to_dbus(dt, variant_level=0):
499
"""Convert a UTC datetime.datetime() to a D-Bus type."""
500
return dbus.String(dt.isoformat(),
501
variant_level=variant_level)
502
503
def enable(self):
504
oldstate = getattr(self, u"enabled", False)
505
r = Client.enable(self)
506
if oldstate != self.enabled:
507
# Emit D-Bus signals
508
self.PropertyChanged(dbus.String(u"enabled"),
509
dbus.Boolean(True, variant_level=1))
510
self.PropertyChanged(
511
dbus.String(u"last_enabled"),
512
self._datetime_to_dbus(self.last_enabled,
513
variant_level=1))
514
return r
515
516
def disable(self, signal = True):
517
oldstate = getattr(self, u"enabled", False)
518
r = Client.disable(self)
519
if signal and oldstate != self.enabled:
520
# Emit D-Bus signal
521
self.PropertyChanged(dbus.String(u"enabled"),
522
dbus.Boolean(False, variant_level=1))
523
return r
524
525
def __del__(self, *args, **kwargs):
526
try:
527
self.remove_from_connection()
528
except LookupError:
529
pass
530
if hasattr(dbus.service.Object, u"__del__"):
531
dbus.service.Object.__del__(self, *args, **kwargs)
532
Client.__del__(self, *args, **kwargs)
533
534
def checker_callback(self, pid, condition, command,
535
*args, **kwargs):
536
self.checker_callback_tag = None
537
self.checker = None
538
# Emit D-Bus signal
539
self.PropertyChanged(dbus.String(u"checker_running"),
540
dbus.Boolean(False, variant_level=1))
541
if os.WIFEXITED(condition):
542
exitstatus = os.WEXITSTATUS(condition)
543
# Emit D-Bus signal
544
self.CheckerCompleted(dbus.Int16(exitstatus),
545
dbus.Int64(condition),
546
dbus.String(command))
547
else:
548
# Emit D-Bus signal
549
self.CheckerCompleted(dbus.Int16(-1),
550
dbus.Int64(condition),
551
dbus.String(command))
552
553
return Client.checker_callback(self, pid, condition, command,
554
*args, **kwargs)
555
556
def checked_ok(self, *args, **kwargs):
557
r = Client.checked_ok(self, *args, **kwargs)
558
# Emit D-Bus signal
559
self.PropertyChanged(
560
dbus.String(u"last_checked_ok"),
561
(self._datetime_to_dbus(self.last_checked_ok,
562
variant_level=1)))
563
return r
564
565
def start_checker(self, *args, **kwargs):
566
old_checker = self.checker
567
if self.checker is not None:
568
old_checker_pid = self.checker.pid
569
else:
570
old_checker_pid = None
571
r = Client.start_checker(self, *args, **kwargs)
572
# Only if new checker process was started
573
if (self.checker is not None
574
and old_checker_pid != self.checker.pid):
575
# Emit D-Bus signal
576
self.CheckerStarted(self.current_checker_command)
577
self.PropertyChanged(
578
dbus.String(u"checker_running"),
579
dbus.Boolean(True, variant_level=1))
580
return r
581
582
def stop_checker(self, *args, **kwargs):
583
old_checker = getattr(self, u"checker", None)
584
r = Client.stop_checker(self, *args, **kwargs)
585
if (old_checker is not None
586
and getattr(self, u"checker", None) is None):
587
self.PropertyChanged(dbus.String(u"checker_running"),
588
dbus.Boolean(False, variant_level=1))
589
return r
590
591
## D-Bus methods & signals
592
_interface = u"se.bsnet.fukt.Mandos.Client"
593
594
# CheckedOK - method
595
@dbus.service.method(_interface)
596
def CheckedOK(self):
597
return self.checked_ok()
598
599
# CheckerCompleted - signal
600
@dbus.service.signal(_interface, signature=u"nxs")
601
def CheckerCompleted(self, exitcode, waitstatus, command):
602
"D-Bus signal"
603
pass
604
605
# CheckerStarted - signal
606
@dbus.service.signal(_interface, signature=u"s")
607
def CheckerStarted(self, command):
608
"D-Bus signal"
609
pass
610
611
# GetAllProperties - method
612
@dbus.service.method(_interface, out_signature=u"a{sv}")
613
def GetAllProperties(self):
614
"D-Bus method"
615
return dbus.Dictionary({
616
dbus.String(u"name"):
617
dbus.String(self.name, variant_level=1),
618
dbus.String(u"fingerprint"):
619
dbus.String(self.fingerprint, variant_level=1),
620
dbus.String(u"host"):
621
dbus.String(self.host, variant_level=1),
622
dbus.String(u"created"):
623
self._datetime_to_dbus(self.created,
624
variant_level=1),
625
dbus.String(u"last_enabled"):
626
(self._datetime_to_dbus(self.last_enabled,
627
variant_level=1)
628
if self.last_enabled is not None
629
else dbus.Boolean(False, variant_level=1)),
630
dbus.String(u"enabled"):
631
dbus.Boolean(self.enabled, variant_level=1),
632
dbus.String(u"last_checked_ok"):
633
(self._datetime_to_dbus(self.last_checked_ok,
634
variant_level=1)
635
if self.last_checked_ok is not None
636
else dbus.Boolean (False, variant_level=1)),
637
dbus.String(u"timeout"):
638
dbus.UInt64(self.timeout_milliseconds(),
639
variant_level=1),
640
dbus.String(u"interval"):
641
dbus.UInt64(self.interval_milliseconds(),
642
variant_level=1),
643
dbus.String(u"checker"):
644
dbus.String(self.checker_command,
645
variant_level=1),
646
dbus.String(u"checker_running"):
647
dbus.Boolean(self.checker is not None,
648
variant_level=1),
649
dbus.String(u"object_path"):
650
dbus.ObjectPath(self.dbus_object_path,
651
variant_level=1)
652
}, signature=u"sv")
653
654
# IsStillValid - method
655
@dbus.service.method(_interface, out_signature=u"b")
656
def IsStillValid(self):
657
return self.still_valid()
658
659
# PropertyChanged - signal
660
@dbus.service.signal(_interface, signature=u"sv")
661
def PropertyChanged(self, property, value):
662
"D-Bus signal"
663
pass
664
665
# ReceivedSecret - signal
666
@dbus.service.signal(_interface)
667
def ReceivedSecret(self):
668
"D-Bus signal"
669
pass
670
671
# Rejected - signal
672
@dbus.service.signal(_interface)
673
def Rejected(self):
674
"D-Bus signal"
675
pass
676
677
# SetChecker - method
678
@dbus.service.method(_interface, in_signature=u"s")
679
def SetChecker(self, checker):
680
"D-Bus setter method"
681
self.checker_command = checker
682
# Emit D-Bus signal
683
self.PropertyChanged(dbus.String(u"checker"),
684
dbus.String(self.checker_command,
685
variant_level=1))
686
687
# SetHost - method
688
@dbus.service.method(_interface, in_signature=u"s")
689
def SetHost(self, host):
690
"D-Bus setter method"
691
self.host = host
692
# Emit D-Bus signal
693
self.PropertyChanged(dbus.String(u"host"),
694
dbus.String(self.host, variant_level=1))
695
696
# SetInterval - method
697
@dbus.service.method(_interface, in_signature=u"t")
698
def SetInterval(self, milliseconds):
699
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
700
# Emit D-Bus signal
701
self.PropertyChanged(dbus.String(u"interval"),
702
(dbus.UInt64(self.interval_milliseconds(),
703
variant_level=1)))
704
705
# SetSecret - method
706
@dbus.service.method(_interface, in_signature=u"ay",
707
byte_arrays=True)
708
def SetSecret(self, secret):
709
"D-Bus setter method"
710
self.secret = str(secret)
711
712
# SetTimeout - method
713
@dbus.service.method(_interface, in_signature=u"t")
714
def SetTimeout(self, milliseconds):
715
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
716
# Emit D-Bus signal
717
self.PropertyChanged(dbus.String(u"timeout"),
718
(dbus.UInt64(self.timeout_milliseconds(),
719
variant_level=1)))
720
721
# Enable - method
722
@dbus.service.method(_interface)
723
def Enable(self):
724
"D-Bus method"
725
self.enable()
726
727
# StartChecker - method
728
@dbus.service.method(_interface)
729
def StartChecker(self):
730
"D-Bus method"
731
self.start_checker()
732
733
# Disable - method
734
@dbus.service.method(_interface)
735
def Disable(self):
736
"D-Bus method"
737
self.disable()
738
739
# StopChecker - method
740
@dbus.service.method(_interface)
741
def StopChecker(self):
742
self.stop_checker()
743
744
del _interface
745
746
747
class ClientHandler(socketserver.BaseRequestHandler, object):
748
"""A class to handle client connections.
749
750
Instantiated once for each connection to handle it.
371
def peer_certificate(session):
372
"Return the peer's OpenPGP certificate as a bytestring"
373
# If not an OpenPGP certificate...
374
if gnutls.library.functions.gnutls_certificate_type_get\
375
(session._c_object) \
376
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP:
377
# ...do the normal thing
378
return session.peer_certificate
379
list_size = ctypes.c_uint()
380
cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
381
(session._c_object, ctypes.byref(list_size))
382
if list_size.value == 0:
383
return None
384
cert = cert_list[0]
385
return ctypes.string_at(cert.data, cert.size)
386
387
388
def fingerprint(openpgp):
389
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
390
# New GnuTLS "datum" with the OpenPGP public key
391
datum = gnutls.library.types.gnutls_datum_t\
392
(ctypes.cast(ctypes.c_char_p(openpgp),
393
ctypes.POINTER(ctypes.c_ubyte)),
394
ctypes.c_uint(len(openpgp)))
395
# New empty GnuTLS certificate
396
crt = gnutls.library.types.gnutls_openpgp_crt_t()
397
gnutls.library.functions.gnutls_openpgp_crt_init\
398
(ctypes.byref(crt))
399
# Import the OpenPGP public key into the certificate
400
gnutls.library.functions.gnutls_openpgp_crt_import\
401
(crt, ctypes.byref(datum),
402
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
403
# New buffer for the fingerprint
404
buffer = ctypes.create_string_buffer(20)
405
buffer_length = ctypes.c_size_t()
406
# Get the fingerprint from the certificate into the buffer
407
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
408
(crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
409
# Deinit the certificate
410
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
411
# Convert the buffer to a Python bytestring
412
fpr = ctypes.string_at(buffer, buffer_length.value)
413
# Convert the bytestring to hexadecimal notation
414
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
415
return hex_fpr
416
417
418
class tcp_handler(SocketServer.BaseRequestHandler, object):
419
"""A TCP request handler class.
420
Instantiated by IPv6_TCPServer for each request to handle it.
751
421
Note: This will run in its own forked process."""
752
422
753
423
def handle(self):
754
424
logger.info(u"TCP connection from: %s",
755
unicode(self.client_address))
756
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
757
# Open IPC pipe to parent process
758
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
759
session = (gnutls.connection
760
.ClientSession(self.request,
761
gnutls.connection
762
.X509Credentials()))
763
764
line = self.request.makefile().readline()
765
logger.debug(u"Protocol version: %r", line)
766
try:
767
if int(line.strip().split()[0]) > 1:
768
raise RuntimeError
769
except (ValueError, IndexError, RuntimeError), error:
770
logger.error(u"Unknown protocol version: %s", error)
771
return
772
773
# Note: gnutls.connection.X509Credentials is really a
774
# generic GnuTLS certificate credentials object so long as
775
# no X.509 keys are added to it. Therefore, we can use it
776
# here despite using OpenPGP certificates.
777
778
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
779
# u"+AES-256-CBC", u"+SHA1",
780
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
781
# u"+DHE-DSS"))
782
# Use a fallback default, since this MUST be set.
783
priority = self.server.gnutls_priority
784
if priority is None:
785
priority = u"NORMAL"
786
(gnutls.library.functions
787
.gnutls_priority_set_direct(session._c_object,
788
priority, None))
789
790
try:
791
session.handshake()
792
except gnutls.errors.GNUTLSError, error:
793
logger.warning(u"Handshake failed: %s", error)
794
# Do not run session.bye() here: the session is not
795
# established. Just abandon the request.
796
return
797
logger.debug(u"Handshake succeeded")
798
try:
799
fpr = self.fingerprint(self.peer_certificate(session))
800
except (TypeError, gnutls.errors.GNUTLSError), error:
801
logger.warning(u"Bad certificate: %s", error)
802
session.bye()
803
return
804
logger.debug(u"Fingerprint: %s", fpr)
805
806
for c in self.server.clients:
807
if c.fingerprint == fpr:
808
client = c
809
break
810
else:
811
ipc.write(u"NOTFOUND %s\n" % fpr)
812
session.bye()
813
return
814
# Have to check if client.still_valid(), since it is
815
# possible that the client timed out while establishing
816
# the GnuTLS session.
817
if not client.still_valid():
818
ipc.write(u"INVALID %s\n" % client.name)
819
session.bye()
820
return
821
ipc.write(u"SENDING %s\n" % client.name)
822
sent_size = 0
823
while sent_size < len(client.secret):
824
sent = session.send(client.secret[sent_size:])
825
logger.debug(u"Sent: %d, remaining: %d",
826
sent, len(client.secret)
827
- (sent_size + sent))
828
sent_size += sent
829
session.bye()
830
831
@staticmethod
832
def peer_certificate(session):
833
"Return the peer's OpenPGP certificate as a bytestring"
834
# If not an OpenPGP certificate...
835
if (gnutls.library.functions
836
.gnutls_certificate_type_get(session._c_object)
837
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
838
# ...do the normal thing
839
return session.peer_certificate
840
list_size = ctypes.c_uint(1)
841
cert_list = (gnutls.library.functions
842
.gnutls_certificate_get_peers
843
(session._c_object, ctypes.byref(list_size)))
844
if not bool(cert_list) and list_size.value != 0:
845
raise gnutls.errors.GNUTLSError(u"error getting peer"
846
u" certificate")
847
if list_size.value == 0:
848
return None
849
cert = cert_list[0]
850
return ctypes.string_at(cert.data, cert.size)
851
852
@staticmethod
853
def fingerprint(openpgp):
854
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
855
# New GnuTLS "datum" with the OpenPGP public key
856
datum = (gnutls.library.types
857
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
858
ctypes.POINTER
859
(ctypes.c_ubyte)),
860
ctypes.c_uint(len(openpgp))))
861
# New empty GnuTLS certificate
862
crt = gnutls.library.types.gnutls_openpgp_crt_t()
863
(gnutls.library.functions
864
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
865
# Import the OpenPGP public key into the certificate
866
(gnutls.library.functions
867
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
868
gnutls.library.constants
869
.GNUTLS_OPENPGP_FMT_RAW))
870
# Verify the self signature in the key
871
crtverify = ctypes.c_uint()
872
(gnutls.library.functions
873
.gnutls_openpgp_crt_verify_self(crt, 0,
874
ctypes.byref(crtverify)))
875
if crtverify.value != 0:
876
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
877
raise (gnutls.errors.CertificateSecurityError
878
(u"Verify failed"))
879
# New buffer for the fingerprint
880
buf = ctypes.create_string_buffer(20)
881
buf_len = ctypes.c_size_t()
882
# Get the fingerprint from the certificate into the buffer
883
(gnutls.library.functions
884
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
885
ctypes.byref(buf_len)))
886
# Deinit the certificate
887
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
888
# Convert the buffer to a Python bytestring
889
fpr = ctypes.string_at(buf, buf_len.value)
890
# Convert the bytestring to hexadecimal notation
891
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
892
return hex_fpr
893
894
895
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
896
"""Like socketserver.ForkingMixIn, but also pass a pipe.
897
898
Assumes a gobject.MainLoop event loop.
899
"""
900
def process_request(self, request, client_address):
901
"""Overrides and wraps the original process_request().
902
903
This function creates a new pipe in self.pipe
904
"""
905
self.pipe = os.pipe()
906
super(ForkingMixInWithPipe,
907
self).process_request(request, client_address)
908
os.close(self.pipe[1]) # close write end
909
# Call "handle_ipc" for both data and EOF events
910
gobject.io_add_watch(self.pipe[0],
911
gobject.IO_IN | gobject.IO_HUP,
912
self.handle_ipc)
913
def handle_ipc(source, condition):
914
"""Dummy function; override as necessary"""
915
os.close(source)
916
return False
917
918
919
class IPv6_TCPServer(ForkingMixInWithPipe,
920
socketserver.TCPServer, object):
921
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
922
425
unicode(self.client_address))
426
session = gnutls.connection.ClientSession\
427
(self.request, gnutls.connection.X509Credentials())
428
429
line = self.request.makefile().readline()
430
logger.debug(u"Protocol version: %r", line)
431
try:
432
if int(line.strip().split()[0]) > 1:
433
raise RuntimeError
434
except (ValueError, IndexError, RuntimeError), error:
435
logger.error(u"Unknown protocol version: %s", error)
436
return
437
438
# Note: gnutls.connection.X509Credentials is really a generic
439
# GnuTLS certificate credentials object so long as no X.509
440
# keys are added to it. Therefore, we can use it here despite
441
# using OpenPGP certificates.
442
443
#priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
444
# "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
445
# "+DHE-DSS"))
446
priority = "NORMAL" # Fallback default, since this
447
# MUST be set.
448
if self.server.settings["priority"]:
449
priority = self.server.settings["priority"]
450
gnutls.library.functions.gnutls_priority_set_direct\
451
(session._c_object, priority, None);
452
453
try:
454
session.handshake()
455
except gnutls.errors.GNUTLSError, error:
456
logger.warning(u"Handshake failed: %s", error)
457
# Do not run session.bye() here: the session is not
458
# established. Just abandon the request.
459
return
460
try:
461
fpr = fingerprint(peer_certificate(session))
462
except (TypeError, gnutls.errors.GNUTLSError), error:
463
logger.warning(u"Bad certificate: %s", error)
464
session.bye()
465
return
466
logger.debug(u"Fingerprint: %s", fpr)
467
client = None
468
for c in self.server.clients:
469
if c.fingerprint == fpr:
470
client = c
471
break
472
if not client:
473
logger.warning(u"Client not found for fingerprint: %s",
474
fpr)
475
session.bye()
476
return
477
# Have to check if client.still_valid(), since it is possible
478
# that the client timed out while establishing the GnuTLS
479
# session.
480
if not client.still_valid():
481
logger.warning(u"Client %(name)s is invalid",
482
vars(client))
483
session.bye()
484
return
485
sent_size = 0
486
while sent_size < len(client.secret):
487
sent = session.send(client.secret[sent_size:])
488
logger.debug(u"Sent: %d, remaining: %d",
489
sent, len(client.secret)
490
- (sent_size + sent))
491
sent_size += sent
492
session.bye()
493
494
495
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
496
"""IPv6 TCP server. Accepts 'None' as address and/or port.
923
497
Attributes:
924
enabled: Boolean; whether this server is activated yet
925
interface: None or a network interface name (string)
926
use_ipv6: Boolean; to use IPv6 or not
927
----
928
clients: set of Client objects
929
gnutls_priority GnuTLS priority string
930
use_dbus: Boolean; to emit D-Bus signals or not
498
settings: Server settings
499
clients: Set() of Client objects
931
500
"""
932
def __init__(self, server_address, RequestHandlerClass,
933
interface=None, use_ipv6=True, clients=None,
934
gnutls_priority=None, use_dbus=True):
935
self.enabled = False
936
self.interface = interface
937
if use_ipv6:
938
self.address_family = socket.AF_INET6
939
self.clients = clients
940
self.use_dbus = use_dbus
941
self.gnutls_priority = gnutls_priority
942
socketserver.TCPServer.__init__(self, server_address,
943
RequestHandlerClass)
501
address_family = socket.AF_INET6
502
def __init__(self, *args, **kwargs):
503
if "settings" in kwargs:
504
self.settings = kwargs["settings"]
505
del kwargs["settings"]
506
if "clients" in kwargs:
507
self.clients = kwargs["clients"]
508
del kwargs["clients"]
509
return super(type(self), self).__init__(*args, **kwargs)
944
510
def server_bind(self):
945
511
"""This overrides the normal server_bind() function
946
512
to bind to an interface if one was specified, and also NOT to
947
513
bind to an address or port if they were not specified."""
948
if self.interface is not None:
949
if SO_BINDTODEVICE is None:
950
logger.error(u"SO_BINDTODEVICE does not exist;"
951
u" cannot bind to interface %s",
952
self.interface)
953
else:
954
try:
955
self.socket.setsockopt(socket.SOL_SOCKET,
956
SO_BINDTODEVICE,
957
str(self.interface
958
+ u'\0'))
959
except socket.error, error:
960
if error[0] == errno.EPERM:
961
logger.error(u"No permission to"
962
u" bind to interface %s",
963
self.interface)
964
elif error[0] == errno.ENOPROTOOPT:
965
logger.error(u"SO_BINDTODEVICE not available;"
966
u" cannot bind to interface %s",
967
self.interface)
968
else:
969
raise
514
if self.settings["interface"]:
515
# 25 is from /usr/include/asm-i486/socket.h
516
SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
517
try:
518
self.socket.setsockopt(socket.SOL_SOCKET,
519
SO_BINDTODEVICE,
520
self.settings["interface"])
521
except socket.error, error:
522
if error[0] == errno.EPERM:
523
logger.error(u"No permission to"
524
u" bind to interface %s",
525
self.settings["interface"])
526
else:
527
raise error
970
528
# Only bind(2) the socket if we really need to.
971
529
if self.server_address[0] or self.server_address[1]:
972
530
if not self.server_address[0]:
973
if self.address_family == socket.AF_INET6:
974
any_address = u"::" # in6addr_any
975
else:
976
any_address = socket.INADDR_ANY
977
self.server_address = (any_address,
531
in6addr_any = "::"
532
self.server_address = (in6addr_any,
978
533
self.server_address[1])
979
534
elif not self.server_address[1]:
980
535
self.server_address = (self.server_address[0],
981
536
0)
982
# if self.interface:
537
# if self.settings["interface"]:
983
538
# self.server_address = (self.server_address[0],
984
539
# 0, # port
985
540
# 0, # flowinfo
986
541
# if_nametoindex
987
# (self.interface))
988
return socketserver.TCPServer.server_bind(self)
989
def server_activate(self):
990
if self.enabled:
991
return socketserver.TCPServer.server_activate(self)
992
def enable(self):
993
self.enabled = True
994
def handle_ipc(self, source, condition, file_objects={}):
995
condition_names = {
996
gobject.IO_IN: u"IN", # There is data to read.
997
gobject.IO_OUT: u"OUT", # Data can be written (without
998
# blocking).
999
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1000
gobject.IO_ERR: u"ERR", # Error condition.
1001
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1002
# broken, usually for pipes and
1003
# sockets).
1004
}
1005
conditions_string = ' | '.join(name
1006
for cond, name in
1007
condition_names.iteritems()
1008
if cond & condition)
1009
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1010
conditions_string)
1011
1012
# Turn the pipe file descriptor into a Python file object
1013
if source not in file_objects:
1014
file_objects[source] = os.fdopen(source, u"r", 1)
1015
1016
# Read a line from the file object
1017
cmdline = file_objects[source].readline()
1018
if not cmdline: # Empty line means end of file
1019
# close the IPC pipe
1020
file_objects[source].close()
1021
del file_objects[source]
1022
1023
# Stop calling this function
1024
return False
1025
1026
logger.debug(u"IPC command: %r", cmdline)
1027
1028
# Parse and act on command
1029
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1030
1031
if cmd == u"NOTFOUND":
1032
logger.warning(u"Client not found for fingerprint: %s",
1033
args)
1034
if self.use_dbus:
1035
# Emit D-Bus signal
1036
mandos_dbus_service.ClientNotFound(args)
1037
elif cmd == u"INVALID":
1038
for client in self.clients:
1039
if client.name == args:
1040
logger.warning(u"Client %s is invalid", args)
1041
if self.use_dbus:
1042
# Emit D-Bus signal
1043
client.Rejected()
1044
break
1045
else:
1046
logger.error(u"Unknown client %s is invalid", args)
1047
elif cmd == u"SENDING":
1048
for client in self.clients:
1049
if client.name == args:
1050
logger.info(u"Sending secret to %s", client.name)
1051
client.checked_ok()
1052
if self.use_dbus:
1053
# Emit D-Bus signal
1054
client.ReceivedSecret()
1055
break
1056
else:
1057
logger.error(u"Sending secret to unknown client %s",
1058
args)
1059
else:
1060
logger.error(u"Unknown IPC command: %r", cmdline)
1061
1062
# Keep calling this function
1063
return True
542
# (self.settings
543
# ["interface"]))
544
return super(type(self), self).server_bind()
1064
545
1065
546
1066
547
def string_to_delta(interval):
1067
548
"""Parse a string and return a datetime.timedelta
1068
1069
>>> string_to_delta(u'7d')
549
550
>>> string_to_delta('7d')
1070
551
datetime.timedelta(7)
1071
>>> string_to_delta(u'60s')
552
>>> string_to_delta('60s')
1072
553
datetime.timedelta(0, 60)
1073
>>> string_to_delta(u'60m')
554
>>> string_to_delta('60m')
1074
555
datetime.timedelta(0, 3600)
1075
>>> string_to_delta(u'24h')
556
>>> string_to_delta('24h')
1076
557
datetime.timedelta(1)
1077
558
>>> string_to_delta(u'1w')
1078
559
datetime.timedelta(7)
1079
>>> string_to_delta(u'5m 30s')
1080
datetime.timedelta(0, 330)
1081
560
"""
1082
timevalue = datetime.timedelta(0)
1083
for s in interval.split():
1084
try:
1085
suffix = unicode(s[-1])
1086
value = int(s[:-1])
1087
if suffix == u"d":
1088
delta = datetime.timedelta(value)
1089
elif suffix == u"s":
1090
delta = datetime.timedelta(0, value)
1091
elif suffix == u"m":
1092
delta = datetime.timedelta(0, 0, 0, 0, value)
1093
elif suffix == u"h":
1094
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1095
elif suffix == u"w":
1096
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1097
else:
1098
raise ValueError
1099
except (ValueError, IndexError):
561
try:
562
suffix=unicode(interval[-1])
563
value=int(interval[:-1])
564
if suffix == u"d":
565
delta = datetime.timedelta(value)
566
elif suffix == u"s":
567
delta = datetime.timedelta(0, value)
568
elif suffix == u"m":
569
delta = datetime.timedelta(0, 0, 0, 0, value)
570
elif suffix == u"h":
571
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
572
elif suffix == u"w":
573
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
574
else:
1100
575
raise ValueError
1101
timevalue += delta
1102
return timevalue
1103
576
except (ValueError, IndexError):
577
raise ValueError
578
return delta
579
580
581
def server_state_changed(state):
582
"""Derived from the Avahi example code"""
583
if state == avahi.SERVER_COLLISION:
584
logger.error(u"Server name collision")
585
service.remove()
586
elif state == avahi.SERVER_RUNNING:
587
service.add()
588
589
590
def entry_group_state_changed(state, error):
591
"""Derived from the Avahi example code"""
592
logger.debug(u"state change: %i", state)
593
594
if state == avahi.ENTRY_GROUP_ESTABLISHED:
595
logger.debug(u"Service established.")
596
elif state == avahi.ENTRY_GROUP_COLLISION:
597
logger.warning(u"Service name collision.")
598
service.rename()
599
elif state == avahi.ENTRY_GROUP_FAILURE:
600
logger.critical(u"Error in group state changed %s",
601
unicode(error))
602
raise AvahiGroupError("State changed: %s", str(error))
1104
603
1105
604
def if_nametoindex(interface):
1106
"""Call the C function if_nametoindex(), or equivalent
1107
1108
Note: This function cannot accept a unicode string."""
605
"""Call the C function if_nametoindex(), or equivalent"""
1109
606
global if_nametoindex
1110
607
try:
1111
if_nametoindex = (ctypes.cdll.LoadLibrary
1112
(ctypes.util.find_library(u"c"))
1113
.if_nametoindex)
608
if "ctypes.util" not in sys.modules:
609
import ctypes.util
610
if_nametoindex = ctypes.cdll.LoadLibrary\
611
(ctypes.util.find_library("c")).if_nametoindex
1114
612
except (OSError, AttributeError):
1115
logger.warning(u"Doing if_nametoindex the hard way")
613
if "struct" not in sys.modules:
614
import struct
615
if "fcntl" not in sys.modules:
616
import fcntl
1116
617
def if_nametoindex(interface):
1117
618
"Get an interface index the hard way, i.e. using fcntl()"
1118
619
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1119
with closing(socket.socket()) as s:
1120
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1121
struct.pack(str(u"16s16x"),
1122
interface))
1123
interface_index = struct.unpack(str(u"I"),
1124
ifreq[16:20])[0]
620
s = socket.socket()
621
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
622
struct.pack("16s16x", interface))
623
s.close()
624
interface_index = struct.unpack("I", ifreq[16:20])[0]
1125
625
return interface_index
1126
626
return if_nametoindex(interface)
1127
627
1128
628
1129
629
def daemon(nochdir = False, noclose = False):
1130
630
"""See daemon(3). Standard BSD Unix function.
1131
1132
631
This should really exist as os.daemon, but it doesn't (yet)."""
1133
632
if os.fork():
1134
633
sys.exit()
1135
634
os.setsid()
1136
635
if not nochdir:
1137
os.chdir(u"/")
636
os.chdir("/")
1138
637
if os.fork():
1139
638
sys.exit()
1140
639
if not noclose:
1142
641
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1143
642
if not stat.S_ISCHR(os.fstat(null).st_mode):
1144
643
raise OSError(errno.ENODEV,
1145
u"/dev/null not a character device")
644
"/dev/null not a character device")
1146
645
os.dup2(null, sys.stdin.fileno())
1147
646
os.dup2(null, sys.stdout.fileno())
1148
647
os.dup2(null, sys.stderr.fileno())
1151
650
1152
651
1153
652
def main():
1154
1155
######################################################################
1156
# Parsing of options, both command line and config file
1157
1158
parser = optparse.OptionParser(version = "%%prog %s" % version)
1159
parser.add_option("-i", u"--interface", type=u"string",
1160
metavar="IF", help=u"Bind to interface IF")
1161
parser.add_option("-a", u"--address", type=u"string",
1162
help=u"Address to listen for requests on")
1163
parser.add_option("-p", u"--port", type=u"int",
1164
help=u"Port number to receive requests on")
1165
parser.add_option("--check", action=u"store_true",
1166
help=u"Run self-test")
1167
parser.add_option("--debug", action=u"store_true",
1168
help=u"Debug mode; run in foreground and log to"
1169
u" terminal")
1170
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1171
u" priority string (see GnuTLS documentation)")
1172
parser.add_option("--servicename", type=u"string",
1173
metavar=u"NAME", help=u"Zeroconf service name")
1174
parser.add_option("--configdir", type=u"string",
1175
default=u"/etc/mandos", metavar=u"DIR",
1176
help=u"Directory to search for configuration"
1177
u" files")
1178
parser.add_option("--no-dbus", action=u"store_false",
1179
dest=u"use_dbus", help=u"Do not provide D-Bus"
1180
u" system bus interface")
1181
parser.add_option("--no-ipv6", action=u"store_false",
1182
dest=u"use_ipv6", help=u"Do not use IPv6")
1183
options = parser.parse_args()[0]
653
global main_loop_started
654
main_loop_started = False
655
656
parser = OptionParser()
657
parser.add_option("-i", "--interface", type="string",
658
metavar="IF", help="Bind to interface IF")
659
parser.add_option("-a", "--address", type="string",
660
help="Address to listen for requests on")
661
parser.add_option("-p", "--port", type="int",
662
help="Port number to receive requests on")
663
parser.add_option("--check", action="store_true", default=False,
664
help="Run self-test")
665
parser.add_option("--debug", action="store_true",
666
help="Debug mode; run in foreground and log to"
667
" terminal")
668
parser.add_option("--priority", type="string", help="GnuTLS"
669
" priority string (see GnuTLS documentation)")
670
parser.add_option("--servicename", type="string", metavar="NAME",
671
help="Zeroconf service name")
672
parser.add_option("--configdir", type="string",
673
default="/etc/mandos", metavar="DIR",
674
help="Directory to search for configuration"
675
" files")
676
(options, args) = parser.parse_args()
1184
677
1185
678
if options.check:
1186
679
import doctest
1188
681
sys.exit()
1189
682
1190
683
# Default values for config file for server-global settings
1191
server_defaults = { u"interface": u"",
1192
u"address": u"",
1193
u"port": u"",
1194
u"debug": u"False",
1195
u"priority":
1196
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1197
u"servicename": u"Mandos",
1198
u"use_dbus": u"True",
1199
u"use_ipv6": u"True",
684
server_defaults = { "interface": "",
685
"address": "",
686
"port": "",
687
"debug": "False",
688
"priority":
689
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
690
"servicename": "Mandos",
1200
691
}
1201
692
1202
693
# Parse config file for server-global settings
1203
server_config = configparser.SafeConfigParser(server_defaults)
694
server_config = ConfigParser.SafeConfigParser(server_defaults)
1204
695
del server_defaults
1205
server_config.read(os.path.join(options.configdir,
1206
u"mandos.conf"))
696
server_config.read(os.path.join(options.configdir, "mandos.conf"))
697
server_section = "server"
1207
698
# Convert the SafeConfigParser object to a dict
1208
server_settings = server_config.defaults()
1209
# Use the appropriate methods on the non-string config options
1210
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1211
server_settings[option] = server_config.getboolean(u"DEFAULT",
1212
option)
1213
if server_settings["port"]:
1214
server_settings["port"] = server_config.getint(u"DEFAULT",
1215
u"port")
699
server_settings = dict(server_config.items(server_section))
700
# Use getboolean on the boolean config option
701
server_settings["debug"] = server_config.getboolean\
702
(server_section, "debug")
1216
703
del server_config
1217
704
1218
705
# Override the settings from the config file with command line
1219
706
# options, if set.
1220
for option in (u"interface", u"address", u"port", u"debug",
1221
u"priority", u"servicename", u"configdir",
1222
u"use_dbus", u"use_ipv6"):
707
for option in ("interface", "address", "port", "debug",
708
"priority", "servicename", "configdir"):
1223
709
value = getattr(options, option)
1224
710
if value is not None:
1225
711
server_settings[option] = value
1226
712
del options
1227
# Force all strings to be unicode
1228
for option in server_settings.keys():
1229
if type(server_settings[option]) is str:
1230
server_settings[option] = unicode(server_settings[option])
1231
713
# Now we have our good server settings in "server_settings"
1232
714
1233
##################################################################
1234
1235
# For convenience
1236
debug = server_settings[u"debug"]
1237
use_dbus = server_settings[u"use_dbus"]
1238
use_ipv6 = server_settings[u"use_ipv6"]
715
debug = server_settings["debug"]
1239
716
1240
717
if not debug:
1241
718
syslogger.setLevel(logging.WARNING)
1242
console.setLevel(logging.WARNING)
1243
719
1244
if server_settings[u"servicename"] != u"Mandos":
1245
syslogger.setFormatter(logging.Formatter
1246
(u'Mandos (%s) [%%(process)d]:'
1247
u' %%(levelname)s: %%(message)s'
1248
% server_settings[u"servicename"]))
720
if server_settings["servicename"] != "Mandos":
721
syslogger.setFormatter(logging.Formatter\
722
('Mandos (%s): %%(levelname)s:'
723
' %%(message)s'
724
% server_settings["servicename"]))
1249
725
1250
726
# Parse config file with clients
1251
client_defaults = { u"timeout": u"1h",
1252
u"interval": u"5m",
1253
u"checker": u"fping -q -- %%(host)s",
1254
u"host": u"",
727
client_defaults = { "timeout": "1h",
728
"interval": "5m",
729
"checker": "fping -q -- %%(host)s",
1255
730
}
1256
client_config = configparser.SafeConfigParser(client_defaults)
1257
client_config.read(os.path.join(server_settings[u"configdir"],
1258
u"clients.conf"))
1259
1260
global mandos_dbus_service
1261
mandos_dbus_service = None
1262
1263
clients = set()
1264
tcp_server = IPv6_TCPServer((server_settings[u"address"],
1265
server_settings[u"port"]),
1266
ClientHandler,
1267
interface=
1268
server_settings[u"interface"],
1269
use_ipv6=use_ipv6,
1270
clients=clients,
1271
gnutls_priority=
1272
server_settings[u"priority"],
1273
use_dbus=use_dbus)
1274
pidfilename = u"/var/run/mandos.pid"
1275
try:
1276
pidfile = open(pidfilename, u"w")
1277
except IOError:
1278
logger.error(u"Could not open file %r", pidfilename)
1279
1280
try:
1281
uid = pwd.getpwnam(u"_mandos").pw_uid
1282
gid = pwd.getpwnam(u"_mandos").pw_gid
1283
except KeyError:
1284
try:
1285
uid = pwd.getpwnam(u"mandos").pw_uid
1286
gid = pwd.getpwnam(u"mandos").pw_gid
1287
except KeyError:
1288
try:
1289
uid = pwd.getpwnam(u"nobody").pw_uid
1290
gid = pwd.getpwnam(u"nobody").pw_gid
1291
except KeyError:
1292
uid = 65534
1293
gid = 65534
1294
try:
1295
os.setgid(gid)
1296
os.setuid(uid)
1297
except OSError, error:
1298
if error[0] != errno.EPERM:
1299
raise error
1300
1301
# Enable all possible GnuTLS debugging
1302
if debug:
1303
# "Use a log level over 10 to enable all debugging options."
1304
# - GnuTLS manual
1305
gnutls.library.functions.gnutls_global_set_log_level(11)
1306
1307
@gnutls.library.types.gnutls_log_func
1308
def debug_gnutls(level, string):
1309
logger.debug(u"GnuTLS: %s", string[:-1])
1310
1311
(gnutls.library.functions
1312
.gnutls_global_set_log_function(debug_gnutls))
731
client_config = ConfigParser.SafeConfigParser(client_defaults)
732
client_config.read(os.path.join(server_settings["configdir"],
733
"clients.conf"))
734
735
global service
736
service = AvahiService(name = server_settings["servicename"],
737
type = "_mandos._tcp", );
738
if server_settings["interface"]:
739
service.interface = if_nametoindex(server_settings["interface"])
1313
740
1314
741
global main_loop
742
global bus
743
global server
1315
744
# From the Avahi example code
1316
745
DBusGMainLoop(set_as_default=True )
1317
746
main_loop = gobject.MainLoop()
1318
747
bus = dbus.SystemBus()
748
server = dbus.Interface(
749
bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
750
avahi.DBUS_INTERFACE_SERVER )
1319
751
# End of Avahi example code
1320
if use_dbus:
1321
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1322
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1323
service = AvahiService(name = server_settings[u"servicename"],
1324
servicetype = u"_mandos._tcp",
1325
protocol = protocol, bus = bus)
1326
if server_settings["interface"]:
1327
service.interface = (if_nametoindex
1328
(str(server_settings[u"interface"])))
1329
1330
client_class = Client
1331
if use_dbus:
1332
client_class = functools.partial(ClientDBus, bus = bus)
1333
clients.update(set(
1334
client_class(name = section,
1335
config= dict(client_config.items(section)))
1336
for section in client_config.sections()))
752
753
if debug:
754
console = logging.StreamHandler()
755
# console.setLevel(logging.DEBUG)
756
console.setFormatter(logging.Formatter\
757
('%(levelname)s: %(message)s'))
758
logger.addHandler(console)
759
del console
760
761
clients = Set()
762
def remove_from_clients(client):
763
clients.remove(client)
764
if not clients:
765
logger.critical(u"No clients left, exiting")
766
sys.exit()
767
768
clients.update(Set(Client(name = section,
769
stop_hook = remove_from_clients,
770
config
771
= dict(client_config.items(section)))
772
for section in client_config.sections()))
1337
773
if not clients:
1338
logger.warning(u"No clients defined")
774
logger.critical(u"No clients defined")
775
sys.exit(1)
1339
776
1340
if debug:
1341
# Redirect stdin so all checkers get /dev/null
1342
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1343
os.dup2(null, sys.stdin.fileno())
1344
if null > 2:
1345
os.close(null)
1346
else:
1347
# No console logging
1348
logger.removeHandler(console)
1349
# Close all input and output, do double fork, etc.
777
if not debug:
1350
778
daemon()
1351
779
780
pidfilename = "/var/run/mandos/mandos.pid"
781
pid = os.getpid()
1352
782
try:
1353
with closing(pidfile):
1354
pid = os.getpid()
1355
pidfile.write(str(pid) + "\n")
783
pidfile = open(pidfilename, "w")
784
pidfile.write(str(pid) + "\n")
785
pidfile.close()
1356
786
del pidfile
1357
except IOError:
1358
logger.error(u"Could not write to file %r with PID %d",
1359
pidfilename, pid)
1360
except NameError:
1361
# "pidfile" was never created
1362
pass
1363
del pidfilename
787
except IOError, err:
788
logger.error(u"Could not write %s file with PID %d",
789
pidfilename, os.getpid())
1364
790
1365
791
def cleanup():
1366
792
"Cleanup function; run on exit"
1367
service.cleanup()
793
global group
794
# From the Avahi example code
795
if not group is None:
796
group.Free()
797
group = None
798
# End of Avahi example code
1368
799
1369
800
while clients:
1370
801
client = clients.pop()
1371
client.disable_hook = None
1372
client.disable()
802
client.stop_hook = None
803
client.stop()
1373
804
1374
805
atexit.register(cleanup)
1375
806
1378
809
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1379
810
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1380
811
1381
if use_dbus:
1382
class MandosDBusService(dbus.service.Object):
1383
"""A D-Bus proxy object"""
1384
def __init__(self):
1385
dbus.service.Object.__init__(self, bus, u"/")
1386
_interface = u"se.bsnet.fukt.Mandos"
1387
1388
@dbus.service.signal(_interface, signature=u"oa{sv}")
1389
def ClientAdded(self, objpath, properties):
1390
"D-Bus signal"
1391
pass
1392
1393
@dbus.service.signal(_interface, signature=u"s")
1394
def ClientNotFound(self, fingerprint):
1395
"D-Bus signal"
1396
pass
1397
1398
@dbus.service.signal(_interface, signature=u"os")
1399
def ClientRemoved(self, objpath, name):
1400
"D-Bus signal"
1401
pass
1402
1403
@dbus.service.method(_interface, out_signature=u"ao")
1404
def GetAllClients(self):
1405
"D-Bus method"
1406
return dbus.Array(c.dbus_object_path for c in clients)
1407
1408
@dbus.service.method(_interface,
1409
out_signature=u"a{oa{sv}}")
1410
def GetAllClientsWithProperties(self):
1411
"D-Bus method"
1412
return dbus.Dictionary(
1413
((c.dbus_object_path, c.GetAllProperties())
1414
for c in clients),
1415
signature=u"oa{sv}")
1416
1417
@dbus.service.method(_interface, in_signature=u"o")
1418
def RemoveClient(self, object_path):
1419
"D-Bus method"
1420
for c in clients:
1421
if c.dbus_object_path == object_path:
1422
clients.remove(c)
1423
c.remove_from_connection()
1424
# Don't signal anything except ClientRemoved
1425
c.disable(signal=False)
1426
# Emit D-Bus signal
1427
self.ClientRemoved(object_path, c.name)
1428
return
1429
raise KeyError
1430
1431
del _interface
1432
1433
mandos_dbus_service = MandosDBusService()
1434
1435
812
for client in clients:
1436
if use_dbus:
1437
# Emit D-Bus signal
1438
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1439
client.GetAllProperties())
1440
client.enable()
1441
1442
tcp_server.enable()
1443
tcp_server.server_activate()
1444
813
client.start()
814
815
tcp_server = IPv6_TCPServer((server_settings["address"],
816
server_settings["port"]),
817
tcp_handler,
818
settings=server_settings,
819
clients=clients)
1445
820
# Find out what port we got
1446
821
service.port = tcp_server.socket.getsockname()[1]
1447
if use_ipv6:
1448
logger.info(u"Now listening on address %r, port %d,"
1449
" flowinfo %d, scope_id %d"
1450
% tcp_server.socket.getsockname())
1451
else: # IPv4
1452
logger.info(u"Now listening on address %r, port %d"
1453
% tcp_server.socket.getsockname())
822
logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
823
u" scope_id %d" % tcp_server.socket.getsockname())
1454
824
1455
825
#service.interface = tcp_server.socket.getsockname()[3]
1456
826
1457
827
try:
1458
828
# From the Avahi example code
829
server.connect_to_signal("StateChanged", server_state_changed)
1459
830
try:
1460
service.activate()
831
server_state_changed(server.GetState())
1461
832
except dbus.exceptions.DBusException, error:
1462
833
logger.critical(u"DBusException: %s", error)
1463
834
sys.exit(1)
1465
836
1466
837
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1467
838
lambda *args, **kwargs:
1468
(tcp_server.handle_request
1469
(*args[2:], **kwargs) or True))
839
tcp_server.handle_request\
840
(*args[2:], **kwargs) or True)
1470
841
1471
842
logger.debug(u"Starting main loop")
843
main_loop_started = True
1472
844
main_loop.run()
1473
845
except AvahiError, error:
1474
logger.critical(u"AvahiError: %s", error)
846
logger.critical(u"AvahiError: %s" + unicode(error))
1475
847
sys.exit(1)
1476
848
except KeyboardInterrupt:
1477
849
if debug:
1478
print >> sys.stderr
1479
logger.debug(u"Server received KeyboardInterrupt")
1480
logger.debug(u"Server exiting")
850
print
1481
851
1482
852
if __name__ == '__main__':
1483
853
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0