Backed out changeset b4f503076020 (bug 1745819) for causing mochitest failures on test_ext_scripting_contentScripts.html. CLOSED TREE

Author: IulianMoraru

dom/chrome-webidl/WebExtensionContentScript.webidl

@@ -20,6 +20,13 @@ interface MozDocumentMatcher {
    */
   boolean matchesURI(URI uri);
 
+  /**
+   * Returns true if the the given URI and LoadInfo objects match.
+   * This should be used to determine whether to begin pre-loading a content
+   * script based on network events.
+   */
+  boolean matchesLoadInfo(URI uri, LoadInfo loadInfo);
+
   /**
    * Returns true if the given window matches. This should be used
    * to determine whether to run a script in a window at load time.
@@ -32,14 +39,6 @@ interface MozDocumentMatcher {
   [Constant]
   readonly attribute boolean allFrames;
 
-  /**
-   * If we can't check extension has permissions to access the URI upfront,
-   * set the flag to perform the origin check at runtime, upon matching.
-   * This is always true in MV3, where host permissions are optional.
-   */
-  [Constant]
-  readonly attribute boolean checkPermissions;
-
   /**
    * If true, this (misleadingly-named, but inherited from Chrome) attribute
    * causes us to match frames with URLs which inherit a principal that
@@ -103,8 +102,6 @@ interface MozDocumentMatcher {
 dictionary MozDocumentMatcherInit {
   boolean allFrames = false;
 
-  boolean checkPermissions = false;
-
   sequence<OriginAttributesPatternDictionary>? originAttributesPatterns = null;
 
   boolean matchAboutBlank = false;

toolkit/components/extensions/WebExtensionContentScript.h

@@ -115,6 +115,10 @@ class MozDocumentMatcher : public nsISupports, public nsWrapperCache {
   bool Matches(const DocInfo& aDoc) const;
   bool MatchesURI(const URLInfo& aURL) const;
 
+  bool MatchesLoadInfo(const URLInfo& aURL, nsILoadInfo* aLoadInfo) const {
+    return Matches({aURL, aLoadInfo});
+  }
+
   bool MatchesWindowGlobal(dom::WindowGlobalChild& aWindow) const;
 
   WebExtensionPolicy* GetExtension() { return mExtension; }
@@ -123,7 +127,6 @@ class MozDocumentMatcher : public nsISupports, public nsWrapperCache {
   const WebExtensionPolicy* Extension() const { return mExtension; }
 
   bool AllFrames() const { return mAllFrames; }
-  bool CheckPermissions() const { return mCheckPermissions; }
   bool MatchAboutBlank() const { return mMatchAboutBlank; }
 
   MatchPatternSet* Matches() { return mMatches; }
@@ -170,7 +173,6 @@ class MozDocumentMatcher : public nsISupports, public nsWrapperCache {
   Nullable<MatchGlobSet> mExcludeGlobs;
 
   bool mAllFrames;
-  bool mCheckPermissions;
   Nullable<uint64_t> mFrameID;
   bool mMatchAboutBlank;
   Nullable<dom::Sequence<OriginAttributesPattern>> mOriginAttributesPatterns;

toolkit/components/extensions/WebExtensionPolicy.cpp

@@ -634,7 +634,6 @@ MozDocumentMatcher::MozDocumentMatcher(GlobalObject& aGlobal,
     : mHasActiveTabPermission(aInit.mHasActiveTabPermission),
       mRestricted(aRestricted),
       mAllFrames(aInit.mAllFrames),
-      mCheckPermissions(aInit.mCheckPermissions),
       mFrameID(aInit.mFrameID),
       mMatchAboutBlank(aInit.mMatchAboutBlank) {
   MatchPatternOptions options;
@@ -691,11 +690,6 @@ WebExtensionContentScript::WebExtensionContentScript(
   mCssPaths.Assign(aInit.mCssPaths);
   mJsPaths.Assign(aInit.mJsPaths);
   mExtension = &aExtension;
-
-  // Origin permissions are optional in mv3, so always check them at runtime.
-  if (mExtension->ManifestVersion() >= 3) {
-    mCheckPermissions = true;
-  }
 }
 
 bool MozDocumentMatcher::Matches(const DocInfo& aDoc) const {
@@ -744,7 +738,7 @@ bool MozDocumentMatcher::Matches(const DocInfo& aDoc) const {
     return true;
   }
 
-  if (mRestricted && mExtension && mExtension->IsRestrictedDoc(aDoc)) {
+  if (mRestricted && mExtension->IsRestrictedDoc(aDoc)) {
     return false;
   }
 
@@ -758,8 +752,6 @@ bool MozDocumentMatcher::Matches(const DocInfo& aDoc) const {
 }
 
 bool MozDocumentMatcher::MatchesURI(const URLInfo& aURL) const {
-  MOZ_ASSERT(!mRestricted && !mCheckPermissions || mExtension);
-
   if (!mMatches->Matches(aURL)) {
     return false;
   }
@@ -780,11 +772,6 @@ bool MozDocumentMatcher::MatchesURI(const URLInfo& aURL) const {
     return false;
   }
 
-  if (mCheckPermissions &&
-      !mExtension->CanAccessURI(aURL, false, false, true)) {
-    return false;
-  }
-
   return true;
 }
 

toolkit/components/extensions/test/mochitest/test_ext_scripting_contentScripts.html

@@ -30,10 +30,8 @@
         // Used in `file_contains_iframe.html`
         "*://example.org/",
       ],
-      granted_host_permissions: true,
       ...manifestProps,
     },
-    temporarilyInstalled: true,
     ...otherProps,
   });
 };