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

Hide redundant settings-secure-dns settings #25521

Merged
merged 1 commit into from
Sep 14, 2024

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Sep 11, 2024

fix brave/brave-browser#40989

image

Resolves

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

@simonhong simonhong self-assigned this Sep 11, 2024
@github-actions github-actions bot added the CI/storybook-url Deploy storybook and provide a unique URL for each build label Sep 11, 2024
Copy link
Contributor

The security team is monitoring all repositories for certain keywords. This PR includes the word(s) "secure" and so security team members have been added as reviewers to take a look.

No need to request a full security review at this stage, the security team will take a look shortly and either clear the label or request more information/changes.

Notifications have already been sent, but if this is blocking your merge feel free to reach out directly to the security team on Slack so that we can expedite this check.

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

@brave-builds
Copy link
Collaborator

A Storybook has been deployed to preview UI for the latest push

Copy link
Collaborator

@mkarolin mkarolin left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you!

@simonhong simonhong force-pushed the hide_duplicated_secure_dns_setting branch from 0b32091 to 8a8e97a Compare September 13, 2024 22:58
@simonhong simonhong requested a review from a team as a code owner September 13, 2024 22:58
Copy link
Collaborator

@mkarolin mkarolin left a comment

Choose a reason for hiding this comment

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

Thank you! LGTM

@mihaiplesa mihaiplesa merged commit e9b85bb into master Sep 14, 2024
16 of 17 checks passed
@mihaiplesa mihaiplesa deleted the hide_duplicated_secure_dns_setting branch September 14, 2024 08:19
@github-actions github-actions bot added this to the 1.72.x - Nightly milestone Sep 14, 2024
jagadeshjai pushed a commit to jagadeshjai/brave-core that referenced this pull request Sep 14, 2024
Fixed duplicated secure dns settings

fix brave/brave-browser#40989

It's upstream issue and applied upstream fix in advance.
https://chromium-review.googlesource.com/c/chromium/src/+/5857984
brave-builds added a commit that referenced this pull request Sep 16, 2024
brave-builds added a commit that referenced this pull request Sep 16, 2024
@kjozwiak
Copy link
Member

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

Brave | 1.72.11 Chromium: 129.0.6668.42 (Official Build) nightly (64-bit)
-- | --
Revision | 13146b182b4f6abcce19429d54e41f4bae10ebe8
OS | Windows 11 Version 23H2 (Build 22631.4112)

Using the STR/Cases outlined via brave/brave-browser#40989 (comment), ensured that the redundant select DNS provider was removed. Also ensured that selecting different DNS providers worked without any issues as per the following:

Example Example Example
image image image

kjozwiak pushed a commit that referenced this pull request Sep 16, 2024
kjozwiak pushed a commit that referenced this pull request Sep 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/storybook-url Deploy storybook and provide a unique URL for each build
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CR129 - Redundant settings Use secure DNS and Select DNS provider under brave://settings/security
6 participants