- Merge branch 'iframe-sandbox-support' of github.com:plotly/dash into iframe-sandbox-support

Marc-André Rivet · Marc-André Rivet · commit a3a7859dbb9c · 2020-02-04T12:50:29.000-05:00
- Update build artifacts

# Conflicts:
#	dash-renderer/src/AccessDenied.react.js
#	dash-renderer/src/actions/index.js
#	tests/integration/renderer/test_iframe.py
diff --git a/@plotly/dash-component-plugins/package.json b/@plotly/dash-component-plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plotly/dash-component-plugins",
-  "version": "1.0.2",
+  "version": "1.2.0",
   "description": "Plugins for Dash Components",
   "repository": {
     "type": "git",
diff --git a/@plotly/dash-component-plugins/src/History.js b/@plotly/dash-component-plugins/src/History.js
@@ -0,0 +1,13 @@
+const ON_CHANGE = '_dashprivate_historychange';
+
+export default class History {
+    static dispatchChangeEvent() {
+        window.dispatchEvent(new CustomEvent(ON_CHANGE));
+    }
+
+    static onChange(listener) {
+        window.addEventListener(ON_CHANGE, listener);
+
+        return () => window.removeEventListener(ON_CHANGE, listener);
+    }
+}
diff --git a/@plotly/dash-component-plugins/src/dynamicImport.js b/@plotly/dash-component-plugins/src/dynamicImport.js
@@ -27,5 +27,11 @@ export const asyncDecorator = (target, promise) => {
     return state.get;
 };
 
+export const inheritAsyncDecorator = (target, source) => {
+    Object.defineProperty(target, '_dashprivate_isLazyComponentReady', {
+        get: () => isReady(source)
+    });
+}
+
 export const isReady = target => target &&
     target._dashprivate_isLazyComponentReady;
diff --git a/@plotly/dash-component-plugins/src/index.js b/@plotly/dash-component-plugins/src/index.js
@@ -1,3 +1,5 @@
-import { asyncDecorator, isReady } from './dynamicImport';
+import { asyncDecorator, inheritAsyncDecorator, isReady } from './dynamicImport';
+import History from './History';
 
-export { asyncDecorator, isReady };
+export { asyncDecorator, inheritAsyncDecorator, isReady };
+export { History };
diff --git a/@plotly/webpack-dash-dynamic-import/package.json b/@plotly/webpack-dash-dynamic-import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plotly/webpack-dash-dynamic-import",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Webpack Plugin for Dynamic Import in Dash",
   "repository": {
     "type": "git",
diff --git a/@plotly/webpack-dash-dynamic-import/src/index.js b/@plotly/webpack-dash-dynamic-import/src/index.js
@@ -20,7 +20,15 @@ var getCurrentScript = function() {
     if (!script) {
         /* Shim for IE11 and below */
         /* Do not take into account async scripts and inline scripts */
-        var scripts = Array.from(document.getElementsByTagName('script')).filter(function(s) { return !s.async && !s.text && !s.textContent; });
+
+        var doc_scripts = document.getElementsByTagName('script');
+        var scripts = [];
+
+        for (var i = 0; i < doc_scripts.length; i++) {
+            scripts.push(doc_scripts[i]);
+        }
+
+        scripts = scripts.filter(function(s) { return !s.async && !s.text && !s.textContent; });
         script = scripts.slice(-1)[0];
     }
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to `dash` will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.9.0] - 2020-02-04
+### Fixed
+- [#1080](https://github.com/plotly/dash/pull/1080) Handle case where dash fails to load when used inside an iframe with a sandbox attribute that only has allow-scripts
+
 ## [1.8.0] - 2020-01-14
 ### Added
 - [#1073](https://github.com/plotly/dash/pull/1073) Two new functions to simplify usage handling URLs and pathnames: `app.get_relative_path` & `app.trim_relative_path`.
diff --git a/dash-renderer/dash_renderer/dash_renderer.dev.js b/dash-renderer/dash_renderer/dash_renderer.dev.js
@@ -30344,10 +30344,18 @@ function hydrateInitialOutputs() {
     dispatch(setAppLifecycle(Object(_reducers_constants__WEBPACK_IMPORTED_MODULE_3__["getAppState"])('HYDRATED')));
   };
 }
+/* eslint-disable-next-line no-console */
+
+var logWarningOnce = Object(ramda__WEBPACK_IMPORTED_MODULE_0__["once"])(console.warn);
 function getCSRFHeader() {
-  return {
-    'X-CSRFToken': cookie__WEBPACK_IMPORTED_MODULE_5___default.a.parse(document.cookie)._csrf_token
-  };
+  try {
+    return {
+      'X-CSRFToken': cookie__WEBPACK_IMPORTED_MODULE_5___default.a.parse(document.cookie)._csrf_token
+    };
+  } catch (e) {
+    logWarningOnce(e);
+    return {};
+  }
 }
 
 function triggerDefaultState(dispatch, getState) {
diff --git a/dash-renderer/dash_renderer/dash_renderer.min.js b/dash-renderer/dash_renderer/dash_renderer.min.js
diff --git a/dash-renderer/digest.json b/dash-renderer/digest.json
@@ -1,6 +1,6 @@
 {
-    "MD5 (dash_renderer.dev.js)":"561787639c4e4e6dfc2ed334f8b9c08e",
-    "MD5 (dash_renderer.min.js)":"b89f7fc48aecc81250a3a002f0f0a5a0",
+    "MD5 (dash_renderer.dev.js)":"cf7796e1ced87563812cea38d16ea281",
+    "MD5 (dash_renderer.min.js)":"c6e5cda1b2572fee63e19b344258b512",
     "MD5 (polyfill@7.7.0.min.js)":"ed6472b73ae010eee88282933a04c2a1",
     "MD5 (prop-types@15.7.2.js)":"85947944e396a28895fad5f553eee36f",
     "MD5 (prop-types@15.7.2.min.js)":"e3053393609bd2744010498629a43597",
diff --git a/dash-renderer/package.json b/dash-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dash-renderer",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "render dash components in react",
   "main": "dash_renderer/dash_renderer.min.js",
   "scripts": {
diff --git a/dash-renderer/src/AccessDenied.react.js b/dash-renderer/src/AccessDenied.react.js
@@ -1,10 +1,13 @@
 /* global window:true, document:true */
 import React from 'react';
-import {mergeRight} from 'ramda';
+import {mergeRight, once} from 'ramda';
 import PropTypes from 'prop-types';
 import * as styles from './styles/styles.js';
 import * as constants from './constants/constants.js';
 
+/* eslint-disable-next-line no-console */
+const logWarningOnce = once(console.warn);
+
 function AccessDenied(props) {
     const {config} = props;
     const fid = config.fid;
@@ -28,9 +31,14 @@ function AccessDenied(props) {
             <a
                 style={styles.base.a}
                 onClick={() => {
-                    document.cookie =
-                        `${constants.OAUTH_COOKIE_NAME}=; ` +
-                        'expires=Thu, 01 Jan 1970 00:00:01 GMT;';
+                    /* eslint no-empty: ["error", { "allowEmptyCatch": true }] */
+                    try {
+                        document.cookie =
+                            `${constants.OAUTH_COOKIE_NAME}=; ` +
+                            'expires=Thu, 01 Jan 1970 00:00:01 GMT;';
+                    } catch (e) {
+                        logWarningOnce(e);
+                    }
                     window.location.reload(true);
                 }}
             >
diff --git a/dash-renderer/src/actions/index.js b/dash-renderer/src/actions/index.js
@@ -16,6 +16,7 @@ import {
     lensPath,
     mergeLeft,
     mergeDeepRight,
+    once,
     path,
     pluck,
     propEq,
@@ -54,10 +55,18 @@ export function hydrateInitialOutputs() {
     };
 }
 
+/* eslint-disable-next-line no-console */
+const logWarningOnce = once(console.warn);
+
 export function getCSRFHeader() {
-    return {
-        'X-CSRFToken': cookie.parse(document.cookie)._csrf_token,
-    };
+    try {
+        return {
+            'X-CSRFToken': cookie.parse(document.cookie)._csrf_token,
+        };
+    } catch (e) {
+        logWarningOnce(e);
+        return {};
+    }
 }
 
 function triggerDefaultState(dispatch, getState) {
diff --git a/dash/version.py b/dash/version.py
@@ -1 +1 @@
-__version__ = '1.8.0'
+__version__ = '1.9.0'
diff --git a/requires-install.txt b/requires-install.txt
@@ -1,8 +1,8 @@
 Flask>=1.0.2
 flask-compress
 plotly
-dash_renderer==1.2.3
-dash-core-components==1.7.0
+dash_renderer==1.2.4
+dash-core-components==1.8.0
 dash-html-components==1.0.2
 dash-table==4.6.0
 future
diff --git a/tests/integration/renderer/test_iframe.py b/tests/integration/renderer/test_iframe.py
@@ -0,0 +1,57 @@
+from multiprocessing import Value
+
+import dash
+from dash.dependencies import Input, Output
+from dash.exceptions import PreventUpdate
+
+import dash_html_components as html
+
+
+def test_rdif001_sandbox_allow_scripts(dash_duo):
+    app = dash.Dash(__name__)
+    call_count = Value("i")
+
+    N_OUTPUTS = 50
+
+    app.layout = html.Div([
+        html.Button("click me", id="btn"),
+    ] + [html.Div(id="output-{}".format(i)) for i in range(N_OUTPUTS)])
+
+    @app.callback(
+        [Output("output-{}".format(i), "children") for i in range(N_OUTPUTS)],
+        [Input("btn", "n_clicks")]
+    )
+    def update_output(n_clicks):
+        if n_clicks is None:
+            raise PreventUpdate
+
+        call_count.value += 1
+        return ["{}={}".format(i, i + n_clicks) for i in range(N_OUTPUTS)]
+
+    @app.server.after_request
+    def apply_cors(response):
+        response.headers["Access-Control-Allow-Origin"] = "*"
+        response.headers["Access-Control-Allow-Headers"] = "Origin, X-Requested-With, Content-Type, Accept, Authorization"
+        return response
+
+    dash_duo.start_server(app)
+
+    iframe = """
+        <!DOCTYPE html>
+    <html>
+    <iframe src="{0}" sandbox="allow-scripts">
+    </iframe>
+    </html>
+    """
+
+    html_content = iframe.format(dash_duo.server_url)
+
+    dash_duo.driver.get("data:text/html;charset=utf-8," + html_content)
+
+    dash_duo.driver.switch_to.frame(0)
+
+    dash_duo.wait_for_element('#output-0')
+    dash_duo.wait_for_element_by_id('btn').click()
+    dash_duo.wait_for_element('#output-0').text == '0=1'
+
+    assert len(dash_duo.get_logs()) != 0

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@plotly/dash-component-plugins",`
`3`		`- "version": "1.0.2",`
	`3`	`+ "version": "1.2.0",`
`4`	`4`	`"description": "Plugins for Dash Components",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@plotly/webpack-dash-dynamic-import",`
`3`		`- "version": "1.1.4",`
	`3`	`+ "version": "1.1.5",`
`4`	`4`	`"description": "Webpack Plugin for Dynamic Import in Dash",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "MD5 (dash_renderer.dev.js)":"561787639c4e4e6dfc2ed334f8b9c08e",`
`3`		`- "MD5 (dash_renderer.min.js)":"b89f7fc48aecc81250a3a002f0f0a5a0",`
	`2`	`+ "MD5 (dash_renderer.dev.js)":"cf7796e1ced87563812cea38d16ea281",`
	`3`	`+ "MD5 (dash_renderer.min.js)":"c6e5cda1b2572fee63e19b344258b512",`
`4`	`4`	`"MD5 ([email protected])":"ed6472b73ae010eee88282933a04c2a1",`
`5`	`5`	`"MD5 ([email protected])":"85947944e396a28895fad5f553eee36f",`
`6`	`6`	`"MD5 ([email protected])":"e3053393609bd2744010498629a43597",`