430278 - Update blocklist to handle version 2 URL schema

Status: RESOLVED FIXED

(Toolkit :: Blocklist Policy Requests, defect)

Description

[Michael Morgan [:morgamic]]

firefox 3 has a new URL schema as defined in bug 430120 and the service needs to be updated to allow it.

The script itself doesn't need to be adjusted, just the apache config.

Current rewrites need to be appended to:
    RewriteRule ^blocklist/(.+)/(.+)/(.+)[/]{0,1}$ services/blocklist.php?reqVersion=$1&appGuid=$2&appVersion=$3 [L]

Dave, can you post a sample blocklist URL here?

Comment 1

[Michael Morgan [:morgamic]]

Rewrites are in this file:
http://svn.mozilla.org/addons/trunk/site/app/webroot/.htaccess

Comment 2

[Dave Townsend [:mossop]]

I was going to ask you if there was a particular form that you wanted, if not maybe we go with something like this:

https://addons.mozilla.org/blocklist/2/%APP_ID%/%APP_VERSION%/
%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/blocklist.xml

This is basically the same as the current schema with the extra information tacked onto the end.

Comment 3

[Michael Morgan [:morgamic]]

Great - thanks Dave!

Comment 4

[Dave Townsend [:mossop]]

This is a filled in example from my current code from a current nightly: https://addons.mozilla.org/blocklist/2/%7Bec8030f7-c20a-464f-9b0e-13a3a9e97384%7D/3.0pre/Firefox/2008042309/Darwin_x86-gcc3/en-US/default/Darwin%209.2.2/default/default/blocklist.xml

Comment 5

[Dave Townsend [:mossop]]

Just to confirm what was said on IRC, the blocklist.xml won't be there so the url form will be:

https://addons.mozilla.org/blocklist/2/%APP_ID%/%APP_VERSION%/
%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/

Comment 6

[Michael Morgan [:morgamic]]

Attachment: v1, adjusted .htaccess

Jeremy - this lets the version 2 URLs work.  The script ignores params because at the moment they don't dictate any business logic.

Comment 7

[Thomas]

This blocks a blocker, shouldn't this be "blocking‑firefox3+" then?

Comment 8

[Michael Morgan [:morgamic]]

Jeremy?

Comment 9

[Michael Morgan [:morgamic]]

Comment on attachment 317442 [details] [diff] [review]
v1, adjusted .htaccess

Checked in r12523 -- not scheduled for release until next Thursday (3.4.1).

Comment 10

[Michael Morgan [:morgamic]]

Will see if we can push this sooner... AMO doesn't have any scheduled updates until 5/1 though.

Comment 11

[Jeremy Orem [:oremj]]

Comment on attachment 317442 [details] [diff] [review]
v1, adjusted .htaccess

Rewrites look good.

Comment 12

[Michael Morgan [:morgamic]]

This was pushed this morning...

https://addons.mozilla.org/blocklist/2/%7Bec8030f7-c20a-464f-9b0e-13a3a9e97384%7D/3.0pre/Firefox/2008042309/Darwin_x86-gcc3/en-US/default/Darwin%209.2.2/default/default/