1134615 - Take versionRange into consideration when get(Addon|Plugin)BlocklistURL

Status: VERIFIED FIXED

(Toolkit :: Add-ons Manager, defect)

Description

[Hector Zhao [:hectorz]]

As mentioned in bug 1109795 comment 34, bug 1110519 comment 0 & bug 1129287 comment 30 etc. "Update now" for a blocked plugin may take users to a BAMO entry for other versions of this plugin.

IIUC, this is the result of not checking versionRange part of blocklist entries when Services.blocklist.get(Addon|Plugin)BlocklistURL is called.

Comment 1

[Benjamin Smedberg]

This code is poorly factored and _getPluginBlockEntry should be using the logic from _getPluginBlocklistState. Should be pretty trivial.

Comment 2

[Benjamin Smedberg]

Attachment: bug1134615

Comment 3

[Blair McBride [:Unfocused] (UNAVAILABLE)]

Comment on attachment 8566621 [details] [diff] [review]
bug1134615

Sorry, I'm swamped with ReadingList stuff. Over to Dave.

Comment 4

[Dave Townsend [:mossop]]

Comment on attachment 8566621 [details] [diff] [review]
bug1134615

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

::: toolkit/mozapps/extensions/nsBlocklistService.js
@@ -467,5 @@
>    /* See nsIBlocklistService */
>    getAddonBlocklistURL: function Blocklist_getAddonBlocklistURL(addon, appVersion, toolkitVersion) {
> -    if (!gBlocklistEnabled)
> -      return "";
> -

Why did you remove this block?

Comment 5

[Robert Strong (they/them - no direct email)]

Heads up that bug 897031 made some minor changes to nsBlocklistService.js that I think your changes to _getPluginBlocklistEntry and _getPluginBlocklistState might need to take into account.

Comment 6

[Benjamin Smedberg]

re getAddonBlocklistURL, that is an accidental change. I'll exclude it.

Comment 7

[Dave Townsend [:mossop]]

Comment on attachment 8566621 [details] [diff] [review]
bug1134615

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

r+ with the change to getAddonBlocklistURL reverted.

Comment 8

[Benjamin Smedberg]

https://hg.mozilla.org/integration/mozilla-inbound/rev/1a20af713866

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/1a20af713866

Comment 10

[Kamil Jozwiak [:kjozwiak]]

Went through verification using the following build:
* http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2015-03-05-03-02-06-mozilla-central/

File: NPSWF32_13_0_0_262.dll
Path: C:\Windows\SysWOW64\Macromed\Flash\NPSWF32_13_0_0_262.dll

* https://blocklist.addons.mozilla.org/en-US/firefox/blocked/p824
** Flash Player Plugin 13.0.0.259 to 13.0.0.263 (click-to-play) has been blocked for your protection.

File: NPSWF32_13_0_0_264.dll
Path: C:\Windows\SysWOW64\Macromed\Flash\NPSWF32_13_0_0_264.dll

* https://blocklist.addons.mozilla.org/en-US/firefox/blocked/p834
** Flash Player Plugin 13.0.0.263 to 13.0.0.268 (click-to-play) has been blocked for your protection.

File: NPSWF32_16_0_0_257.dll
Path: C:\Windows\SysWOW64\Macromed\Flash\NPSWF32_16_0_0_257.dll

* https://blocklist.addons.mozilla.org/en-US/firefox/blocked/p828
** Flash Player Plugin 15.0.0.243 to 16.0.0.287 (click-to-play) has been blocked for your protection.

File: NPSWF32_16_0_0_287.dll
Path: C:\Windows\SysWOW64\Macromed\Flash\NPSWF32_16_0_0_287.dll

* https://blocklist.addons.mozilla.org/en-US/firefox/blocked/p828
** Flash Player Plugin 15.0.0.243 to 16.0.0.287 (click-to-play) has been blocked for your protection.

File: Flash Player.plugin
Path: /Library/Internet Plug-Ins/Flash Player.plugin
Version: 16.0.0.296

* https://blocklist.addons.mozilla.org/en-US/firefox/blocked/p832
** Flash Player Plugin 16.0.0.295 to 16.0.0.304 (click-to-play) has been blocked for your protection.

File: NPSWF32_15_0_0_246.dll
Path: C:\Windows\SysWOW64\Macromed\Flash\NPSWF32_15_0_0_246.dll

* https://blocklist.addons.mozilla.org/en-US/firefox/blocked/p828
** Flash Player Plugin 15.0.0.243 to 16.0.0.287 (click-to-play) has been blocked for your protection.

File: libflashplayer.so
Path: /usr/lib/mozilla/plugins/libflashplayer.so
Version: 11.2.202.438

* https://blocklist.addons.mozilla.org/en-US/firefox/blocked/p826
** Flash Player Plugin on Linux 11.2.202.425 to 11.2.202.439 (click-to-play) has been blocked for your protection.

File: libflashplayer.so
Path: /usr/lib/mozilla/plugins/libflashplayer.so
Version: 11.2.202.440

* https://blocklist.addons.mozilla.org/en-US/firefox/blocked/p830
** Flash Player Plugin on Linux 11.2.202.439 to 11.2.202.441 (click-to-play) has been blocked for your protection.

OS's Used:

Win 7 x64 -> PASSED
Win 8.1 x64 -> PASSED
Win Vista x64 -> PASSED
Ubuntu 14.04.1 -> PASSED
OSX 10.10.2 x64 -> PASSED