github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 23:27:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

[7.17] Manual backport of 103944 (#104016)

Browse source 
* Manual backport of 103944

* copy RegisteredDomainProcessorTests#testBasic from main
This commit is contained in:
Jake Landis 2024-01-08 10:31:01 -06:00 • committed by GitHub
parent 77bf12f0a0
commit 2aeecfd084
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 49 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build-tools-internal/version.properties
View file

@ -30,7 +30,7 @@ bouncycastle=1.77
randomizedrunner = 2.8.0 randomizedrunner = 2.8.0
junit = 4.13.2 junit = 4.13.2
junit5 = 5.7.1 junit5 = 5.7.1
httpclient = 4.5.10 httpclient = 4.5.14
httpcore = 4.4.12 httpcore = 4.4.12
httpasyncclient = 4.1.4 httpasyncclient = 4.1.4
commonslogging = 1.1.3 commonslogging = 1.1.3

1
client/rest/licenses/httpclient-4.5.10.jar.sha1
View file

@ -1 +0,0 @@
7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

1
client/rest/licenses/httpclient-4.5.14.jar.sha1 Normal file
View file

@ -0,0 +1 @@
1194890e6f56ec29177673f2f12d0b8e627dec98

1
client/sniffer/licenses/httpclient-4.5.10.jar.sha1
View file

@ -1 +0,0 @@
7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

1
client/sniffer/licenses/httpclient-4.5.14.jar.sha1 Normal file
View file

@ -0,0 +1 @@
1194890e6f56ec29177673f2f12d0b8e627dec98

2
gradle/build.versions.toml
View file

@ -18,7 +18,7 @@ docker-compose = "com.avast.gradle:gradle-docker-compose-plugin:0.17.5"
forbiddenApis = "de.thetaphi:forbiddenapis:3.5.1" forbiddenApis = "de.thetaphi:forbiddenapis:3.5.1"
hamcrest = "org.hamcrest:hamcrest:2.1" hamcrest = "org.hamcrest:hamcrest:2.1"
httpcore = "org.apache.httpcomponents:httpcore:4.4.12" httpcore = "org.apache.httpcomponents:httpcore:4.4.12"
httpclient = "org.apache.httpcomponents:httpclient:4.5.10" httpclient = "org.apache.httpcomponents:httpclient:4.5.14"
idea-ext = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4" idea-ext = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4"
json-schema-validator = "com.networknt:json-schema-validator:1.0.72" json-schema-validator = "com.networknt:json-schema-validator:1.0.72"
json-assert = "org.skyscreamer:jsonassert:1.5.0" json-assert = "org.skyscreamer:jsonassert:1.5.0"

27
gradle/verification-metadata.xml
View file

@ -2592,9 +2592,9 @@
<sha256 value="5d45b7904857c3e4ad36b3bcc57be2d2c5f308c69b5f6a58bd86aa7d48a25ef6" origin="Generated by Gradle"/> <sha256 value="5d45b7904857c3e4ad36b3bcc57be2d2c5f308c69b5f6a58bd86aa7d48a25ef6" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.apache.httpcomponents" name="fluent-hc" version="4.5.10"> <component group="org.apache.httpcomponents" name="fluent-hc" version="4.5.14">
<artifact name="fluent-hc-4.5.10.jar"> <artifact name="fluent-hc-4.5.14.jar">
<sha256 value="f9b60d7a2a9a6944e8f5722c486933f6118dce474c4d8bdc0330f30c7801723a" origin="Generated by Gradle"/> <sha256 value="6916043081fd7b0acb3e50a12a0e82187063d7a6dfed3d2fb2f3296b580ab0f8" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.apache.httpcomponents" name="httpasyncclient" version="4.1.4"> <component group="org.apache.httpcomponents" name="httpasyncclient" version="4.1.4">
@ -2602,24 +2602,24 @@
<sha256 value="50e981a8e567a16ebdad104605b156540a863459fa127b8ba647f310dfc83ef8" origin="Generated by Gradle"/> <sha256 value="50e981a8e567a16ebdad104605b156540a863459fa127b8ba647f310dfc83ef8" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.apache.httpcomponents" name="httpclient" version="4.5.10">
<artifact name="httpclient-4.5.10.jar">
<sha256 value="38b9f16f504928e4db736a433b9cd10968d9ec8d6f5d0e61a64889a689172134" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.httpcomponents" name="httpclient" version="4.5.13"> <component group="org.apache.httpcomponents" name="httpclient" version="4.5.13">
<artifact name="httpclient-4.5.13.jar"> <artifact name="httpclient-4.5.13.jar">
<sha256 value="6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743" origin="Generated by Gradle"/> <sha256 value="6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.apache.httpcomponents" name="httpclient" version="4.5.14">
<artifact name="httpclient-4.5.14.jar">
<sha256 value="c8bc7e1c51a6d4ce72f40d2ebbabf1c4b68bfe76e732104b04381b493478e9d6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.httpcomponents" name="httpclient" version="4.5.2"> <component group="org.apache.httpcomponents" name="httpclient" version="4.5.2">
<artifact name="httpclient-4.5.2.jar"> <artifact name="httpclient-4.5.2.jar">
<sha256 value="0dffc621400d6c632f55787d996b8aeca36b30746a716e079a985f24d8074057" origin="Generated by Gradle"/> <sha256 value="0dffc621400d6c632f55787d996b8aeca36b30746a716e079a985f24d8074057" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.apache.httpcomponents" name="httpclient-cache" version="4.5.10"> <component group="org.apache.httpcomponents" name="httpclient-cache" version="4.5.14">
<artifact name="httpclient-cache-4.5.10.jar"> <artifact name="httpclient-cache-4.5.14.jar">
<sha256 value="beff09f209510332d30f9444785a06755da2686d92338e37581cd62c5a2844bf" origin="Generated by Gradle"/> <sha256 value="5324d2cbc2d311c9f91b82bcbc746ec2a29f1f5b744395a50ff3afb873db1cee" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.apache.httpcomponents" name="httpcore" version="4.4.12"> <component group="org.apache.httpcomponents" name="httpcore" version="4.4.12">
@ -2632,6 +2632,11 @@
<sha256 value="e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424" origin="Generated by Gradle"/> <sha256 value="e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="org.apache.httpcomponents" name="httpcore" version="4.4.16">
<artifact name="httpcore-4.4.16.jar">
<sha256 value="6c9b3dd142a09dc468e23ad39aad6f75a0f2b85125104469f026e52a474e464f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.httpcomponents" name="httpcore" version="4.4.4"> <component group="org.apache.httpcomponents" name="httpcore" version="4.4.4">
<artifact name="httpcore-4.4.4.jar"> <artifact name="httpcore-4.4.4.jar">
<sha256 value="f7bc09dc8a7003822d109634ffd3845d579d12e725ae54673e323a7ce7f5e325" origin="Generated by Gradle"/> <sha256 value="f7bc09dc8a7003822d109634ffd3845d579d12e725ae54673e323a7ce7f5e325" origin="Generated by Gradle"/>

1
modules/ingest-common/licenses/httpclient-4.5.10.jar.sha1
View file

@ -1 +0,0 @@
7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

1
modules/ingest-common/licenses/httpclient-4.5.14.jar.sha1 Normal file
View file

@ -0,0 +1 @@
1194890e6f56ec29177673f2f12d0b8e627dec98

25
modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RegisteredDomainProcessorTests.java
View file

@ -33,14 +33,33 @@ public class RegisteredDomainProcessorTests extends ESTestCase {
testRegisteredDomainProcessor(buildEvent("."), null, null, null, null); testRegisteredDomainProcessor(buildEvent("."), null, null, null, null);
testRegisteredDomainProcessor(buildEvent("$"), null, null, null, null); testRegisteredDomainProcessor(buildEvent("$"), null, null, null, null);
testRegisteredDomainProcessor(buildEvent("foo.bar.baz"), null, null, null, null); testRegisteredDomainProcessor(buildEvent("foo.bar.baz"), null, null, null, null);
testRegisteredDomainProcessor(buildEvent("www.books.amazon.co.uk"), "www.books.amazon.co.uk", "amazon.co.uk", "co.uk", "www.books");
// 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);
testRegisteredDomainProcessor(buildEvent("googleapis.com"), "googleapis.com", "googleapis.com", "com", null);
testRegisteredDomainProcessor(
buildEvent("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
);
testRegisteredDomainProcessor( testRegisteredDomainProcessor(
buildEvent("1.www.global.ssl.fastly.net"), buildEvent("1.www.global.ssl.fastly.net"),
"1.www.global.ssl.fastly.net", "1.www.global.ssl.fastly.net",
"www.global.ssl.fastly.net",
"global.ssl.fastly.net", "global.ssl.fastly.net",
"1" "ssl.fastly.net",
"1.www"
); );
testRegisteredDomainProcessor(buildEvent("www.books.amazon.co.uk"), "www.books.amazon.co.uk", "amazon.co.uk", "co.uk", "www.books");
} }
public void testUseRoot() throws Exception { public void testUseRoot() throws Exception {

1
modules/repository-url/licenses/httpclient-4.5.10.jar.sha1
View file

@ -1 +0,0 @@
7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

1
modules/repository-url/licenses/httpclient-4.5.14.jar.sha1 Normal file
View file

@ -0,0 +1 @@
1194890e6f56ec29177673f2f12d0b8e627dec98

1
plugins/discovery-azure-classic/licenses/httpclient-4.5.10.jar.sha1
View file

@ -1 +0,0 @@
7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

1
plugins/discovery-azure-classic/licenses/httpclient-4.5.14.jar.sha1 Normal file
View file

@ -0,0 +1 @@
1194890e6f56ec29177673f2f12d0b8e627dec98

1
plugins/discovery-ec2/licenses/httpclient-4.5.10.jar.sha1
View file

@ -1 +0,0 @@
7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

1
plugins/discovery-ec2/licenses/httpclient-4.5.14.jar.sha1 Normal file
View file

@ -0,0 +1 @@
1194890e6f56ec29177673f2f12d0b8e627dec98

1
plugins/repository-s3/licenses/httpclient-4.5.10.jar.sha1
View file

@ -1 +0,0 @@
7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

1
plugins/repository-s3/licenses/httpclient-4.5.14.jar.sha1 Normal file
View file

@ -0,0 +1 @@
1194890e6f56ec29177673f2f12d0b8e627dec98

1
x-pack/plugin/core/licenses/httpclient-4.5.10.jar.sha1
View file

@ -1 +0,0 @@
7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

1
x-pack/plugin/core/licenses/httpclient-4.5.14.jar.sha1 Normal file
View file

@ -0,0 +1 @@
1194890e6f56ec29177673f2f12d0b8e627dec98

1
x-pack/snapshot-tool/licenses/httpclient-4.5.10.jar.sha1
View file

@ -1 +0,0 @@
7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

1
x-pack/snapshot-tool/licenses/httpclient-4.5.14.jar.sha1 Normal file
View file

@ -0,0 +1 @@
1194890e6f56ec29177673f2f12d0b8e627dec98