Skip to content

Fix HTML escaping in StringRangeMarker

Heinrich Lee Yu requested to merge 31034-escape-string-range-marker into master

What does this MR do?

In Rails 6, html_safe is now taken into consideration when using the []= operator to replace text.

We need to mark the replacement text as HTML-safe so that it doesn't get escaped when it gets inserted into the HTML-safe string.

Example:

string = "<p>Hello</p>".html_safe
string[3..4] = "<b>He</b>"
"<p>&lt;b&gt;He&lt;/b&gt;llo</p>"

Correct way:

string = "<p>Hello</p>".html_safe
string[3..4] = "<b>He</b>".html_safe
"<p><b>He</b>llo</p>"

This was extracted from !19891 (merged)

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

#31034 (closed)

Edited by Heinrich Lee Yu

Merge request reports