diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index e689f91ddd..4b9318ab03 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -384,14 +384,21 @@ class DatabaseQuery: _raise_exception() for field in self.fields: + lower_field = field.lower().strip() + if SUB_QUERY_PATTERN.match(field): - if any(f"({keyword}" in field.lower() for keyword in blacklisted_keywords): - _raise_exception() + if lower_field[0] == "(": + subquery_token = lower_field[1:].lstrip().split(" ", 1)[0] + if subquery_token in blacklisted_keywords: + _raise_exception() - if any(f"{keyword}(" in field.lower() for keyword in blacklisted_functions): - _raise_exception() + function = lower_field.split("(", 1)[0].rstrip() + if function in blacklisted_functions: + frappe.throw( + _("Use of function {0} in field is restricted").format(function), exc=frappe.DataError + ) - if "@" in field.lower(): + if "@" in lower_field: # prevent access to global variables _raise_exception() @@ -407,7 +414,7 @@ class DatabaseQuery: if STRICT_FIELD_PATTERN.match(field): frappe.throw(_("Illegal SQL Query")) - if STRICT_UNION_PATTERN.match(field.lower()): + if STRICT_UNION_PATTERN.match(lower_field): frappe.throw(_("Illegal SQL Query")) def extract_tables(self): diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py index 162d3e9d8a..52f18f5963 100644 --- a/frappe/tests/test_db_query.py +++ b/frappe/tests/test_db_query.py @@ -418,6 +418,43 @@ class TestReportview(FrappeTestCase): ) self.assertTrue("date_diff" in data[0]) + with self.assertRaises(frappe.DataError): + DatabaseQuery("DocType").execute( + fields=["name", "issingle", "if (issingle=1, (select name from tabUser), count(name))"], + limit_start=0, + limit_page_length=1, + ) + + with self.assertRaises(frappe.DataError): + DatabaseQuery("DocType").execute( + fields=["name", "issingle", "if(issingle=1, (select name from tabUser), count(name))"], + limit_start=0, + limit_page_length=1, + ) + + with self.assertRaises(frappe.DataError): + DatabaseQuery("DocType").execute( + fields=[ + "name", + "issingle", + "( select name from `tabUser` where `tabDocType`.owner = `tabUser`.name )", + ], + limit_start=0, + limit_page_length=1, + ignore_permissions=True, + ) + + with self.assertRaises(frappe.DataError): + DatabaseQuery("DocType").execute( + fields=[ + "name", + "issingle", + "(select name from `tabUser` where `tabDocType`.owner = `tabUser`.name )", + ], + limit_start=0, + limit_page_length=1, + ) + def test_nested_permission(self): frappe.set_user("Administrator") create_nested_doctype()