Check hosts policy when loading extensions

Bug: 1451146
Change-Id: I59219bfa59c090264c7a074507520002b9d93384
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/4667235
Auto-Submit: Philip Pfaffe <[email protected]>
Commit-Queue: Danil Somsikov <[email protected]>
Reviewed-by: Danil Somsikov <[email protected]>

Author: pfaffe

front_end/models/extensions/ExtensionServer.ts

@@ -92,6 +92,19 @@ export class HostsPolicy {
   }
   private constructor(readonly runtimeAllowedHosts: HostUrlPattern[], readonly runtimeBlockedHosts: HostUrlPattern[]) {
   }
+
+  isAllowedOnCurrentTarget(): boolean {
+    const inspectedURL = SDK.TargetManager.TargetManager.instance().primaryPageTarget()?.inspectedURL();
+    if (!inspectedURL) {
+      // If there aren't any blocked hosts retain the old behavior and don't worry about the inspectedURL
+      return this.runtimeBlockedHosts.length === 0;
+    }
+    if (this.runtimeBlockedHosts.some(pattern => pattern.matchesUrl(inspectedURL)) &&
+        !this.runtimeAllowedHosts.some(pattern => pattern.matchesUrl(inspectedURL))) {
+      return false;
+    }
+    return true;
+  }
 }
 
 export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper<EventTypes> {
@@ -1005,7 +1018,7 @@ export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper<EventTyp
       return;
     }
     const hostsPolicy = HostsPolicy.create(extensionInfo.hostsPolicy);
-    if (!hostsPolicy) {
+    if (!hostsPolicy || !hostsPolicy.isAllowedOnCurrentTarget()) {
       return;
     }
     try {
@@ -1060,18 +1073,7 @@ export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper<EventTyp
     if (!extension) {
       return false;
     }
-
-    const inspectedURL = SDK.TargetManager.TargetManager.instance().primaryPageTarget()?.inspectedURL();
-    if (!inspectedURL) {
-      // If there aren't any blocked hosts retain the old behavior and don't worry about the inspectedURL
-      return extension.hostsPolicy.runtimeBlockedHosts.length === 0;
-    }
-    if (extension.hostsPolicy.runtimeBlockedHosts.some(pattern => pattern.matchesUrl(inspectedURL)) &&
-        !extension.hostsPolicy.runtimeAllowedHosts.some(pattern => pattern.matchesUrl(inspectedURL))) {
-      return false;
-    }
-
-    return true;
+    return extension.hostsPolicy.isAllowedOnCurrentTarget();
   }
 
   private async onmessage(event: MessageEvent): Promise<void> {