Repository navigation
fix(ui): escape rule and device data rendered into HTML - #10
Merged
Merged
Conversation
Imported rules keep their own id and per-field values are not type-checked server-side, so a crafted backup/template could inject markup into the rule list (onclick handlers) and the rule editor. Escape every data-derived value, pass JS handler arguments via escJsArg (JSON-quoted), and make escHtml also escape single quotes.
escHtml does not protect a JS string inside an on* attribute: the browser decodes ' back to ' before running the handler.
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
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.
Fixes the 3 open CodeQL
js/xss-through-domalerts and the wider issue behind them.Problem: an imported rule (backup, shared template) keeps its own
id, and per-field values such asportorscenario_idare not type-checked server-side. Those values were inserted into HTML unescaped, so a crafted rule file could run script in the admin's browser:onclick="editRule('...')"), on page load;Fix:
escHtml(); fixed labels are unchanged.escJsArg()(JSON-quoted, then HTML-escaped).escHtml()also escapes'.settings.js: removed a strayescHtmlon atextContentassignment (showed&).Tested on camera 155 (P3288-LV, OS 12.11):
" ' & < > \\round-trip byte-identical.