kiwix/kiwix-js-pwa
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-js-pwa.git synced 2025-09-09 04:06:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

More crash protection for proprietary ZIMs

Browse Source 
Former-commit-id: 7badbb875bf29ffae2cf81d2abb250c057ec5f17 [formerly c20bc2f22ac15a586bbd6cc3b1392e41852d7c1a]
Former-commit-id: cdbac0b66ecd4264caaf43708ce9648dda87629c
This commit is contained in:
Jaifroid 2018-11-23 01:56:27 +00:00
parent af08e7512b
commit 0f90dc42b0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
www/js/app.js
View File

@ -2096,7 +2096,7 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
//Add required path in front of injected styles (i.e. those that have no ./ or ../../.. etc) //Add required path in front of injected styles (i.e. those that have no ./ or ../../.. etc)
cssArray$ = cssArray$.replace(/(\bhref\s*=\s*["']\s*)(?![./]+|blob:)/ig, "$1" + treePath); cssArray$ = cssArray$.replace(/(\bhref\s*=\s*["']\s*)(?![./]+|blob:)/ig, "$1" + treePath);
//For all cases, neutralize the toggleOpenSection javascript that causes a crash //For all cases, neutralize the toggleOpenSection javascript that causes a crash
htmlArticle = htmlArticle.replace(/(onclick\s*=\s*["'])toggleOpenSection[^"']*(['"]\s*)/ig, "$1$2"); //htmlArticle = htmlArticle.replace(/(onclick\s*=\s*["'])toggleOpenSection[^"']*(['"]\s*)/ig, "$1$2");
// Remove and save inline javascript contents only (does not remove scripts with src) // Remove and save inline javascript contents only (does not remove scripts with src)
// This is required because most app CSPs forbid inline scripts or require hashes // This is required because most app CSPs forbid inline scripts or require hashes
// DEV: {5,} in regex means script must have at least 5 characters between the script tags to be matched // DEV: {5,} in regex means script must have at least 5 characters between the script tags to be matched
@ -2110,6 +2110,10 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
htmlArticle = htmlArticle.replace(/<(script\b(?![^>]+type\s*=\s*["']math\/)(?:[^<]|<(?!\/script>))+<\/script)>/ig, "<!-- $1 --!>"); htmlArticle = htmlArticle.replace(/<(script\b(?![^>]+type\s*=\s*["']math\/)(?:[^<]|<(?!\/script>))+<\/script)>/ig, "<!-- $1 --!>");
//Neutralize onload events, as they cause a crash in ZIMs with proprietary UIs //Neutralize onload events, as they cause a crash in ZIMs with proprietary UIs
htmlArticle = htmlArticle.replace(/(<[^>]+?)onload\s*=\s*["'][^"']+["']\s*/ig, '$1'); htmlArticle = htmlArticle.replace(/(<[^>]+?)onload\s*=\s*["'][^"']+["']\s*/ig, '$1');
//Neutralize onclick events
htmlArticle = htmlArticle.replace(/(<[^>]+?)onclick\s*=\s*["'][^"']+["']\s*/ig, '$1');
//Neutralize href="javascript:" links
htmlArticle = htmlArticle.replace(/href\s*=\s*["']javascript:[^"']+["']/gi, 'href=""');
//Ensure all headings are open //Ensure all headings are open
//htmlArticle = htmlArticle.replace(/class\s*=\s*["']\s*client-js\s*["']\s*/i, ""); //htmlArticle = htmlArticle.replace(/class\s*=\s*["']\s*client-js\s*["']\s*/i, "");
htmlArticle = htmlArticle.replace(/\s*(<\/head>)/i, cssArray$ + "$1"); htmlArticle = htmlArticle.replace(/\s*(<\/head>)/i, cssArray$ + "$1");
@ -2169,15 +2173,16 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
$('#articleListWithHeader').hide(); $('#articleListWithHeader').hide();
$("#prefix").val(""); $("#prefix").val("");
// Inject the new article's HTML into the iframe // Inject the new article's HTML into the iframe
var articleContent = iframeArticleContent.contentDocument.documentElement; var articleDoc = iframeArticleContent.contentDocument.documentElement;
articleContent.innerHTML = htmlArticle; articleDoc.innerHTML = htmlArticle;
var articleContent = document.getElementById('articleContent').contentDocument;
// Add any missing classes stripped from the <html> tag // Add any missing classes stripped from the <html> tag
if (htmlCSS) articleContent.getElementsByTagName('body')[0].classList.add(htmlCSS); if (htmlCSS) articleContent.getElementsByTagName('body')[0].classList.add(htmlCSS);
// Allow back/forward in browser history // Allow back/forward in browser history
pushBrowserHistoryState(dirEntry.namespace + "/" + dirEntry.url); pushBrowserHistoryState(dirEntry.namespace + "/" + dirEntry.url);
//Set relative font size + Stackexchange-family multiplier //Set relative font size + Stackexchange-family multiplier
articleContent.style.fontSize = ~zimType.indexOf("stx") ? params.relativeFontSize * 1.5 + "%" : params.relativeFontSize + "%"; articleContent.body.style.fontSize = ~zimType.indexOf("stx") ? params.relativeFontSize * 1.5 + "%" : params.relativeFontSize + "%";
//Set page width according to user preference //Set page width according to user preference
removePageMaxWidth(); removePageMaxWidth();