-
Notifications
You must be signed in to change notification settings - Fork 868
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue 2351: Adding WebSocket proxy for Brave shields.
- Loading branch information
Showing
11 changed files
with
725 additions
and
83 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* 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_proxying_utils.h" | ||
|
|
||
| #include <utility> | ||
|
|
||
| #include "brave/browser/net/brave_proxying_url_loader_factory.h" | ||
| #include "brave/browser/net/brave_proxying_web_socket.h" | ||
| #include "brave/browser/net/brave_request_handler.h" | ||
| #include "content/public/browser/resource_context.h" | ||
|
|
||
| // User data key for ResourceContextData. | ||
| const void* const kResourceContextUserDataKey = &kResourceContextUserDataKey; | ||
|
|
||
| ResourceContextData::ResourceContextData() | ||
| : request_id_generator_(base::MakeRefCounted<RequestIDGenerator>()), | ||
| weak_factory_(this) {} | ||
|
|
||
| ResourceContextData::~ResourceContextData() = default; | ||
|
|
||
| // static | ||
| void ResourceContextData::StartProxying( | ||
| content::ResourceContext* resource_context, | ||
| int render_process_id, | ||
| int frame_tree_node_id, | ||
| network::mojom::URLLoaderFactoryRequest request, | ||
| network::mojom::URLLoaderFactoryPtrInfo target_factory) { | ||
| DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | ||
|
|
||
| auto* self = static_cast<ResourceContextData*>( | ||
| resource_context->GetUserData(kResourceContextUserDataKey)); | ||
| if (!self) { | ||
| self = new ResourceContextData(); | ||
| resource_context->SetUserData(kResourceContextUserDataKey, | ||
| base::WrapUnique(self)); | ||
| } | ||
|
|
||
| if (!self->request_handler_) { | ||
| self->request_handler_.reset(new BraveRequestHandler); | ||
| } | ||
|
|
||
| auto proxy = std::make_unique<BraveProxyingURLLoaderFactory>( | ||
| self->request_handler_.get(), resource_context, render_process_id, | ||
| frame_tree_node_id, std::move(request), std::move(target_factory), | ||
| self->request_id_generator_, | ||
| base::BindOnce(&ResourceContextData::RemoveProxy, | ||
| self->weak_factory_.GetWeakPtr())); | ||
|
|
||
| self->proxies_.emplace(std::move(proxy)); | ||
| } | ||
|
|
||
| // static | ||
| void ResourceContextData::StartProxyingWebSocket( | ||
| content::ResourceContext* resource_context, | ||
| int render_process_id, | ||
| int frame_id, | ||
| int frame_tree_node_id, | ||
| const url::Origin& origin, | ||
| network::mojom::WebSocketPtrInfo proxied_socket_ptr_info, | ||
| network::mojom::WebSocketRequest proxied_request) { | ||
| DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | ||
|
|
||
| auto* self = static_cast<ResourceContextData*>( | ||
| resource_context->GetUserData(kResourceContextUserDataKey)); | ||
| if (!self) { | ||
| self = new ResourceContextData(); | ||
| resource_context->SetUserData(kResourceContextUserDataKey, | ||
| base::WrapUnique(self)); | ||
| } | ||
|
|
||
| if (!self->request_handler_) { | ||
| self->request_handler_.reset(new BraveRequestHandler); | ||
| } | ||
|
|
||
| auto proxy = std::make_unique<BraveProxyingWebSocket>( | ||
| self->request_handler_.get(), resource_context, render_process_id, | ||
| frame_id, frame_tree_node_id, origin, | ||
| self->request_id_generator_, | ||
| network::mojom::WebSocketPtr(std::move(proxied_socket_ptr_info)), | ||
| std::move(proxied_request), | ||
| base::BindOnce(&ResourceContextData::RemoveProxyWebSocket, | ||
| self->weak_factory_.GetWeakPtr())); | ||
|
|
||
| self->websocket_proxies_.emplace(std::move(proxy)); | ||
| } | ||
|
|
||
|
|
||
| void ResourceContextData::RemoveProxy(BraveProxyingURLLoaderFactory* proxy) { | ||
| auto it = proxies_.find(proxy); | ||
| DCHECK(it != proxies_.end()); | ||
| proxies_.erase(it); | ||
| } | ||
|
|
||
| void ResourceContextData::RemoveProxyWebSocket(BraveProxyingWebSocket* proxy) { | ||
| auto it = websocket_proxies_.find(proxy); | ||
| DCHECK(it != websocket_proxies_.end()); | ||
| websocket_proxies_.erase(it); | ||
| } | ||
|
|
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,94 @@ | ||
| /* 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/. */ | ||
|
|
||
| #ifndef BRAVE_BROWSER_NET_BRAVE_PROXYING_UTILS_H_ | ||
| #define BRAVE_BROWSER_NET_BRAVE_PROXYING_UTILS_H_ | ||
|
|
||
| #include <cstdint> | ||
| #include <memory> | ||
| #include <set> | ||
|
|
||
| #include "base/containers/unique_ptr_adapters.h" | ||
| #include "base/macros.h" | ||
| #include "base/memory/ref_counted.h" | ||
| #include "base/supports_user_data.h" | ||
| #include "content/public/browser/browser_thread.h" | ||
| #include "services/network/public/mojom/url_loader_factory.mojom.h" | ||
| #include "services/network/public/mojom/websocket.mojom.h" | ||
|
|
||
| class BraveProxyingURLLoaderFactory; | ||
| class BraveProxyingWebSocket; | ||
| class BraveRequestHandler; | ||
|
|
||
| namespace content { | ||
| class ResourceContext; | ||
| } | ||
|
|
||
| // Used for both URLLoaders and WebSocket proxies. | ||
| class RequestIDGenerator | ||
| : public base::RefCountedThreadSafe<RequestIDGenerator> { | ||
| public: | ||
| RequestIDGenerator() = default; | ||
| int64_t Generate() { | ||
| DCHECK_CURRENTLY_ON(content::BrowserThread::IO); | ||
| return ++id_; | ||
| } | ||
|
|
||
| private: | ||
| friend class base::RefCountedThreadSafe<RequestIDGenerator>; | ||
| ~RequestIDGenerator() {} | ||
|
|
||
| // Although this initialization can be done in a thread other than the IO | ||
| // thread, we expect at least one memory barrier before actually calling | ||
| // Generate in the IO thread, so we don't protect the variable with a lock. | ||
| int64_t id_ = 0; | ||
| DISALLOW_COPY_AND_ASSIGN(RequestIDGenerator); | ||
| }; | ||
|
|
||
| // Owns proxying factories for URLLoaders and websocket proxies. There is | ||
| // one |ResourceContextData| per profile. | ||
| class ResourceContextData : public base::SupportsUserData::Data { | ||
| public: | ||
| ~ResourceContextData() override; | ||
|
|
||
| static void StartProxying( | ||
| content::ResourceContext* resource_context, | ||
| int render_process_id, | ||
| int frame_tree_node_id, | ||
| network::mojom::URLLoaderFactoryRequest request, | ||
| network::mojom::URLLoaderFactoryPtrInfo target_factory); | ||
|
|
||
| static void StartProxyingWebSocket( | ||
| content::ResourceContext* resource_context, | ||
| int render_process_id, | ||
| int frame_id, | ||
| int frame_tree_node_id, | ||
| const url::Origin& origin, | ||
| network::mojom::WebSocketPtrInfo proxied_socket_ptr_info, | ||
| network::mojom::WebSocketRequest proxied_request); | ||
|
|
||
| void RemoveProxy(BraveProxyingURLLoaderFactory* proxy); | ||
| void RemoveProxyWebSocket(BraveProxyingWebSocket* proxy); | ||
|
|
||
| private: | ||
| ResourceContextData(); | ||
|
|
||
| std::unique_ptr<BraveRequestHandler> request_handler_; | ||
| scoped_refptr<RequestIDGenerator> request_id_generator_; | ||
|
|
||
| std::set<std::unique_ptr<BraveProxyingURLLoaderFactory>, | ||
| base::UniquePtrComparator> | ||
| proxies_; | ||
|
|
||
| std::set<std::unique_ptr<BraveProxyingWebSocket>, | ||
| base::UniquePtrComparator> | ||
| websocket_proxies_; | ||
|
|
||
| base::WeakPtrFactory<ResourceContextData> weak_factory_; | ||
|
|
||
| DISALLOW_COPY_AND_ASSIGN(ResourceContextData); | ||
| }; | ||
|
|
||
| #endif // BRAVE_BROWSER_NET_BRAVE_PROXYING_UTILS_H_ |
Oops, something went wrong.