CIRCL
/
url-abuse
mirror of https://github.com/CIRCL/url-abuse
2
0
Fork 0
Code Issues Releases Wiki Activity

chg: Some more cleanup

pull/14/head
Raphaël Vinot 2019-01-11 16:14:21 +01:00
parent 12291e267b
commit 3b1260d257
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
website/web/__init__.py
View File

@ -146,9 +146,9 @@ def create_app(configfile=None):
@app.route("/_result/<job_key>", methods=['GET']) @app.route("/_result/<job_key>", methods=['GET'])
def check_valid(job_key): def check_valid(job_key):
if not job_key or not queue.exists(job_key): if not job_key or not queue.exists(job_key):
return json.dumps(None), 200 return Response(json.dumps(None), mimetype='application/json'), 200
if not queue.hexists(job_key, 'result'): if not queue.hexists(job_key, 'result'):
return json.dumps("Nay!"), 202 return Response(json.dumps('Nay!'), mimetype='application/json'), 202
result = queue.hget(job_key, 'result') result = queue.hget(job_key, 'result')
queue.delete(job_key) queue.delete(job_key)
return Response(result, mimetype='application/json'), 200 return Response(result, mimetype='application/json'), 200
@ -294,11 +294,10 @@ def create_app(configfile=None):
@app.route('/get_cache', methods=['POST']) @app.route('/get_cache', methods=['POST'])
def get_cache(): def get_cache():
data = json.loads(request.data.decode()) data = request.get_json(force=True)
url = data["query"] url = data["query"]
data = urlabuse_query.cached(url) data = urlabuse_query.cached(url)
dumped = json.dumps(data, sort_keys=True, indent=4, separators=(',', ': ')) return Response(json.dumps(data), mimetype='application/json')
return dumped
def digest(data): def digest(data):
to_return = '' to_return = ''
@ -355,7 +354,7 @@ def create_app(configfile=None):
@app.route('/submit', methods=['POST']) @app.route('/submit', methods=['POST'])
def send_mail(): def send_mail():
data = json.loads(request.data.decode()) data = request.get_json(force=True)
url = data["url"] url = data["url"]
if not urlabuse_query.get_mail_sent(url): if not urlabuse_query.get_mail_sent(url):
ip = _get_user_ip(request) ip = _get_user_ip(request)