New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Block API: Parse entity only when valid character reference #13512

Merged
merged 2 commits into from Jan 29, 2019

Conversation

Projects
None yet
4 participants
@aduth
Copy link
Member

aduth commented Jan 25, 2019

Fixes #12448
Supersedes #13406

This pull request seeks to resolve an issue where certain HTML strings may result in a block being incorrectly marked as invalid.

Implementation notes:

The root issue is that in the HTML tokenization which occurs during block validation, the entity decoder wrongly evaluates invalid character references.

For example, given the markup:

<h2>Test & Test</h2><h2>Test &amp; Test</h2>

Previously, the entity decoder would wrongly produce a value for every segment of text between & and ;. With this string, producing a value for the segment Test</h2><h2>Test &amp would confuse the tokenizer into considering the entire string as a continuous set of character data, thus missing the EndTag (</h2>) and StartTag (<h2>) within.

Testing instructions:

Repeat steps to reproduce from #12448 (comment), verifying that no block invalidation occurs.

Ensure unit tests pass:

npm run test-unit packages/blocks/src/api/test/validation.js

cc @fastlinemedia

@talldan
Copy link
Contributor

talldan left a comment

Thanks for finding the root cause of this issue.

Tested and I no longer saw the block validation warning. Code looks great, very helpful comments 😄 .

@gziolo gziolo added this to the 5.0 (Gutenberg) milestone Jan 29, 2019

@aduth aduth force-pushed the fix/12448-normalize-encoded branch from 76c0e42 to 895fb27 Jan 29, 2019

@aduth aduth force-pushed the fix/12448-normalize-encoded branch from 895fb27 to df99432 Jan 29, 2019

@aduth aduth merged commit a6f7f9d into master Jan 29, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@aduth aduth deleted the fix/12448-normalize-encoded branch Jan 29, 2019

daniloercoli added a commit that referenced this pull request Jan 30, 2019

Merge branch 'master' of https://github.com/WordPress/gutenberg into …
…rnmobile/372-use-RichText-on-Title-block

* 'master' of https://github.com/WordPress/gutenberg: (36 commits)
  Fixes plural messages POT generation. (#13577)
  Typo fix (#13595)
  REST API: Remove oEmbed proxy HTML filtering (#13575)
  Removed unnecessary className attribute. Fixes #11664 (#11831)
  Add changelog for RSS block (#13588)
  Components: Set type=button for TabPanel button elements. (#11944)
  Update util.js (#13582)
  Docs: Add accessbility specific page (#13169)
  Rnmobile/media methods refactor (#13554)
  chore(release): publish
  chore(release): publish
  Plugin: Deprecate gutenberg_get_script_polyfill (#13536)
  Block API: Parse entity only when valid character reference (#13512)
  RichText: List: fix indentation (#13563)
  Plugin: Deprecate window._wpLoadGutenbergEditor (#13547)
  Plugin: Avoid setting generic "Edit Post" title on load (#13552)
  Plugin: Populate demo content by default content filters (#13553)
  RichText: List: Fix getParentIndex (#13562)
  RichText: List: Fix outdent with children (#13559)
  Scripts: Remove npm run build from test-e2e default run (#13420)
  ...
@designsimply

This comment has been minimized.

Copy link
Contributor

designsimply commented Jan 30, 2019

I tested with master @ f2c5db6c8 and the problem is still there for me. I very likely did something wrong in my testing though! f2c5db6c8 should include the fix right? (23s)

@aduth

This comment has been minimized.

Copy link
Member Author

aduth commented Jan 30, 2019

@designsimply Did you confirm to compile the files from that commit by npm run build to make sure what you're running reflects the code at that point? I'm not able to reproduce the issue.

@designsimply

This comment has been minimized.

Copy link
Contributor

designsimply commented Feb 1, 2019

I thought I had but perhaps I was mistaken! 🤦‍♀️ I just tested again and it's working, ack sorry for the noise!

(Aside: this makes me want a badge in the dev env that shows what level or branch I'm on…)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment