mirror of
https://github.com/aljazceru/CTFd.git
synced 2025-12-19 06:54:20 +01:00
Fix 500s from invalid page args (#818)
* Fix some 500s generated by invalid non-int page arguments
This commit is contained in:
@@ -13,7 +13,7 @@ def submissions_listing(submission_type):
|
|||||||
if submission_type:
|
if submission_type:
|
||||||
filters['type'] = submission_type
|
filters['type'] = submission_type
|
||||||
|
|
||||||
curr_page = abs(int(request.args.get('page', 1)))
|
curr_page = abs(int(request.args.get('page', 1, type=int)))
|
||||||
results_per_page = 50
|
results_per_page = 50
|
||||||
page_start = results_per_page * (curr_page - 1)
|
page_start = results_per_page * (curr_page - 1)
|
||||||
page_end = results_per_page * (curr_page - 1) + results_per_page
|
page_end = results_per_page * (curr_page - 1) + results_per_page
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ from sqlalchemy.sql import not_
|
|||||||
@admin.route('/admin/teams')
|
@admin.route('/admin/teams')
|
||||||
@admins_only
|
@admins_only
|
||||||
def teams_listing():
|
def teams_listing():
|
||||||
page = request.args.get('page', 1)
|
page = abs(request.args.get('page', 1, type=int))
|
||||||
q = request.args.get('q')
|
q = request.args.get('q')
|
||||||
if q:
|
if q:
|
||||||
field = request.args.get('field')
|
field = request.args.get('field')
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ from sqlalchemy.sql import not_
|
|||||||
@admin.route('/admin/users')
|
@admin.route('/admin/users')
|
||||||
@admins_only
|
@admins_only
|
||||||
def users_listing():
|
def users_listing():
|
||||||
page = request.args.get('page', 1)
|
page = abs(request.args.get('page', 1, type=int))
|
||||||
q = request.args.get('q')
|
q = request.args.get('q')
|
||||||
if q:
|
if q:
|
||||||
field = request.args.get('field')
|
field = request.args.get('field')
|
||||||
|
|||||||
@@ -18,8 +18,7 @@ teams = Blueprint('teams', __name__)
|
|||||||
@check_account_visibility
|
@check_account_visibility
|
||||||
@require_team_mode
|
@require_team_mode
|
||||||
def listing():
|
def listing():
|
||||||
page = request.args.get('page', 1)
|
page = abs(request.args.get('page', 1, type=int))
|
||||||
page = abs(int(page))
|
|
||||||
results_per_page = 50
|
results_per_page = 50
|
||||||
page_start = results_per_page * (page - 1)
|
page_start = results_per_page * (page - 1)
|
||||||
page_end = results_per_page * (page - 1) + results_per_page
|
page_end = results_per_page * (page - 1) + results_per_page
|
||||||
|
|||||||
@@ -14,8 +14,7 @@ users = Blueprint('users', __name__)
|
|||||||
@users.route('/users')
|
@users.route('/users')
|
||||||
@check_account_visibility
|
@check_account_visibility
|
||||||
def listing():
|
def listing():
|
||||||
page = request.args.get('page', 1)
|
page = abs(request.args.get('page', 1, type=int))
|
||||||
page = abs(int(page))
|
|
||||||
results_per_page = 50
|
results_per_page = 50
|
||||||
page_start = results_per_page * (page - 1)
|
page_start = results_per_page * (page - 1)
|
||||||
page_end = results_per_page * (page - 1) + results_per_page
|
page_end = results_per_page * (page - 1) + results_per_page
|
||||||
|
|||||||
Reference in New Issue
Block a user