diff options
author | Florian Diebold <flodiebold@gmail.com> | 2011-07-10 12:57:43 +0200 |
---|---|---|
committer | Florian Diebold <flodiebold@gmail.com> | 2011-07-10 12:58:11 +0200 |
commit | 484b5f2db7f25d02544268075fbed12ae9a5e1d1 (patch) | |
tree | f2597ec765656d5e7607c70f6e5a06d0b8398d80 /crawl-ref/source/webserver/server.py | |
parent | baddf42e18f1c22a1e0452d16643545d62fa2015 (diff) | |
download | crawl-ref-484b5f2db7f25d02544268075fbed12ae9a5e1d1.tar.gz crawl-ref-484b5f2db7f25d02544268075fbed12ae9a5e1d1.zip |
Catch a WebTiles server exception when deselecting "Remember me" with an invalid login token.
Diffstat (limited to 'crawl-ref/source/webserver/server.py')
-rwxr-xr-x | crawl-ref/source/webserver/server.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/source/webserver/server.py b/crawl-ref/source/webserver/server.py index 2afed439c0..ac461bdf13 100755 --- a/crawl-ref/source/webserver/server.py +++ b/crawl-ref/source/webserver/server.py @@ -436,14 +436,16 @@ class CrawlWebSocket(tornado.websocket.WebSocketHandler): self.write_message("set_login_cookie(" + tornado.escape.json_encode(cookie) + "," + str(login_token_lifetime) + ");") - pass elif message.startswith("UnRemember: "): message = message[len("UnRemember: "):] username, _, token = message.partition(' ') - token = long(token) - if (token, username) in login_tokens: - del login_tokens[(token, username)] + try: + token = long(token) + if (token, username) in login_tokens: + del login_tokens[(token, username)] + except ValueError: + return elif message.startswith("Play: "): if self.p or self.watched_game: return |