60 lines
2.8 KiB
Diff
60 lines
2.8 KiB
Diff
From: uazo <uazo@users.noreply.github.com>
|
|
Date: Mon, 26 Apr 2021 15:04:11 +0000
|
|
Subject: Add IsCleartextPermitted flag
|
|
|
|
Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|
---
|
|
.../about_flags_cc/Add-IsCleartextPermitted-flag.inc | 8 ++++++++
|
|
.../base/features_cc/Add-IsCleartextPermitted-flag.inc | 3 +++
|
|
.../net/base/features_h/Add-IsCleartextPermitted-flag.inc | 1 +
|
|
net/url_request/url_request_http_job.cc | 5 +++++
|
|
4 files changed, 17 insertions(+)
|
|
create mode 100644 cromite_flags/chrome/browser/about_flags_cc/Add-IsCleartextPermitted-flag.inc
|
|
create mode 100644 cromite_flags/net/base/features_cc/Add-IsCleartextPermitted-flag.inc
|
|
create mode 100644 cromite_flags/net/base/features_h/Add-IsCleartextPermitted-flag.inc
|
|
|
|
diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-IsCleartextPermitted-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-IsCleartextPermitted-flag.inc
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/cromite_flags/chrome/browser/about_flags_cc/Add-IsCleartextPermitted-flag.inc
|
|
@@ -0,0 +1,8 @@
|
|
+#ifdef FLAG_SECTION
|
|
+
|
|
+ {"cleartext-permitted",
|
|
+ "Allow cleartext traffic",
|
|
+ "Allow insecure connections over HTTP", kOsAll,
|
|
+ FEATURE_VALUE_TYPE(net::features::kIsCleartextPermitted)},
|
|
+
|
|
+#endif
|
|
diff --git a/cromite_flags/net/base/features_cc/Add-IsCleartextPermitted-flag.inc b/cromite_flags/net/base/features_cc/Add-IsCleartextPermitted-flag.inc
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/cromite_flags/net/base/features_cc/Add-IsCleartextPermitted-flag.inc
|
|
@@ -0,0 +1,3 @@
|
|
+CROMITE_FEATURE(kIsCleartextPermitted,
|
|
+ "IsCleartextPermitted",
|
|
+ base::FEATURE_ENABLED_BY_DEFAULT);
|
|
diff --git a/cromite_flags/net/base/features_h/Add-IsCleartextPermitted-flag.inc b/cromite_flags/net/base/features_h/Add-IsCleartextPermitted-flag.inc
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/cromite_flags/net/base/features_h/Add-IsCleartextPermitted-flag.inc
|
|
@@ -0,0 +1 @@
|
|
+NET_EXPORT BASE_DECLARE_FEATURE(kIsCleartextPermitted);
|
|
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
|
|
@@ -403,6 +403,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
|
|
}
|
|
}
|
|
|
|
+ if (base::FeatureList::IsEnabled(net::features::kIsCleartextPermitted) == false) {
|
|
+ return std::make_unique<URLRequestErrorJob>(request,
|
|
+ ERR_CLEARTEXT_NOT_PERMITTED);
|
|
+ }
|
|
+
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
// Check whether the app allows cleartext traffic to this host, and return
|
|
// ERR_CLEARTEXT_NOT_PERMITTED if not.
|
|
--
|