Skip to content

Commit e190f1a

Browse files
author
elasticsearchmachine
committed
Merge remote-tracking branch 'origin/main' into lucene_snapshot
2 parents 491de84 + 1aed2bc commit e190f1a

File tree

63 files changed

+1721
-812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1721
-812
lines changed

docs/changelog/134893.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 134893
2+
summary: Add trust configuration for cross cluster api keys
3+
area: Security
4+
type: enhancement
5+
issues: []

docs/changelog/135505.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 135505
2+
summary: Address es819 tsdb doc values format performance bug
3+
area: Codec
4+
type: bug
5+
issues:
6+
- 135340

docs/reference/query-languages/esql/_snippets/functions/examples/copy_sign.md

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/_snippets/functions/layout/copy_sign.md

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/kibana/definition/functions/copy_sign.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/kibana/docs/functions/copy_sign.md

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libs/entitlement/tools/jdk-api-extractor/build.gradle

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,6 @@ ext {
1818

1919
application {
2020
mainClass.set(javaMainClass)
21-
applicationDefaultJvmArgs = [
22-
'--add-exports', 'java.base/sun.security.util=ALL-UNNAMED',
23-
'--add-opens', 'java.base/java.lang=ALL-UNNAMED',
24-
'--add-opens', 'java.base/java.net=ALL-UNNAMED',
25-
'--add-opens', 'java.base/java.net.spi=ALL-UNNAMED',
26-
'--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED',
27-
'--add-opens', 'java.base/javax.crypto=ALL-UNNAMED',
28-
'--add-opens', 'java.base/javax.security.auth=ALL-UNNAMED',
29-
'--add-opens', 'java.base/jdk.internal.logger=ALL-UNNAMED',
30-
'--add-opens', 'java.base/sun.nio.ch=ALL-UNNAMED',
31-
'--add-opens', 'jdk.management.jfr/jdk.management.jfr=ALL-UNNAMED',
32-
'--add-opens', 'java.logging/java.util.logging=ALL-UNNAMED',
33-
'--add-opens', 'java.logging/sun.util.logging.internal=ALL-UNNAMED',
34-
'--add-opens', 'java.naming/javax.naming.ldap.spi=ALL-UNNAMED',
35-
'--add-opens', 'java.rmi/sun.rmi.runtime=ALL-UNNAMED',
36-
'--add-opens', 'jdk.dynalink/jdk.dynalink=ALL-UNNAMED',
37-
'--add-opens', 'jdk.dynalink/jdk.dynalink.linker=ALL-UNNAMED',
38-
'--add-opens', 'java.desktop/sun.awt=ALL-UNNAMED',
39-
'--add-opens', 'java.sql.rowset/javax.sql.rowset.spi=ALL-UNNAMED',
40-
'--add-opens', 'java.sql/java.sql=ALL-UNNAMED',
41-
'--add-opens', 'java.xml.crypto/com.sun.org.apache.xml.internal.security.utils=ALL-UNNAMED'
42-
]
4321
}
4422

4523
tasks.named("run").configure {

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/CompositeTrustConfig.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ public boolean isSystemDefault() {
4242
return configs.stream().allMatch(SslTrustConfig::isSystemDefault);
4343
}
4444

45+
@Override
46+
public boolean hasExplicitConfig() {
47+
return configs.stream().allMatch(SslTrustConfig::hasExplicitConfig);
48+
}
49+
4550
@Override
4651
public X509ExtendedTrustManager createTrustManager() {
4752
try {

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/PemTrustConfig.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,8 @@ public int hashCode() {
129129
return Objects.hash(certificateAuthorities);
130130
}
131131

132+
@Override
133+
public boolean hasExplicitConfig() {
134+
return true;
135+
}
132136
}

libs/ssl-config/src/main/java/org/elasticsearch/common/ssl/SslTrustConfig.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ public interface SslTrustConfig {
3939
*/
4040
Collection<? extends StoredCertificate> getConfiguredCertificates();
4141

42+
/**
43+
* @return {@code true} if this trust config is based on any explicit trust settings
44+
*/
45+
default boolean hasExplicitConfig() {
46+
return false;
47+
}
48+
4249
/**
4350
* @return {@code true} if this trust config is based on the system default truststore
4451
*/

0 commit comments

Comments
 (0)