-
Notifications
You must be signed in to change notification settings - Fork 920
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2583 from brave/bsc-user-agent-update
Revert changes to user agent after experiencing webcompat issues in Dev/Nightly
- Loading branch information
Showing
25 changed files
with
570 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* Copyright (c) 2019 The Brave Authors. All rights reserved. | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| * You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| #include "brave/browser/net/brave_referrals_network_delegate_helper.h" | ||
|
|
||
| #include "base/values.h" | ||
| #include "brave/components/brave_referrals/browser/brave_referrals_service.h" | ||
| #include "brave/common/network_constants.h" | ||
| #include "chrome/browser/browser_process.h" | ||
| #include "content/public/browser/browser_thread.h" | ||
| #include "extensions/common/url_pattern.h" | ||
| #include "net/url_request/url_request.h" | ||
|
|
||
| namespace brave { | ||
|
|
||
| int OnBeforeStartTransaction_ReferralsWork( | ||
| net::URLRequest* request, | ||
| net::HttpRequestHeaders* headers, | ||
| const ResponseCallback& next_callback, | ||
| std::shared_ptr<BraveRequestInfo> ctx) { | ||
| if (!ctx->referral_headers_list) | ||
| return net::OK; | ||
| // If the domain for this request matches one of our target domains, | ||
| // set the associated custom headers. | ||
| const base::DictionaryValue* request_headers_dict = nullptr; | ||
| if (!BraveReferralsService::GetMatchingReferralHeaders( | ||
| *ctx->referral_headers_list, &request_headers_dict, request->url())) | ||
| return net::OK; | ||
| for (const auto& it : request_headers_dict->DictItems()) { | ||
| if (it.first == kBravePartnerHeader) { | ||
| headers->SetHeader(it.first, it.second.GetString()); | ||
| } | ||
| } | ||
| return net::OK; | ||
| } | ||
|
|
||
| } // namespace brave |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* Copyright (c) 2019 The Brave Authors. All rights reserved. | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| * You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| #ifndef BRAVE_BROWSER_NET_BRAVE_REFERRALS_NETWORK_DELEGATE_HELPER_H_ | ||
| #define BRAVE_BROWSER_NET_BRAVE_REFERRALS_NETWORK_DELEGATE_HELPER_H_ | ||
|
|
||
| #include <memory> | ||
|
|
||
| #include "brave/browser/net/url_context.h" | ||
|
|
||
| struct BraveRequestInfo; | ||
|
|
||
| namespace net { | ||
| class HttpRequestHeaders; | ||
| class URLRequest; | ||
| } | ||
|
|
||
| namespace brave { | ||
|
|
||
| int OnBeforeStartTransaction_ReferralsWork( | ||
| net::URLRequest* request, | ||
| net::HttpRequestHeaders* headers, | ||
| const ResponseCallback& next_callback, | ||
| std::shared_ptr<BraveRequestInfo> ctx); | ||
|
|
||
| } // namespace brave | ||
|
|
||
| #endif // BRAVE_BROWSER_NET_BRAVE_REFERRALS_NETWORK_DELEGATE_HELPER_H_ |
133 changes: 133 additions & 0 deletions
133
browser/net/brave_referrals_network_delegate_helper_unittest.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* Copyright 2019 The Brave Authors. All rights reserved. | ||
| * This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| * You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| #include "brave/browser/net/brave_referrals_network_delegate_helper.h" | ||
|
|
||
| #include <memory> | ||
| #include <string> | ||
|
|
||
| #include "base/json/json_reader.h" | ||
| #include "brave/browser/net/url_context.h" | ||
| #include "brave/common/network_constants.h" | ||
| #include "chrome/test/base/chrome_render_view_host_test_harness.h" | ||
| #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" | ||
| #include "net/url_request/url_request_test_util.h" | ||
| #include "url/gurl.h" | ||
| #include "url/url_constants.h" | ||
|
|
||
| const char kTestReferralHeaders[] = R"( | ||
| [ | ||
| { | ||
| "domains": [ | ||
| "marketwatch.com", | ||
| "barrons.com" | ||
| ], | ||
| "headers": { | ||
| "X-Brave-Partner":"dowjones", | ||
| "X-Invalid": "test" | ||
| }, | ||
| "cookieNames": [ | ||
| ], | ||
| "expiration":31536000000 | ||
| }, | ||
| { | ||
| "domains": [ | ||
| "townsquareblogs.com", | ||
| "tasteofcountry.com", | ||
| "ultimateclassicrock.com", | ||
| "xxlmag.com", | ||
| "popcrush.com" | ||
| ], | ||
| "headers": { | ||
| "X-Brave-Partner":"townsquare" | ||
| }, | ||
| "cookieNames":[ | ||
| ], | ||
| "expiration":31536000000 | ||
| } | ||
| ])"; | ||
|
|
||
| namespace { | ||
|
|
||
| class BraveReferralsNetworkDelegateHelperTest : public testing::Test { | ||
| public: | ||
| BraveReferralsNetworkDelegateHelperTest() | ||
| : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), | ||
| context_(new net::TestURLRequestContext(true)) { | ||
| } | ||
| ~BraveReferralsNetworkDelegateHelperTest() override {} | ||
| void SetUp() override { | ||
| context_->Init(); | ||
| } | ||
| net::TestURLRequestContext* context() { return context_.get(); } | ||
|
|
||
| private: | ||
| content::TestBrowserThreadBundle thread_bundle_; | ||
| std::unique_ptr<net::TestURLRequestContext> context_; | ||
| }; | ||
|
|
||
| TEST_F(BraveReferralsNetworkDelegateHelperTest, | ||
| ReplaceHeadersForMatchingDomain) { | ||
| GURL url("https://www.marketwatch.com"); | ||
| net::TestDelegate test_delegate; | ||
| std::unique_ptr<net::URLRequest> request = context()->CreateRequest( | ||
| url, net::IDLE, &test_delegate, TRAFFIC_ANNOTATION_FOR_TESTS); | ||
|
|
||
| base::Optional<base::Value> referral_headers = | ||
| base::JSONReader().ReadToValue(kTestReferralHeaders); | ||
| ASSERT_TRUE(referral_headers); | ||
| ASSERT_TRUE(referral_headers->is_list()); | ||
|
|
||
| base::ListValue* referral_headers_list = nullptr; | ||
| referral_headers->GetAsList(&referral_headers_list); | ||
|
|
||
| net::HttpRequestHeaders headers; | ||
| brave::ResponseCallback callback; | ||
| std::shared_ptr<brave::BraveRequestInfo> brave_request_info( | ||
| new brave::BraveRequestInfo()); | ||
| brave_request_info->referral_headers_list = referral_headers_list; | ||
| int ret = brave::OnBeforeStartTransaction_ReferralsWork( | ||
| request.get(), &headers, callback, brave_request_info); | ||
|
|
||
| std::string partner_header; | ||
| headers.GetHeader("X-Brave-Partner", &partner_header); | ||
| EXPECT_EQ(partner_header, "dowjones"); | ||
|
|
||
| std::string invalid_partner_header; | ||
| EXPECT_EQ(headers.GetHeader("X-Invalid", &invalid_partner_header), false); | ||
| EXPECT_EQ(invalid_partner_header, ""); | ||
|
|
||
| EXPECT_EQ(ret, net::OK); | ||
| } | ||
|
|
||
| TEST_F(BraveReferralsNetworkDelegateHelperTest, | ||
| NoReplaceHeadersForNonMatchingDomain) { | ||
| GURL url("https://www.google.com"); | ||
| net::TestDelegate test_delegate; | ||
| std::unique_ptr<net::URLRequest> request = context()->CreateRequest( | ||
| url, net::IDLE, &test_delegate, TRAFFIC_ANNOTATION_FOR_TESTS); | ||
|
|
||
| base::Optional<base::Value> referral_headers = | ||
| base::JSONReader().ReadToValue(kTestReferralHeaders); | ||
| ASSERT_TRUE(referral_headers); | ||
| ASSERT_TRUE(referral_headers->is_list()); | ||
|
|
||
| base::ListValue* referral_headers_list = nullptr; | ||
| referral_headers->GetAsList(&referral_headers_list); | ||
|
|
||
| net::HttpRequestHeaders headers; | ||
| brave::ResponseCallback callback; | ||
| std::shared_ptr<brave::BraveRequestInfo> brave_request_info( | ||
| new brave::BraveRequestInfo()); | ||
| brave_request_info->referral_headers_list = referral_headers_list; | ||
| int ret = brave::OnBeforeStartTransaction_ReferralsWork( | ||
| request.get(), &headers, callback, brave_request_info); | ||
|
|
||
| EXPECT_FALSE(headers.HasHeader("X-Brave-Partner")); | ||
|
|
||
| EXPECT_EQ(ret, net::OK); | ||
| } | ||
|
|
||
| } // namespace |
Oops, something went wrong.