SQL validator
This commit is contained in:
@@ -4,30 +4,36 @@ import json
|
||||
import tornado.gen
|
||||
import tornado.web
|
||||
|
||||
from helpers import validatorHelper
|
||||
from web import asyncTornado
|
||||
from constants import argumentTypes
|
||||
|
||||
from objects import glob
|
||||
|
||||
ARGS = {
|
||||
("file_hash", "file_version", "timestamp"): argumentTypes.one_required
|
||||
}
|
||||
|
||||
SQL_STRUCT = {
|
||||
"main": "SELECT * FROM updates WHERE %s LIMIT 1",
|
||||
"file_hash": "%s = '%s'",
|
||||
"file_version": "%s = %s",
|
||||
"timestamp": "timestamp <= '%s' ORDER BY timestamp DESC"
|
||||
}
|
||||
|
||||
class handler(asyncTornado.asyncRequestHandler):
|
||||
ARGS = {
|
||||
("file_hash", "file_version", "timestamp"): argumentTypes.one_required
|
||||
}
|
||||
|
||||
ARGS_VALIDATION = {
|
||||
validatorHelper.HEX: ["file_hash"],
|
||||
validatorHelper.INT: ["file_version", "timestamp"]
|
||||
}
|
||||
|
||||
SQL_STRUCT = {
|
||||
"main": "SELECT * FROM updates WHERE %s LIMIT 1",
|
||||
"file_hash": "%s = '%s'",
|
||||
"file_version": "%s = %s",
|
||||
"timestamp": "timestamp <= '%s' ORDER BY timestamp DESC"
|
||||
}
|
||||
|
||||
@tornado.web.asynchronous
|
||||
@tornado.gen.engine
|
||||
def asyncGet(self):
|
||||
status_code = 400
|
||||
data = {}
|
||||
try:
|
||||
args_filter = asyncTornado.check_arguments(self.request.arguments, ARGS)
|
||||
args_filter = asyncTornado.check_arguments(self)
|
||||
if not args_filter:
|
||||
raise Exception("Missing required arguments")
|
||||
|
||||
@@ -37,7 +43,7 @@ class handler(asyncTornado.asyncRequestHandler):
|
||||
conn = glob.new_sql()
|
||||
cur = conn.cursor()
|
||||
|
||||
sql = SQL_STRUCT["main"] % SQL_STRUCT[method]
|
||||
sql = self.SQL_STRUCT["main"] % self.SQL_STRUCT[method]
|
||||
if method == "timestamp":
|
||||
sql = sql % method_value
|
||||
else:
|
||||
|
||||
@@ -4,36 +4,40 @@ import json
|
||||
import tornado.gen
|
||||
import tornado.web
|
||||
|
||||
from helpers import validatorHelper
|
||||
from web import asyncTornado
|
||||
from constants import argumentTypes
|
||||
|
||||
from objects import glob
|
||||
|
||||
ARGS = {
|
||||
("file_hash", "file_version", "timestamp"): argumentTypes.one_required
|
||||
}
|
||||
|
||||
SQL_STRUCT = {
|
||||
"main": "SELECT %s FROM updates WHERE filename = 'osu!.exe' ORDER BY file_version"
|
||||
}
|
||||
|
||||
class handler(asyncTornado.asyncRequestHandler):
|
||||
ARGS = {
|
||||
("file_hash", "file_version", "timestamp"): argumentTypes.one_required
|
||||
}
|
||||
|
||||
ARGS_VALIDATION = {
|
||||
validatorHelper.HEX: ["file_hash"],
|
||||
validatorHelper.INT: ["file_version", "timestamp"]
|
||||
}
|
||||
|
||||
SQL_STRUCT = {
|
||||
"main": "SELECT %s FROM updates WHERE filename = 'osu!.exe' ORDER BY file_version"
|
||||
}
|
||||
|
||||
@tornado.web.asynchronous
|
||||
@tornado.gen.engine
|
||||
def asyncGet(self):
|
||||
status_code = 400
|
||||
data = {}
|
||||
try:
|
||||
args_filter = asyncTornado.check_arguments(self.request.arguments, ARGS)
|
||||
args_filter = asyncTornado.check_arguments(self)
|
||||
if not args_filter:
|
||||
raise Exception("Missing required arguments")
|
||||
|
||||
conn = glob.new_sql()
|
||||
cur = conn.cursor()
|
||||
|
||||
sql = SQL_STRUCT["main"]
|
||||
|
||||
cur.execute(sql % ",".join(args_filter))
|
||||
cur.execute(self.SQL_STRUCT["main"] % ",".join(args_filter))
|
||||
data = cur.fetchall()
|
||||
|
||||
cur.close()
|
||||
|
||||
@@ -1,32 +1,39 @@
|
||||
import traceback
|
||||
import json
|
||||
|
||||
import tornado.gen
|
||||
import tornado.web
|
||||
|
||||
from helpers import validatorHelper
|
||||
from web import asyncTornado
|
||||
from constants import argumentTypes
|
||||
|
||||
from objects import glob
|
||||
|
||||
ARGS = {
|
||||
("file_hash", "file_version", "timestamp"): argumentTypes.one_required
|
||||
}
|
||||
|
||||
SQL_STRUCT = {
|
||||
"main": "SELECT max(search.file_version) as file_version, search.* FROM updates search %s GROUP BY filename;",
|
||||
"file_hash": "WHERE %s <= %s",
|
||||
"file_version": "WHERE %s <= %s",
|
||||
"timestamp": "INNER JOIN ( SELECT file_version, file_version FROM updates WHERE %s = '%s' ) find ON search.file_version <= find.file_version"
|
||||
}
|
||||
|
||||
class handler(asyncTornado.asyncRequestHandler):
|
||||
ARGS = {
|
||||
("file_hash", "file_version", "timestamp"): argumentTypes.one_required
|
||||
}
|
||||
|
||||
ARGS_VALIDATION = {
|
||||
validatorHelper.HEX: ["file_hash"],
|
||||
validatorHelper.INT: ["file_version", "timestamp"]
|
||||
}
|
||||
|
||||
SQL_STRUCT = {
|
||||
"main": "SELECT max(search.file_version) as file_version, search.* FROM updates search %s GROUP BY filename;",
|
||||
"file_hash": "WHERE %s <= %s",
|
||||
"file_version": "WHERE %s <= %s",
|
||||
"timestamp": "INNER JOIN ( SELECT file_version, file_version FROM updates WHERE %s = '%s' ) find ON search.file_version <= find.file_version"
|
||||
}
|
||||
|
||||
@tornado.web.asynchronous
|
||||
@tornado.gen.engine
|
||||
def asyncGet(self):
|
||||
status_code = 400
|
||||
data = {}
|
||||
try:
|
||||
args_filter = asyncTornado.check_arguments(self.request.arguments, ARGS)
|
||||
args_filter = asyncTornado.check_arguments(self)
|
||||
if not args_filter:
|
||||
raise Exception("Missing required arguments")
|
||||
|
||||
@@ -36,7 +43,7 @@ class handler(asyncTornado.asyncRequestHandler):
|
||||
conn = glob.new_sql()
|
||||
cur = conn.cursor()
|
||||
|
||||
sql = SQL_STRUCT["main"] % SQL_STRUCT[method]
|
||||
sql = self.SQL_STRUCT["main"] % self.SQL_STRUCT[method]
|
||||
|
||||
cur.execute(sql % (method, method_value))
|
||||
data = cur.fetchall()
|
||||
@@ -50,6 +57,7 @@ class handler(asyncTornado.asyncRequestHandler):
|
||||
data["status"] = status_code
|
||||
data["message"] = str(e)
|
||||
print("Err: %s" % e)
|
||||
traceback.print_exc()
|
||||
finally:
|
||||
self.write( json.dumps(data) )
|
||||
self.set_header("Content-Type", "application/json")
|
||||
|
||||
Reference in New Issue
Block a user