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

Fix vpn's invalid selected name crash #25596

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Sep 17, 2024

Resolves

fix brave/brave-browser#41093

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • 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 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 the linked issue for manual test

fix brave/brave-browser#41093

Device region is set with timezone data.
and set selected region with it when it's not selected yet.
As timezone data uses v1 region name, region name from timezone
data should be updated to its v2 name.
@simonhong simonhong force-pushed the fix_invalid_selected_name_crash branch from e68464e to 7414d1c Compare September 17, 2024 05:55
Copy link
Contributor

@deeppandya deeppandya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Migration LGTM. how would it behave for an upgrade scenario ?

@simonhong
Copy link
Member Author

Migration LGTM. how would it behave for an upgrade scenario ?

When upgraded, new region list data & timezone data are fetched again as previously cached region list became invalid.
Then, it sets device region again with timezone data with new name as timezone uses old name still.
(Maybe we need to use new guardian timezone fetch api later?)
With new device region, it's set to selected region again if it's empty.
If user already has selected region, it is migrated to new name during the startup and it's not changed again with device region.

@deeppandya
Copy link
Contributor

Migration LGTM. how would it behave for an upgrade scenario ?

When upgraded, new region list data & timezone data are fetched again as previously cached region list became invalid. Then, it sets device region again with timezone data with new name as timezone uses old name still. (Maybe we need to use new guardian timezone fetch api later?) With new device region, it's set to selected region again if it's empty. If user already has selected region, it is migrated to new name during the startup and it's not changed again with device region.

I am definitely going to reach out to guardian team for new timezone api.

Copy link
Contributor

@deeppandya deeppandya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@simonhong simonhong merged commit 5fa2576 into master Sep 19, 2024
17 checks passed
@simonhong simonhong deleted the fix_invalid_selected_name_crash branch September 19, 2024 13:50
@github-actions github-actions bot added this to the 1.72.x - Nightly milestone Sep 19, 2024
brave-builds added a commit that referenced this pull request Sep 19, 2024
@MadhaviSeelam
Copy link

Verification PASSED using

Brave | 1.72.26 Chromium: 129.0.6668.59 (Official Build) nightly (64-bit)
-- | --
Revision | 4580158f4966388aa15f701b5fa01cbe22846cc5
OS | Windows 11 Version 23H2 (Build 22631.4169)
  1. Installed 1.72.26
  2. launched Brave
  3. logged into account.bravesoftware.com as an existing VPN subscriber (refresh39132vpn627@mailinator.com)
  4. clicked Refresh Firewall + VPN button on the subscription page
  5. waited for few seconds
  6. clicked VPN button in the toolbar
  7. enabled/disabled via VPN panel, hamburger menu and taskbar VPN icon
  8. switched to different region - Sweden
  9. opened whatismyipaddress.com
  • Confirmed no crash happened
  • VPN worked as expected
  • confirmed correct region is shown
2024-09-20_09h05_07.mp4

kjozwiak pushed a commit that referenced this pull request Sep 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Brave crashed when attempted to refresh Brave VPN credentials
3 participants