If we have other roll-up site patches that can ship, that's fine as well.

Tom, would this just mean shipping what's in our current master of the GitHub repo, or do we need some kind of cherry-picking here?

I'm not 100% sure what would be best; I'd veer towards cherrypicking, just to be safest. Dennis, what do you think?

(Assuming master only contains the about:compat fixes and some additional site fixes -- I would lean towards including the other site patches. Might as well let them ride along)

ssuming master only contains the about:compat fixes and some additional site fixes

The refactoring are already merged to the master branch. However, I'm not even sure if we want to cherry-pick here, as the about:compat fixes were made on the refactorings. If we can get QA for that, I'd vote for shipping everything we have right now - as that would significantly reduce the complexity on our end, and I honestly don't thing it's very risky at all.

Thanks Dennis.

Ksenia, can you attach an XPI for QA to test, containing the latest from master (and being sure to update the version number)?

Ksenia, can you update the name of the XPI with the version number? Something like webcompat-N.N.N.unsigned.xpi.

Also, can we get a list of interventions / overrides that this XPI contains so we can ask QA to verify each one? Thanks.

Override:
corporate.santander.co.uk (mobile+desktop)
https://github.com/webcompat/web-bugs/issues/35386 (https://bugzilla.mozilla.org/show_bug.cgi?id=1567198)

posts.google.com (mobile)
https://github.com/webcompat/web-bugs/issues/17870 (https://bugzilla.mozilla.org/show_bug.cgi?id=1566253)

beeg.com (mobile)
https://github.com/webcompat/web-bugs/issues/16648 (https://bugzilla.mozilla.org/show_bug.cgi?id=1567945)

bob.santanderbank.com (mobile+desktop)
I'm not sure what are the affected pages

Intervention:
www.zertifikate.commerzbank.de (mobile)
https://github.com/webcompat/web-bugs/issues/9102 (https://bugzilla.mozilla.org/show_bug.cgi?id=1568256)

dns.google.com (mobile+desktop)
https://github.com/webcompat/web-bugs/issues/22494 (https://bugzilla.mozilla.org/show_bug.cgi?id=1567610)

Ksenia, we just heard from Santander that there is one more affected domain: bob.santanderbank.com. Can we add that and attach a new XPI please?

Oana, can you please test the webcompat-5.0.2.unsigned.xpi locally on both release desktop and fennec?

0. download the unbranded Desktop Release builds from here, unbranded Release Fennec apk from here (you can install that via adb install target.apk, if connected via USB). Note: it's important to use these builds and not Nightly builds, so we can be sure it works for our Release population.
1. xpinstall.signatures.required to false, extensions.legacy.enabled to true
2. navigate to this bug and install webcompat-5.0.2.unsigned.xpi
3. verify the site patches from Comment #9.

Report any bugs or signoff here.

I'm uploading an updated version of the unsigned XPI to address a bug.

Oana FYI, the link to apk https://queue.taskcluster.net/v1/task/V0YYlWS3SQ--WsUXOy0aVg/runs/0/artifacts/public/build/target.apk

Mike, I've performed some tests on the provided domains and also on some of the duplicates and related issues. Below are the results.

corporate.santander.co.uk
[Fixed - mobile+desktop] - https://github.com/webcompat/web-bugs/issues/35386 (https://bugzilla.mozilla.org/show_bug.cgi?id=1567198)
[No account available] - https://github.com/webcompat/web-bugs/issues/35614
[Fixed - mobile+desktop] - https://github.com/webcompat/web-bugs/issues/33462
[Fixed - mobile+desktop] - https://github.com/webcompat/web-bugs/issues/32203

bob.santanderbank.com

• I previously checked duplicates and related issues from santanderbank.com

