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 47
- compare with another revision
- download diff
- download tarball
- view history from revision 47
- Committer: Teddy Hogeborn
- Date: 2008-08-07 21:45:41 UTC
- Revision ID: teddy@fukt.bsnet.se-20080807214541-pyg8itw6kphz1dy5
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed.
* plugins.d/mandosclient.c: Renamed to "plugins.d/password-request.c".
All users changed.
* plugins.d/passprompt.c: Renamed to "plugins.d/password-prompt.c".
All users changed.
* server.conf: Renamed to "mandos.conf". All users changed.
* server.py: Renamed to "mandos".
(daemon): Have default values for arguments. Caller changed.
* Makefile (distclean, mostlyclean, maintainer-clean): New aliases for
"clean".
(check, run-client, run-server): New.
* network-protocol.txt: New.
* plugins.d/mandosclient.c: Renamed to "plugins.d/password-request.c".
All users changed.
* plugins.d/passprompt.c: Renamed to "plugins.d/password-prompt.c".
All users changed.
* server.conf: Renamed to "mandos.conf". All users changed.
* server.py: Renamed to "mandos".
(daemon): Have default values for arguments. Caller changed.
* Makefile (distclean, mostlyclean, maintainer-clean): New aliases for
"clean".
(check, run-client, run-server): New.
* network-protocol.txt: New.
- files added:
- network-protocol.txt
- files removed:
- .bzr-builddeb
- debian
- debian/po
- files renamed:
- plugin-runner.c => mandos-client.c
- plugins.d/mandos-client.c => plugins.d/password-request.c
- files modified:
- Makefile
added
removed
mandos
11
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
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
55
54
import stat
56
55
import logging
57
56
import logging.handlers
58
import pwd
59
from contextlib import closing
60
57
61
58
import dbus
62
import dbus.service
63
59
import gobject
64
60
import avahi
65
61
from dbus.mainloop.glib import DBusGMainLoop
66
62
import ctypes
67
import ctypes.util
68
63
69
version = "1.0.5"
70
64
71
65
logger = logging.Logger('mandos')
72
syslogger = (logging.handlers.SysLogHandler
73
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
74
address = "/dev/log"))
75
syslogger.setFormatter(logging.Formatter
76
('Mandos: %(levelname)s: %(message)s'))
66
syslogger = logging.handlers.SysLogHandler\
67
(facility = logging.handlers.SysLogHandler.LOG_DAEMON)
68
syslogger.setFormatter(logging.Formatter\
69
('%(levelname)s: %(message)s'))
77
70
logger.addHandler(syslogger)
71
del syslogger
78
72
79
console = logging.StreamHandler()
80
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
81
' %(message)s'))
82
logger.addHandler(console)
83
73
84
74
class AvahiError(Exception):
85
def __init__(self, value, *args, **kwargs):
75
def __init__(self, value):
86
76
self.value = value
87
super(AvahiError, self).__init__(value, *args, **kwargs)
88
def __unicode__(self):
89
return unicode(repr(self.value))
77
def __str__(self):
78
return repr(self.value)
90
79
91
80
class AvahiServiceError(AvahiError):
92
81
pass
112
101
a sensible number of times
113
102
"""
114
103
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
115
servicetype = None, port = None, TXT = None,
116
domain = "", host = "", max_renames = 32768):
104
type = None, port = None, TXT = None, domain = "",
105
host = "", max_renames = 12):
117
106
self.interface = interface
118
107
self.name = name
119
self.type = servicetype
108
self.type = type
120
109
self.port = port
121
self.TXT = TXT if TXT is not None else []
110
if TXT is None:
111
self.TXT = []
112
else:
113
self.TXT = TXT
122
114
self.domain = domain
123
115
self.host = host
124
116
self.rename_count = 0
125
self.max_renames = max_renames
126
117
def rename(self):
127
118
"""Derived from the Avahi example code"""
128
119
if self.rename_count >= self.max_renames:
129
logger.critical(u"No suitable Zeroconf service name found"
130
u" after %i retries, exiting.",
131
self.rename_count)
132
raise AvahiServiceError(u"Too many renames")
133
self.name = server.GetAlternativeServiceName(self.name)
134
logger.info(u"Changing Zeroconf service name to %r ...",
135
str(self.name))
136
syslogger.setFormatter(logging.Formatter
137
('Mandos (%s): %%(levelname)s:'
138
' %%(message)s' % 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)
139
125
self.remove()
140
126
self.add()
141
127
self.rename_count += 1
147
133
"""Derived from the Avahi example code"""
148
134
global group
149
135
if group is None:
150
group = dbus.Interface(bus.get_object
151
(avahi.DBUS_NAME,
136
group = dbus.Interface\
137
(bus.get_object(avahi.DBUS_NAME,
152
138
server.EntryGroupNew()),
153
avahi.DBUS_INTERFACE_ENTRY_GROUP)
139
avahi.DBUS_INTERFACE_ENTRY_GROUP)
154
140
group.connect_to_signal('StateChanged',
155
141
entry_group_state_changed)
156
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
142
logger.debug(u"Adding service '%s' of type '%s' ...",
157
143
service.name, service.type)
158
144
group.AddService(
159
145
self.interface, # interface
170
156
# End of Avahi example code
171
157
172
158
173
def _datetime_to_dbus(dt, variant_level=0):
174
"""Convert a UTC datetime.datetime() to a D-Bus type."""
175
return dbus.String(dt.isoformat(), variant_level=variant_level)
176
177
178
class Client(dbus.service.Object):
159
class Client(object):
179
160
"""A representation of a client host served by this server.
180
161
Attributes:
181
name: string; from the config file, used in log messages and
182
D-Bus identifiers
162
name: string; from the config file, used in log messages
183
163
fingerprint: string (40 or 32 hexadecimal digits); used to
184
164
uniquely identify the client
185
secret: bytestring; sent verbatim (over TLS) to client
186
host: string; available for use by the checker command
187
created: datetime.datetime(); (UTC) object creation
188
last_enabled: datetime.datetime(); (UTC)
189
enabled: bool()
190
last_checked_ok: datetime.datetime(); (UTC) or None
191
timeout: datetime.timedelta(); How long from last_checked_ok
192
until this client is invalid
193
interval: datetime.timedelta(); How often to start a new checker
194
disable_hook: If set, called by disable() as disable_hook(self)
195
checker: subprocess.Popen(); a running checker process used
196
to see if the client lives.
197
'None' if no process is running.
165
secret: bytestring; sent verbatim (over TLS) to client
166
fqdn: string (FQDN); available for use by the checker command
167
created: datetime.datetime(); object creation, not client host
168
last_checked_ok: datetime.datetime() or None if not yet checked OK
169
timeout: datetime.timedelta(); How long from last_checked_ok
170
until this client is invalid
171
interval: datetime.timedelta(); How often to start a new checker
172
stop_hook: If set, called by stop() as stop_hook(self)
173
checker: subprocess.Popen(); a running checker process used
174
to see if the client lives.
175
'None' if no process is running.
198
176
checker_initiator_tag: a gobject event source tag, or None
199
disable_initiator_tag: - '' -
177
stop_initiator_tag: - '' -
200
178
checker_callback_tag: - '' -
201
179
checker_command: string; External command which is run to check if
202
180
client lives. %() expansions are done at
203
181
runtime with vars(self) as dict, so that for
204
182
instance %(name)s can be used in the command.
205
use_dbus: bool(); Whether to provide D-Bus interface and signals
206
dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
183
Private attibutes:
184
_timeout: Real variable for 'timeout'
185
_interval: Real variable for 'interval'
186
_timeout_milliseconds: Used when calling gobject.timeout_add()
187
_interval_milliseconds: - '' -
207
188
"""
208
def timeout_milliseconds(self):
209
"Return the 'timeout' attribute in milliseconds"
210
return ((self.timeout.days * 24 * 60 * 60 * 1000)
211
+ (self.timeout.seconds * 1000)
212
+ (self.timeout.microseconds // 1000))
213
214
def interval_milliseconds(self):
215
"Return the 'interval' attribute in milliseconds"
216
return ((self.interval.days * 24 * 60 * 60 * 1000)
217
+ (self.interval.seconds * 1000)
218
+ (self.interval.microseconds // 1000))
219
220
def __init__(self, name = None, disable_hook=None, config=None,
221
use_dbus=True):
189
def _set_timeout(self, timeout):
190
"Setter function for 'timeout' attribute"
191
self._timeout = timeout
192
self._timeout_milliseconds = ((self.timeout.days
193
* 24 * 60 * 60 * 1000)
194
+ (self.timeout.seconds * 1000)
195
+ (self.timeout.microseconds
196
// 1000))
197
timeout = property(lambda self: self._timeout,
198
_set_timeout)
199
del _set_timeout
200
def _set_interval(self, interval):
201
"Setter function for 'interval' attribute"
202
self._interval = interval
203
self._interval_milliseconds = ((self.interval.days
204
* 24 * 60 * 60 * 1000)
205
+ (self.interval.seconds
206
* 1000)
207
+ (self.interval.microseconds
208
// 1000))
209
interval = property(lambda self: self._interval,
210
_set_interval)
211
del _set_interval
212
def __init__(self, name = None, stop_hook=None, config={}):
222
213
"""Note: the 'checker' key in 'config' sets the
223
214
'checker_command' attribute and *not* the 'checker'
224
215
attribute."""
225
216
self.name = name
226
if config is None:
227
config = {}
228
217
logger.debug(u"Creating client %r", self.name)
229
self.use_dbus = False # During __init__
230
218
# Uppercase and remove spaces from fingerprint for later
231
219
# comparison purposes with return value from the fingerprint()
232
220
# function
233
self.fingerprint = (config["fingerprint"].upper()
234
.replace(u" ", u""))
221
self.fingerprint = config["fingerprint"].upper()\
222
.replace(u" ", u"")
235
223
logger.debug(u" Fingerprint: %s", self.fingerprint)
236
224
if "secret" in config:
237
225
self.secret = config["secret"].decode(u"base64")
238
226
elif "secfile" in config:
239
with closing(open(os.path.expanduser
240
(os.path.expandvars
241
(config["secfile"])))) as secfile:
242
self.secret = secfile.read()
227
sf = open(config["secfile"])
228
self.secret = sf.read()
229
sf.close()
243
230
else:
244
231
raise TypeError(u"No secret or secfile for client %s"
245
232
% self.name)
246
self.host = config.get("host", "")
247
self.created = datetime.datetime.utcnow()
248
self.enabled = False
249
self.last_enabled = None
233
self.fqdn = config.get("fqdn", "")
234
self.created = datetime.datetime.now()
250
235
self.last_checked_ok = None
251
236
self.timeout = string_to_delta(config["timeout"])
252
237
self.interval = string_to_delta(config["interval"])
253
self.disable_hook = disable_hook
238
self.stop_hook = stop_hook
254
239
self.checker = None
255
240
self.checker_initiator_tag = None
256
self.disable_initiator_tag = None
241
self.stop_initiator_tag = None
257
242
self.checker_callback_tag = None
258
self.checker_command = config["checker"]
259
self.last_connect = None
260
# Only now, when this client is initialized, can it show up on
261
# the D-Bus
262
self.use_dbus = use_dbus
263
if self.use_dbus:
264
self.dbus_object_path = (dbus.ObjectPath
265
("/clients/"
266
+ self.name.replace(".", "_")))
267
dbus.service.Object.__init__(self, bus,
268
self.dbus_object_path)
269
270
def enable(self):
243
self.check_command = config["checker"]
244
def start(self):
271
245
"""Start this client's checker and timeout hooks"""
272
self.last_enabled = datetime.datetime.utcnow()
273
246
# Schedule a new checker to be started an 'interval' from now,
274
247
# and every interval from then on.
275
self.checker_initiator_tag = (gobject.timeout_add
276
(self.interval_milliseconds(),
277
self.start_checker))
248
self.checker_initiator_tag = gobject.timeout_add\
249
(self._interval_milliseconds,
250
self.start_checker)
278
251
# Also start a new checker *right now*.
279
252
self.start_checker()
280
# Schedule a disable() when 'timeout' has passed
281
self.disable_initiator_tag = (gobject.timeout_add
282
(self.timeout_milliseconds(),
283
self.disable))
284
self.enabled = True
285
if self.use_dbus:
286
# Emit D-Bus signals
287
self.PropertyChanged(dbus.String(u"enabled"),
288
dbus.Boolean(True, variant_level=1))
289
self.PropertyChanged(dbus.String(u"last_enabled"),
290
(_datetime_to_dbus(self.last_enabled,
291
variant_level=1)))
292
293
def disable(self):
294
"""Disable this client."""
295
if not getattr(self, "enabled", False):
253
# Schedule a stop() when 'timeout' has passed
254
self.stop_initiator_tag = gobject.timeout_add\
255
(self._timeout_milliseconds,
256
self.stop)
257
def stop(self):
258
"""Stop this client.
259
The possibility that a client might be restarted is left open,
260
but not currently used."""
261
# If this client doesn't have a secret, it is already stopped.
262
if self.secret:
263
logger.info(u"Stopping client %s", self.name)
264
self.secret = None
265
else:
296
266
return False
297
logger.info(u"Disabling client %s", self.name)
298
if getattr(self, "disable_initiator_tag", False):
299
gobject.source_remove(self.disable_initiator_tag)
300
self.disable_initiator_tag = None
267
if getattr(self, "stop_initiator_tag", False):
268
gobject.source_remove(self.stop_initiator_tag)
269
self.stop_initiator_tag = None
301
270
if getattr(self, "checker_initiator_tag", False):
302
271
gobject.source_remove(self.checker_initiator_tag)
303
272
self.checker_initiator_tag = None
304
273
self.stop_checker()
305
if self.disable_hook:
306
self.disable_hook(self)
307
self.enabled = False
308
if self.use_dbus:
309
# Emit D-Bus signal
310
self.PropertyChanged(dbus.String(u"enabled"),
311
dbus.Boolean(False, variant_level=1))
274
if self.stop_hook:
275
self.stop_hook(self)
312
276
# Do not run this again if called by a gobject.timeout_add
313
277
return False
314
315
278
def __del__(self):
316
self.disable_hook = None
317
self.disable()
318
319
def checker_callback(self, pid, condition, command):
279
self.stop_hook = None
280
self.stop()
281
def checker_callback(self, pid, condition):
320
282
"""The checker has completed, so take appropriate actions."""
283
now = datetime.datetime.now()
321
284
self.checker_callback_tag = None
322
285
self.checker = None
323
if self.use_dbus:
324
# Emit D-Bus signal
325
self.PropertyChanged(dbus.String(u"checker_running"),
326
dbus.Boolean(False, variant_level=1))
327
if os.WIFEXITED(condition):
328
exitstatus = os.WEXITSTATUS(condition)
329
if exitstatus == 0:
330
logger.info(u"Checker for %(name)s succeeded",
331
vars(self))
332
self.checked_ok()
333
else:
334
logger.info(u"Checker for %(name)s failed",
335
vars(self))
336
if self.use_dbus:
337
# Emit D-Bus signal
338
self.CheckerCompleted(dbus.Int16(exitstatus),
339
dbus.Int64(condition),
340
dbus.String(command))
341
else:
286
if os.WIFEXITED(condition) \
287
and (os.WEXITSTATUS(condition) == 0):
288
logger.info(u"Checker for %(name)s succeeded",
289
vars(self))
290
self.last_checked_ok = now
291
gobject.source_remove(self.stop_initiator_tag)
292
self.stop_initiator_tag = gobject.timeout_add\
293
(self._timeout_milliseconds,
294
self.stop)
295
elif not os.WIFEXITED(condition):
342
296
logger.warning(u"Checker for %(name)s crashed?",
343
297
vars(self))
344
if self.use_dbus:
345
# Emit D-Bus signal
346
self.CheckerCompleted(dbus.Int16(-1),
347
dbus.Int64(condition),
348
dbus.String(command))
349
350
def checked_ok(self):
351
"""Bump up the timeout for this client.
352
This should only be called when the client has been seen,
353
alive and well.
354
"""
355
self.last_checked_ok = datetime.datetime.utcnow()
356
gobject.source_remove(self.disable_initiator_tag)
357
self.disable_initiator_tag = (gobject.timeout_add
358
(self.timeout_milliseconds(),
359
self.disable))
360
if self.use_dbus:
361
# Emit D-Bus signal
362
self.PropertyChanged(
363
dbus.String(u"last_checked_ok"),
364
(_datetime_to_dbus(self.last_checked_ok,
365
variant_level=1)))
366
298
else:
299
logger.info(u"Checker for %(name)s failed",
300
vars(self))
367
301
def start_checker(self):
368
302
"""Start a new checker subprocess if one is not running.
369
303
If a checker already exists, leave it running and do
378
312
# is as it should be.
379
313
if self.checker is None:
380
314
try:
381
# In case checker_command has exactly one % operator
382
command = self.checker_command % self.host
315
# In case check_command has exactly one % operator
316
command = self.check_command % self.fqdn
383
317
except TypeError:
384
318
# Escape attributes for the shell
385
319
escaped_attrs = dict((key, re.escape(str(val)))
386
320
for key, val in
387
321
vars(self).iteritems())
388
322
try:
389
command = self.checker_command % escaped_attrs
323
command = self.check_command % escaped_attrs
390
324
except TypeError, error:
391
325
logger.error(u'Could not format string "%s":'
392
u' %s', self.checker_command, error)
326
u' %s', self.check_command, error)
393
327
return True # Try again later
394
328
try:
395
329
logger.info(u"Starting checker %r for %s",
396
330
command, self.name)
397
# We don't need to redirect stdout and stderr, since
398
# in normal mode, that is already done by daemon(),
399
# and in debug mode we don't want to. (Stdin is
400
# always replaced by /dev/null.)
401
331
self.checker = subprocess.Popen(command,
402
332
close_fds=True,
403
333
shell=True, cwd="/")
404
if self.use_dbus:
405
# Emit D-Bus signal
406
self.CheckerStarted(command)
407
self.PropertyChanged(
408
dbus.String("checker_running"),
409
dbus.Boolean(True, variant_level=1))
410
self.checker_callback_tag = (gobject.child_watch_add
411
(self.checker.pid,
412
self.checker_callback,
413
data=command))
414
except OSError, error:
334
self.checker_callback_tag = gobject.child_watch_add\
335
(self.checker.pid,
336
self.checker_callback)
337
except subprocess.OSError, error:
415
338
logger.error(u"Failed to start subprocess: %s",
416
339
error)
417
340
# Re-run this periodically if run by gobject.timeout_add
418
341
return True
419
420
342
def stop_checker(self):
421
343
"""Force the checker process, if any, to stop."""
422
344
if self.checker_callback_tag:
424
346
self.checker_callback_tag = None
425
347
if getattr(self, "checker", None) is None:
426
348
return
427
logger.debug(u"Stopping checker for %(name)s", vars(self))
349
logger.debug("Stopping checker for %(name)s", vars(self))
428
350
try:
429
351
os.kill(self.checker.pid, signal.SIGTERM)
430
352
#os.sleep(0.5)
434
356
if error.errno != errno.ESRCH: # No such process
435
357
raise
436
358
self.checker = None
437
if self.use_dbus:
438
self.PropertyChanged(dbus.String(u"checker_running"),
439
dbus.Boolean(False, variant_level=1))
440
441
359
def still_valid(self):
442
360
"""Has the timeout not yet passed for this client?"""
443
if not getattr(self, "enabled", False):
444
return False
445
now = datetime.datetime.utcnow()
361
now = datetime.datetime.now()
446
362
if self.last_checked_ok is None:
447
363
return now < (self.created + self.timeout)
448
364
else:
449
365
return now < (self.last_checked_ok + self.timeout)
450
451
## D-Bus methods & signals
452
_interface = u"se.bsnet.fukt.Mandos.Client"
453
454
# CheckedOK - method
455
CheckedOK = dbus.service.method(_interface)(checked_ok)
456
CheckedOK.__name__ = "CheckedOK"
457
458
# CheckerCompleted - signal
459
@dbus.service.signal(_interface, signature="nxs")
460
def CheckerCompleted(self, exitcode, waitstatus, command):
461
"D-Bus signal"
462
pass
463
464
# CheckerStarted - signal
465
@dbus.service.signal(_interface, signature="s")
466
def CheckerStarted(self, command):
467
"D-Bus signal"
468
pass
469
470
# GetAllProperties - method
471
@dbus.service.method(_interface, out_signature="a{sv}")
472
def GetAllProperties(self):
473
"D-Bus method"
474
return dbus.Dictionary({
475
dbus.String("name"):
476
dbus.String(self.name, variant_level=1),
477
dbus.String("fingerprint"):
478
dbus.String(self.fingerprint, variant_level=1),
479
dbus.String("host"):
480
dbus.String(self.host, variant_level=1),
481
dbus.String("created"):
482
_datetime_to_dbus(self.created, variant_level=1),
483
dbus.String("last_enabled"):
484
(_datetime_to_dbus(self.last_enabled,
485
variant_level=1)
486
if self.last_enabled is not None
487
else dbus.Boolean(False, variant_level=1)),
488
dbus.String("enabled"):
489
dbus.Boolean(self.enabled, variant_level=1),
490
dbus.String("last_checked_ok"):
491
(_datetime_to_dbus(self.last_checked_ok,
492
variant_level=1)
493
if self.last_checked_ok is not None
494
else dbus.Boolean (False, variant_level=1)),
495
dbus.String("timeout"):
496
dbus.UInt64(self.timeout_milliseconds(),
497
variant_level=1),
498
dbus.String("interval"):
499
dbus.UInt64(self.interval_milliseconds(),
500
variant_level=1),
501
dbus.String("checker"):
502
dbus.String(self.checker_command,
503
variant_level=1),
504
dbus.String("checker_running"):
505
dbus.Boolean(self.checker is not None,
506
variant_level=1),
507
dbus.String("object_path"):
508
dbus.ObjectPath(self.dbus_object_path,
509
variant_level=1)
510
}, signature="sv")
511
512
# IsStillValid - method
513
IsStillValid = (dbus.service.method(_interface, out_signature="b")
514
(still_valid))
515
IsStillValid.__name__ = "IsStillValid"
516
517
# PropertyChanged - signal
518
@dbus.service.signal(_interface, signature="sv")
519
def PropertyChanged(self, property, value):
520
"D-Bus signal"
521
pass
522
523
# SetChecker - method
524
@dbus.service.method(_interface, in_signature="s")
525
def SetChecker(self, checker):
526
"D-Bus setter method"
527
self.checker_command = checker
528
# Emit D-Bus signal
529
self.PropertyChanged(dbus.String(u"checker"),
530
dbus.String(self.checker_command,
531
variant_level=1))
532
533
# SetHost - method
534
@dbus.service.method(_interface, in_signature="s")
535
def SetHost(self, host):
536
"D-Bus setter method"
537
self.host = host
538
# Emit D-Bus signal
539
self.PropertyChanged(dbus.String(u"host"),
540
dbus.String(self.host, variant_level=1))
541
542
# SetInterval - method
543
@dbus.service.method(_interface, in_signature="t")
544
def SetInterval(self, milliseconds):
545
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
546
# Emit D-Bus signal
547
self.PropertyChanged(dbus.String(u"interval"),
548
(dbus.UInt64(self.interval_milliseconds(),
549
variant_level=1)))
550
551
# SetSecret - method
552
@dbus.service.method(_interface, in_signature="ay",
553
byte_arrays=True)
554
def SetSecret(self, secret):
555
"D-Bus setter method"
556
self.secret = str(secret)
557
558
# SetTimeout - method
559
@dbus.service.method(_interface, in_signature="t")
560
def SetTimeout(self, milliseconds):
561
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
562
# Emit D-Bus signal
563
self.PropertyChanged(dbus.String(u"timeout"),
564
(dbus.UInt64(self.timeout_milliseconds(),
565
variant_level=1)))
566
567
# Enable - method
568
Enable = dbus.service.method(_interface)(enable)
569
Enable.__name__ = "Enable"
570
571
# StartChecker - method
572
@dbus.service.method(_interface)
573
def StartChecker(self):
574
"D-Bus method"
575
self.start_checker()
576
577
# Disable - method
578
@dbus.service.method(_interface)
579
def Disable(self):
580
"D-Bus method"
581
self.disable()
582
583
# StopChecker - method
584
StopChecker = dbus.service.method(_interface)(stop_checker)
585
StopChecker.__name__ = "StopChecker"
586
587
del _interface
588
366
589
367
590
368
def peer_certificate(session):
591
369
"Return the peer's OpenPGP certificate as a bytestring"
592
370
# If not an OpenPGP certificate...
593
if (gnutls.library.functions
594
.gnutls_certificate_type_get(session._c_object)
595
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
371
if gnutls.library.functions.gnutls_certificate_type_get\
372
(session._c_object) \
373
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP:
596
374
# ...do the normal thing
597
375
return session.peer_certificate
598
list_size = ctypes.c_uint(1)
599
cert_list = (gnutls.library.functions
600
.gnutls_certificate_get_peers
601
(session._c_object, ctypes.byref(list_size)))
602
if not bool(cert_list) and list_size.value != 0:
603
raise gnutls.errors.GNUTLSError("error getting peer"
604
" certificate")
376
list_size = ctypes.c_uint()
377
cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
378
(session._c_object, ctypes.byref(list_size))
605
379
if list_size.value == 0:
606
380
return None
607
381
cert = cert_list[0]
611
385
def fingerprint(openpgp):
612
386
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
613
387
# New GnuTLS "datum" with the OpenPGP public key
614
datum = (gnutls.library.types
615
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
616
ctypes.POINTER
617
(ctypes.c_ubyte)),
618
ctypes.c_uint(len(openpgp))))
388
datum = gnutls.library.types.gnutls_datum_t\
389
(ctypes.cast(ctypes.c_char_p(openpgp),
390
ctypes.POINTER(ctypes.c_ubyte)),
391
ctypes.c_uint(len(openpgp)))
619
392
# New empty GnuTLS certificate
620
393
crt = gnutls.library.types.gnutls_openpgp_crt_t()
621
(gnutls.library.functions
622
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
394
gnutls.library.functions.gnutls_openpgp_crt_init\
395
(ctypes.byref(crt))
623
396
# Import the OpenPGP public key into the certificate
624
(gnutls.library.functions
625
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
626
gnutls.library.constants
627
.GNUTLS_OPENPGP_FMT_RAW))
628
# Verify the self signature in the key
629
crtverify = ctypes.c_uint()
630
(gnutls.library.functions
631
.gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
632
if crtverify.value != 0:
633
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
634
raise gnutls.errors.CertificateSecurityError("Verify failed")
397
gnutls.library.functions.gnutls_openpgp_crt_import\
398
(crt, ctypes.byref(datum),
399
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
635
400
# New buffer for the fingerprint
636
buf = ctypes.create_string_buffer(20)
637
buf_len = ctypes.c_size_t()
401
buffer = ctypes.create_string_buffer(20)
402
buffer_length = ctypes.c_size_t()
638
403
# Get the fingerprint from the certificate into the buffer
639
(gnutls.library.functions
640
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
641
ctypes.byref(buf_len)))
404
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
405
(crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
642
406
# Deinit the certificate
643
407
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
644
408
# Convert the buffer to a Python bytestring
645
fpr = ctypes.string_at(buf, buf_len.value)
409
fpr = ctypes.string_at(buffer, buffer_length.value)
646
410
# Convert the bytestring to hexadecimal notation
647
411
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
648
412
return hex_fpr
649
413
650
414
651
class TCP_handler(SocketServer.BaseRequestHandler, object):
415
class tcp_handler(SocketServer.BaseRequestHandler, object):
652
416
"""A TCP request handler class.
653
417
Instantiated by IPv6_TCPServer for each request to handle it.
654
418
Note: This will run in its own forked process."""
655
419
656
420
def handle(self):
657
421
logger.info(u"TCP connection from: %s",
658
unicode(self.client_address))
659
session = (gnutls.connection
660
.ClientSession(self.request,
661
gnutls.connection
662
.X509Credentials()))
422
unicode(self.client_address))
423
session = gnutls.connection.ClientSession\
424
(self.request, gnutls.connection.X509Credentials())
663
425
664
426
line = self.request.makefile().readline()
665
427
logger.debug(u"Protocol version: %r", line)
678
440
#priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
679
441
# "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
680
442
# "+DHE-DSS"))
681
# Use a fallback default, since this MUST be set.
682
priority = self.server.settings.get("priority", "NORMAL")
683
(gnutls.library.functions
684
.gnutls_priority_set_direct(session._c_object,
685
priority, None))
443
priority = "NORMAL" # Fallback default, since this
444
# MUST be set.
445
if self.server.settings["priority"]:
446
priority = self.server.settings["priority"]
447
gnutls.library.functions.gnutls_priority_set_direct\
448
(session._c_object, priority, None);
686
449
687
450
try:
688
451
session.handshake()
691
454
# Do not run session.bye() here: the session is not
692
455
# established. Just abandon the request.
693
456
return
694
logger.debug(u"Handshake succeeded")
695
457
try:
696
458
fpr = fingerprint(peer_certificate(session))
697
459
except (TypeError, gnutls.errors.GNUTLSError), error:
699
461
session.bye()
700
462
return
701
463
logger.debug(u"Fingerprint: %s", fpr)
702
464
client = None
703
465
for c in self.server.clients:
704
466
if c.fingerprint == fpr:
705
467
client = c
706
468
break
707
else:
469
if not client:
708
470
logger.warning(u"Client not found for fingerprint: %s",
709
471
fpr)
710
472
session.bye()
717
479
vars(client))
718
480
session.bye()
719
481
return
720
## This won't work here, since we're in a fork.
721
# client.checked_ok()
722
482
sent_size = 0
723
483
while sent_size < len(client.secret):
724
484
sent = session.send(client.secret[sent_size:])
729
489
session.bye()
730
490
731
491
732
class IPv6_TCPServer(SocketServer.ForkingMixIn,
733
SocketServer.TCPServer, object):
492
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
734
493
"""IPv6 TCP server. Accepts 'None' as address and/or port.
735
494
Attributes:
736
495
settings: Server settings
737
496
clients: Set() of Client objects
738
enabled: Boolean; whether this server is activated yet
739
497
"""
740
498
address_family = socket.AF_INET6
741
499
def __init__(self, *args, **kwargs):
745
503
if "clients" in kwargs:
746
504
self.clients = kwargs["clients"]
747
505
del kwargs["clients"]
748
self.enabled = False
749
super(IPv6_TCPServer, self).__init__(*args, **kwargs)
506
return super(type(self), self).__init__(*args, **kwargs)
750
507
def server_bind(self):
751
508
"""This overrides the normal server_bind() function
752
509
to bind to an interface if one was specified, and also NOT to
771
528
in6addr_any = "::"
772
529
self.server_address = (in6addr_any,
773
530
self.server_address[1])
774
elif not self.server_address[1]:
531
elif self.server_address[1] is None:
775
532
self.server_address = (self.server_address[0],
776
533
0)
777
# if self.settings["interface"]:
778
# self.server_address = (self.server_address[0],
779
# 0, # port
780
# 0, # flowinfo
781
# if_nametoindex
782
# (self.settings
783
# ["interface"]))
784
return super(IPv6_TCPServer, self).server_bind()
785
def server_activate(self):
786
if self.enabled:
787
return super(IPv6_TCPServer, self).server_activate()
788
def enable(self):
789
self.enabled = True
534
return super(type(self), self).server_bind()
790
535
791
536
792
537
def string_to_delta(interval):
793
538
"""Parse a string and return a datetime.timedelta
794
539
795
540
>>> string_to_delta('7d')
796
541
datetime.timedelta(7)
797
542
>>> string_to_delta('60s')
802
547
datetime.timedelta(1)
803
548
>>> string_to_delta(u'1w')
804
549
datetime.timedelta(7)
805
>>> string_to_delta('5m 30s')
806
datetime.timedelta(0, 330)
807
550
"""
808
timevalue = datetime.timedelta(0)
809
for s in interval.split():
810
try:
811
suffix = unicode(s[-1])
812
value = int(s[:-1])
813
if suffix == u"d":
814
delta = datetime.timedelta(value)
815
elif suffix == u"s":
816
delta = datetime.timedelta(0, value)
817
elif suffix == u"m":
818
delta = datetime.timedelta(0, 0, 0, 0, value)
819
elif suffix == u"h":
820
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
821
elif suffix == u"w":
822
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
823
else:
824
raise ValueError
825
except (ValueError, IndexError):
551
try:
552
suffix=unicode(interval[-1])
553
value=int(interval[:-1])
554
if suffix == u"d":
555
delta = datetime.timedelta(value)
556
elif suffix == u"s":
557
delta = datetime.timedelta(0, value)
558
elif suffix == u"m":
559
delta = datetime.timedelta(0, 0, 0, 0, value)
560
elif suffix == u"h":
561
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
562
elif suffix == u"w":
563
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
564
else:
826
565
raise ValueError
827
timevalue += delta
828
return timevalue
566
except (ValueError, IndexError):
567
raise ValueError
568
return delta
829
569
830
570
831
571
def server_state_changed(state):
832
572
"""Derived from the Avahi example code"""
833
573
if state == avahi.SERVER_COLLISION:
834
logger.error(u"Zeroconf server name collision")
574
logger.error(u"Server name collision")
835
575
service.remove()
836
576
elif state == avahi.SERVER_RUNNING:
837
577
service.add()
839
579
840
580
def entry_group_state_changed(state, error):
841
581
"""Derived from the Avahi example code"""
842
logger.debug(u"Avahi state change: %i", state)
582
logger.debug(u"state change: %i", state)
843
583
844
584
if state == avahi.ENTRY_GROUP_ESTABLISHED:
845
logger.debug(u"Zeroconf service established.")
585
logger.debug(u"Service established.")
846
586
elif state == avahi.ENTRY_GROUP_COLLISION:
847
logger.warning(u"Zeroconf service name collision.")
587
logger.warning(u"Service name collision.")
848
588
service.rename()
849
589
elif state == avahi.ENTRY_GROUP_FAILURE:
850
logger.critical(u"Avahi: Error in group state changed %s",
590
logger.critical(u"Error in group state changed %s",
851
591
unicode(error))
852
raise AvahiGroupError(u"State changed: %s" % unicode(error))
592
raise AvahiGroupError("State changed: %s", str(error))
853
593
854
594
def if_nametoindex(interface):
855
595
"""Call the C function if_nametoindex(), or equivalent"""
856
596
global if_nametoindex
857
597
try:
858
if_nametoindex = (ctypes.cdll.LoadLibrary
859
(ctypes.util.find_library("c"))
860
.if_nametoindex)
598
if "ctypes.util" not in sys.modules:
599
import ctypes.util
600
if_nametoindex = ctypes.cdll.LoadLibrary\
601
(ctypes.util.find_library("c")).if_nametoindex
861
602
except (OSError, AttributeError):
862
603
if "struct" not in sys.modules:
863
604
import struct
866
607
def if_nametoindex(interface):
867
608
"Get an interface index the hard way, i.e. using fcntl()"
868
609
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
869
with closing(socket.socket()) as s:
870
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
871
struct.pack("16s16x", interface))
610
s = socket.socket()
611
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
612
struct.pack("16s16x", interface))
613
s.close()
872
614
interface_index = struct.unpack("I", ifreq[16:20])[0]
873
615
return interface_index
874
616
return if_nametoindex(interface)
898
640
899
641
900
642
def main():
901
parser = optparse.OptionParser(version = "%%prog %s" % version)
643
global main_loop_started
644
main_loop_started = False
645
646
parser = OptionParser()
902
647
parser.add_option("-i", "--interface", type="string",
903
648
metavar="IF", help="Bind to interface IF")
904
649
parser.add_option("-a", "--address", type="string",
905
650
help="Address to listen for requests on")
906
651
parser.add_option("-p", "--port", type="int",
907
652
help="Port number to receive requests on")
908
parser.add_option("--check", action="store_true",
653
parser.add_option("--check", action="store_true", default=False,
909
654
help="Run self-test")
910
parser.add_option("--debug", action="store_true",
655
parser.add_option("--debug", action="store_true", default=False,
911
656
help="Debug mode; run in foreground and log to"
912
657
" terminal")
913
658
parser.add_option("--priority", type="string", help="GnuTLS"
918
663
default="/etc/mandos", metavar="DIR",
919
664
help="Directory to search for configuration"
920
665
" files")
921
parser.add_option("--no-dbus", action="store_false",
922
dest="use_dbus",
923
help="Do not provide D-Bus system bus"
924
" interface")
925
options = parser.parse_args()[0]
666
(options, args) = parser.parse_args()
926
667
927
668
if options.check:
928
669
import doctest
937
678
"priority":
938
679
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
939
680
"servicename": "Mandos",
940
"use_dbus": "True",
941
681
}
942
682
943
683
# Parse config file for server-global settings
944
684
server_config = ConfigParser.SafeConfigParser(server_defaults)
945
685
del server_defaults
946
686
server_config.read(os.path.join(options.configdir, "mandos.conf"))
687
server_section = "server"
947
688
# Convert the SafeConfigParser object to a dict
948
server_settings = server_config.defaults()
949
# Use the appropriate methods on the non-string config options
950
server_settings["debug"] = server_config.getboolean("DEFAULT",
951
"debug")
952
server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
953
"use_dbus")
954
if server_settings["port"]:
955
server_settings["port"] = server_config.getint("DEFAULT",
956
"port")
689
server_settings = dict(server_config.items(server_section))
690
# Use getboolean on the boolean config option
691
server_settings["debug"] = server_config.getboolean\
692
(server_section, "debug")
957
693
del server_config
958
694
959
695
# Override the settings from the config file with command line
960
696
# options, if set.
961
697
for option in ("interface", "address", "port", "debug",
962
"priority", "servicename", "configdir",
963
"use_dbus"):
698
"priority", "servicename", "configdir"):
964
699
value = getattr(options, option)
965
700
if value is not None:
966
701
server_settings[option] = value
967
702
del options
968
703
# Now we have our good server settings in "server_settings"
969
704
970
# For convenience
971
debug = server_settings["debug"]
972
use_dbus = server_settings["use_dbus"]
973
974
def sigsegvhandler(signum, frame):
975
raise RuntimeError('Segmentation fault')
976
977
if not debug:
978
syslogger.setLevel(logging.WARNING)
979
console.setLevel(logging.WARNING)
980
else:
981
signal.signal(signal.SIGSEGV, sigsegvhandler)
982
983
if server_settings["servicename"] != "Mandos":
984
syslogger.setFormatter(logging.Formatter
985
('Mandos (%s): %%(levelname)s:'
986
' %%(message)s'
987
% server_settings["servicename"]))
988
989
705
# Parse config file with clients
990
706
client_defaults = { "timeout": "1h",
991
707
"interval": "5m",
992
"checker": "fping -q -- %%(host)s",
993
"host": "",
708
"checker": "fping -q -- %%(fqdn)s",
994
709
}
995
710
client_config = ConfigParser.SafeConfigParser(client_defaults)
996
711
client_config.read(os.path.join(server_settings["configdir"],
997
712
"clients.conf"))
998
713
999
clients = Set()
1000
tcp_server = IPv6_TCPServer((server_settings["address"],
1001
server_settings["port"]),
1002
TCP_handler,
1003
settings=server_settings,
1004
clients=clients)
1005
pidfilename = "/var/run/mandos.pid"
1006
try:
1007
pidfile = open(pidfilename, "w")
1008
except IOError, error:
1009
logger.error("Could not open file %r", pidfilename)
1010
1011
try:
1012
uid = pwd.getpwnam("_mandos").pw_uid
1013
gid = pwd.getpwnam("_mandos").pw_gid
1014
except KeyError:
1015
try:
1016
uid = pwd.getpwnam("mandos").pw_uid
1017
gid = pwd.getpwnam("mandos").pw_gid
1018
except KeyError:
1019
try:
1020
uid = pwd.getpwnam("nobody").pw_uid
1021
gid = pwd.getpwnam("nogroup").pw_gid
1022
except KeyError:
1023
uid = 65534
1024
gid = 65534
1025
try:
1026
os.setgid(gid)
1027
os.setuid(uid)
1028
except OSError, error:
1029
if error[0] != errno.EPERM:
1030
raise error
1031
1032
# Enable all possible GnuTLS debugging
1033
if debug:
1034
# "Use a log level over 10 to enable all debugging options."
1035
# - GnuTLS manual
1036
gnutls.library.functions.gnutls_global_set_log_level(11)
1037
1038
@gnutls.library.types.gnutls_log_func
1039
def debug_gnutls(level, string):
1040
logger.debug("GnuTLS: %s", string[:-1])
1041
1042
(gnutls.library.functions
1043
.gnutls_global_set_log_function(debug_gnutls))
1044
1045
714
global service
1046
715
service = AvahiService(name = server_settings["servicename"],
1047
servicetype = "_mandos._tcp", )
716
type = "_mandos._tcp", );
1048
717
if server_settings["interface"]:
1049
service.interface = (if_nametoindex
1050
(server_settings["interface"]))
718
service.interface = if_nametoindex(server_settings["interface"])
1051
719
1052
720
global main_loop
1053
721
global bus
1056
724
DBusGMainLoop(set_as_default=True )
1057
725
main_loop = gobject.MainLoop()
1058
726
bus = dbus.SystemBus()
1059
server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1060
avahi.DBUS_PATH_SERVER),
1061
avahi.DBUS_INTERFACE_SERVER)
727
server = dbus.Interface(
728
bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
729
avahi.DBUS_INTERFACE_SERVER )
1062
730
# End of Avahi example code
1063
if use_dbus:
1064
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
731
732
debug = server_settings["debug"]
733
734
if debug:
735
console = logging.StreamHandler()
736
# console.setLevel(logging.DEBUG)
737
console.setFormatter(logging.Formatter\
738
('%(levelname)s: %(message)s'))
739
logger.addHandler(console)
740
del console
741
742
clients = Set()
743
def remove_from_clients(client):
744
clients.remove(client)
745
if not clients:
746
logger.critical(u"No clients left, exiting")
747
sys.exit()
1065
748
1066
749
clients.update(Set(Client(name = section,
750
stop_hook = remove_from_clients,
1067
751
config
1068
= dict(client_config.items(section)),
1069
use_dbus = use_dbus)
752
= dict(client_config.items(section)))
1070
753
for section in client_config.sections()))
1071
if not clients:
1072
logger.warning(u"No clients defined")
1073
754
1074
if debug:
1075
# Redirect stdin so all checkers get /dev/null
1076
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1077
os.dup2(null, sys.stdin.fileno())
1078
if null > 2:
1079
os.close(null)
1080
else:
1081
# No console logging
1082
logger.removeHandler(console)
1083
# Close all input and output, do double fork, etc.
755
if not debug:
1084
756
daemon()
1085
757
1086
try:
1087
pid = os.getpid()
1088
pidfile.write(str(pid) + "\n")
1089
pidfile.close()
1090
del pidfile
1091
except IOError:
1092
logger.error(u"Could not write to file %r with PID %d",
1093
pidfilename, pid)
1094
except NameError:
1095
# "pidfile" was never created
1096
pass
1097
del pidfilename
1098
1099
758
def cleanup():
1100
759
"Cleanup function; run on exit"
1101
760
global group
1107
766
1108
767
while clients:
1109
768
client = clients.pop()
1110
client.disable_hook = None
1111
client.disable()
769
client.stop_hook = None
770
client.stop()
1112
771
1113
772
atexit.register(cleanup)
1114
773
1117
776
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1118
777
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1119
778
1120
if use_dbus:
1121
class MandosServer(dbus.service.Object):
1122
"""A D-Bus proxy object"""
1123
def __init__(self):
1124
dbus.service.Object.__init__(self, bus, "/")
1125
_interface = u"se.bsnet.fukt.Mandos"
1126
1127
@dbus.service.signal(_interface, signature="oa{sv}")
1128
def ClientAdded(self, objpath, properties):
1129
"D-Bus signal"
1130
pass
1131
1132
@dbus.service.signal(_interface, signature="os")
1133
def ClientRemoved(self, objpath, name):
1134
"D-Bus signal"
1135
pass
1136
1137
@dbus.service.method(_interface, out_signature="ao")
1138
def GetAllClients(self):
1139
"D-Bus method"
1140
return dbus.Array(c.dbus_object_path for c in clients)
1141
1142
@dbus.service.method(_interface, out_signature="a{oa{sv}}")
1143
def GetAllClientsWithProperties(self):
1144
"D-Bus method"
1145
return dbus.Dictionary(
1146
((c.dbus_object_path, c.GetAllProperties())
1147
for c in clients),
1148
signature="oa{sv}")
1149
1150
@dbus.service.method(_interface, in_signature="o")
1151
def RemoveClient(self, object_path):
1152
"D-Bus method"
1153
for c in clients:
1154
if c.dbus_object_path == object_path:
1155
clients.remove(c)
1156
# Don't signal anything except ClientRemoved
1157
c.use_dbus = False
1158
c.disable()
1159
# Emit D-Bus signal
1160
self.ClientRemoved(object_path, c.name)
1161
return
1162
raise KeyError
1163
1164
del _interface
1165
1166
mandos_server = MandosServer()
1167
1168
779
for client in clients:
1169
if use_dbus:
1170
# Emit D-Bus signal
1171
mandos_server.ClientAdded(client.dbus_object_path,
1172
client.GetAllProperties())
1173
client.enable()
1174
1175
tcp_server.enable()
1176
tcp_server.server_activate()
1177
780
client.start()
781
782
tcp_server = IPv6_TCPServer((server_settings["address"],
783
server_settings["port"]),
784
tcp_handler,
785
settings=server_settings,
786
clients=clients)
1178
787
# Find out what port we got
1179
788
service.port = tcp_server.socket.getsockname()[1]
1180
789
logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
1194
803
1195
804
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1196
805
lambda *args, **kwargs:
1197
(tcp_server.handle_request
1198
(*args[2:], **kwargs) or True))
806
tcp_server.handle_request\
807
(*args[2:], **kwargs) or True)
1199
808
1200
logger.debug(u"Starting main loop")
809
logger.debug("Starting main loop")
810
main_loop_started = True
1201
811
main_loop.run()
1202
812
except AvahiError, error:
1203
logger.critical(u"AvahiError: %s", error)
813
logger.critical(u"AvahiError: %s" + unicode(error))
1204
814
sys.exit(1)
1205
815
except KeyboardInterrupt:
1206
816
if debug:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0