Hotfix for possible SVG spearsphishing attack vector #3394
Merged
Conversation
This file contains 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
PRO-1971 Implement solution to SVG XSS attack risk
See PRO-1859 for the background on this.
|
boutell
commented
Sep 7, 2021
| @@ -707,7 +734,10 @@ module.exports = { | |||
| const batchSize = 100; | |||
| let lastId = ''; | |||
| while (true) { | |||
| const docs = await self.db.find({ _id: { $gt: lastId } }).limit(batchSize).sort({ _id: 1 }).toArray(); | |||
| const docs = await self.db.find({ | |||
| ...(criteria || {}), | |||
There was a problem hiding this comment.
A bug that got in the way: the each method for attachment migrations was ignoring its criteria argument.
abea
suggested changes
Sep 7, 2021
| @@ -402,6 +405,16 @@ module.exports = { | |||
| } | |||
| info.length = await self.apos.util.fileLength(file.path); | |||
| info.md5 = await self.apos.util.md5File(file.path); | |||
| if (info.extension === 'svg') { | |||
| try { | |||
| await self.sanitizeSvg(file, info); | |||
There was a problem hiding this comment.
The info parameter isn't used in the method.
abea
previously approved these changes
Sep 8, 2021
abea
approved these changes
Sep 8, 2021
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.
This is low probability, but possible. This initial PR is against a base branch that matches 3.3.1. I like this procedure better than starting out with a PR against main, because this way no error-prone cherry-picking is required, just a merge to main after release.