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