Skip to content

Commit

Permalink
Fix deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@uazo
uazo committed Dec 27, 2023
1 parent 8e71c67 commit 8f29813
Showing 1 changed file with 53 additions and 28 deletions.
81 changes: 53 additions & 28 deletions build/patches/00Internal-firewall.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
.../about_flags_cc/Internal-firewall.inc | 8 +
net/BUILD.gn | 1 +
.../network_traffic_annotation.h | 4 -
net/url_request/url_request_http_job.cc | 15 +
net/url_request/url_request_http_job.cc | 17 +
net/url_request/url_request_http_job.h | 3 +
services/firewall/public/BUILD.gn | 70 +++
services/firewall/public/BUILD.gn | 74 +++
services/firewall/public/firewall_features.cc | 28 ++
services/firewall/public/firewall_features.h | 31 ++
services/firewall/public/firewall_service.cc | 46 ++
Expand All @@ -32,14 +32,15 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
services/firewall/tools/gen_builders.py | 65 +++
services/firewall/tools/rules.xml | 83 ++++
services/firewall/tools/rules_model.py | 35 ++
services/network/BUILD.gn | 1 +
services/network/network_context.cc | 73 +++
.../network/public/cpp/simple_url_loader.cc | 18 +
.../network/public/cpp/simple_url_loader.h | 3 +
.../platform/loader/fetch/fetch_utils.cc | 191 ++++++-
.../loader/fetch/url_loader/url_loader.cc | 4 +-
.../scripts/auditor/auditor.py | 1 +
.../scripts/auditor/util.py | 1 +
30 files changed, 1569 insertions(+), 20 deletions(-)
31 files changed, 1576 insertions(+), 20 deletions(-)
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Internal-firewall.inc
create mode 100644 services/firewall/public/BUILD.gn
create mode 100644 services/firewall/public/firewall_features.cc
Expand All @@ -62,7 +63,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//third_party/ungoogled:switches",
"//services/device/public/mojom",
"//services/device/public/mojom:usb",
+ "//services/firewall/public:firewall_builders",
+ "//services/firewall/public:firewall_cpp",
"//services/image_annotation:service",
"//services/media_session/public/mojom",
"//services/metrics/public/cpp:ukm_builders",
Expand Down Expand Up @@ -243,7 +244,7 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn
"//build:chromeos_buildflags",
"//components/miracle_parameter/common",
"//net/http:transport_security_state_generated_files",
+ "//services/firewall/public:firewall_builders",
+ "//services/firewall/public:firewall_cpp",
"//components/network_session_configurator/common"
]

Expand All @@ -264,7 +265,16 @@ diff --git a/net/traffic_annotation/network_traffic_annotation.h b/net/traffic_a
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -322,6 +322,9 @@ URLRequestHttpJob::URLRequestHttpJob(
@@ -95,6 +95,8 @@
#include "net/url_request/url_request_redirect_job.h"
#include "net/url_request/url_request_throttler_manager.h"
#include "net/url_request/websocket_handshake_userdata_key.h"
+#include "services/firewall/public/firewall_features.h"
+#include "services/firewall/public/firewall_service.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -322,6 +324,9 @@ URLRequestHttpJob::URLRequestHttpJob(
throttling_entry_ = manager->RegisterRequestUrl(request->url());

ResetTimer();
Expand All @@ -274,7 +284,7 @@ diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_reque
}

URLRequestHttpJob::~URLRequestHttpJob() {
@@ -616,6 +619,18 @@ void URLRequestHttpJob::MaybeStartTransactionInternal(int result) {
@@ -616,6 +621,18 @@ void URLRequestHttpJob::MaybeStartTransactionInternal(int result) {
void URLRequestHttpJob::StartTransactionInternal() {
DCHECK(!override_response_headers_);

Expand Down Expand Up @@ -317,7 +327,7 @@ diff --git a/services/firewall/public/BUILD.gn b/services/firewall/public/BUILD.
new file mode 100644
--- /dev/null
+++ b/services/firewall/public/BUILD.gn
@@ -0,0 +1,70 @@
@@ -0,0 +1,74 @@
+# This file is part of Bromite.
+# Bromite is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
Expand All @@ -330,22 +340,6 @@ new file mode 100644
+# You should have received a copy of the GNU General Public License
+# along with Bromite. If not, see <https://www.gnu.org/licenses/>.
+
+component("firewall_cpp") {
+ sources = [
+ "firewall_service.h",
+ "firewall_service.cc",
+ "firewall_features.h",
+ "firewall_features.cc",
+ ]
+
+ defines = [ "FIREWALL_IMPLEMENTATION" ]
+
+ public_deps = [
+ "//base",
+ "//third_party/abseil-cpp:absl"
+ ]
+}
+
+action("gen_firewall_builders") {
+ script = "//services/firewall/tools/gen_builders.py"
+
Expand Down Expand Up @@ -379,15 +373,35 @@ new file mode 100644
+ ]
+}
+
+static_library("firewall_builders") {
+ sources = get_target_outputs(":gen_firewall_builders")
+static_library("firewall_cpp") {
+ sources = [
+ "firewall_service.h",
+ "firewall_service.cc",
+ "firewall_features.h",
+ "firewall_features.cc",
+ ]
+
+ sources += get_target_outputs(":gen_firewall_builders")
+
+ defines = [ "FIREWALL_IMPLEMENTATION" ]
+
+ public_deps = [
+ "//base",
+ "//third_party/abseil-cpp:absl"
+ ]
+
+ deps = [
+ ":gen_firewall_builders",
+ ":firewall_cpp",
+ "//base",
+ "//components/prefs",
+ ]
+
+ visibility = [
+ "//net",
+ "//services/network:network_service",
+ "//chrome/browser:browser",
+ ]
+}
+
diff --git a/services/firewall/public/firewall_features.cc b/services/firewall/public/firewall_features.cc
new file mode 100644
--- /dev/null
Expand Down Expand Up @@ -1547,6 +1561,17 @@ new file mode 100644
+ ])
+
+RULES_XML_TYPE = models.DocumentType(_RULES_CONFIGURATION_TYPE)
diff --git a/services/network/BUILD.gn b/services/network/BUILD.gn
--- a/services/network/BUILD.gn
+++ b/services/network/BUILD.gn
@@ -340,6 +340,7 @@ component("network_service") {
"//services/service_manager/public/cpp",
"//services/service_manager/public/mojom",
"//url",
+ "//services/firewall/public:firewall_cpp",
]

if (is_linux || is_chromeos) {
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
Expand Down

0 comments on commit 8f29813

Please sign in to comment.