LibWeb: Revert proxy_data ipc parameters

Author: kunlinglio

Libraries/LibIPC/Decoder.cpp

@@ -13,6 +13,7 @@
 #include <LibCore/AnonymousBuffer.h>
 #include <LibIPC/Decoder.h>
 #include <LibIPC/File.h>
+#include <LibProxy/Proxy.h>
 #include <LibURL/Parser.h>
 #include <LibURL/URL.h>
 
@@ -174,6 +175,16 @@ ErrorOr<Core::AnonymousBuffer> decode(Decoder& decoder)
     return Core::AnonymousBuffer::create_from_anon_fd(anon_file.take_fd(), size);
 }
 
+template<>
+ErrorOr<Proxy::ProxyData> decode(Decoder& decoder)
+{
+    auto type = TRY(decoder.decode<Proxy::ProxyData::Type>());
+    auto host = TRY(decoder.decode<String>());
+    auto port = TRY(decoder.decode<u16>());
+
+    return Proxy::ProxyData { type, host, port };
+}
+
 template<>
 ErrorOr<URL::BlobURLEntry::Blob> decode<URL::BlobURLEntry::Blob>(Decoder& decoder)
 {

Libraries/LibIPC/Decoder.h

@@ -23,6 +23,7 @@
 #include <LibIPC/Concepts.h>
 #include <LibIPC/File.h>
 #include <LibIPC/Forward.h>
+#include <LibProxy/Proxy.h>
 #include <LibURL/Origin.h>
 #include <LibURL/URL.h>
 
@@ -139,7 +140,7 @@ template<>
 ErrorOr<Core::AnonymousBuffer> decode(Decoder&);
 
 template<>
-ErrorOr<Core::ProxyData> decode(Decoder&);
+ErrorOr<Proxy::ProxyData> decode(Decoder&);
 
 template<>
 ErrorOr<URL::BlobURLEntry::Blob> decode(Decoder&);

Libraries/LibIPC/Encoder.cpp

@@ -20,6 +20,7 @@
 #include <LibIPC/Attachment.h>
 #include <LibIPC/Encoder.h>
 #include <LibIPC/File.h>
+#include <LibProxy/Proxy.h>
 #include <LibURL/Origin.h>
 #include <LibURL/URL.h>
 
@@ -196,6 +197,15 @@ ErrorOr<void> encode(Encoder& encoder, Core::AnonymousBuffer const& buffer)
     return {};
 }
 
