filippodb/LocalCDN-Firefox-Chrome-Brave
1
0
Fork 0
mirror of https://codeberg.org/nobody/LocalCDN.git synced 2025-06-05 21:49:31 +02:00
Code Issues Projects Releases Wiki Activity

Refactor request handling (#787)

Browse Source
This commit is contained in:
nobody
2021-12-04 07:46:03 +01:00
parent 8f9d501c51
commit f0baf0e81b
4 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/interceptor.js
View File

@@ -31,10 +31,9 @@ var interceptor = {};
*/
interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
let validCandidate, targetDetails, targetPath, targetDetailURL;
let validCandidate, targetDetails, targetDomain;
validCandidate = requestAnalyzer.isValidCandidate(requestDetails, tab);
if (!validCandidate) {
return {
'cancel': false
@@ -42,20 +41,17 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
}
if (interceptor._isBadResource(requestDetails.url)) {
console.log(`[ LocalCDN ] Evil resource blocked: ${requestDetails.url}`);
console.log(`${LogString.PREFIX} ${LogString.EVIL_RESOURCE_BLOCKED} ${requestDetails.url}`);
log.append(tab.url, requestDetails.url, '-', true);
return {
'cancel': true
};
}
targetDetails = requestAnalyzer.getLocalTarget(requestDetails, tab.url);
targetPath = targetDetails.path;
targetDomain = helpers.extractDomainFromUrl(requestDetails.url, true);
if (Regex.GOOGLE_FONTS.test(requestDetails.url)) {
if (requestAnalyzer.isGoogleFont(targetDomain) && !requestAnalyzer.isGoogleMaterialIcons(requestDetails.url)) {
let initiatorDomain, isListed;
initiatorDomain = helpers.extractDomainFromUrl(tab.url, true);
isListed = helpers.checkAllowlisted(initiatorDomain, interceptor.allowedDomainsGoogleFonts);
// Check if the website is allowed to load Google Fonts
@@ -70,13 +66,13 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
}
}
targetDetailURL = helpers.extractDomainFromUrl(requestDetails.url, true);
targetDetails = requestAnalyzer.getLocalTarget(requestDetails, tab.url);
console.log(targetDetails['result']);
if (targetDetails === false && !IgnoredHost[targetDetailURL]) {
++stateManager.tabs[tabIdentifier].missing;
}
if (!targetDetails) {
if (targetDetails['result'] === false) {
if (!IgnoredHost[targetDomain]) {
++stateManager.tabs[tabIdentifier].missing;
}
return interceptor._handleMissingCandidate(requestDetails.url, tabIdentifier);
}
@@ -85,7 +81,7 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
};
return {
'redirectUrl': chrome.runtime.getURL(targetPath + fileGuard.secret)
'redirectUrl': chrome.runtime.getURL(targetDetails.path + fileGuard.secret)
};
};