Refactor extension whitelist module

This commit is contained in:
hensm
2021-04-24 08:01:29 +01:00
parent 2edbfce2e4
commit 378ed90b21

View File

@@ -9,9 +9,6 @@ import { CAST_FRAMEWORK_LOADER_SCRIPT_URL
, CAST_LOADER_SCRIPT_URL } from "../lib/endpoints"; , CAST_LOADER_SCRIPT_URL } from "../lib/endpoints";
export async function initWhitelist () {
logger.info("init (whitelist)");
// Missing on @types/firefox-webext-browser // Missing on @types/firefox-webext-browser
type OnBeforeSendHeadersDetails = Parameters<Parameters< type OnBeforeSendHeadersDetails = Parameters<Parameters<
typeof browser.webRequest.onBeforeSendHeaders.addListener>[0]>[0] & { typeof browser.webRequest.onBeforeSendHeaders.addListener>[0]>[0] & {
@@ -25,9 +22,43 @@ export async function initWhitelist () {
const originUrlCache: string[] = []; const originUrlCache: string[] = [];
let platform: string;
let chromeUserAgent: string | undefined;
let chromeUserAgentHybrid: string | undefined;
export async function initWhitelist () {
logger.info("init (whitelist)");
if (!platform) {
// TODO: Allow hybrid UA to be configurable // TODO: Allow hybrid UA to be configurable
const platform = (await browser.runtime.getPlatformInfo()).os; platform = (await browser.runtime.getPlatformInfo()).os;
const chromeUserAgent = getChromeUserAgent(platform); chromeUserAgent = getChromeUserAgent(platform);
chromeUserAgentHybrid = getChromeUserAgent(platform, true);
/**
* If a UA string can't be obtained, don't bother continuing
* extension initialization
*/
if (!chromeUserAgent) {
throw logger.error("Failed to get Chrome UA string");
}
}
// Register on first run
await registerUserAgentWhitelist();
// Re-register when options change
options.addEventListener("changed", ev => {
const alteredOpts = ev.detail;
if (alteredOpts.includes("userAgentWhitelist")
|| alteredOpts.includes("userAgentWhitelistEnabled")) {
unregisterUserAgentWhitelist();
registerUserAgentWhitelist();
}
});
}
/** /**
* Web apps usually only load the sender library and * Web apps usually only load the sender library and
@@ -52,7 +83,7 @@ export async function initWhitelist () {
for (const header of details.requestHeaders) { for (const header of details.requestHeaders) {
if (header.name === "User-Agent") { if (header.name === "User-Agent") {
header.value = host?.value === "www.youtube.com" header.value = host?.value === "www.youtube.com"
? getChromeUserAgent(platform, true) ? chromeUserAgentHybrid
: chromeUserAgent; : chromeUserAgent;
break; break;
} }
@@ -84,7 +115,7 @@ export async function initWhitelist () {
for (const header of details.requestHeaders) { for (const header of details.requestHeaders) {
if (header.name === "User-Agent") { if (header.name === "User-Agent") {
header.value = host?.value === "www.youtube.com" header.value = host?.value === "www.youtube.com"
? getChromeUserAgent(platform, true) ? chromeUserAgentHybrid
: chromeUserAgent; : chromeUserAgent;
break; break;
} }
@@ -188,18 +219,3 @@ export async function initWhitelist () {
browser.webRequest.onBeforeRequest browser.webRequest.onBeforeRequest
.removeListener(onBeforeCastSDKRequest); .removeListener(onBeforeCastSDKRequest);
} }
// Register on first run
await registerUserAgentWhitelist();
// Re-register when options change
options.addEventListener("changed", ev => {
const alteredOpts = ev.detail;
if (alteredOpts.includes("userAgentWhitelist")
|| alteredOpts.includes("userAgentWhitelistEnabled")) {
unregisterUserAgentWhitelist();
registerUserAgentWhitelist();
}
});
}