From 9dab5bafa2ecc66d60775a57c91ada156b82bc9b Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Thu, 11 Jan 2024 19:18:40 +0100
Subject: [PATCH] Remove requestDomain from messaging

---
 src/background/messages/hello.ts         | 2 +-
 src/background/messages/makeRequest.ts   | 2 +-
 src/background/messages/prepareStream.ts | 2 +-
 src/types/request.ts                     | 4 +---
 src/utils/storage.ts                     | 3 ++-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/background/messages/hello.ts b/src/background/messages/hello.ts
index 3dc8697..1381b6b 100644
--- a/src/background/messages/hello.ts
+++ b/src/background/messages/hello.ts
@@ -17,7 +17,7 @@ const handler: PlasmoMessaging.MessageHandler<BaseRequest, Response> = async (re
     res.send({
       success: true,
       version,
-      allowed: await isDomainWhitelisted(req.body.requestDomain),
+      allowed: await isDomainWhitelisted(req.sender.tab.url),
     });
   } catch (err) {
     res.send({
diff --git a/src/background/messages/makeRequest.ts b/src/background/messages/makeRequest.ts
index 463aa51..5c37429 100644
--- a/src/background/messages/makeRequest.ts
+++ b/src/background/messages/makeRequest.ts
@@ -26,7 +26,7 @@ type Response<T> = BaseResponse<{
 
 const handler: PlasmoMessaging.MessageHandler<Request, Response<any>> = async (req, res) => {
   try {
-    await assertDomainWhitelist(req.body.requestDomain);
+    await assertDomainWhitelist(req.sender.tab.url);
 
     const response = await fetch(makeFullUrl(req.body.url, req.body), {
       method: req.body.method,
diff --git a/src/background/messages/prepareStream.ts b/src/background/messages/prepareStream.ts
index dbb995e..73b070c 100644
--- a/src/background/messages/prepareStream.ts
+++ b/src/background/messages/prepareStream.ts
@@ -24,7 +24,7 @@ const mapHeadersToDeclarativeNetRequestHeaders = (
 
 const handler: PlasmoMessaging.MessageHandler<Request, BaseResponse> = async (req, res) => {
   try {
-    await assertDomainWhitelist(req.body.requestDomain);
+    await assertDomainWhitelist(req.sender.tab.url);
 
     if (chrome) {
       await chrome.declarativeNetRequest.updateDynamicRules({
diff --git a/src/types/request.ts b/src/types/request.ts
index 8509221..34a29cf 100644
--- a/src/types/request.ts
+++ b/src/types/request.ts
@@ -1,3 +1 @@
-export interface BaseRequest {
-  requestDomain: string;
-}
+export interface BaseRequest {}
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index 6314da6..1d95e7f 100644
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -16,7 +16,8 @@ export function useDomainStorage() {
   return useStorage<string[]>('domainWhitelist', (v) => v ?? DEFAULT_DOMAIN_WHITELIST);
 }
 
-export const isDomainWhitelisted = async (url: string) => {
+export const isDomainWhitelisted = async (url: string | undefined) => {
+  if (!url) return false;
   const domain = makeUrlIntoDomain(url);
   if (!domain) return false;
   return domainIsInWhitelist(domain);