external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(rpc): restore "Too Many Package Results" error

Browse source 
Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2022-02-10 01:04:25 -08:00
parent 86caee74c5
commit 3af66cafbe
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
2 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
aurweb/rpc.py
View file

@ -275,7 +275,11 @@ class RPC:
# Union all subqueries together. # Union all subqueries together.
max_results = config.getint("options", "max_rpc_results") max_results = config.getint("options", "max_rpc_results")
query = subqueries[0].union_all(*subqueries[1:]).limit(max_results) query = subqueries[0].union_all(*subqueries[1:]).limit(
max_results + 1).all()
if len(query) > max_results:
raise RPCError("Too many package results.")
# Store our extra information in a class-wise dictionary, # Store our extra information in a class-wise dictionary,
# which contains package id -> extra info dict mappings. # which contains package id -> extra info dict mappings.
@ -307,7 +311,11 @@ class RPC:
search.search_by(by, arg) search.search_by(by, arg)
max_results = config.getint("options", "max_rpc_results") max_results = config.getint("options", "max_rpc_results")
results = self._entities(search.results()).limit(max_results) results = self._entities(search.results()).limit(max_results + 1).all()
if len(results) > max_results:
raise RPCError("Too many package results.")
return self._assemble_json_data(results, self._get_json_data) return self._assemble_json_data(results, self._get_json_data)
def _handle_msearch_type(self, args: List[str] = [], **kwargs)\ def _handle_msearch_type(self, args: List[str] = [], **kwargs)\

31
test/test_rpc.py
View file

@ -795,3 +795,34 @@ def test_rpc_post(client: TestClient, packages: List[Package]):
resp = request.post("/rpc", data=data) resp = request.post("/rpc", data=data)
assert resp.status_code == int(HTTPStatus.OK) assert resp.status_code == int(HTTPStatus.OK)
assert resp.json().get("resultcount") == 2 assert resp.json().get("resultcount") == 2
def test_rpc_too_many_search_results(client: TestClient,
packages: List[Package]):
config_getint = config.getint
def mock_config(section: str, key: str):
if key == "max_rpc_results":
return 1
return config_getint(section, key)
params = {"v": 5, "type": "search", "arg": "chungus"}
with mock.patch("aurweb.config.getint", side_effect=mock_config):
with client as request:
resp = request.get("/rpc", params=params)
assert resp.json().get("error") == "Too many package results."
def test_rpc_too_many_info_results(client: TestClient, packages: List[Package]):
config_getint = config.getint
def mock_config(section: str, key: str):
if key == "max_rpc_results":
return 1
return config_getint(section, key)
params = {"v": 5, "type": "info", "arg[]": [p.Name for p in packages]}
with mock.patch("aurweb.config.getint", side_effect=mock_config):
with client as request:
resp = request.get("/rpc", params=params)
assert resp.json().get("error") == "Too many package results."