maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

syncevo-http-server: detect premature client disconnect (BMC #10031)

Browse source 
The documentation of Twisted's Request.notifyFinish() doesn't say so
explicitly, but errors are passed to the Errback, not the normal
callback. Adding self.done() as both of these allows the server to
detect premature client disconnects.

That error handling code itself was not working properly: instead of
keeping the connection to syncevo-dbus-server open in case that the
client resends the POST, it close the D-Bus connection. With this
patch it is kept open.

The new SuspendProxy tests covered this failure.
This commit is contained in:
Patrick Ohly 2011-01-03 21:27:48 +01:00
parent fe7406177d
commit 0dea4e939c
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
test/syncevo-http-server.py
View file

@ -143,8 +143,9 @@ class SyncMLSession:
request.finish()
self.sessionid = session
else:
self.connection.Close(False, "could not deliver reply")
self.connection = None
# syncevo-dbus-server does not need to know about lost connection
# to client, because client might still resend
logger.debug("could not send reply immediately, buffering it")
if final:
logger.debug("closing connection for connection %s session %s", self.conpath, session)
if self.connection:
@ -154,16 +155,19 @@ class SyncMLSession:
def done(self, error):
'''lost connection to HTTP client, either normally or in error'''
if error and self.connection:
self.connection.Close(False, error)
self.connection = None
logger.debug("done with request in session %s, error %s", self.sessionid, error)
# keep connection to syncevo-dbus-server, client might still
# retry the request
self.request = None
def start(self, request, config, url):
'''start a new session based on the incoming message'''
logger.debug("requesting new session")
self.object = Context.getDBusServer()
self.request = request
deferred = request.notifyFinish()
deferred.addCallback(self.done)
deferred.addErrback(self.done)
self.conpath = self.object.Connect({'description': 'syncevo-server-http.py',
'transport': 'HTTP',
'config': config,
@ -193,7 +197,6 @@ class SyncMLSession:
request.content.seek(0, 0)
self.connection.Process(request.content.read(),
request.getHeader('content-type'))
self.request = request
SyncMLSession.sessions.append(self)
def process(self, request, data):
@ -205,9 +208,10 @@ class SyncMLSession:
self.request = None
deferred = request.notifyFinish()
deferred.addCallback(self.done)
deferred.addErrback(self.done)
self.request = request
self.connection.Process(data,
request.getHeader('content-type'))
self.request = request
class SyncMLPost(resource.Resource):
isLeaf = True