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

fix: notify URLLoaderClient about redirect inside intercepted protocol's handler #23742

Merged
merged 4 commits into from
Jun 2, 2020
Merged

fix: notify URLLoaderClient about redirect inside intercepted protocol's handler #23742

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0ba475
fix: notify URLLoaderClient about redirect inside intercepted protoco…
wjch-krl May 25, 2020
154b6cb
Merge branch 'master' of https://github.com/electron/electron into bu…
May 31, 2020
02cd7f6
fix: update new_request's site_for_coookies
May 31, 2020
bcaa0ad
fix: Unound client, so it an be passed to sub-methods
Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 18 additions & 1 deletion shell/browser/net/electron_url_loader_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,25 @@ void ElectronURLLoaderFactory::StartLoading(
// API in WebRequestProxyingURLLoaderFactory.
std::string location;
if (head->headers->IsRedirect(&location)) {
GURL new_location = GURL(location);
net::SiteForCookies new_site_for_cookies =
net::SiteForCookies::FromUrl(new_location);
network::ResourceRequest new_request = request;
new_request.url = GURL(location);
new_request.url = new_location;
new_request.site_for_cookies = new_site_for_cookies;

net::RedirectInfo redirect_info;
redirect_info.status_code = head->headers->response_code();
redirect_info.new_method = request.method;
redirect_info.new_url = new_location;
redirect_info.new_site_for_cookies = new_site_for_cookies;
mojo::Remote<network::mojom::URLLoaderClient> client_remote(
std::move(client));

client_remote->OnReceiveRedirect(redirect_info, std::move(head));

// Unound client, so it an be passed to sub-methods
client = client_remote.Unbind();
// When the redirection comes from an intercepted scheme (which has
// |proxy_factory| passed), we askes the proxy factory to create a loader
// for new URL, otherwise we call |StartLoadingHttp|, which creates
Expand Down