crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trap Exception during SimpleHTTPRequestHandler.handle call 

There could be any error during a normal GET operation or even during a
'server-up' check before making an upgrade call. These errors are
currently unhandled, as a result the exception rises to the top of the
stack and if run_once is not used the entire process crashes with an
exception.

This problem become widely visible when using the
WebSocketProxy  which uses a request handler class.
To handle every request a new process is spawned and if it is an invalid
request (empty request, SSL HELLO etc) the process crashes.

With this patch in such a case the request is caught and an error is
sent back, allowing a graceful termination of process.
This commit is contained in:
Sumit Jamgade 2019-03-18 11:21:03 +01:00
parent 6e09ec2548
commit d4ba0aa297
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
websockify/websockifyserver.py
View File

@ -315,7 +315,11 @@ class WebSockifyRequestHandler(WebSocketRequestHandlerMixIn, SimpleHTTPRequestHa
if self.run_once: if self.run_once:
self.handle_one_request() self.handle_one_request()
else: else:
SimpleHTTPRequestHandler.handle(self) try:
SimpleHTTPRequestHandler.handle(self)
except Exception:
exc = sys.exc_info()[1]
self.send_error(400, str(exc))
def log_request(self, code='-', size='-'): def log_request(self, code='-', size='-'):
if self.verbose: if self.verbose: