-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
Fixed scripting issues due to improperly encoded kibana payload #7568
Conversation
@@ -12,5 +18,5 @@ html(lang='en') | |||
title Kibana | |||
block head | |||
body(kbn-chrome, id='#{appName}-body') | |||
script window.__KBN__ = !{j(kibanaPayload)}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can the !{}
can just be replaced with #{}
to use jade's default escaping?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No. That'd turn JSON into "
and stuff. It HTML-encodes.
@@ -12,5 +12,5 @@ html(lang='en') | |||
title Kibana | |||
block head | |||
body(kbn-chrome, id='#{appName}-body') | |||
script window.__KBN__ = !{j(kibanaPayload)}; | |||
meta(kbn-initial-state=JSON.stringify(kibanaPayload)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like it, but I think we should use the meta tag how it's supposed to be use semantically:
- in the
<head>
- with
name="kbn-initial-state"
- with
content="..."
LGTM |
@spalger That's exactly why I first went for the escaping approach. It's more naive but it doesn't quadruple the footprint of the state object. |
Don't worry, our JS bundles are magnitudes larger than that. Just a drop in the bucket. |
--------- **Commit 1:** [fix] Fixed scripting issues due to improperly encoded kibana payload. * Original sha: 08a6f40 * Authored by Nicolás Bevacqua <[email protected]> on 2016-06-28T19:44:18Z **Commit 2:** [fix] Switch to attribute-encoding * Original sha: 2cdb0f9 * Authored by Nicolás Bevacqua <[email protected]> on 2016-06-28T20:46:50Z **Commit 3:** [fix] Get rid of <meta> in favor of directive-style element. * Original sha: e33fa40 * Authored by Nicolás Bevacqua <[email protected]> on 2016-06-28T20:53:25Z
[backport] PR #7568 to 5.0.0-alpha4
…config-xss"" This reverts commit dda84e9.
--------- **Commit 1:** [fix] Tests passing. * Original sha: 41b0651 * Authored by Nicolás Bevacqua <[email protected]> on 2016-06-29T14:52:19Z **Commit 2:** Revert "Revert "Merge pull request #7568 from bevacqua/hotfix/config-xss"" This reverts commit dda84e9. * Original sha: 4854f2d * Authored by Nicolás Bevacqua <[email protected]> on 2016-06-29T15:02:17Z
Fixed scripting issues due to improperly encoded kibana payload Former-commit-id: 271aa69
`v93.3.0`⏩ `v93.4.0` --- ## [`v93.4.0`](https://github.com/elastic/eui/releases/v93.4.0) - Added the following properties to `EuiButtonGroup`'s `options` configs: `toolTipContent`, `toolTipProps`, and `title`. These new properties allow wrapping buttons in `EuiToolTips`, and additionally customizing or disabling the native browser `title` tooltip. ([#7461](elastic/eui#7461)) - Enhanced `EuiResizeObserver` and `useResizeObserver`'s performance to not trigger page reflows on resize event ([#7575](elastic/eui#7575)) - Updated `EuiSuperUpdateButton` to support custom button text via an optional `children` prop ([#7576](elastic/eui#7576)) **Bug fixes** - Fixed `EuiFlyout` to not repeatedly remove/add a body class on resize ([#7462](elastic/eui#7462)) - Fixed `EuiToast` title text to wrap instead of overflowing out of the container ([#7568](elastic/eui#7568)) - Fixed a visual bug with `EuiHeaderBreadcrumbs` with popovers ([#7580](elastic/eui#7580)) **Deprecations** - Deprecated `euiPalettePositive` and `euiPaletteNegative` in favour of a more culturally inclusive `euiPaletteGreen` and `euiPaletteRed` ([#7570](elastic/eui#7570)) - Deprecated all charts theme exports in favor of `@elastic/charts` exports: ([#7572](elastic/eui#7572)) - Deprecated `EUI_CHARTS_THEME_<DARK|LIGHT>` in favor of `<DARK|LIGHT>_THEME` from `@elastic/charts`. ([#7572](elastic/eui#7572)) - Deprecated `EUI_SPARKLINE_THEME_PARTIAL` in favor of `useSparklineOverrides` theme from the kibana `charts` plugin `theme` service. **Accessibility** - Updated `EuiModal` to set an `aria-modal` attribute and a default `dialog` role ([#7564](elastic/eui#7564)) - Updated `EuiConfirmModal` to set a default `alertdialog` role ([#7564](elastic/eui#7564)) - Fixed `EuiModal` and `EuiConfirmModal` to properly trap Safari+VoiceOver's virtual cursor ([#7564](elastic/eui#7564))
Fixes #7566
Screnshot: