Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable site affiliation fetcher #18153

Merged
merged 2 commits into from
Apr 27, 2023
Merged

Conversation

fmarier
Copy link
Member

@fmarier fmarier commented Apr 19, 2023

Resolves brave/brave-browser#29872

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

See steps in brave/brave-browser#29872 (comment)

@fmarier fmarier added the CI/run-network-audit Run network-audit label Apr 19, 2023
@fmarier fmarier requested review from a team as code owners April 19, 2023 23:49
@fmarier fmarier self-assigned this Apr 19, 2023
@goodov
Copy link
Member

goodov commented Apr 20, 2023

can we add a network audit test for this? if calling some PasswordManager API directly from the code will trigger this, then it would be enough.

@fmarier fmarier requested a review from iefremov as a code owner April 21, 2023 00:09
@fmarier
Copy link
Member Author

fmarier commented Apr 21, 2023

can we add a network audit test for this? if calling some PasswordManager API directly from the code will trigger this, then it would be enough.

Looks like it works indeed. I instrumented the fetching code (where the macro is) and confirmed that without my fix, adding an entry to the password manager in the browser test does trigger the fetch.

So I've added it to the beginning of the network auditor.

@fmarier fmarier force-pushed the disable-hash-affiliation-service-29872 branch 4 times, most recently from cbd2941 to a27c92d Compare April 24, 2023 18:07
@fmarier fmarier force-pushed the disable-hash-affiliation-service-29872 branch from a27c92d to c767130 Compare April 26, 2023 23:38
@fmarier fmarier requested a review from iefremov April 26, 2023 23:38
@fmarier fmarier force-pushed the disable-hash-affiliation-service-29872 branch from c767130 to 5544b40 Compare April 27, 2023 04:20
@fmarier fmarier force-pushed the disable-hash-affiliation-service-29872 branch from 5544b40 to 0c01bd6 Compare April 27, 2023 18:01
@fmarier fmarier merged commit 5f32b7e into master Apr 27, 2023
@fmarier fmarier deleted the disable-hash-affiliation-service-29872 branch April 27, 2023 20:46
@github-actions github-actions bot added this to the 1.53.x - Nightly milestone Apr 27, 2023
brave-builds added a commit that referenced this pull request Apr 27, 2023
brave-builds added a commit that referenced this pull request Apr 27, 2023
@kjozwiak
Copy link
Member

Verification PASSED on Win 11 x64 using the following build(s):

