Skip to content

fix(api): Validate selected_columns in OrganizationEventsEndpoint for RPC datasets #120607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sentry wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −0
Draft

fix(api): Validate selected_columns in OrganizationEventsEndpoint for RPC datasets #120607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/sentry/api/endpoints/organization_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
from sentry.apidocs.response_types import DetailResponse
from sentry.apidocs.utils import inline_sentry_response_serializer
from sentry.discover.models import DiscoverSavedQuery, DiscoverSavedQueryTypes
from sentry.exceptions import InvalidSearchQuery
from sentry.models.dashboard_widget import DashboardWidget, DashboardWidgetTypes
from sentry.models.organization import Organization
from sentry.ratelimits.config import RateLimitConfig
Expand Down Expand Up @@ -624,6 +625,9 @@ def get_rpc_config():
def flex_time_data_fn(limit, page_token):
config = get_rpc_config()

if not self.get_field_list(organization, request):
raise InvalidSearchQuery("No columns selected")

return scoped_dataset.run_table_query(
params=snuba_params,
query_string=scoped_query or "",
Expand All @@ -646,6 +650,9 @@ def data_fn(offset, limit):
if scoped_dataset in RPC_DATASETS:
config = get_rpc_config()

if not self.get_field_list(organization, request):
raise InvalidSearchQuery("No columns selected")

return scoped_dataset.run_table_query(
params=snuba_params,
query_string=scoped_query or "",
Expand Down
Loading