ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server/search: protect against weird page numbers

Browse source
This commit is contained in:
rr- 2016-04-14 21:11:38 +02:00
parent b382f3398f
commit b5e9f37450
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/szurubooru/search/search_executor.py
View file

@ -20,6 +20,8 @@ class SearchExecutor(object):
Parse input and return tuple containing total record count and filtered Parse input and return tuple containing total record count and filtered
entities. entities.
''' '''
page = max(1, int(page))
page_size = max(1, int(page_size))
filter_query = self._prepare(session, query_text) filter_query = self._prepare(session, query_text)
entities = filter_query \ entities = filter_query \
.offset((page - 1) * page_size).limit(page_size).all() .offset((page - 1) * page_size).limit(page_size).all()

3
server/szurubooru/tests/search/test_user_search_config.py
View file

@ -134,6 +134,9 @@ class TestUserSearchExecutor(DatabaseTestCase):
self.session.add(util.mock_user('u2')) self.session.add(util.mock_user('u2'))
self._test('', 1, 1, 2, ['u1']) self._test('', 1, 1, 2, ['u1'])
self._test('', 2, 1, 2, ['u2']) self._test('', 2, 1, 2, ['u2'])
self._test('', 3, 1, 2, [])
self._test('', 0, 1, 2, ['u1'])
self._test('', 0, 0, 2, ['u1'])
def test_order_by_name(self): def test_order_by_name(self):
self.session.add(util.mock_user('u2')) self.session.add(util.mock_user('u2'))