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 237.2.11
- compare with another revision
- download diff
- download tarball
- view history from revision 237.2.11
- Committer: Teddy Hogeborn
- Date: 2009-01-17 02:12:05 UTC
- mto: (24.1.170 mandos) (237.4.29 release)
- mto: This revision was merged to the branch mainline in revision 273.
- Revision ID: teddy@fukt.bsnet.se-20090117021205-581c9f5ccub4576r
Tags: version-1.0.5-1
* Makefile (version): Changed to "1.0.5".
* NEWS (1.0.5): New entry.
* debian/changelog (1.0.5-1): - '' -
* NEWS (1.0.5): New entry.
* debian/changelog (1.0.5-1): - '' -
added
removed
mandos
178
178
class Client(dbus.service.Object):
179
179
"""A representation of a client host served by this server.
180
180
Attributes:
181
name: string; from the config file, used in log messages and
182
D-Bus identifiers
181
name: string; from the config file, used in log messages
183
182
fingerprint: string (40 or 32 hexadecimal digits); used to
184
183
uniquely identify the client
185
184
secret: bytestring; sent verbatim (over TLS) to client
226
225
if config is None:
227
226
config = {}
228
227
logger.debug(u"Creating client %r", self.name)
229
self.use_dbus = False # During __init__
228
self.use_dbus = use_dbus
229
if self.use_dbus:
230
self.dbus_object_path = (dbus.ObjectPath
231
("/Mandos/clients/"
232
+ self.name.replace(".", "_")))
233
dbus.service.Object.__init__(self, bus,
234
self.dbus_object_path)
230
235
# Uppercase and remove spaces from fingerprint for later
231
236
# comparison purposes with return value from the fingerprint()
232
237
# function
256
261
self.disable_initiator_tag = None
257
262
self.checker_callback_tag = None
258
263
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
264
270
265
def enable(self):
271
266
"""Start this client's checker and timeout hooks"""
324
319
# Emit D-Bus signal
325
320
self.PropertyChanged(dbus.String(u"checker_running"),
326
321
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))
322
if (os.WIFEXITED(condition)
323
and (os.WEXITSTATUS(condition) == 0)):
324
logger.info(u"Checker for %(name)s succeeded",
325
vars(self))
336
326
if self.use_dbus:
337
327
# Emit D-Bus signal
338
self.CheckerCompleted(dbus.Int16(exitstatus),
339
dbus.Int64(condition),
328
self.CheckerCompleted(dbus.Boolean(True),
329
dbus.UInt16(condition),
340
330
dbus.String(command))
341
else:
331
self.bump_timeout()
332
elif not os.WIFEXITED(condition):
342
333
logger.warning(u"Checker for %(name)s crashed?",
343
334
vars(self))
344
335
if self.use_dbus:
345
336
# Emit D-Bus signal
346
self.CheckerCompleted(dbus.Int16(-1),
347
dbus.Int64(condition),
337
self.CheckerCompleted(dbus.Boolean(False),
338
dbus.UInt16(condition),
339
dbus.String(command))
340
else:
341
logger.info(u"Checker for %(name)s failed",
342
vars(self))
343
if self.use_dbus:
344
# Emit D-Bus signal
345
self.CheckerCompleted(dbus.Boolean(False),
346
dbus.UInt16(condition),
348
347
dbus.String(command))
349
348
350
def checked_ok(self):
349
def bump_timeout(self):
351
350
"""Bump up the timeout for this client.
352
351
This should only be called when the client has been seen,
353
352
alive and well.
449
448
return now < (self.last_checked_ok + self.timeout)
450
449
451
450
## D-Bus methods & signals
452
_interface = u"se.bsnet.fukt.Mandos.Client"
451
_interface = u"org.mandos_system.Mandos.Client"
453
452
454
# CheckedOK - method
455
CheckedOK = dbus.service.method(_interface)(checked_ok)
456
CheckedOK.__name__ = "CheckedOK"
453
# BumpTimeout - method
454
BumpTimeout = dbus.service.method(_interface)(bump_timeout)
455
BumpTimeout.__name__ = "BumpTimeout"
457
456
458
457
# CheckerCompleted - signal
459
@dbus.service.signal(_interface, signature="nxs")
460
def CheckerCompleted(self, exitcode, waitstatus, command):
458
@dbus.service.signal(_interface, signature="bqs")
459
def CheckerCompleted(self, success, condition, command):
461
460
"D-Bus signal"
462
461
pass
463
462
504
503
dbus.String("checker_running"):
505
504
dbus.Boolean(self.checker is not None,
506
505
variant_level=1),
507
dbus.String("object_path"):
508
dbus.ObjectPath(self.dbus_object_path,
509
variant_level=1)
510
506
}, signature="sv")
511
507
512
508
# IsStillValid - method
595
591
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
596
592
# ...do the normal thing
597
593
return session.peer_certificate
598
list_size = ctypes.c_uint(1)
594
list_size = ctypes.c_uint()
599
595
cert_list = (gnutls.library.functions
600
596
.gnutls_certificate_get_peers
601
597
(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")
605
598
if list_size.value == 0:
606
599
return None
607
600
cert = cert_list[0]
691
684
# Do not run session.bye() here: the session is not
692
685
# established. Just abandon the request.
693
686
return
694
logger.debug(u"Handshake succeeded")
695
687
try:
696
688
fpr = fingerprint(peer_certificate(session))
697
689
except (TypeError, gnutls.errors.GNUTLSError), error:
717
709
session.bye()
718
710
return
719
711
## This won't work here, since we're in a fork.
720
# client.checked_ok()
712
# client.bump_timeout()
721
713
sent_size = 0
722
714
while sent_size < len(client.secret):
723
715
sent = session.send(client.secret[sent_size:])
919
911
" files")
920
912
parser.add_option("--no-dbus", action="store_false",
921
913
dest="use_dbus",
922
help="Do not provide D-Bus system bus"
923
" interface")
914
help=optparse.SUPPRESS_HELP) # XXX: Not done yet
924
915
options = parser.parse_args()[0]
925
916
926
917
if options.check:
945
936
server_config.read(os.path.join(options.configdir, "mandos.conf"))
946
937
# Convert the SafeConfigParser object to a dict
947
938
server_settings = server_config.defaults()
948
# Use the appropriate methods on the non-string config options
949
server_settings["debug"] = server_config.getboolean("DEFAULT",
950
"debug")
951
server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
952
"use_dbus")
953
if server_settings["port"]:
954
server_settings["port"] = server_config.getint("DEFAULT",
955
"port")
939
# Use getboolean on the boolean config options
940
server_settings["debug"] = (server_config.getboolean
941
("DEFAULT", "debug"))
942
server_settings["use_dbus"] = (server_config.getboolean
943
("DEFAULT", "use_dbus"))
956
944
del server_config
957
945
958
946
# Override the settings from the config file with command line
969
957
# For convenience
970
958
debug = server_settings["debug"]
971
959
use_dbus = server_settings["use_dbus"]
960
use_dbus = False # XXX: Not done yet
972
961
973
962
if not debug:
974
963
syslogger.setLevel(logging.WARNING)
1042
1031
avahi.DBUS_INTERFACE_SERVER)
1043
1032
# End of Avahi example code
1044
1033
if use_dbus:
1045
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1034
bus_name = dbus.service.BusName(u"org.mandos-system.Mandos",
1035
bus)
1046
1036
1047
1037
clients.update(Set(Client(name = section,
1048
1038
config
1102
1092
class MandosServer(dbus.service.Object):
1103
1093
"""A D-Bus proxy object"""
1104
1094
def __init__(self):
1105
dbus.service.Object.__init__(self, bus, "/")
1106
_interface = u"se.bsnet.fukt.Mandos"
1107
1095
dbus.service.Object.__init__(self, bus,
1096
"/Mandos")
1097
_interface = u"org.mandos_system.Mandos"
1098
1108
1099
@dbus.service.signal(_interface, signature="oa{sv}")
1109
1100
def ClientAdded(self, objpath, properties):
1110
1101
"D-Bus signal"
1111
1102
pass
1112
1113
@dbus.service.signal(_interface, signature="os")
1114
def ClientRemoved(self, objpath, name):
1103
1104
@dbus.service.signal(_interface, signature="o")
1105
def ClientRemoved(self, objpath):
1115
1106
"D-Bus signal"
1116
1107
pass
1117
1108
1118
1109
@dbus.service.method(_interface, out_signature="ao")
1119
1110
def GetAllClients(self):
1120
"D-Bus method"
1121
1111
return dbus.Array(c.dbus_object_path for c in clients)
1122
1112
1123
1113
@dbus.service.method(_interface, out_signature="a{oa{sv}}")
1124
1114
def GetAllClientsWithProperties(self):
1125
"D-Bus method"
1126
1115
return dbus.Dictionary(
1127
1116
((c.dbus_object_path, c.GetAllProperties())
1128
1117
for c in clients),
1129
1118
signature="oa{sv}")
1130
1119
1131
1120
@dbus.service.method(_interface, in_signature="o")
1132
1121
def RemoveClient(self, object_path):
1133
"D-Bus method"
1134
1122
for c in clients:
1135
1123
if c.dbus_object_path == object_path:
1136
1124
clients.remove(c)
1138
1126
c.use_dbus = False
1139
1127
c.disable()
1140
1128
# Emit D-Bus signal
1141
self.ClientRemoved(object_path, c.name)
1129
self.ClientRemoved(object_path)
1142
1130
return
1143
1131
raise KeyError
1144
1132
@dbus.service.method(_interface)
1133
def Quit(self):
1134
main_loop.quit()
1135
1145
1136
del _interface
1146
1137
1147
1138
mandos_server = MandosServer()
1148
1139
1149
1140
for client in clients:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0