alex/yomichan
1
Fork 0
Code Releases Activity

Secure popup frame url changes (#622)

Browse Source 
* Throw error if options is not ready

* Remove id

* Change unsecurePopupFrameUrl to useSecurePopupFrameUrl
This commit is contained in:
toasted-nutbread 2020-06-22 19:26:59 -04:00 committed by GitHub
parent f2991fb9ee
commit 65c41975a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/bg/data/options-schema.json
View File

@ -110,7 +110,7 @@
"showPitchAccentPositionNotation", "showPitchAccentPositionNotation",
"showPitchAccentGraph", "showPitchAccentGraph",
"showIframePopupsInRootFrame", "showIframePopupsInRootFrame",
"unsecurePopupFrameUrl" "useSecurePopupFrameUrl"
], ],
"properties": { "properties": {
"enable": { "enable": {
@ -249,9 +249,9 @@
"type": "boolean", "type": "boolean",
"default": false "default": false
}, },
"unsecurePopupFrameUrl": { "useSecurePopupFrameUrl": {
"type": "boolean", "type": "boolean",
"default": false "default": true
} }
} }
}, },

2
ext/bg/js/options.js
View File

@ -177,7 +177,7 @@ function profileOptionsCreateDefaults() {
showPitchAccentPositionNotation: true, showPitchAccentPositionNotation: true,
showPitchAccentGraph: false, showPitchAccentGraph: false,
showIframePopupsInRootFrame: false, showIframePopupsInRootFrame: false,
unsecurePopupFrameUrl: false useSecurePopupFrameUrl: true
}, },
audio: { audio: {

2
ext/bg/settings.html
View File

@ -183,7 +183,7 @@
</div> </div>
<div class="checkbox options-advanced"> <div class="checkbox options-advanced">
<label><input type="checkbox" id="show-iframe-popups-in-root-frame" data-setting="general.unsecurePopupFrameUrl"> Use unsecure popup frame URL</label> <label><input type="checkbox" data-setting="general.useSecurePopupFrameUrl"> Use secure popup frame URL</label>
</div> </div>
<div class="checkbox options-advanced"> <div class="checkbox options-advanced">

13
ext/fg/js/popup.js
View File

@ -326,19 +326,24 @@ class Popup {
} }
async _createInjectPromise() { async _createInjectPromise() {
if (this._options === null) {
throw new Error('Options not initialized');
}
const {useSecurePopupFrameUrl} = this._options.general;
this._injectStyles(); this._injectStyles();
const unsecurePopupFrameUrl = (this._options !== null && this._options.general.unsecurePopupFrameUrl);
const {secret, token} = await this._initializeFrame(this._frame, this._targetOrigin, this._frameId, (frame) => { const {secret, token} = await this._initializeFrame(this._frame, this._targetOrigin, this._frameId, (frame) => {
frame.removeAttribute('src'); frame.removeAttribute('src');
frame.removeAttribute('srcdoc'); frame.removeAttribute('srcdoc');
this._observeFullscreen(true); this._observeFullscreen(true);
this._onFullscreenChanged(); this._onFullscreenChanged();
const url = chrome.runtime.getURL('/fg/float.html'); const url = chrome.runtime.getURL('/fg/float.html');
if (unsecurePopupFrameUrl) { if (useSecurePopupFrameUrl) {
frame.setAttribute('src', url);
} else {
frame.contentDocument.location.href = url; frame.contentDocument.location.href = url;
} else {
frame.setAttribute('src', url);
} }
}); });
this._frameSecret = secret; this._frameSecret = secret;