+template<>
+ErrorOr<void> encode(Encoder& encoder, Proxy::ProxyData const& proxy)
+{
+    TRY(encoder.encode(proxy.type));
+    TRY(encoder.encode(proxy.host));
+    TRY(encoder.encode(proxy.port));
+    return {};
+}
+
 template<>
 ErrorOr<void> encode(Encoder& encoder, URL::BlobURLEntry::Blob const& blob)
 {

Libraries/LibIPC/Encoder.h

@@ -18,6 +18,7 @@
 #include <LibIPC/File.h>
 #include <LibIPC/Forward.h>
 #include <LibIPC/Message.h>
+#include <LibProxy/Proxy.h>
 #include <LibURL/URL.h>
 
 namespace IPC {
@@ -143,7 +144,7 @@ template<>
 ErrorOr<void> encode(Encoder&, Core::AnonymousBuffer const&);
 
 template<>
-ErrorOr<void> encode(Encoder&, Core::ProxyData const&);
+ErrorOr<void> encode(Encoder&, Proxy::ProxyData const&);
 
 template<>
 ErrorOr<void> encode(Encoder&, URL::BlobURLEntry::Blob const&);

Libraries/LibProxy/Platform/ProxyEnv.cpp

@@ -7,10 +7,8 @@
 #include "../Proxy.h"
 #include "ProxyPlatform.h"
 #include <AK/ByteString.h>
-#include <CoreFoundation/CoreFoundation.h>
 #include <LibCore/Environment.h>
 #include <LibURL/Parser.h>
-#include <SystemConfiguration/SystemConfiguration.h>
 
 namespace Proxy {
 

Libraries/LibRequests/RequestClient.cpp

@@ -76,12 +76,12 @@ void RequestClient::die()
     }
 }
 
-RefPtr<Request> RequestClient::start_request(ByteString const& method, URL::URL const& url, Optional<HTTP::HeaderList const&> request_headers, ReadonlyBytes request_body, HTTP::CacheMode cache_mode, HTTP::Cookie::IncludeCredentials include_credentials)
+RefPtr<Request> RequestClient::start_request(ByteString const& method, URL::URL const& url, Optional<HTTP::HeaderList const&> request_headers, ReadonlyBytes request_body, HTTP::CacheMode cache_mode, HTTP::Cookie::IncludeCredentials include_credentials, ::Proxy::ProxyData const& proxy_data)
 {
     auto request_id = m_next_request_id++;
     auto headers = request_headers.map([](auto const& headers) { return headers.headers().span(); }).value_or({});
 
-    IPCProxy::async_start_request(request_id, method, url, headers, request_body, cache_mode, include_credentials);
+    IPCProxy::async_start_request(request_id, method, url, headers, request_body, cache_mode, include_credentials, proxy_data);
     auto request = Request::create_from_id({}, *this, request_id);
     m_requests.set(request_id, request);
     return request;

Libraries/LibRequests/RequestClient.h

@@ -13,6 +13,7 @@
 #include <LibHTTP/Cookie/IncludeCredentials.h>
 #include <LibHTTP/HeaderList.h>
 #include <LibIPC/ConnectionToServer.h>
+#include <LibProxy/Proxy.h>
 #include <LibRequests/CacheSizes.h>
 #include <LibRequests/RequestTimingInfo.h>
 #include <LibRequests/WebSocket.h>
@@ -35,7 +36,7 @@ class RequestClient final
     explicit RequestClient(NonnullOwnPtr<IPC::Transport>);
     virtual ~RequestClient() override;
 
-    RefPtr<Request> start_request(ByteString const& method, URL::URL const&, Optional<HTTP::HeaderList const&> request_headers = {}, ReadonlyBytes request_body = {}, HTTP::CacheMode = HTTP::CacheMode::Default, HTTP::Cookie::IncludeCredentials = HTTP::Cookie::IncludeCredentials::Yes);
+    RefPtr<Request> start_request(ByteString const& method, URL::URL const&, Optional<HTTP::HeaderList const&> request_headers = {}, ReadonlyBytes request_body = {}, HTTP::CacheMode = HTTP::CacheMode::Default, HTTP::Cookie::IncludeCredentials = HTTP::Cookie::IncludeCredentials::Yes, ::Proxy::ProxyData const& proxy_data = {});
     bool stop_request(Badge<Request>, Request&);
     void ensure_connection(URL::URL const&, RequestServer::CacheLevel);
 

Services/RequestServer/ConnectionFromClient.cpp

@@ -263,7 +263,7 @@ void ConnectionFromClient::set_proxy_mode(u8 proxy_mode)
     Proxy::set_proxy_mode(static_cast<Proxy::ProxyMode>(proxy_mode));
 }
 
-void ConnectionFromClient::start_request(u64 request_id, ByteString method, URL::URL url, Vector<HTTP::Header> request_headers, ByteBuffer request_body, HTTP::CacheMode cache_mode, HTTP::Cookie::IncludeCredentials include_credentials)
+void ConnectionFromClient::start_request(u64 request_id, ByteString method, URL::URL url, Vector<HTTP::Header> request_headers, ByteBuffer request_body, HTTP::CacheMode cache_mode, HTTP::Cookie::IncludeCredentials include_credentials, Proxy::ProxyData proxy_data)
 {
     note_event_tick("ipc-start-request"sv);
     dbgln_if(REQUESTSERVER_DEBUG, "RequestServer: start_request({}, {})", request_id, url);
@@ -282,18 +282,18 @@ void ConnectionFromClient::start_request(u64 request_id, ByteString method, URL:
         }
     }
 
-    auto request = Request::fetch(request_id, m_disk_cache, cache_mode, *this, m_curl_multi, m_resolver, move(url), move(method), HTTP::HeaderList::create(move(request_headers)), move(request_body), include_credentials, m_alt_svc_cache_path);
+    auto request = Request::fetch(request_id, m_disk_cache, cache_mode, *this, m_curl_multi, m_resolver, move(url), move(method), HTTP::HeaderList::create(move(request_headers)), move(request_body), include_credentials, m_alt_svc_cache_path, move(proxy_data));
     m_active_requests.set(request_id, move(request));
 }
 
