better and secure file handling #33
Conversation
|
Warning Rate limit exceeded@skerbis has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 1 minutes and 13 seconds before requesting another review. ⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. 📒 Files selected for processing (2)
WalkthroughThe pull request introduces enhanced file upload validation and improved temporary filename generation in the Changes
Possibly related PRs
Poem
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🔭 Outside diff range comments (1)
lib/zip_install.php (1)
Line range hint
141-187: Protect against ZIP slip and path traversal vulnerabilitiesThe ZIP extraction process is vulnerable to directory traversal attacks. Add validation for extracted filenames:
for ($i = 0; $i < $zip->numFiles; $i++) { /** @var array{name: string, index: int, size: int, mtime: int, crc: int, comp_size: int, comp_method: int} $stat */ $stat = $zip->statIndex($i); $filename = $stat['name']; + + // Protect against ZIP slip + $realPath = realpath($extractPath . $filename); + if ($realPath === false || !str_starts_with($realPath, realpath($extractPath))) { + throw new Exception(rex_i18n::msg('zip_install_security_warning')); + } if ($i == 0) { // First entry must be a directoryAlso, consider:
- Implementing file size limits for extracted files
- Adding timeout for extraction process
- Improving cleanup error handling
🧹 Nitpick comments (1)
lib/zip_install.php (1)
Line range hint
1-359: Consider implementing comprehensive file handling securityWhile the changes improve file handling, consider implementing a dedicated secure file handling class that encapsulates all security measures:
- File validation (MIME, extension, content)
- Secure temporary file management
- ZIP security (slip protection, size limits)
- Cleanup management
This would improve maintainability and ensure consistent security across the codebase.
Would you like me to provide an example implementation of such a class?
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
lib/zip_install.php(2 hunks)
🔇 Additional comments (1)
lib/zip_install.php (1)
123-123: Apply secure filename generation for downloadsSimilar to the upload file handling, replace
uniqid()with cryptographically secure random filename generation.
lib/zip_install.php
Outdated
|
|
||
| // Check filesize | ||
| $maxSize = $this->addon->getConfig('upload_max_size', 20) * 1024 * 1024; // Convert MB to bytes | ||
| if ($uploadedFile['size'] > $maxSize) { | ||
| return rex_view::error(rex_i18n::msg('zip_install_size_error', $this->addon->getConfig('upload_max_size', 20))); | ||
| } | ||
|
|
||
| $tmpFile = $this->tmpFolder . '/temp.zip'; | ||
| $tmpFile = $this->tmpFolder . '/' . uniqid('upload_') . '.zip'; // Generate unique filename |
There was a problem hiding this comment.
Use cryptographically secure random filenames
Using uniqid() for filename generation is not cryptographically secure and could be predictable. Consider using random_bytes() for better security:
-$tmpFile = $this->tmpFolder . '/' . uniqid('upload_') . '.zip';
+$tmpFile = $this->tmpFolder . '/' . 'upload_' . bin2hex(random_bytes(16)) . '.zip';Also, consider implementing exclusive file creation to prevent race conditions:
$tmpFile = tempnam($this->tmpFolder, 'upload_');
if ($tmpFile === false) {
throw new Exception(rex_i18n::msg('zip_install_temp_file_failed'));
}
rename($tmpFile, $tmpFile . '.zip');
$tmpFile .= '.zip';
lib/zip_install.php
Outdated
| // Check mime type | ||
| $allowedMimeTypes = ['application/zip', 'application/octet-stream']; | ||
| if (!in_array($uploadedFile['type'], $allowedMimeTypes)) { | ||
| return rex_view::error(rex_i18n::msg('zip_install_mime_error')); | ||
| } | ||
|
|
There was a problem hiding this comment.
Enhance file validation security
While MIME type validation is a good start, it's insufficient as MIME types can be easily spoofed. Consider implementing additional security measures:
- Validate file extension (e.g.,
.zip) - Verify file content using
ZipArchive::open()before moving the file - Consider using
fileinfoextension to detect actual MIME type:
// Check mime type
$allowedMimeTypes = ['application/zip', 'application/octet-stream'];
-if (!in_array($uploadedFile['type'], $allowedMimeTypes)) {
+
+// Verify file extension
+if (!preg_match('/\.zip$/i', $uploadedFile['name'])) {
+ return rex_view::error(rex_i18n::msg('zip_install_invalid_extension'));
+}
+
+// Check actual MIME type using fileinfo
+$finfo = new finfo(FILEINFO_MIME_TYPE);
+$mimeType = $finfo->file($uploadedFile['tmp_name']);
+if (!in_array($mimeType, $allowedMimeTypes)) {
return rex_view::error(rex_i18n::msg('zip_install_mime_error'));
}
+
+// Verify ZIP structure
+$zip = new ZipArchive();
+if ($zip->open($uploadedFile['tmp_name']) !== true) {
+ return rex_view::error(rex_i18n::msg('zip_install_invalid_zip'));
+}
+$zip->close();📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| // Check mime type | |
| $allowedMimeTypes = ['application/zip', 'application/octet-stream']; | |
| if (!in_array($uploadedFile['type'], $allowedMimeTypes)) { | |
| return rex_view::error(rex_i18n::msg('zip_install_mime_error')); | |
| } | |
| // Check mime type | |
| $allowedMimeTypes = ['application/zip', 'application/octet-stream']; | |
| // Verify file extension | |
| if (!preg_match('/\.zip$/i', $uploadedFile['name'])) { | |
| return rex_view::error(rex_i18n::msg('zip_install_invalid_extension')); | |
| } | |
| // Check actual MIME type using fileinfo | |
| $finfo = new finfo(FILEINFO_MIME_TYPE); | |
| $mimeType = $finfo->file($uploadedFile['tmp_name']); | |
| if (!in_array($mimeType, $allowedMimeTypes)) { | |
| return rex_view::error(rex_i18n::msg('zip_install_mime_error')); | |
| } | |
| // Verify ZIP structure | |
| $zip = new ZipArchive(); | |
| if ($zip->open($uploadedFile['tmp_name']) !== true) { | |
| return rex_view::error(rex_i18n::msg('zip_install_invalid_zip')); | |
| } | |
| $zip->close(); |
Summary by CodeRabbit
Security Improvements
Bug Fixes