summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/webserver/server.py
diff options
context:
space:
mode:
authorFlorian Diebold <flodiebold@gmail.com>2011-06-30 13:01:30 +0200
committerFlorian Diebold <flodiebold@gmail.com>2011-07-09 19:30:21 +0200
commit7e98c0129acb867943c395571bdc2d23d44467d8 (patch)
tree429032b071e82d20dfbde59e7fa3b3aaf30e63ed /crawl-ref/source/webserver/server.py
parent0fecd01e2a676afc7da88648a1b7474514623e50 (diff)
downloadcrawl-ref-7e98c0129acb867943c395571bdc2d23d44467d8.tar.gz
crawl-ref-7e98c0129acb867943c395571bdc2d23d44467d8.zip
Catch exceptions when trying to encode the password.
Diffstat (limited to 'crawl-ref/source/webserver/server.py')
-rwxr-xr-xcrawl-ref/source/webserver/server.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/webserver/server.py b/crawl-ref/source/webserver/server.py
index 2823b55284..2afed439c0 100755
--- a/crawl-ref/source/webserver/server.py
+++ b/crawl-ref/source/webserver/server.py
@@ -31,8 +31,11 @@ class TornadoFilter(logging.Filter):
logging.getLogger().addFilter(TornadoFilter())
def user_passwd_match(username, passwd): # Returns the correctly cased username.
- passwd = passwd[0:max_passwd_length]
- crypted_pw = crypt.crypt(passwd, passwd)
+ try:
+ passwd = passwd[0:max_passwd_length]
+ crypted_pw = crypt.crypt(passwd, passwd)
+ except:
+ return None
try:
conn = sqlite3.connect(password_db)