elastic · elasticsearchmachine · Jun 28, 2022 · Jun 8, 2022 · Jun 15, 2022 · Jun 16, 2022
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -36,9 +36,9 @@ opensaml = 4.0.1
 randomizedrunner  = 2.7.7
 junit             = 4.12
 junit5            = 5.7.1
-httpclient        = 4.5.10
-httpcore          = 4.4.12
-httpasyncclient   = 4.1.4
+httpclient        = 4.5.13
+httpcore          = 4.4.13
+httpasyncclient   = 4.1.5
 commonslogging    = 1.1.3
 commonscodec      = 1.14
 hamcrest          = 2.1

diff --git a/client/rest/licenses/httpasyncclient-4.1.4.jar.sha1 b/client/rest/licenses/httpasyncclient-4.1.4.jar.sha1
diff --git a/client/rest/licenses/httpasyncclient-4.1.5.jar.sha1 b/client/rest/licenses/httpasyncclient-4.1.5.jar.sha1
@@ -0,0 +1 @@
+cd18227f1eb8e9a263286c1d7362ceb24f6f9b32
diff --git a/client/rest/licenses/httpclient-4.5.10.jar.sha1 b/client/rest/licenses/httpclient-4.5.10.jar.sha1
diff --git a/client/rest/licenses/httpclient-4.5.13.jar.sha1 b/client/rest/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/client/rest/licenses/httpcore-4.4.12.jar.sha1 b/client/rest/licenses/httpcore-4.4.12.jar.sha1
diff --git a/client/rest/licenses/httpcore-4.4.13.jar.sha1 b/client/rest/licenses/httpcore-4.4.13.jar.sha1
@@ -0,0 +1 @@
+853b96d3afbb7bf8cc303fe27ee96836a10c1834
diff --git a/client/rest/licenses/httpcore-nio-4.4.12.jar.sha1 b/client/rest/licenses/httpcore-nio-4.4.12.jar.sha1
diff --git a/client/rest/licenses/httpcore-nio-4.4.13.jar.sha1 b/client/rest/licenses/httpcore-nio-4.4.13.jar.sha1
@@ -0,0 +1 @@
+3f897ace4d7f10f0ea6a58f524a3b105dd483653
diff --git a/client/sniffer/licenses/httpclient-4.5.10.jar.sha1 b/client/sniffer/licenses/httpclient-4.5.10.jar.sha1
diff --git a/client/sniffer/licenses/httpclient-4.5.13.jar.sha1 b/client/sniffer/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/client/sniffer/licenses/httpcore-4.4.12.jar.sha1 b/client/sniffer/licenses/httpcore-4.4.12.jar.sha1
diff --git a/client/sniffer/licenses/httpcore-4.4.13.jar.sha1 b/client/sniffer/licenses/httpcore-4.4.13.jar.sha1
@@ -0,0 +1 @@
+853b96d3afbb7bf8cc303fe27ee96836a10c1834
diff --git a/docs/changelog/87491.yaml b/docs/changelog/87491.yaml
@@ -0,0 +1,5 @@
+pr: 87491
+summary: Update version of internal http client
+area: "Infra/Core"
+type: enhancement
+issues: []
diff --git a/modules/ingest-common/licenses/httpclient-4.5.10.jar.sha1 b/modules/ingest-common/licenses/httpclient-4.5.10.jar.sha1
diff --git a/modules/ingest-common/licenses/httpclient-4.5.13.jar.sha1 b/modules/ingest-common/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/modules/ingest-common/licenses/httpcore-4.4.12.jar.sha1 b/modules/ingest-common/licenses/httpcore-4.4.12.jar.sha1
diff --git a/modules/ingest-common/licenses/httpcore-4.4.13.jar.sha1 b/modules/ingest-common/licenses/httpcore-4.4.13.jar.sha1
@@ -0,0 +1 @@
+853b96d3afbb7bf8cc303fe27ee96836a10c1834
diff --git a/...-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java b/...-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java
@@ -45,23 +45,28 @@ public void testBasic() throws Exception {
         // Verify "com" is returned as the eTLD, for that FQDN or subdomain
         testRegisteredDomainProcessor(buildEvent("com"), "com", null, "com", null);
         testRegisteredDomainProcessor(buildEvent("example.com"), "example.com", "example.com", "com", null);
-        // Verify "googleapis.com" is returned as the eTLD, for that FQDN or subdomain
-        testRegisteredDomainProcessor(buildEvent("googleapis.com"), "googleapis.com", null, "googleapis.com", null);
+        testRegisteredDomainProcessor(buildEvent("googleapis.com"), "googleapis.com", "googleapis.com", "com", null);
         testRegisteredDomainProcessor(
             buildEvent("content-autofill.googleapis.com"),
             "content-autofill.googleapis.com",
-            "content-autofill.googleapis.com",
             "googleapis.com",
+            "com",
+            "content-autofill"
+        );
+        // Verify "ssl.fastly.net" is returned as the eTLD, for that FQDN or subdomain
+        testRegisteredDomainProcessor(
+            buildEvent("global.ssl.fastly.net"),
+            "global.ssl.fastly.net",
+            "global.ssl.fastly.net",
+            "ssl.fastly.net",
             null
         );
-        // Verify "global.ssl.fastly.net" is returned as the eTLD, for that FQDN or subdomain
-        testRegisteredDomainProcessor(buildEvent("global.ssl.fastly.net"), "global.ssl.fastly.net", null, "global.ssl.fastly.net", null);
         testRegisteredDomainProcessor(
             buildEvent("1.www.global.ssl.fastly.net"),
             "1.www.global.ssl.fastly.net",
-            "www.global.ssl.fastly.net",
             "global.ssl.fastly.net",
-            "1"
+            "ssl.fastly.net",
+            "1.www"
         );
     }
 

