pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-12 08:39:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: trap SQLAlchemy common exceptions & throw 422 error instead (#19672)

Browse Source
This commit is contained in:
Diego Medina 2022-04-20 17:03:02 -04:00 committed by GitHub
parent dfbaba97c6
commit 4513cc4758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
superset/views/base.py
View File

@ -45,7 +45,7 @@ from flask_jwt_extended.exceptions import NoAuthorizationError
from flask_wtf.csrf import CSRFError
from flask_wtf.form import FlaskForm
from pkg_resources import resource_filename
from sqlalchemy import or_
from sqlalchemy import exc, or_
from sqlalchemy.orm import Query
from werkzeug.exceptions import HTTPException
from wtforms import Form
@ -231,6 +231,9 @@ def handle_api_exception(
return json_error_response(
utils.error_msg_from_exception(ex), status=cast(int, ex.code)
)
except (exc.IntegrityError, exc.DatabaseError, exc.DataError) as ex:
logger.exception(ex)
return json_error_response(utils.error_msg_from_exception(ex), status=422)
except Exception as ex: # pylint: disable=broad-except
logger.exception(ex)
return json_error_response(utils.error_msg_from_exception(ex))

9
superset/views/base_api.py
View File

@ -39,6 +39,7 @@ from superset.sql_lab import Query as SqllabQuery
from superset.stats_logger import BaseStatsLogger
from superset.superset_typing import FlaskResponse
from superset.utils.core import time_function
from superset.views.base import handle_api_exception
logger = logging.getLogger(__name__)
get_related_schema = {
@ -386,6 +387,7 @@ class BaseSupersetModelRestApi(ModelRestApi):
object_ref=False,
log_to_statsd=False,
)
@handle_api_exception
def info_headless(self, **kwargs: Any) -> Response:
"""
Add statsd metrics to builtin FAB _info endpoint
@ -399,6 +401,7 @@ class BaseSupersetModelRestApi(ModelRestApi):
object_ref=False,
log_to_statsd=False,
)
@handle_api_exception
def get_headless(self, pk: int, **kwargs: Any) -> Response:
"""
Add statsd metrics to builtin FAB GET endpoint
@ -412,6 +415,7 @@ class BaseSupersetModelRestApi(ModelRestApi):
object_ref=False,
log_to_statsd=False,
)
@handle_api_exception
def get_list_headless(self, **kwargs: Any) -> Response:
"""
Add statsd metrics to builtin FAB GET list endpoint
@ -425,6 +429,7 @@ class BaseSupersetModelRestApi(ModelRestApi):
object_ref=False,
log_to_statsd=False,
)
@handle_api_exception
def post_headless(self) -> Response:
"""
Add statsd metrics to builtin FAB POST endpoint
@ -438,6 +443,7 @@ class BaseSupersetModelRestApi(ModelRestApi):
object_ref=False,
log_to_statsd=False,
)
@handle_api_exception
def put_headless(self, pk: int) -> Response:
"""
Add statsd metrics to builtin FAB PUT endpoint
@ -451,6 +457,7 @@ class BaseSupersetModelRestApi(ModelRestApi):
object_ref=False,
log_to_statsd=False,
)
@handle_api_exception
def delete_headless(self, pk: int) -> Response:
"""
Add statsd metrics to builtin FAB DELETE endpoint
@ -464,6 +471,7 @@ class BaseSupersetModelRestApi(ModelRestApi):
@safe
@statsd_metrics
@rison(get_related_schema)
@handle_api_exception
def related(self, column_name: str, **kwargs: Any) -> FlaskResponse:
"""Get related fields data
---
@ -542,6 +550,7 @@ class BaseSupersetModelRestApi(ModelRestApi):
@safe
@statsd_metrics
@rison(get_related_schema)
@handle_api_exception
def distinct(self, column_name: str, **kwargs: Any) -> FlaskResponse:
"""Get distinct values from field data
---