Verified Commit 55015024 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! BB 19741: Fix FPI with OpenSearch. 

Fix the principal and add FPD also to opensearch images.
parent b71d3c72

browser/components/search/SearchUIUtils.sys.mjs

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ export var SearchUIUtils = { 
      await Services.search.addOpenSearchEngine(

        locationURL,

        image,

        browsingContext?.originAttributes

        browsingContext?.embedderElement?.contentPrincipal?.originAttributes

      );

    } catch (ex) {

      let titleMsgName;

toolkit/components/search/SearchUtils.sys.mjs

+15 −4
Original line number Diff line number Diff line
@@ -253,10 +253,21 @@ export var SearchUtils = { 
    }

    try {

      let uri = typeof url == "string" ? Services.io.newURI(url) : url;

      let principal =

        uri.scheme == "moz-extension"

          ? Services.scriptSecurityManager.createContentPrincipal(uri, {})

          : Services.scriptSecurityManager.createNullPrincipal({});

      let principal;

      if (uri.scheme == "moz-extension") {

        principal = Services.scriptSecurityManager.createContentPrincipal(

          uri,

          {}

        );

      } else {

        let originAttributes = {};

        try {

          originAttributes.firstPartyDomain =

            Services.eTLD.getSchemelessSite(uri);

        } catch {}

        principal =

          Services.scriptSecurityManager.createNullPrincipal(originAttributes);

      }



      return Services.io.newChannelFromURI(

        uri,