-void ConnectionFromClient::start_revalidation_request(Badge<Request>, ByteString method, URL::URL url, NonnullRefPtr<HTTP::HeaderList> request_headers, ByteBuffer request_body, HTTP::Cookie::IncludeCredentials include_credentials)
+void ConnectionFromClient::start_revalidation_request(Badge<Request>, ByteString method, URL::URL url, NonnullRefPtr<HTTP::HeaderList> request_headers, ByteBuffer request_body, HTTP::Cookie::IncludeCredentials include_credentials, Proxy::ProxyData proxy_data)
 {
     note_event_tick("ipc-start-revalidation"sv);
     auto request_id = m_next_revalidation_request_id++;
 
     dbgln_if(REQUESTSERVER_DEBUG, "RequestServer: start_revalidation_request({}, {})", request_id, url);
 
-    auto request = Request::revalidate(request_id, m_disk_cache, *this, m_curl_multi, m_resolver, move(url), move(method), move(request_headers), move(request_body), include_credentials, m_alt_svc_cache_path);
+    auto request = Request::revalidate(request_id, m_disk_cache, *this, m_curl_multi, m_resolver, move(url), move(method), move(request_headers), move(request_body), include_credentials, m_alt_svc_cache_path, move(proxy_data));
     m_active_revalidation_requests.set(request_id, move(request));
 }
 

Services/RequestServer/ConnectionFromClient.h

@@ -43,7 +43,7 @@ class ConnectionFromClient final
 
     static Optional<ConnectionFromClient&> primary_connection();
 
-    void start_revalidation_request(Badge<Request>, ByteString method, URL::URL, NonnullRefPtr<HTTP::HeaderList> request_headers, ByteBuffer request_body, HTTP::Cookie::IncludeCredentials);
+    void start_revalidation_request(Badge<Request>, ByteString method, URL::URL, NonnullRefPtr<HTTP::HeaderList> request_headers, ByteBuffer request_body, HTTP::Cookie::IncludeCredentials, Proxy::ProxyData);
     void request_complete(Badge<Request>, Request const&);
 
 private:
@@ -59,7 +59,7 @@ class ConnectionFromClient final
     virtual void set_dns_server(ByteString host_or_address, u16 port, bool use_tls, bool validate_dnssec_locally) override;
     virtual void set_use_system_dns() override;
     virtual void set_proxy_mode(u8 proxy_mode) override;
-    virtual void start_request(u64 request_id, ByteString, URL::URL, Vector<HTTP::Header>, ByteBuffer, HTTP::CacheMode, HTTP::Cookie::IncludeCredentials) override;
+    virtual void start_request(u64 request_id, ByteString, URL::URL, Vector<HTTP::Header>, ByteBuffer, HTTP::CacheMode, HTTP::Cookie::IncludeCredentials, Proxy::ProxyData) override;
     virtual Messages::RequestServer::StopRequestResponse stop_request(u64 request_id) override;
     virtual Messages::RequestServer::SetCertificateResponse set_certificate(u64 request_id, ByteString, ByteString) override;
     virtual void ensure_connection(u64 request_id, URL::URL url, ::RequestServer::CacheLevel cache_level) override;

Services/RequestServer/Request.cpp

