summaryrefslogtreecommitdiff
path: root/tupkg
diff options
context:
space:
mode:
authorsimo <simo>2005-12-18 00:17:58 +0000
committersimo <simo>2005-12-18 00:17:58 +0000
commit1c4883edbab3f6a59598f54c894f62fa8590cf28 (patch)
tree8f891d99623a6b6b73cbd760e789dbdaa31c84d5 /tupkg
parent70af7c7d5c5945039f494ca5f9e435bc515db18e (diff)
More descriptive tupkg error message
Catch sql server connection death
Diffstat (limited to 'tupkg')
-rwxr-xr-xtupkg/client/tupkg3
-rwxr-xr-xtupkg/server/tupkgs14
2 files changed, 12 insertions, 5 deletions
diff --git a/tupkg/client/tupkg b/tupkg/client/tupkg
index c4806c9..021e647 100755
--- a/tupkg/client/tupkg
+++ b/tupkg/client/tupkg
@@ -87,6 +87,9 @@ class ClientSocket:
reply = self.readMsg(1)
if reply['result'] == ["PASS"]:
return 1
+ elif reply['result'] == ["SQLERR"]:
+ print "SQL server-side error"
+ return 0
else:
return 0
diff --git a/tupkg/server/tupkgs b/tupkg/server/tupkgs
index ca9ab26..05d6024 100755
--- a/tupkg/server/tupkgs
+++ b/tupkg/server/tupkgs
@@ -119,11 +119,15 @@ class ClientSocket(threading.Thread):
m = md5.new()
m.update(authdata['password'][0])
encpw = m.hexdigest()
- q.execute("SELECT ID, Suspended, AccountTypeID FROM Users WHERE Username = '"+
- MySQLdb.escape_string(authdata['username'][0])+
- "' AND Passwd = '"+
- MySQLdb.escape_string(encpw)+
- "'")
+ try:
+ q.execute("SELECT ID, Suspended, AccountTypeID FROM Users WHERE Username = '"+
+ MySQLdb.escape_string(authdata['username'][0])+
+ "' AND Passwd = '"+
+ MySQLdb.escape_string(encpw)+
+ "'")
+ except MySQLdb.OperationalError:
+ self.sendMsg("result=SQLERR")
+ return 0
if q.rowcount == 0:
self.sendMsg("result=FAIL")
return 0