[PR #5968] [MERGED] Add some additional resource-based limits #6611

Closed
opened 2026-02-05 10:36:43 +03:00 by OVERLORD · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/BookStackApp/BookStack/pull/5968
Author: @ssddanbrown
Created: 12/30/2025
Status: Merged
Merged: 12/30/2025
Merged by: @ssddanbrown

Base: developmentHead: limits


📝 Commits (2)

  • 88d86df ZIP Exports: Added limit to ZIP file size before extraction
  • b08d1b3 Search: Set limits on the amount of search terms

📊 Changes

10 files changed (+171 additions, -3 deletions)

View changed files

📝 app/Exports/ZipExports/ZipExportReader.php (+21 -0)
📝 app/Exports/ZipExports/ZipFileReferenceRule.php (+7 -1)
📝 app/Exports/ZipExports/ZipImportRunner.php (+6 -0)
📝 app/Search/SearchController.php (+3 -2)
📝 app/Search/SearchOptionSet.php (+8 -0)
📝 app/Search/SearchOptions.php (+22 -0)
📝 lang/en/errors.php (+1 -0)
📝 lang/en/validation.php (+1 -0)
📝 tests/Exports/ZipImportRunnerTest.php (+53 -0)
📝 tests/Search/SearchOptionsTest.php (+49 -0)

📄 Description

  • Limits ZIP import file sizes to the configured FILE_UPLOAD_SIZE_LIMIT.
  • Limits the amount of search terms which can be used in one search.

Docs Updates

Update search page to note limits:

        $searchLimit = $userLoggedIn ? 10 : 5;
        $exactLimit = $userLoggedIn ? 4 : 2;
        $tagLimit = $userLoggedIn ? 8 : 4;
        $filterLimit = $userLoggedIn ? 10 : 5;

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/BookStackApp/BookStack/pull/5968 **Author:** [@ssddanbrown](https://github.com/ssddanbrown) **Created:** 12/30/2025 **Status:** ✅ Merged **Merged:** 12/30/2025 **Merged by:** [@ssddanbrown](https://github.com/ssddanbrown) **Base:** `development` ← **Head:** `limits` --- ### 📝 Commits (2) - [`88d86df`](https://github.com/BookStackApp/BookStack/commit/88d86df66f3eca1e0cd67c052aa1a99116d4d557) ZIP Exports: Added limit to ZIP file size before extraction - [`b08d1b3`](https://github.com/BookStackApp/BookStack/commit/b08d1b36de36d96fae55fff65bcb5908a43e63b5) Search: Set limits on the amount of search terms ### 📊 Changes **10 files changed** (+171 additions, -3 deletions) <details> <summary>View changed files</summary> 📝 `app/Exports/ZipExports/ZipExportReader.php` (+21 -0) 📝 `app/Exports/ZipExports/ZipFileReferenceRule.php` (+7 -1) 📝 `app/Exports/ZipExports/ZipImportRunner.php` (+6 -0) 📝 `app/Search/SearchController.php` (+3 -2) 📝 `app/Search/SearchOptionSet.php` (+8 -0) 📝 `app/Search/SearchOptions.php` (+22 -0) 📝 `lang/en/errors.php` (+1 -0) 📝 `lang/en/validation.php` (+1 -0) 📝 `tests/Exports/ZipImportRunnerTest.php` (+53 -0) 📝 `tests/Search/SearchOptionsTest.php` (+49 -0) </details> ### 📄 Description - Limits ZIP import file sizes to the configured `FILE_UPLOAD_SIZE_LIMIT`. - Limits the amount of search terms which can be used in one search. ### Docs Updates Update search page to note limits: ``` $searchLimit = $userLoggedIn ? 10 : 5; $exactLimit = $userLoggedIn ? 4 : 2; $tagLimit = $userLoggedIn ? 8 : 4; $filterLimit = $userLoggedIn ? 10 : 5; ``` --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
OVERLORD added the pull-request label 2026-02-05 10:36:44 +03:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/BookStack#6611