Harden XML parsing against invalid tokens (batch 1/4)#785
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Follow-up to the settingsSecure invalid-XML fix: applies the same recovery to other converted
ET.parseartifacts so a malformed XML file (raw control characters, unescaped&) no longer errors the artifact.Each file gains a local
_parse_xml(file_found)helper that, onParseError, strips XML-1.0-invalid control chars, escapes bare ampersands, and re-parses; if still unparseable it logs and returns an empty element (so the artifact yields no rows for that file instead of crashing).Batch 1 (7 prefs/settings XML parsers): gmail, kijijiLocalUserInfo, usageHistory, atrackerdetect, ulrUserprefs, suggestions, setupWizardinfo.
Tested: each
_parse_xmlrecovers a file containing a control char + bare ampersand (returns the real root), parses normal files unchanged, no recursion, loader builds (417), pylint clean. More batches to follow for the remaining ET.parse artifacts.