Skip to content

Check url's scheme before binding with WebUI (uplift to 1.57.x) #19809

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 23, 2023
Merged

Check url's scheme before binding with WebUI (uplift to 1.57.x) #19809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
324b814
Uplift of #19806 (squashed) to release
brave-builds Aug 22, 2023
aa96901
Merge pull request #19820 from brave/bsc-crash-follow-up
bsclifton Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions browser/brave_content_browser_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,6 +993,18 @@ GURL BraveContentBrowserClient::GetEffectiveURL(
bool BraveContentBrowserClient::HandleURLOverrideRewrite(
GURL* url,
content::BrowserContext* browser_context) {
// Some of these rewrites are for WebUI pages with URL that has moved.
// After rewrite happens, GetWebUIFactoryFunction() will work as expected.
// (see browser\ui\webui\brave_web_ui_controller_factory.cc for more info)
//
// Scope of schema is intentionally narrower than content::HasWebUIScheme(url)
// which also allows both `chrome-untrusted` and `chrome-devtools`.
if (!url->SchemeIs(content::kBraveUIScheme) &&
!url->SchemeIs(content::kChromeUIScheme)) {
return false;
}

// brave://sync => brave://settings/braveSync
if (url->host() == chrome::kChromeUISyncHost) {
GURL::Replacements replacements;
replacements.SetSchemeStr(content::kChromeUIScheme);
Expand All @@ -1003,6 +1015,7 @@ bool BraveContentBrowserClient::HandleURLOverrideRewrite(
}

#if !BUILDFLAG(IS_ANDROID)
// brave://adblock => brave://settings/shields/filters
if (url->host() == kAdblockHost) {
GURL::Replacements replacements;
replacements.SetSchemeStr(content::kChromeUIScheme);
Expand Down
5 changes: 5 additions & 0 deletions browser/ui/brave_browser_browsertest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ IN_PROC_BROWSER_TEST_F(BraveBrowserBrowserTest, NTPFaviconTest) {
browser()->ShouldDisplayFavicon(tab_model->GetActiveWebContents()));
}

IN_PROC_BROWSER_TEST_F(BraveBrowserBrowserTest, LoadWebUIURLWithBadSchemeTest) {
ASSERT_TRUE(
ui_test_utils::NavigateToURL(browser(), GURL("http://settings/")));
}

IN_PROC_BROWSER_TEST_F(BraveBrowserBrowserTest, OpenNewTabWhenTabStripIsEmpty) {
ASSERT_TRUE(embedded_test_server()->Start());
Browser* new_browser = OpenNewBrowser(browser()->profile());
Expand Down
11 changes: 11 additions & 0 deletions browser/ui/webui/brave_web_ui_controller_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include "chrome/common/url_constants.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/url_utils.h"
#include "url/gurl.h"

#if !BUILDFLAG(IS_ANDROID)
Expand Down Expand Up @@ -191,6 +192,16 @@ WebUIController* NewWebUI(WebUI* web_ui, const GURL& url) {
WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
Profile* profile,
const GURL& url) {
// This will get called a lot to check all URLs, so do a quick check of other
// schemes to filter out most URLs.
//
// This has a narrow scoper scope than content::HasWebUIScheme(url) which also
// allows both `chrome-untrusted` and `chrome-devtools`.
if (!url.SchemeIs(content::kBraveUIScheme) &&
!url.SchemeIs(content::kChromeUIScheme)) {
return nullptr;
}

if (url.host_piece() == kAdblockHost ||
url.host_piece() == kAdblockInternalsHost ||
url.host_piece() == kWebcompatReporterHost ||
Expand Down