Brave | 1.53.4 Chromium: 113.0.5672.53 (Official Build) nightly (64-bit)
-- | --
Revision | 12f5dac35d12e8f4e72d7dd11df557ef93bc046f-refs/branch-heads/5672@{#703}
OS | Windows 11 Version 22H2 (Build 22621.1555)

Reproduced the original issue using 1.53.3 Chromium: 113.0.5672.53 via the STR/Cases outlined via brave/brave-browser#29872 (comment) as per the following:

reproducedNetowrkCall

Using the same STR/Cases outlined above, verified that the Google API network call wasn't occurring as per the following:

Example Example
fixed1 fixed2
kjozwiak pushed a commit that referenced this pull request Apr 28, 2023
kjozwiak pushed a commit that referenced this pull request Apr 28, 2023
muliswilliam added a commit that referenced this pull request Apr 28, 2023
Remove network icon

Move import

Squashed commit of the following:

commit c98ff5e
Author: brave-builds <brave-builds+devops@brave.com>
Date:   Fri Apr 28 08:29:10 2023 +0000

    1.51.107

commit ce813ef
Author: Max <41635752+mkarolin@users.noreply.github.com>
Date:   Fri Apr 28 04:25:41 2023 -0400

    Upgrade from Chromium 113.0.5672.53 to Chromium 113.0.5672.63 (1.51.x). (#18269)

    * Upgrade from Chromium 113.0.5672.53 to Chromium 113.0.5672.63

    * Upgrade patches from Chromium 113.0.5672.53 to Chromium 113.0.5672.63

    * Update pins list timestamp

    * Temporarily disables WindowClosingConfirmBrowserTest.TestWithDownload on MacOS.

    The test fails because in Chromium Private/Incognito profiles now ignore the
    "Ask for download location" setting and always prompt for the location.
    We will fix that in brave/brave-browser#29823,
    but until then let's disable this test on MacOS.

    ---------

    Co-authored-by: brave-builds <brave-builds+devops@brave.com>

commit b18aeae
Author: brave-builds <45370463+brave-builds@users.noreply.github.com>
Date:   Fri Apr 28 10:15:10 2023 +0200

    Disable site affiliation fetcher (uplift to 1.51.x) (#18286)

    Uplift of #18153 (squashed) to release

commit 6b1db58
Author: brave-builds <45370463+brave-builds@users.noreply.github.com>
Date:   Fri Apr 28 09:47:20 2023 +0200

    Revise the behavior of "Extensions (Brave Wallet fallback)" setting (uplift to 1.51.x) (#18228)

    Uplift of #18172 (squashed) to beta

commit f7f8042
Author: brave-builds <45370463+brave-builds@users.noreply.github.com>
Date:   Fri Apr 28 09:42:41 2023 +0200

    Send kUAModel and kUAPlatformVersion CHs when requested. (uplift to 1.51.x) (#18263)

    Uplift of #18154 (squashed) to beta

commit 545fa57
Author: Max <41635752+mkarolin@users.noreply.github.com>
Date:   Fri Apr 28 03:07:51 2023 -0400

    Don't call GetSessionRoute() when media router is disabled (#18245) (1.51.x). (#18264)

    Don't call GetSessionRoute() when media router is disabled (#18245)

    Otherwise, it would end in reaching NOTREACHED()

    Co-authored-by: Sangwoo Ko <sko@brave.com>

commit 0fbe592
Author: Arthur Edelstein <aedelstein@brave.com>
Date:   Thu Apr 27 17:44:23 2023 -0700

    Uplift HTTPS First Mode v2 Migration (#17856) and HTTP error code fallback (#18141) (#18179)

    * Migrate to HttpsFirstMode v2 (#17856)

    Migrate HTTPS by Default feature to use HttpsFirstMode v2

    * Force HTTPS Upgrader to fall back to HTTP if we have an HTTP error code (#18141)

commit e369d71
Author: Aleksey Khoroshilov <5928869+goodov@users.noreply.github.com>
Date:   Fri Apr 28 03:34:51 2023 +0700

    Disable flaky upstream tests. (Uplift to 1.51.x) (#18274)
muliswilliam added a commit that referenced this pull request Apr 28, 2023
commit c98ff5e
Author: brave-builds <brave-builds+devops@brave.com>
Date:   Fri Apr 28 08:29:10 2023 +0000

    1.51.107

commit ce813ef
Author: Max <41635752+mkarolin@users.noreply.github.com>
Date:   Fri Apr 28 04:25:41 2023 -0400

    Upgrade from Chromium 113.0.5672.53 to Chromium 113.0.5672.63 (1.51.x). (#18269)

    * Upgrade from Chromium 113.0.5672.53 to Chromium 113.0.5672.63

    * Upgrade patches from Chromium 113.0.5672.53 to Chromium 113.0.5672.63

    * Update pins list timestamp

    * Temporarily disables WindowClosingConfirmBrowserTest.TestWithDownload on MacOS.

    The test fails because in Chromium Private/Incognito profiles now ignore the
    "Ask for download location" setting and always prompt for the location.
    We will fix that in brave/brave-browser#29823,
    but until then let's disable this test on MacOS.

    ---------

    Co-authored-by: brave-builds <brave-builds+devops@brave.com>

commit b18aeae
Author: brave-builds <45370463+brave-builds@users.noreply.github.com>
Date:   Fri Apr 28 10:15:10 2023 +0200

    Disable site affiliation fetcher (uplift to 1.51.x) (#18286)

    Uplift of #18153 (squashed) to release

commit 6b1db58
Author: brave-builds <45370463+brave-builds@users.noreply.github.com>
Date:   Fri Apr 28 09:47:20 2023 +0200

    Revise the behavior of "Extensions (Brave Wallet fallback)" setting (uplift to 1.51.x) (#18228)

    Uplift of #18172 (squashed) to beta

commit f7f8042
Author: brave-builds <45370463+brave-builds@users.noreply.github.com>
Date:   Fri Apr 28 09:42:41 2023 +0200

    Send kUAModel and kUAPlatformVersion CHs when requested. (uplift to 1.51.x) (#18263)

    Uplift of #18154 (squashed) to beta

commit 545fa57
Author: Max <41635752+mkarolin@users.noreply.github.com>
Date:   Fri Apr 28 03:07:51 2023 -0400

    Don't call GetSessionRoute() when media router is disabled (#18245) (1.51.x). (#18264)

    Don't call GetSessionRoute() when media router is disabled (#18245)

    Otherwise, it would end in reaching NOTREACHED()

    Co-authored-by: Sangwoo Ko <sko@brave.com>

commit 0fbe592
Author: Arthur Edelstein <aedelstein@brave.com>
Date:   Thu Apr 27 17:44:23 2023 -0700

    Uplift HTTPS First Mode v2 Migration (#17856) and HTTP error code fallback (#18141) (#18179)

    * Migrate to HttpsFirstMode v2 (#17856)

    Migrate HTTPS by Default feature to use HttpsFirstMode v2

    * Force HTTPS Upgrader to fall back to HTTP if we have an HTTP error code (#18141)

commit e369d71
Author: Aleksey Khoroshilov <5928869+goodov@users.noreply.github.com>
Date:   Fri Apr 28 03:34:51 2023 +0700

    Disable flaky upstream tests. (Uplift to 1.51.x) (#18274)

Update nft-details.tsx
kjozwiak pushed a commit that referenced this pull request May 1, 2023
Hide network icon

commit c98ff5e
Author: brave-builds <brave-builds+devops@brave.com>
Date:   Fri Apr 28 08:29:10 2023 +0000

    1.51.107

commit ce813ef
Author: Max <41635752+mkarolin@users.noreply.github.com>
Date:   Fri Apr 28 04:25:41 2023 -0400

    Upgrade from Chromium 113.0.5672.53 to Chromium 113.0.5672.63 (1.51.x). (#18269)

    * Upgrade from Chromium 113.0.5672.53 to Chromium 113.0.5672.63

    * Upgrade patches from Chromium 113.0.5672.53 to Chromium 113.0.5672.63

    * Update pins list timestamp

    * Temporarily disables WindowClosingConfirmBrowserTest.TestWithDownload on MacOS.

    The test fails because in Chromium Private/Incognito profiles now ignore the
    "Ask for download location" setting and always prompt for the location.
    We will fix that in brave/brave-browser#29823,
    but until then let's disable this test on MacOS.

    ---------

    Co-authored-by: brave-builds <brave-builds+devops@brave.com>

commit b18aeae
Author: brave-builds <45370463+brave-builds@users.noreply.github.com>
Date:   Fri Apr 28 10:15:10 2023 +0200

    Disable site affiliation fetcher (uplift to 1.51.x) (#18286)

    Uplift of #18153 (squashed) to release

commit 6b1db58
Author: brave-builds <45370463+brave-builds@users.noreply.github.com>
Date:   Fri Apr 28 09:47:20 2023 +0200

    Revise the behavior of "Extensions (Brave Wallet fallback)" setting (uplift to 1.51.x) (#18228)

    Uplift of #18172 (squashed) to beta

commit f7f8042
Author: brave-builds <45370463+brave-builds@users.noreply.github.com>
Date:   Fri Apr 28 09:42:41 2023 +0200

    Send kUAModel and kUAPlatformVersion CHs when requested. (uplift to 1.51.x) (#18263)

    Uplift of #18154 (squashed) to beta

commit 545fa57
Author: Max <41635752+mkarolin@users.noreply.github.com>
Date:   Fri Apr 28 03:07:51 2023 -0400

    Don't call GetSessionRoute() when media router is disabled (#18245) (1.51.x). (#18264)

    Don't call GetSessionRoute() when media router is disabled (#18245)

    Otherwise, it would end in reaching NOTREACHED()

    Co-authored-by: Sangwoo Ko <sko@brave.com>

commit 0fbe592
Author: Arthur Edelstein <aedelstein@brave.com>
Date:   Thu Apr 27 17:44:23 2023 -0700

    Uplift HTTPS First Mode v2 Migration (#17856) and HTTP error code fallback (#18141) (#18179)

    * Migrate to HttpsFirstMode v2 (#17856)

    Migrate HTTPS by Default feature to use HttpsFirstMode v2

    * Force HTTPS Upgrader to fall back to HTTP if we have an HTTP error code (#18141)

commit e369d71
Author: Aleksey Khoroshilov <5928869+goodov@users.noreply.github.com>
Date:   Fri Apr 28 03:34:51 2023 +0700

    Disable flaky upstream tests. (Uplift to 1.51.x) (#18274)

Update nft-details.tsx
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/run-network-audit Run network-audit
4 participants