Skip to content

Disable XSS filter in flow step description markdown #1599

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.

Sign up for GitHub

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

Merged
balloob merged 1 commit into from
Aug 26, 2018
Merged

Disable XSS filter in flow step description markdown #1599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/components/ha-markdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ class HaMarkdown extends EventsMixin(PolymerElement) {
content: {
type: String,
observer: '_render',
}
},
disableXssFilter: {
type: Boolean,
value: false,
},
};
}

Expand All @@ -29,7 +33,7 @@ class HaMarkdown extends EventsMixin(PolymerElement) {
loaded.then(
({ marked, filterXSS }) => {
this.marked = marked;
this.filterXSS = filterXSS;
this.filterXSS = this.disableXssFilter ? c => c : filterXSS;
this._scriptLoaded = 1;
},
() => { this._scriptLoaded = 2; },
Expand Down
2 changes: 1 addition & 1 deletion src/panels/config/config-entries/ha-config-flow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class HaConfigFlow extends

<template is="dom-if" if="[[_equals(_step.type, 'form')]]">
<template is="dom-if" if="[[_computeStepDescription(localize, _step)]]">
<ha-markdown content="[[_computeStepDescription(localize, _step)]]"></ha-markdown>
<ha-markdown content="[[_computeStepDescription(localize, _step)]]" disable-xss-filter></ha-markdown>
</template>

<ha-form
Expand Down
2 changes: 1 addition & 1 deletion src/panels/profile/ha-mfa-module-setup-flow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class HaMfaModuleSetupFlow extends

<template is="dom-if" if="[[_equals(_step.type, 'form')]]">
<template is="dom-if" if="[[_computeStepDescription(localize, _step)]]">
<ha-markdown content="[[_computeStepDescription(localize, _step)]]"></ha-markdown>
<ha-markdown content="[[_computeStepDescription(localize, _step)]]" disable-xss-filter></ha-markdown>
</template>

<ha-form
Expand Down