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