JS: extract .erb files as html #11175
Open
+143
−3
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
aibaars
reviewed
Nov 10, 2022
| @@ -104,7 +104,7 @@ private static int skipBOM(byte[] bytes, int length) { | |||
|
|
|||
| /** Information about supported file types. */ | |||
| public static enum FileType { | |||
| HTML(".htm", ".html", ".xhtm", ".xhtml", ".vue", ".hbs", ".ejs", ".njk") { | |||
| HTML(".htm", ".html", ".xhtm", ".xhtml", ".vue", ".hbs", ".ejs", ".njk", ".erb") { | |||
There was a problem hiding this comment.
Perhaps restrict to .html.erb. While many erb files are html-like templates, they are also used for many other text formats.
Suggested change
| HTML(".htm", ".html", ".xhtm", ".xhtml", ".vue", ".hbs", ".ejs", ".njk", ".erb") { | |
| HTML(".htm", ".html", ".xhtm", ".xhtml", ".vue", ".hbs", ".ejs", ".njk", ".html.erb") { |
aibaars
approved these changes
Nov 10, 2022
Yes. The parser already handles that various templating systems does various weird things. I will become problematic if |
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.
CVE-2022-3704: TP/TN
In that CVE the security issue is entirely contained within some JS code, that sits inside a
<script>tag in an.erbfile.I figured that our HTML parser already handles HTML with various templating languages, so handling
.erbshouldn't be that different.And it wasn't, it just worked.
I tried to add an
.erbfile to the xss-through-dom test, but that wouldn't work, and I don't know why.That's why I put an
.erbtest in the trap-tests.Evaluations look fine.
4 new extracted files in our default.yml suite.
Evaluation on the nightly sources used by Ruby shows a bunch of new extracted files, and OK results.