diff --git a/docs/api/browser/browser-window.md b/docs/api/browser/browser-window.md index 43ef062c3e..b2bfe83820 100644 --- a/docs/api/browser/browser-window.md +++ b/docs/api/browser/browser-window.md @@ -66,12 +66,15 @@ An example of enable node integration in iframe with `node-integration` set to ``` -And you should also notice that the iframes can have access to parent window's -javascript objects via `window.parent`, so in order to grant complete security -from iframes, you should add `sandbox` attribute to the iframes: +And in atom-shell, the security limitaion of iframe is stricter than normal +browser, by default iframe is sandboxed with all permissions except the +`allow-same-origin`, which means iframe could not access parent's js context. + +If you want to enable things like `parent.window.process.exit()` in iframe, +you should explictly set `sandbox` to `none`: ```html - + ``` ### Event: 'page-title-updated' diff --git a/script/lib/config.py b/script/lib/config.py index 2fa2034455..8bd05175aa 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -2,4 +2,4 @@ NODE_VERSION = 'v0.11.10' BASE_URL = 'https://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent' -LIBCHROMIUMCONTENT_COMMIT = '9c654df782c77449e7d8fa741843143145260aeb' +LIBCHROMIUMCONTENT_COMMIT = '607907aed2c1dcdd3b5968a756a990ba3f47bca7' diff --git a/spec/chromium-spec.coffee b/spec/chromium-spec.coffee index 91461a3e00..f9be63079e 100644 --- a/spec/chromium-spec.coffee +++ b/spec/chromium-spec.coffee @@ -25,12 +25,14 @@ describe 'chromium feature', -> assert.equal b.constructor.name, 'BrowserWindow' b.destroy() - describe 'iframe with sandbox attribute', -> - it 'can not modify parent', (done) -> - page = path.join fixtures, 'pages', 'change-parent.html' + describe 'iframe', -> + page = path.join fixtures, 'pages', 'change-parent.html' + + beforeEach -> global.changedByIframe = false - iframe = $('