From c67715ea29e12ce255b849ba4492afce3eda67af Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Mon, 17 Nov 2025 07:37:36 -0800
Subject: [PATCH] [PM-28038][PM-28276] Ignore url case for origin matching
 (#17355)

* ignore url case for origin matching

* Fixup typo

* Inject log services
---
 apps/browser/src/background/main.background.ts             | 2 +-
 apps/browser/src/platform/browser/browser-api.ts           | 4 ++--
 .../platform/storage/background-memory-storage.service.ts  | 5 +++--
 .../storage/memory-storage-service-interactions.spec.ts    | 7 ++++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index cff783942fe..f59b6648486 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -548,7 +548,7 @@ export default class MainBackground {
       this.memoryStorageForStateProviders = new BrowserMemoryStorageService(); // mv3 stores to storage.session
       this.memoryStorageService = this.memoryStorageForStateProviders;
     } else {
-      this.memoryStorageForStateProviders = new BackgroundMemoryStorageService(); // mv2 stores to memory
+      this.memoryStorageForStateProviders = new BackgroundMemoryStorageService(this.logService); // mv2 stores to memory
       this.memoryStorageService = this.memoryStorageForStateProviders;
     }
 
diff --git a/apps/browser/src/platform/browser/browser-api.ts b/apps/browser/src/platform/browser/browser-api.ts
index 76ec18f496f..723df95ef63 100644
--- a/apps/browser/src/platform/browser/browser-api.ts
+++ b/apps/browser/src/platform/browser/browser-api.ts
@@ -60,8 +60,8 @@ export class BrowserApi {
     }
 
     // Normalize both URLs by removing trailing slashes
-    const normalizedOrigin = sender.origin.replace(/\/$/, "");
-    const normalizedExtensionUrl = extensionUrl.replace(/\/$/, "");
+    const normalizedOrigin = sender.origin.replace(/\/$/, "").toLowerCase();
+    const normalizedExtensionUrl = extensionUrl.replace(/\/$/, "").toLowerCase();
 
     if (!normalizedOrigin.startsWith(normalizedExtensionUrl)) {
       logger?.warning(
diff --git a/apps/browser/src/platform/storage/background-memory-storage.service.ts b/apps/browser/src/platform/storage/background-memory-storage.service.ts
index 5e1bff99c39..e4431c30db6 100644
--- a/apps/browser/src/platform/storage/background-memory-storage.service.ts
+++ b/apps/browser/src/platform/storage/background-memory-storage.service.ts
@@ -1,6 +1,7 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
 
+import { LogService } from "@bitwarden/logging";
 import { SerializedMemoryStorageService } from "@bitwarden/storage-core";
 
 import { BrowserApi } from "../browser/browser-api";
@@ -11,14 +12,14 @@ import { portName } from "./port-name";
 export class BackgroundMemoryStorageService extends SerializedMemoryStorageService {
   private _ports: chrome.runtime.Port[] = [];
 
-  constructor() {
+  constructor(private readonly logService: LogService) {
     super();
 
     BrowserApi.addListener(chrome.runtime.onConnect, (port) => {
       if (port.name !== portName(chrome.storage.session)) {
         return;
       }
-      if (!BrowserApi.senderIsInternal(port.sender)) {
+      if (!BrowserApi.senderIsInternal(port.sender, this.logService)) {
         return;
       }
 
diff --git a/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts b/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts
index 4a8f5d3f2ff..8004559f57c 100644
--- a/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts
+++ b/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts
@@ -4,6 +4,9 @@
  */
 
 import { trackEmissions } from "@bitwarden/common/../spec/utils";
+import { mock, MockProxy } from "jest-mock-extended";
+
+import { LogService } from "@bitwarden/logging";
 
 import { mockPorts } from "../../../spec/mock-port.spec-util";
 
@@ -14,11 +17,13 @@ import { ForegroundMemoryStorageService } from "./foreground-memory-storage.serv
 describe.skip("foreground background memory storage interaction", () => {
   let foreground: ForegroundMemoryStorageService;
   let background: BackgroundMemoryStorageService;
+  let logService: MockProxy<LogService>;
 
   beforeEach(() => {
     mockPorts();
+    logService = mock();
 
-    background = new BackgroundMemoryStorageService();
+    background = new BackgroundMemoryStorageService(logService);
     foreground = new ForegroundMemoryStorageService();
   });