luckyimnotanigger/LibreTranslate
1
0
Fork 0
mirror of https://github.com/LibreTranslate/LibreTranslate.git synced 2025-05-04 12:24:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix API key logic, add some error handling

Browse source
This commit is contained in:
Piero Toffanin 2021-10-26 17:13:51 -04:00
parent 93b711aa74
commit a82b851a3d
3 changed files with 47 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/app.py
View file

@ -33,6 +33,14 @@ def get_upload_dir():
return upload_dir
def get_req_api_key():
if request.is_json:
json = get_json_dict(request)
ak = json.get("api_key")
else:
ak = request.values.get("api_key")
return ak
def get_json_dict(request):
d = request.get_json()
@ -54,11 +62,7 @@ def get_req_limits(default_limit, api_keys_db, multiplier=1):
req_limit = default_limit
if api_keys_db:
if request.is_json:
json = get_json_dict(request)
api_key = json.get("api_key")
else:
api_key = request.values.get("api_key")
api_key = get_req_api_key()
if api_key:
db_req_limit = api_keys_db.lookup(api_key)
@ -162,11 +166,7 @@ def create_app(args):
abort(403, description="Too many request limits violations")
if args.api_keys and args.require_api_key_origin:
if request.is_json:
json = get_json_dict(request)
ak = json.get("api_key")
else:
ak = request.values.get("api_key")
ak = get_req_api_key()
if (
api_keys_db.lookup(ak) is None and request.headers.get("Origin") != args.require_api_key_origin
@ -608,7 +608,7 @@ def create_app(args):
return jsonify(
{
"translatedFileUrl": url_for('download_file', filename=translated_filename, _external=True)
"translatedFileUrl": url_for('download_file', filename=translated_filename, _external=True, api_key=get_req_api_key())
}
)
except Exception as e: