rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #789 from jonathanKingston/encode-url-fix

Browse source 
Encode non conforming chars that break moz-extension urls. Fixes #787
This commit is contained in:
luke crouch 2017-09-07 09:05:16 -05:00 • committed by GitHub
commit fec2be9429
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
webextension/js/background/assignManager.js
View file

@ -328,6 +328,13 @@ const assignManager = {
});
},
encodeURLProperty(url) {
return encodeURIComponent(url).replace(/[!'()*]/g, (c) => {
const charCode = c.charCodeAt(0).toString(16);
return `%${charCode}`;
});
},
reloadPageInContainer(url, currentUserContextId, userContextId, index, neverAsk = false) {
const cookieStoreId = backgroundLogic.cookieStoreId(userContextId);
const loadPage = browser.extension.getURL("confirm-page.html");
@ -336,7 +343,7 @@ const assignManager = {
if (neverAsk) {
browser.tabs.create({url, cookieStoreId, index});
} else {
let confirmUrl = `${loadPage}?url=${encodeURIComponent(url)}&cookieStoreId=${cookieStoreId}`;
let confirmUrl = `${loadPage}?url=${this.encodeURLProperty(url)}&cookieStoreId=${cookieStoreId}`;
let currentCookieStoreId;
if (currentUserContextId) {
currentCookieStoreId = backgroundLogic.cookieStoreId(currentUserContextId);