@@ -368,9 +368,10 @@ NonnullOwnPtr<Request> Request::fetch(
     NonnullRefPtr<HTTP::HeaderList> request_headers,
     ByteBuffer request_body,
     HTTP::Cookie::IncludeCredentials include_credentials,
-    ByteString alt_svc_cache_path)
+    ByteString alt_svc_cache_path,
+    Proxy::ProxyData proxy_data)
 {
-    auto request = adopt_own(*new Request { request_id, RequestType::Fetch, disk_cache, cache_mode, client, curl_multi, resolver, move(url), move(method), move(request_headers), move(request_body), include_credentials, move(alt_svc_cache_path) });
+    auto request = adopt_own(*new Request { request_id, RequestType::Fetch, disk_cache, cache_mode, client, curl_multi, resolver, move(url), move(method), move(request_headers), move(request_body), include_credentials, move(alt_svc_cache_path), move(proxy_data) });
     request->process();
 
     return request;
@@ -401,9 +402,10 @@ NonnullOwnPtr<Request> Request::revalidate(
     NonnullRefPtr<HTTP::HeaderList> request_headers,
     ByteBuffer request_body,
     HTTP::Cookie::IncludeCredentials include_credentials,
-    ByteString alt_svc_cache_path)
+    ByteString alt_svc_cache_path,
+    Proxy::ProxyData proxy_data)
 {
-    auto request = adopt_own(*new Request { request_id, RequestType::BackgroundRevalidation, disk_cache, HTTP::CacheMode::Default, client, curl_multi, resolver, move(url), move(method), move(request_headers), move(request_body), include_credentials, move(alt_svc_cache_path) });
+    auto request = adopt_own(*new Request { request_id, RequestType::BackgroundRevalidation, disk_cache, HTTP::CacheMode::Default, client, curl_multi, resolver, move(url), move(method), move(request_headers), move(request_body), include_credentials, move(alt_svc_cache_path), move(proxy_data) });
     request->process();
 
     return request;
@@ -422,7 +424,8 @@ Request::Request(
     NonnullRefPtr<HTTP::HeaderList> request_headers,
     ByteBuffer request_body,
     HTTP::Cookie::IncludeCredentials include_credentials,
-    ByteString alt_svc_cache_path)
+    ByteString alt_svc_cache_path,
+    Proxy::ProxyData proxy_data)
     : m_request_id(request_id)
     , m_type(type)
     , m_disk_cache(disk_cache)
@@ -436,6 +439,7 @@ Request::Request(
     , m_request_body(move(request_body))
     , m_include_credentials(include_credentials)
     , m_alt_svc_cache_path(move(alt_svc_cache_path))
+    , m_proxy_data(move(proxy_data))
     , m_response_headers(HTTP::HeaderList::create())
 {
     if constexpr (REQUESTSERVER_WIRE_DEBUG)
@@ -585,6 +589,15 @@ void Request::process()
 
 void Request::transition_to_network_lookup()
 {
+    if (!m_proxy_data.is_direct()) {
+        // Client has provided proxy data, skip proxy resolution
+        if (m_type == RequestType::Connect)
+            transition_to_state(State::Connect);
+        else
+            transition_to_state(State::RetrieveCookie);
+        return;
+    }
+
     if (Proxy::use_system_proxy()) {
         auto proxies = Proxy::get_proxies_for_url(m_url);
         if (!proxies.is_empty()) {
@@ -626,7 +639,7 @@ void Request::handle_initial_state()
 
                     if (m_cache_entry_reader.has_value()) {
                         if (m_cache_entry_reader->revalidation_type() == HTTP::CacheEntryReader::RevalidationType::StaleWhileRevalidate)
-                            m_client.start_revalidation_request({}, m_method, m_url, m_request_headers, m_request_body, m_include_credentials);
+                            m_client.start_revalidation_request({}, m_method, m_url, m_request_headers, m_request_body, m_include_credentials, m_proxy_data);
 
                         if (is_revalidation_request())
                             transition_to_network_lookup();