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.

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

Jump to bottom

Use CDN for publisher list #1623

Merged
merged 1 commit into from
Feb 8, 2019
Merged

Use CDN for publisher list #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions browser/net/brave_static_redirect_network_delegate_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ int OnBeforeURLRequest_StaticRedirectWork(
URLPattern(URLPattern::SCHEME_HTTPS, "https://ledger.mercury.basicattentiontoken.org/*"),
URLPattern(URLPattern::SCHEME_HTTPS, "https://balance.mercury.basicattentiontoken.org/*"),
URLPattern(URLPattern::SCHEME_HTTPS, "https://publishers.basicattentiontoken.org/*"),
URLPattern(URLPattern::SCHEME_HTTPS, "https://publishers-distro.basicattentiontoken.org/*"),
URLPattern(URLPattern::SCHEME_HTTPS, "https://ledger-staging.mercury.basicattentiontoken.org/*"),
URLPattern(URLPattern::SCHEME_HTTPS, "https://balance-staging.mercury.basicattentiontoken.org/*"),
URLPattern(URLPattern::SCHEME_HTTPS, "https://publishers-staging.basicattentiontoken.org/*"),
URLPattern(URLPattern::SCHEME_HTTPS, "https://publishers-staging-distro.basicattentiontoken.org/*"),

// Safe browsing
URLPattern(URLPattern::SCHEME_HTTPS, "https://safebrowsing.brave.com/v4/*"),
Expand Down
4 changes: 3 additions & 1 deletion chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,9 @@ bool ParseJSON(base::StringPiece json,
{ "name": "download.brave.com", "mode": "force-https", "policy": "custom", "pins": "brave"},
{ "name": "laptop-updates.brave.com", "mode": "force-https", "policy": "custom", "pins": "brave"},
{ "name": "sync.brave.com", "mode": "force-https", "policy": "custom", "pins": "brave"},
{ "name": "sync-staging.brave.com", "mode": "force-https", "policy": "custom", "pins": "brave"}
{ "name": "sync-staging.brave.com", "policy": "custom", "mode": "force-https", "pins": "brave"},
{ "name": "publishers-distro.basicattentiontoken.org", "policy": "custom", "mode": "force-https", "pins": "brave"},
{ "name": "publishers-staging-distro.basicattentiontoken.org", "policy": "custom", "mode": "force-https", "pins": "brave"}
]})brave_json";

return ParseJSON_ChromiumImpl(brave_json, entries, pinsets);
Expand Down
7 changes: 7 additions & 0 deletions vendor/bat-native-ledger/src/bat_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2459,6 +2459,13 @@ static bool ignore_ = false;
url = PUBLISHER_STAGING_SERVER;
}
break;
case SERVER_TYPES::PUBLISHER_DISTRO:
if (ledger::is_production) {
url = PUBLISHER_DISTRO_PRODUCTION_SERVER;
} else {
url = PUBLISHER_DISTRO_STAGING_SERVER;
}
break;
default:
if (ledger::is_production) {
url = LEDGER_PRODUCTION_SERVER;
Expand Down
3 changes: 2 additions & 1 deletion vendor/bat-native-ledger/src/bat_helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,8 @@ namespace braveledger_bat_helper {
enum class SERVER_TYPES {
LEDGER,
BALANCE,
PUBLISHER
PUBLISHER,
PUBLISHER_DISTRO
};

struct SERVER_LIST_BANNER {
Expand Down
18 changes: 13 additions & 5 deletions vendor/bat-native-ledger/src/ledger_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,12 +683,20 @@ void LedgerImpl::OnTimer(uint32_t timer_id) {
if (timer_id == last_pub_load_timer_id_) {
last_pub_load_timer_id_ = 0;

std::vector<std::string> headers;
headers.push_back("Accept-Encoding: gzip");

//download the list
std::string url = braveledger_bat_helper::buildURL(GET_PUBLISHERS_LIST_V1, "", braveledger_bat_helper::SERVER_TYPES::PUBLISHER);
auto callback = std::bind(&LedgerImpl::LoadPublishersListCallback, this,
_1, _2, _3);
LoadURL(url, std::vector<std::string>(), "", "",
ledger::URL_METHOD::GET, callback);
std::string url = braveledger_bat_helper::buildURL(
GET_PUBLISHERS_LIST_V1,
"",
braveledger_bat_helper::SERVER_TYPES::PUBLISHER_DISTRO);
auto callback = std::bind(&LedgerImpl::LoadPublishersListCallback,
this,
_1,
_2,
_3);
LoadURL(url, headers, "", "", ledger::URL_METHOD::GET, callback);
} else if (timer_id == last_grant_check_timer_id_) {
last_grant_check_timer_id_ = 0;
FetchGrant(std::string(), std::string());
Expand Down
14 changes: 8 additions & 6 deletions vendor/bat-native-ledger/src/static_values.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
#include <cstdint>
#include <string>

#define LEDGER_STAGING_SERVER "https://ledger-staging.mercury.basicattentiontoken.org"
#define LEDGER_PRODUCTION_SERVER "https://ledger.mercury.basicattentiontoken.org"
#define BALANCE_STAGING_SERVER "https://balance-staging.mercury.basicattentiontoken.org"
#define BALANCE_PRODUCTION_SERVER "https://balance.mercury.basicattentiontoken.org"
#define PUBLISHER_STAGING_SERVER "https://publishers-staging.basicattentiontoken.org"
#define PUBLISHER_PRODUCTION_SERVER "https://publishers.basicattentiontoken.org"
#define LEDGER_STAGING_SERVER "https://ledger-staging.mercury.basicattentiontoken.org"
#define LEDGER_PRODUCTION_SERVER "https://ledger.mercury.basicattentiontoken.org"
#define BALANCE_STAGING_SERVER "https://balance-staging.mercury.basicattentiontoken.org"
#define BALANCE_PRODUCTION_SERVER "https://balance.mercury.basicattentiontoken.org"
#define PUBLISHER_STAGING_SERVER "https://publishers-staging.basicattentiontoken.org"
#define PUBLISHER_PRODUCTION_SERVER "https://publishers.basicattentiontoken.org"
#define PUBLISHER_DISTRO_STAGING_SERVER "https://publishers-staging-distro.basicattentiontoken.org"
#define PUBLISHER_DISTRO_PRODUCTION_SERVER "https://publishers-distro.basicattentiontoken.org"


#define PREFIX_V2 "/v2"
Expand Down