QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-20 16:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: error while parsing invalid json form_data (#12586)

Browse Source 
* Fix error while parsing invalid json form_data

* Refine error returned
This commit is contained in:
Duy Nguyen Hoang
2021-01-19 23:15:16 +07:00
committed by GitHub
parent 9771b82c94
commit 77da4ada99
4 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
superset/views/utils.py
View File

@@ -126,6 +126,13 @@ def get_viz(
return viz_obj
def loads_request_json(request_json_data: str) -> Dict[Any, Any]:
try:
return json.loads(request_json_data)
except (TypeError, json.JSONDecodeError):
return {}
def get_form_data(
slice_id: Optional[int] = None, use_slice_data: bool = False
) -> Tuple[Dict[str, Any], Optional[Slice]]:
@@ -141,10 +148,10 @@ def get_form_data(
if request_json_data:
form_data.update(request_json_data)
if request_form_data:
form_data.update(json.loads(request_form_data))
form_data.update(loads_request_json(request_form_data))
# request params can overwrite the body
if request_args_data:
form_data.update(json.loads(request_args_data))
form_data.update(loads_request_json(request_args_data))
# Fallback to using the Flask globals (used for cache warmup) if defined.
if not form_data and hasattr(g, "form_data"):
@@ -157,7 +164,7 @@ def get_form_data(
url_str = parse.unquote_plus(
saved_url.url.split("?")[1][10:], encoding="utf-8"
)
url_form_data = json.loads(url_str)
url_form_data = loads_request_json(url_str)
# allow form_date in request override saved url
url_form_data.update(form_data)
form_data = url_form_data