Merge pull request Amsterdam#1178 from Amsterdam/fix/codeql-scanning-…

…issues-in-pagination-classes Fixed CodeQL issues found in generic and search pagination classes
delta10 · Feb 22, 2023 · 7588f22 · 7588f22
2 parents 4cdc8b5 + 3598c78
commit 7588f22
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/app/signals/apps/api/generics/pagination.py b/app/signals/apps/api/generics/pagination.py
@@ -56,11 +56,8 @@ def paginate_queryset(self, queryset, request, view=None):
 
         try:
             self.page = paginator.page(page_number)
-        except InvalidPage as exc:
-            msg = self.invalid_page_message.format(
-                page_number=page_number, message=str(exc)
-            )
-            raise NotFound(msg)
+        except InvalidPage:
+            raise NotFound(self.invalid_page_message)
 
         if paginator.num_pages > 1 and self.template is not None:
             # The browsable API should display pagination controls.

diff --git a/app/signals/apps/search/rest_framework/pagination.py b/app/signals/apps/search/rest_framework/pagination.py
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MPL-2.0
 # Copyright (C) 2019 - 2022 Gemeente Amsterdam
 from datapunt_api.pagination import HALPagination
-from django.core.paginator import Page, Paginator
+from django.core.paginator import InvalidPage, Page, Paginator
 from rest_framework.exceptions import NotFound
 
 
@@ -51,9 +51,8 @@ def paginate_queryset(self, queryset, request, view=None):
 
         try:
             self.page = paginator.page(page_number)
-        except Exception as exc:
-            msg = self.invalid_page_message.format(page_number=page_number, message=exc)
-            raise NotFound(msg)
+        except InvalidPage:
+            raise NotFound(self.invalid_page_message)
 
         if paginator.num_pages > 1 and self.template is not None:
             self.display_page_controls = True