Project/Version rename, multi-game support, depenency rework & other changes #89
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Dependency rework
(cherry picked from commit 62253e6)
…y? localized entirely within your kitchen? (begin validation against swagger file)
Rename Mod/ModVersion to Project/Version
…ame, disable beatmods importer, update api responses to not send generic messages
This reverts commit 6c8be9c.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
…tAPIPublicResponse` instead.
| }).then(async (project) => { | ||
| DatabaseHelper.refreshCache(`projects`); | ||
| if (iconIsValid) { | ||
| (icon as UploadedFile).mv(filePath); |
Check failure
Code scanning / CodeQL
Uncontrolled data used in path expression High
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI 6 months ago
To fix the issue, we need to ensure that the constructed filePath is both normalized and validated to prevent directory traversal or other attacks. This can be achieved by:
- Using
path.resolveto normalize the path and remove any..segments. - Using
fs.realpathSyncto resolve symbolic links and ensure the path points to a real location. - Validating that the resolved path starts with the expected root directory (
Config.storage.iconsDir).
Additionally, we should sanitize the icon.name using a library like sanitize-filename to remove any special characters that could be used maliciously.
Changes required:
- Add the
sanitize-filenamepackage to sanitizeicon.name. - Update the construction and validation of
filePathto include normalization, symbolic link resolution, and sanitization.
Suggested changeset
2
src/api/routes/v3/createMod.ts
| @@ -2,2 +2,4 @@ | ||
| import path from 'node:path'; | ||
| import fs from 'node:fs'; | ||
| import sanitize from 'sanitize-filename'; | ||
| import { DatabaseHelper, ContentHash, Status, UserRoles } from '../../../shared/Database.ts'; | ||
| @@ -88,4 +90,6 @@ | ||
| // move the icon to the correct location | ||
| filePath = `${path.resolve(Config.storage.iconsDir)}/${icon.md5}${path.extname(icon.name)}`; | ||
| if (filePath.startsWith(`${path.resolve(Config.storage.iconsDir)}`) == false) { | ||
| const sanitizedFileName = sanitize(icon.name); | ||
| filePath = path.resolve(Config.storage.iconsDir, `${icon.md5}${path.extname(sanitizedFileName)}`); | ||
| const resolvedFilePath = fs.realpathSync(filePath); | ||
| if (!resolvedFilePath.startsWith(fs.realpathSync(Config.storage.iconsDir))) { | ||
| iconIsValid = false; |
package.json
Outside changed files
| @@ -39,3 +39,4 @@ | ||
| "zod": "^3.24.1", | ||
| "zod-validation-error": "^3.4.1" | ||
| "zod-validation-error": "^3.4.1", | ||
| "sanitize-filename": "^1.6.3" | ||
| }, |
This fix introduces these dependencies
| Package | Version | Security advisories |
| sanitize-filename (npm) | 1.6.3 | None |
Copilot is powered by AI and may make mistakes. Always verify output.
| if (filePath.startsWith(`${path.resolve(Config.storage.modsDir)}`) == false) { | ||
| return res.status(400).send({ message: `Invalid zip file.` }); | ||
| } else { | ||
| file.mv(filePath); |
Check failure
Code scanning / CodeQL
Uncontrolled data used in path expression High
| let oldFileName = project.iconFileName; | ||
| project.iconFileName = `${icon.md5}${path.extname(icon.name)}`; | ||
| project.save().then((project) => { | ||
| icon.mv(filePath, (error) => { |
Check failure
Code scanning / CodeQL
Uncontrolled data used in path expression High
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #88
closes #4
closes #83
closes #23