+
diff --git a/extension/popup.js b/extension/popup.js
index 7a3f777..06baf9a 100644
--- a/extension/popup.js
+++ b/extension/popup.js
@@ -1,11 +1,12 @@
import { EVENTS, OFFICIAL_LANDING_PAGE_URL, SUPPORT_URL, getReviewUrl } from './shared/constants.js';
-import { BLACKLIST_DOMAINS } from './shared/blacklist.js';
+import { BLACKLIST_ALLOWLIST_DOMAINS, BLACKLIST_DOMAINS } from './shared/blacklist.js';
import { getAvatarForName, generateUsername, USERNAME_ADJECTIVES, USERNAME_NOUNS } from './shared/names.js';
import { loadLocale, translateDOM, getMessage, getSystemLanguage } from './i18n.js';
import { TITLE_PRIVACY_MODES, normalizeSendTabTitle, normalizeTabTitle } from './title-privacy.js';
import { normalizeRoomId } from './chat-session.js';
import './shared/invite-links.js';
import { normalizeTabId, requestOriginPermission } from './host-access.js';
+import { isTabUrlFiltered } from './tab-filter.js';
let pendingInviteRoomId = '';
let pendingInviteChatKey = '';
@@ -1157,18 +1158,9 @@ async function populateTabs(providedPeers = null, providedTargetTabId = null) {
const filteredTabs = tabs.filter(tab => {
if (!tab.url || tab.url.startsWith('chrome://')) return false;
if (isFilterActive && tab.id !== parseInt(currentTargetTabId)) {
- const urlStr = tab.url.toLowerCase();
- if (BLACKLIST_DOMAINS.some(d => {
- const domain = d.toLowerCase();
- try {
- const hostname = new URL(tab.url).hostname.toLowerCase();
- if (domain.endsWith('.')) return hostname.startsWith(domain) || hostname.includes('.' + domain);
- if (domain.includes('.')) return hostname === domain || hostname.endsWith('.' + domain);
- } catch {
- /* ignore invalid URLs */
- }
- return urlStr.includes(domain);
- })) return false;
+ if (isTabUrlFiltered(tab.url, BLACKLIST_DOMAINS, BLACKLIST_ALLOWLIST_DOMAINS)) {
+ return false;
+ }
}
return true;
});
@@ -2073,7 +2065,7 @@ elements.forceSyncBtn.addEventListener('click', async () => {
failForceSyncTime();
return;
}
- chrome.tabs.sendMessage(tabId, { action: 'get_current_time' }, (retryResponse) => {
+ chrome.runtime.sendMessage({ type: 'GET_VIDEO_STATE', tabId }, (retryResponse) => {
if (chrome.runtime.lastError || !retryResponse || !Number.isFinite(retryResponse.currentTime)) {
failForceSyncTime();
return;
@@ -2081,7 +2073,7 @@ elements.forceSyncBtn.addEventListener('click', async () => {
sendForceSync(retryResponse.currentTime);
});
};
- chrome.tabs.sendMessage(tabId, { action: 'get_current_time' }, (response) => {
+ chrome.runtime.sendMessage({ type: 'GET_VIDEO_STATE', tabId }, (response) => {
if (Number.isFinite(response?.currentTime)) {
sendForceSync(response.currentTime);
return;
diff --git a/extension/tab-filter.js b/extension/tab-filter.js
new file mode 100644
index 0000000..0998c4b
--- /dev/null
+++ b/extension/tab-filter.js
@@ -0,0 +1,22 @@
+function hostnameMatchesDomain(hostname, domain) {
+ const normalizedHostname = String(hostname || '').toLowerCase();
+ const normalizedDomain = String(domain || '').toLowerCase();
+ return normalizedDomain
+ && (normalizedHostname === normalizedDomain
+ || normalizedHostname.endsWith(`.${normalizedDomain}`));
+}
+
+export function isTabUrlFiltered(url, blacklistDomains, allowlistDomains = []) {
+ const urlString = String(url || '');
+
+ try {
+ const hostname = new URL(urlString).hostname.toLowerCase();
+ if (allowlistDomains.some(domain => hostnameMatchesDomain(hostname, domain))) {
+ return false;
+ }
+ return blacklistDomains.some(domain => hostnameMatchesDomain(hostname, domain));
+ } catch {
+ const normalizedUrl = urlString.toLowerCase();
+ return blacklistDomains.some(domain => normalizedUrl.includes(String(domain).toLowerCase()));
+ }
+}
diff --git a/extension/tab-filter.test.mjs b/extension/tab-filter.test.mjs
new file mode 100644
index 0000000..8c1093f
--- /dev/null
+++ b/extension/tab-filter.test.mjs
@@ -0,0 +1,20 @@
+import { describe, expect, it } from 'vitest';
+import { isTabUrlFiltered } from './tab-filter.js';
+
+const blacklist = ['google.com', 'mail.google.com'];
+const allowlist = ['drive.google.com'];
+
+describe('tab URL filtering', () => {
+ it('keeps Google Drive selectable despite the google.com parent-domain rule', () => {
+ expect(isTabUrlFiltered(
+ 'https://drive.google.com/drive/u/1/search?q=mp4',
+ blacklist,
+ allowlist
+ )).toBe(false);
+ });
+
+ it('continues to filter other Google subdomains', () => {
+ expect(isTabUrlFiltered('https://mail.google.com/mail/u/0/', blacklist, allowlist)).toBe(true);
+ expect(isTabUrlFiltered('https://www.google.com/search?q=video', blacklist, allowlist)).toBe(true);
+ });
+});
diff --git a/scripts/test-content-video-finder.cjs b/scripts/test-content-video-finder.cjs
index 70bff9a..63fbaec 100644
--- a/scripts/test-content-video-finder.cjs
+++ b/scripts/test-content-video-finder.cjs
@@ -98,14 +98,15 @@ function loadTimelineFns(hostname, document = makeDocument(), pageApiTime = null
].join('\n'))({ location: { hostname } }, document);
}
-function loadPlayerFixFns(hostname) {
+function loadPlayerFixFns(hostname, href = `https://${hostname}/`) {
return Function('window', [
extractFunction('hostMatchesUrl', source),
extractFunction('matchesPlayerUrls', source),
+ extractFunction('isGoogleDrivePlayerFrame', source),
extractFunction('getPlayerActionFixes', source),
extractFunction('getActivePlayerActionFix', source),
- 'return { getPlayerActionFixes, getActivePlayerActionFix };'
- ].join('\n'))({ location: { hostname } });
+ 'return { isGoogleDrivePlayerFrame, getPlayerActionFixes, getActivePlayerActionFix };'
+ ].join('\n'))({ location: { hostname, href } });
}
const disneyFns = loadTimelineFns('www.disneyplus.com', makeDocument(), {
@@ -147,6 +148,28 @@ const twitchFixFns = loadPlayerFixFns('player.twitch.tv');
assert.equal(twitchFixFns.getActivePlayerActionFix().name, 'twitch-player-buttons');
assert.deepEqual(twitchFixFns.getActivePlayerActionFix().urls, ['twitch.tv']);
+const googleDriveFixFns = loadPlayerFixFns(
+ 'youtube.googleapis.com',
+ 'https://youtube.googleapis.com/embed/?origin=https%3A%2F%2Fdrive.google.com'
+);
+assert.equal(googleDriveFixFns.getActivePlayerActionFix().name, 'google-drive-player-buttons');
+assert.deepEqual(googleDriveFixFns.getActivePlayerActionFix().urls, ['youtube.googleapis.com']);
+const unrelatedGoogleEmbedFixFns = loadPlayerFixFns(
+ 'youtube.googleapis.com',
+ 'https://youtube.googleapis.com/embed/?origin=https%3A%2F%2Fexample.com'
+);
+assert.equal(unrelatedGoogleEmbedFixFns.getActivePlayerActionFix(), null);
+const googleDrivePlayerFns = Function('window', [
+ extractFunction('isGoogleDrivePlayerFrame', source),
+ 'return { isGoogleDrivePlayerFrame };'
+].join('\n'))({
+ location: {
+ hostname: 'youtube.googleapis.com',
+ href: 'https://youtube.googleapis.com/embed/?origin=https%3A%2F%2Fdrive.google.com'
+ }
+});
+assert.equal(googleDrivePlayerFns.isGoogleDrivePlayerFrame(), true);
+
const genericFixFns = loadPlayerFixFns('example.com');
assert.equal(genericFixFns.getActivePlayerActionFix(), null);
diff --git a/scripts/test-host-access.mjs b/scripts/test-host-access.mjs
index f62c524..87bd780 100644
--- a/scripts/test-host-access.mjs
+++ b/scripts/test-host-access.mjs
@@ -5,6 +5,7 @@ import { cwd } from 'node:process';
import {
HOST_ACCESS_REQUIRED_STATUS,
addTabHostAccessRequest,
+ containsOriginPermission,
describeTabUrl,
inspectTabHostAccess,
isHostAccessError,
@@ -122,6 +123,17 @@ const callbackPermissionChrome = {
};
assert.equal(await requestOriginPermission(callbackPermissionChrome, 'https://video.example/*'), true);
assert.equal(await requestOriginPermission({ permissions: {} }, 'https://video.example/*'), null);
+let containedOriginRequest = null;
+assert.equal(await containsOriginPermission({
+ permissions: {
+ contains: async request => {
+ containedOriginRequest = request;
+ return true;
+ }
+ }
+}, 'https://youtube.googleapis.com/*'), true);
+assert.deepEqual(containedOriginRequest, { origins: ['https://youtube.googleapis.com/*'] });
+assert.equal(await containsOriginPermission({ permissions: {} }, 'https://youtube.googleapis.com/*'), null);
const background = fs.readFileSync(path.join(cwd(), 'extension', 'background.js'), 'utf8');
const popup = fs.readFileSync(path.join(cwd(), 'extension', 'popup.js'), 'utf8');
diff --git a/shared/blacklist.js b/shared/blacklist.js
index 816ee74..37f7bd8 100644
--- a/shared/blacklist.js
+++ b/shared/blacklist.js
@@ -178,3 +178,9 @@ export const BLACKLIST_DOMAINS = [
'lichess.org',
'skribbl.io'
];
+
+// Explicit exceptions for useful media pages whose parent domain is filtered.
+// Google Drive is otherwise matched indirectly by the broad `google.com` entry.
+export const BLACKLIST_ALLOWLIST_DOMAINS = [
+ 'drive.google.com'
+];