diff --git a/modules/repository-s3/licenses/httpclient-4.5.10.jar.sha1 b/modules/repository-s3/licenses/httpclient-4.5.10.jar.sha1
diff --git a/modules/repository-s3/licenses/httpclient-4.5.13.jar.sha1 b/modules/repository-s3/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/modules/repository-s3/licenses/httpcore-4.4.12.jar.sha1 b/modules/repository-s3/licenses/httpcore-4.4.12.jar.sha1
diff --git a/modules/repository-s3/licenses/httpcore-4.4.13.jar.sha1 b/modules/repository-s3/licenses/httpcore-4.4.13.jar.sha1
@@ -0,0 +1 @@
+853b96d3afbb7bf8cc303fe27ee96836a10c1834
diff --git a/modules/repository-url/licenses/httpclient-4.5.10.jar.sha1 b/modules/repository-url/licenses/httpclient-4.5.10.jar.sha1
diff --git a/modules/repository-url/licenses/httpclient-4.5.13.jar.sha1 b/modules/repository-url/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/modules/repository-url/licenses/httpcore-4.4.12.jar.sha1 b/modules/repository-url/licenses/httpcore-4.4.12.jar.sha1
diff --git a/modules/repository-url/licenses/httpcore-4.4.13.jar.sha1 b/modules/repository-url/licenses/httpcore-4.4.13.jar.sha1
@@ -0,0 +1 @@
+853b96d3afbb7bf8cc303fe27ee96836a10c1834
diff --git a/plugins/discovery-azure-classic/licenses/httpclient-4.5.10.jar.sha1 b/plugins/discovery-azure-classic/licenses/httpclient-4.5.10.jar.sha1
diff --git a/plugins/discovery-azure-classic/licenses/httpclient-4.5.13.jar.sha1 b/plugins/discovery-azure-classic/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/plugins/discovery-azure-classic/licenses/httpcore-4.4.12.jar.sha1 b/plugins/discovery-azure-classic/licenses/httpcore-4.4.12.jar.sha1
diff --git a/plugins/discovery-azure-classic/licenses/httpcore-4.4.13.jar.sha1 b/plugins/discovery-azure-classic/licenses/httpcore-4.4.13.jar.sha1
@@ -0,0 +1 @@
+853b96d3afbb7bf8cc303fe27ee96836a10c1834
diff --git a/plugins/discovery-ec2/licenses/httpclient-4.5.10.jar.sha1 b/plugins/discovery-ec2/licenses/httpclient-4.5.10.jar.sha1
diff --git a/plugins/discovery-ec2/licenses/httpclient-4.5.13.jar.sha1 b/plugins/discovery-ec2/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/plugins/discovery-ec2/licenses/httpcore-4.4.12.jar.sha1 b/plugins/discovery-ec2/licenses/httpcore-4.4.12.jar.sha1
diff --git a/plugins/discovery-ec2/licenses/httpcore-4.4.13.jar.sha1 b/plugins/discovery-ec2/licenses/httpcore-4.4.13.jar.sha1
@@ -0,0 +1 @@
+853b96d3afbb7bf8cc303fe27ee96836a10c1834
diff --git a/x-pack/plugin/core/licenses/httpasyncclient-4.1.4.jar.sha1 b/x-pack/plugin/core/licenses/httpasyncclient-4.1.4.jar.sha1
diff --git a/x-pack/plugin/core/licenses/httpasyncclient-4.1.5.jar.sha1 b/x-pack/plugin/core/licenses/httpasyncclient-4.1.5.jar.sha1
@@ -0,0 +1 @@
+cd18227f1eb8e9a263286c1d7362ceb24f6f9b32
diff --git a/x-pack/plugin/core/licenses/httpclient-4.5.10.jar.sha1 b/x-pack/plugin/core/licenses/httpclient-4.5.10.jar.sha1
diff --git a/x-pack/plugin/core/licenses/httpclient-4.5.13.jar.sha1 b/x-pack/plugin/core/licenses/httpclient-4.5.13.jar.sha1
@@ -0,0 +1 @@
+e5f6cae5ca7ecaac1ec2827a9e2d65ae2869cada
diff --git a/x-pack/plugin/core/licenses/httpcore-4.4.12.jar.sha1 b/x-pack/plugin/core/licenses/httpcore-4.4.12.jar.sha1
diff --git a/x-pack/plugin/core/licenses/httpcore-4.4.13.jar.sha1 b/x-pack/plugin/core/licenses/httpcore-4.4.13.jar.sha1
@@ -0,0 +1 @@
+853b96d3afbb7bf8cc303fe27ee96836a10c1834
diff --git a/x-pack/plugin/core/licenses/httpcore-nio-4.4.12.jar.sha1 b/x-pack/plugin/core/licenses/httpcore-nio-4.4.12.jar.sha1
diff --git a/x-pack/plugin/core/licenses/httpcore-nio-4.4.13.jar.sha1 b/x-pack/plugin/core/licenses/httpcore-nio-4.4.13.jar.sha1
@@ -0,0 +1 @@
+3f897ace4d7f10f0ea6a58f524a3b105dd483653
diff --git a/x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.10.jar.sha1 b/x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.10.jar.sha1
diff --git a/x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.13.jar.sha1 b/x-pack/plugin/identity-provider/licenses/httpclient-cache-4.5.13.jar.sha1
@@ -0,0 +1 @@
+4abee263cbc9edc12393212ca3a7c89af0755b1f
diff --git a/x-pack/plugin/security/licenses/httpclient-cache-4.5.10.jar.sha1 b/x-pack/plugin/security/licenses/httpclient-cache-4.5.10.jar.sha1
diff --git a/x-pack/plugin/security/licenses/httpclient-cache-4.5.13.jar.sha1 b/x-pack/plugin/security/licenses/httpclient-cache-4.5.13.jar.sha1
@@ -0,0 +1 @@
+4abee263cbc9edc12393212ca3a7c89af0755b1f