add: urlencode selector - space as plus or 20

getredash · Nov 24, 2023 · e60d3e2 · e60d3e2
1 parent c99e13a
commit e60d3e2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/redash/settings/__init__.py b/redash/settings/__init__.py
@@ -457,3 +457,6 @@ def email_server_is_configured():
 
 # Email blocked domains, use delimiter comma to separated multiple domains
 BLOCKED_DOMAINS = set_from_string(os.environ.get("REDASH_BLOCKED_DOMAINS", "qq.com"))
+
+# Ability to urlencode spaces as %20, default is plus
+URLENCODE_SPACE_AS_PLUS = parse_boolean(os.environ.get("REDASH_URLENCODE_SPACE_AS_PLUS", "true"))
diff --git a/redash/utils/requests_session.py b/redash/utils/requests_session.py
@@ -1,3 +1,7 @@
+# pylint: disable=missing-module-docstring
+from urllib.parse import quote, quote_plus, urlencode
+
+# pylint: disable=unused-import
 from advocate.exceptions import UnacceptableAddressException  # noqa: F401
 
 from redash import settings
@@ -8,10 +12,16 @@
     import requests as requests_or_advocate
 
 
-class ConfiguredSession(requests_or_advocate.Session):
+class ConfiguredSession(requests_or_advocate.Session):  # noqa: E501, pylint: disable=missing-class-docstring
     def request(self, *args, **kwargs):
         if not settings.REQUESTS_ALLOW_REDIRECTS:
             kwargs.update({"allow_redirects": False})
+
+        if "params" in kwargs:
+            quoter = quote_plus if settings.URLENCODE_SPACE_AS_PLUS else quote
+
+            kwargs["params"] = urlencode(kwargs["params"], quote_via=quoter)
+
         return super().request(*args, **kwargs)