Skip to content

Fix dashboard signals parsing for dashboard queries #1228

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

Merged
merged 5 commits into from
Jul 12, 2023
Merged

Fix dashboard signals parsing for dashboard queries #1228

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b625635
Fixed dashboard signals parsing for dashboard queries
dmytrotsko Jul 10, 2023
b21141a
Added wildcard signal handling while counting multiples in get_multip…
dmytrotsko Jul 11, 2023
d40668f
Removed unnecessary set cast
dmytrotsko Jul 11, 2023
7e7786b
Merge branch 'dev' into fix_dashboard_signals_parsing
dmytrotsko Jul 11, 2023
17b98dd
Move signals parsing outside try...except block
dmytrotsko Jul 12, 2023
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
15 changes: 8 additions & 7 deletions src/server/_limiter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from ._common import app, get_real_ip_addr
from ._config import RATE_LIMIT, RATELIMIT_STORAGE_URL, REDIS_HOST, REDIS_PASSWORD
from ._exceptions import ValidationFailedException
from ._params import extract_dates, extract_integers, extract_strings
from ._params import extract_dates, extract_integers, extract_strings, parse_source_signal_sets
from ._security import _is_public_route, current_user, require_api_key, show_no_api_key_warning, resolve_auth_token, ERROR_MSG_RATE_LIMIT, ERROR_MSG_MULTIPLES


Expand Down Expand Up @@ -71,12 +71,13 @@ def get_multiples_count(request):
def check_signals_allowlist(request):
signals_allowlist = {":".join(ss_pair) for ss_pair in DashboardSignals().srcsig_list()}
request_signals = []
if "signal" in request.args.keys():
request_signals += extract_strings("signal")
if "signals" in request.args.keys():
request_signals += extract_strings("signals")
if "data_source" in request.args:
request_signals = [f"{request.args['data_source']}:{request_signal}" for request_signal in request_signals]
request_args = request.args.keys()
if "signal" in request_args or "signals" in request_args:
source_signal_sets = parse_source_signal_sets()
for source_signal in source_signal_sets:
if isinstance(source_signal.signal, list):
for signal in source_signal.signal:
request_signals.append(f"{source_signal.source}:{signal}")
if len(request_signals) == 0:
return False
return all([signal in signals_allowlist for signal in request_signals])
Expand Down