posts.google.com
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/17870 (https://bugzilla.mozilla.org/show_bug.cgi?id=1566253)
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/19609
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/19602
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/19863
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/19966
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/20709
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/21081
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/23645
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/31436
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/34520

beeg.com
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/16648 (https://bugzilla.mozilla.org/show_bug.cgi?id=1567945)
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/16575
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/16961
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/16995
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/16910
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/10048
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/17040
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/17295
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/17467
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/17933

www.zertifikate.commerzbank.de
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/9102 (https://bugzilla.mozilla.org/show_bug.cgi?id=1568256)

dns.google.com
[Fixed - mobile+desktop] - https://github.com/webcompat/web-bugs/issues/22494 (https://bugzilla.mozilla.org/show_bug.cgi?id=1567610)

[Environment]
Browser / Version: Firefox Nightly Windows Unbranded 68.0.1 build (https://wiki.mozilla.org/Add-ons/Extension_Signing#Unbranded_Builds), Firefox Nightly Mobile 68.0a1 build (https://queue.taskcluster.net/v1/task/V0YYlWS3SQ--WsUXOy0aVg/runs/0/artifacts/public/build/target.apk)
Operating System: Windows 10 Pro, Samsung Galaxy S7 Edge (Android 8.0.0) - Resolution 1440 x 2560 pixels (~534 ppi pixel density)
About:config: xpinstall.signatures.required : false, extensions.legacy.enabled : true
Add-on: webcompat-5.0.2.unsigned.xpi

Wei, can we please get webcompat-5.0.2.unsigned.xpi signed as a system addon (Mozilla Components key)? QA has tested and verified the unsigned build in Comment #16.

Signed file attached. Please test.

Thanks Wei.

Rehan, can we please get the signed xpi pushed to the test channel (release-sysaddon)?

This is now on release-sysaddon and pending relman sign-off on the release channel (once QA is satisfied)

Cool, thanks!

Oana, can you please test the following using a regular Firefox 68 release build?

1. verify you see webcompat@mozilla.org-5.0.2-signed.xpi at https://aus5.mozilla.org/update/3/SystemAddons/68.0/20190705220548/Darwin_x86_64-gcc3/en-US/release-sysaddon/Darwin%2018.6.0/default/default/update.xml
2. change the update channel to "release-sysaddon" in the "channel-prefs.js" file inside the Firefox directory.
   (Should be somewhere like: C:\Program Files (x86)\Mozilla Firefox\defaults\pref\channel-prefs.js on windows
   Or /Applications/Firefox.app/Contents/Resources/defaults/pref/channel-prefs.js on OSX). you might need to restart firefox at this point, if it was running.
3. Force an add-on update check by running this snippet in the browser console: Components.utils.import("resource://gre/modules/AddonManager.jsm"); AddonManagerPrivate.backgroundUpdateCheck();
4. restart the browser.
5. Re-run the tests similar to Comment #16 to verify the addon worked.

Mike, I've retested the issues on Firefox release with the signed add-on and below are my results:

corporate.santander.co.uk
[Fixed - mobile+desktop] - https://github.com/webcompat/web-bugs/issues/35386 (https://bugzilla.mozilla.org/show_bug.cgi?id=1567198)
[Fixed - mobile+desktop] - https://github.com/webcompat/web-bugs/issues/33462
[Fixed - mobile+desktop] - https://github.com/webcompat/web-bugs/issues/32203

posts.google.com
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/17870 (https://bugzilla.mozilla.org/show_bug.cgi?id=1566253)
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/19609
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/19602
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/19863
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/19966

beeg.com
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/16648 (https://bugzilla.mozilla.org/show_bug.cgi?id=1567945)
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/16575
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/16961
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/16995
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/10048
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/17040

www.zertifikate.commerzbank.de
[Fixed - mobile] - https://github.com/webcompat/web-bugs/issues/9102 (https://bugzilla.mozilla.org/show_bug.cgi?id=1568256)

dns.google.com
[Fixed - mobile+desktop] - https://github.com/webcompat/web-bugs/issues/22494 (https://bugzilla.mozilla.org/show_bug.cgi?id=1567610)

[Environment]
Browser / Version: Firefox Release 68.0.1
Operating System: Windows 10 Pro, MacOS 10.14.5, Samsung Galaxy S7 Edge (Android 8.0.0) - Resolution 1440 x 2560 pixels (~534 ppi pixel density)
Installed add-on: webcompat@mozilla.org-5.0.2-signed.xpi (https://ftp.mozilla.org/pub/system-addons/webcompat/webcompat@mozilla.org-5.0.2-signed.xpi)
Updated channel in the "channel-pref.js" file: pref("app.update.channel", "release-sysaddon");

Ryan, can we get Relman signoff in Balrog? QA has tested and signed off on the addon locally and from the release-systaddon test channel.

Hi Oana, Mike, it's unclear from QA sign offs (c22) whether we also tested about:compat and confirm that it's fixed with this SAO update. Can someone please confirm?

Please see https://bugzilla.mozilla.org/show_bug.cgi?id=1565673#c13

I've confirmed locally on an unbranded Release desktop and Fennec, but let's let Oana also confirm.

Ritu and Mike, I can also confirm that it's fixed.

Comment on attachment 9080622 [details]
Bug 1568636 - Import WebCompat GoFaster 5.0.2 sources

Beta/Release Uplift Approval Request

• User impact if declined: patch for bob.santanderbank.com
• Is this code covered by automated tests?: Yes
• Has the fix been verified in Nightly?: Yes
• Needs manual test from QE?: No
• If yes, steps to reproduce:
• List of other uplifts needed: None
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): Low risk because it's scoped to a single domain.
• String changes made/needed:

ESR Uplift Approval Request

• If this is not a sec:{high,crit} bug, please state case for ESR consideration: web compatibility fix for a bank
• User impact if declined: patch for bob.santanderbank.com
• Fix Landed on Version:
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): Low risk because it's scoped to a single domain.
• String or UUID changes made by this patch:

(In reply to Mike Taylor [:miketaylr] from comment #23)

Ryan, can we get Relman signoff in Balrog? QA has tested and signed off on the addon locally and from the release-systaddon test channel.

(In reply to Oana Arbuzov [:oanaarbuzov] from comment #26)

Ritu and Mike, I can also confirm that it's fixed.

Thanks for the confirmation. I've signed off on the rule change in balrog.

Pushed by rvandermeulen@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/1cfa2925b6a7
Import WebCompat GoFaster 5.0.2 sources r=denschub,rhelmer

(In reply to Rehan Dalal [:rehan, :rdalal] from comment #20)

This is now on release-sysaddon and pending relman sign-off on the release channel (once QA is satisfied)

OK, QA + relman signoffs appear to be in order. Do we need to do anything else?

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

Do we need to do anything else?

There should be no further steps. This should be shipping to users via Balrog now.

Comment on attachment 9080622 [details]
Bug 1568636 - Import WebCompat GoFaster 5.0.2 sources

Fixes another issue with Santander's internal sites. Approved for 69.0b10 and 68.1esr. Given that we're already shipping this SAO to release users via balrog, did we want to land this on mozilla-release ahead of next week's 68.0.2 dot release as well? Please nominate if so :)

There are conflicts to apply the central change to beta. Please provide patches for mozilla-beta and mozilla-esr68. See https://mozilla-version-control-tools.readthedocs.io/en/latest/hgmozilla/unifiedrepo.html?highlight=unified#uplifting-backporting-commits for more info how to work with the release trees if necessary. Thank you.

I've fixed conflicts. Sebastian, is this patch good for both beta and mozilla-esr68?

Comment on attachment 9082377 [details]
Bug 1568636 - Beta - Import WebCompat GoFaster 5.0.2 sources r=denschub,rhelmer

Beta/Release Uplift Approval Request

• User impact if declined: patch for bob.santanderbank.com
• Is this code covered by automated tests?: Yes
• Has the fix been verified in Nightly?: Yes
• Needs manual test from QE?: No
• If yes, steps to reproduce:
• List of other uplifts needed: None
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): Low risk because it's scoped to a single domain.
• String changes made/needed:

ESR Uplift Approval Request

• If this is not a sec:{high,crit} bug, please state case for ESR consideration: web compatibility fix for a bank
• User impact if declined: patch for bob.santanderbank.com
• Fix Landed on Version:
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): Low risk because it's scoped to a single domain.
• String or UUID changes made by this patch:

https://hg.mozilla.org/releases/mozilla-beta/rev/a920221608f6

https://hg.mozilla.org/releases/mozilla-esr68/rev/d6f18e00a6f8

(In reply to Ryan VanderMeulen [:RyanVM] from comment #33)

Approved for 69.0b10 and 68.1esr.

FYI, this missed b10 gtb, so it'll be in next week's b11 build instead.

Comment on attachment 9082377 [details]
Bug 1568636 - Beta - Import WebCompat GoFaster 5.0.2 sources r=denschub,rhelmer

Moving the previous approval flags over to the rebased patch. Also, approved for 68.0.2 and 68.0.2esr.

Sorry again, please provide a patch for release (should also on the ESR68 release branch for 68.0.x). The patch from beta and ESR68 default branch (68.1.x) doesn't apply due to the reformatting with the Prettier javascript formatter.

Provided the patch for release

FIREFOX_ESR_68_0_X_RELBRANCH: https://hg.mozilla.org/releases/mozilla-esr68/rev/0d741fb3b416

https://hg.mozilla.org/releases/mozilla-release/rev/e84a036414a0