986639 - Use the __URI__ property of component and module globals to detect which add-on they come from

Status: RESOLVED FIXED

(DevTools :: Debugger, defect)

Description

[Dave Townsend [:mossop]]

All components and modules have a __URI__ property that defines what loaded them. We can use that to map back to the add-on in the add-on script actor.

Comment 1

[Dave Townsend [:mossop]]

Attachment: patch rev 1

All JS modules have a __URI__ property denoting the URI of the module loaded. We can use this to detect which globals are from add-on provided scripts by mapping them back to the add-on ID. This does that in the add-on thread actor. Pretty simple but the testcase requires bug 986757 and bug 986108 in order to work. I don't think there's a reason not to start the review now though.

Comment 2

[Nick Fitzgerald [:fitzgen] [⏰PST; UTC-8]]

Comment on attachment 8396033 [details] [diff] [review]
patch rev 1

Review of attachment 8396033 [details] [diff] [review]:
-----------------------------------------------------------------

::: browser/devtools/debugger/test/browser_dbg_addon-modules.js
@@ +60,5 @@
> +
> +  gThreadClient.getSources(({sources}) => {
> +    ok(sources.length, "retrieved sources");
> +
> +    sources.forEach(source => {

Any reason why you aren't using

    for (let source of sources) ...

?

::: toolkit/devtools/server/actors/script.js
@@ +4724,5 @@
> +        if (this.addonManager.mapURIToAddonID(uri, id))
> +          return id.value === this.addonID;
> +      }
> +      catch (e) {
> +        console.log("Unexpected URI " + uridescriptor.value);

DevToolsUtils.reportException("AddonThreadActor.prototype._checkGlobal",
                              <e or new Error("Unexpected uri:" + ...)>);

Comment 3

[Dave Townsend [:mossop]]

https://hg.mozilla.org/integration/fx-team/rev/688cef6417d8

Comment 4

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/688cef6417d8

Comment 5

[Dave Townsend [:mossop]]

Realised I failed to address the review comments in my push so here they are: https://hg.mozilla.org/integration/fx-team/rev/c24b05af9a39

Comment 6

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/c24b05af9a39