Skip to content

Commit 4366cc7

Browse files
DaveCTurnerDaveCTurner
authored
Merge branch 'main' into 2025/02/07/post-recovery-merge-bump-version
2 parents 4a323ba + ae7d196 commit 4366cc7

File tree

105 files changed

+1021
-2386
lines changed

Some content is hidden

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

105 files changed

+1021
-2386
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ steps:
7676
ES_VERSION:
7777
- "9.0.0"
7878
ES_COMMIT:
79-
- "b2cc9d9b8f00ee621f93ddca07ea9c671aab1578" # update to match last commit before lucene bump
79+
- "10352e57d85505984582616e1e38530d3ec6ca59" # update to match last commit before lucene bump / head of combat-lucene-10-0-0
8080
agents:
8181
provider: gcp
8282
image: family/elasticsearch-ubuntu-2004

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public enum DockerBase {
2222
// Chainguard based wolfi image with latest jdk
2323
// This is usually updated via renovatebot
2424
// spotless:off
25-
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:ecd940be9f342ee6173397c48f3df5bb410e95000f8726fd01759b6c39b0beda",
25+
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:d74b1fda6b7fee2c90b410df258e005c049e0672fe16d79d00e58f14fb69f90b",
2626
"-wolfi",
2727
"apk"
2828
),

‎docs/changelog/122538.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122538
2+
summary: Fix `ArrayIndexOutOfBoundsException` in `ShardBulkInferenceActionFilter`
3+
area: Ingest
4+
type: bug
5+
issues: []

‎docs/changelog/122737.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 122737
2+
summary: Bump json-smart and oauth2-oidc-sdk
3+
area: Authentication
4+
type: upgrade
5+
issues: []

‎gradle/verification-metadata.xml‎

Lines changed: 14 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -984,36 +984,19 @@
984984
<sha256 value="e8c1c594e2425bdbea2d860de55c69b69fc5d59454452449a0f0913c2a5b8a31" origin="Generated by Gradle"/>
985985
</artifact>
986986
</component>
987+
<component group="com.nimbusds" name="nimbus-jose-jwt" version="10.0.1">
988+
<artifact name="nimbus-jose-jwt-10.0.1.jar">
989+
<sha256 value="f28dbd9ab128324f05050d76b78469d3a9cd83e0319aabc68d1c276e3923e13a" origin="Generated by Gradle"/>
990+
</artifact>
991+
</component>
987992
<component group="com.nimbusds" name="nimbus-jose-jwt" version="4.41.1">
988993
<artifact name="nimbus-jose-jwt-4.41.1.jar">
989994
<sha256 value="fbfd0d5f2b2f86758b821daa5e79b5d7c965edd9dc1b2cc80b515df1c6ddc22d" origin="Generated by Gradle"/>
990995
</artifact>
991996
</component>
992-
<component group="com.nimbusds" name="nimbus-jose-jwt" version="9.37.3">
993-
<artifact name="nimbus-jose-jwt-9.37.3.jar">
994-
<sha256 value="12ae4a3a260095d7aeba2adea7ae396e8b9570db8b7b409e09a824c219cc0444" origin="Generated by Gradle">
995-
<also-trust value="afc63b689d881439b95f343b1dca750391edac63b87392be4d90d19c94ccafbe"/>
996-
</sha256>
997-
</artifact>
998-
</component>
999-
<component group="com.nimbusds" name="nimbus-jose-jwt" version="9.8.1">
1000-
<artifact name="nimbus-jose-jwt-9.8.1.jar">
1001-
<sha256 value="7664cf8c6f2adadf600287812b32878277beda54912eab9d4c2932cd50cb704a" origin="Generated by Gradle"/>
1002-
</artifact>
1003-
</component>
1004-
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="11.10.1">
1005-
<artifact name="oauth2-oidc-sdk-11.10.1.jar">
1006-
<sha256 value="9e51b2c17503cdd3eb97f41491c712aff7783bb3c67185d789f44ccf2a603b26" origin="Generated by Gradle"/>
1007-
</artifact>
1008-
</component>
1009-
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="11.9.1">
1010-
<artifact name="oauth2-oidc-sdk-11.9.1.jar">
1011-
<sha256 value="0820c9690966304d075347b88e81ae490213440fc4d2c84f3d370d41941b2b9c" origin="Generated by Gradle"/>
1012-
</artifact>
1013-
</component>
1014-
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="9.37">
1015-
<artifact name="oauth2-oidc-sdk-9.37.jar">
1016-
<sha256 value="44a04bbed5ae3f6d198aa73ee6b545c476e528ec1a267ef3e9f7033f886dd6fe" origin="Generated by Gradle"/>
997+
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="11.22.2">
998+
<artifact name="oauth2-oidc-sdk-11.22.2.jar">
999+
<sha256 value="64fab42f17bf8e0efb193dd34da716ef7abb7515234036119df1776b808dc066" origin="Generated by Gradle"/>
10171000
</artifact>
10181001
</component>
10191002
<component group="com.perforce" name="p4java" version="2015.2.1365273">
@@ -1779,34 +1762,24 @@
17791762
<sha256 value="0972bbc99437c4163acd09b630e6c77eab4cfab8a9594621c95466c0c6645396" origin="Generated by Gradle"/>
17801763
</artifact>
17811764
</component>
1782-
<component group="net.minidev" name="accessors-smart" version="2.5.0">
1783-
<artifact name="accessors-smart-2.5.0.jar">
1784-
<sha256 value="12314fc6881d66a413fd66370787adba16e504fbf7e138690b0f3952e3fbd321" origin="Generated by Gradle"/>
1765+
<component group="net.minidev" name="accessors-smart" version="2.5.2">
1766+
<artifact name="accessors-smart-2.5.2.jar">
1767+
<sha256 value="9b8a7bc43861d6156c021166d941fb7dddbe4463e2fa5ee88077e4b01452a836" origin="Generated by Gradle"/>
17851768
</artifact>
17861769
</component>
17871770
<component group="net.minidev" name="json-smart" version="2.3">
17881771
<artifact name="json-smart-2.3.jar">
17891772
<sha256 value="903f48c8aa4c3f6426440b8d32de89fa1dc23b1169abde25e4e1d068aa67708b" origin="Generated by Gradle"/>
17901773
</artifact>
17911774
</component>
1792-
<component group="net.minidev" name="json-smart" version="2.4.10">
1793-
<artifact name="json-smart-2.4.10.jar">
1794-
<sha256 value="70cab5e9488630dc631b1fc6e7fa550d95cddd19ba14db39ceca7cabfbd4e5ae" origin="Generated by Gradle"/>
1795-
</artifact>
1796-
</component>
17971775
<component group="net.minidev" name="json-smart" version="2.4.2">
17981776
<artifact name="json-smart-2.4.2.jar">
17991777
<sha256 value="64072f56d9dff5040b2acec477c5d5e6bcebfc88c508f12acb26072d07942146" origin="Generated by Gradle"/>
18001778
</artifact>
18011779
</component>
1802-
<component group="net.minidev" name="json-smart" version="2.5.0">
1803-
<artifact name="json-smart-2.5.0.jar">
1804-
<sha256 value="432b9e545848c4141b80717b26e367f83bf33f19250a228ce75da6e967da2bc7" origin="Generated by Gradle"/>
1805-
</artifact>
1806-
</component>
1807-
<component group="net.minidev" name="json-smart" version="2.5.1">
1808-
<artifact name="json-smart-2.5.1.jar">
1809-
<sha256 value="86c0c189581b79b57b0719f443a724e9f628ffbb9eef645cf79194f5973a1001" origin="Generated by Gradle"/>
1780+
<component group="net.minidev" name="json-smart" version="2.5.2">
1781+
<artifact name="json-smart-2.5.2.jar">
1782+
<sha256 value="4fbdedb0105cedc7f766b95c297d2e88fb6a560da48f3bbaa0cc538ea8b7bf71" origin="Generated by Gradle"/>
18101783
</artifact>
18111784
</component>
18121785
<component group="net.nextencia" name="rrdiagram" version="0.9.4">
@@ -4408,31 +4381,6 @@
44084381
<sha256 value="ca5b8d11569e53921b0e3486469e7c674361c79845dad3d514f38ab6e0c8c10a" origin="Generated by Gradle"/>
44094382
</artifact>
44104383
</component>
4411-
<component group="org.ow2.asm" name="asm" version="9.2">
4412-
<artifact name="asm-9.2.jar">
4413-
<sha256 value="b9d4fe4d71938df38839f0eca42aaaa64cf8b313d678da036f0cb3ca199b47f5" origin="Generated by Gradle"/>
4414-
</artifact>
4415-
</component>
4416-
<component group="org.ow2.asm" name="asm" version="9.3">
4417-
<artifact name="asm-9.3.jar">
4418-
<sha256 value="1263369b59e29c943918de11d6d6152e2ec6085ce63e5710516f8c67d368e4bc" origin="Generated by Gradle"/>
4419-
</artifact>
4420-
</component>
4421-
<component group="org.ow2.asm" name="asm" version="9.4">
4422-
<artifact name="asm-9.4.jar">
4423-
<sha256 value="39d0e2b3dc45af65a09b097945750a94a126e052e124f93468443a1d0e15f381" origin="Generated by Gradle"/>
4424-
</artifact>
4425-
</component>
4426-
<component group="org.ow2.asm" name="asm" version="9.5">
4427-
<artifact name="asm-9.5.jar">
4428-
<sha256 value="b62e84b5980729751b0458c534cf1366f727542bb8d158621335682a460f0353" origin="Generated by Gradle"/>
4429-
</artifact>
4430-
</component>
4431-
<component group="org.ow2.asm" name="asm" version="9.6">
4432-
<artifact name="asm-9.6.jar">
4433-
<sha256 value="3c6fac2424db3d4a853b669f4e3d1d9c3c552235e19a319673f887083c2303a1" origin="Generated by Gradle"/>
4434-
</artifact>
4435-
</component>
44364384
<component group="org.ow2.asm" name="asm" version="9.7.1">
44374385
<artifact name="asm-9.7.1.jar">
44384386
<sha256 value="8cadd43ac5eb6d09de05faecca38b917a040bb9139c7edeb4cc81c740b713281" origin="Generated by Gradle"/>

‎libs/entitlement/bridge/src/main/java/org/elasticsearch/entitlement/bridge/EntitlementChecker.java‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.entitlement.bridge;
1111

1212
import java.io.File;
13+
import java.io.FileDescriptor;
1314
import java.io.FileFilter;
1415
import java.io.FilenameFilter;
1516
import java.io.InputStream;
@@ -572,14 +573,54 @@ public interface EntitlementChecker {
572573

573574
void check$java_io_File$setWritable(Class<?> callerClass, File file, boolean writable, boolean ownerOnly);
574575

576+
void check$java_io_FileInputStream$(Class<?> callerClass, File file);
577+
578+
void check$java_io_FileInputStream$(Class<?> callerClass, FileDescriptor fd);
579+
580+
void check$java_io_FileInputStream$(Class<?> callerClass, String name);
581+
575582
void check$java_io_FileOutputStream$(Class<?> callerClass, File file);
576583

577584
void check$java_io_FileOutputStream$(Class<?> callerClass, File file, boolean append);
578585

586+
void check$java_io_FileOutputStream$(Class<?> callerClass, FileDescriptor fd);
587+
579588
void check$java_io_FileOutputStream$(Class<?> callerClass, String name);
580589

581590
void check$java_io_FileOutputStream$(Class<?> callerClass, String name, boolean append);
582591

592+
void check$java_io_FileReader$(Class<?> callerClass, File file);
593+
594+
void check$java_io_FileReader$(Class<?> callerClass, File file, Charset charset);
595+
596+
void check$java_io_FileReader$(Class<?> callerClass, FileDescriptor fd);
597+
598+
void check$java_io_FileReader$(Class<?> callerClass, String name);
599+
600+
void check$java_io_FileReader$(Class<?> callerClass, String name, Charset charset);
601+
602+
void check$java_io_FileWriter$(Class<?> callerClass, File file);
603+
604+
void check$java_io_FileWriter$(Class<?> callerClass, File file, boolean append);
605+
606+
void check$java_io_FileWriter$(Class<?> callerClass, File file, Charset charset);
607+
608+
void check$java_io_FileWriter$(Class<?> callerClass, File file, Charset charset, boolean append);
609+
610+
void check$java_io_FileWriter$(Class<?> callerClass, FileDescriptor fd);
611+
612+
void check$java_io_FileWriter$(Class<?> callerClass, String name);
613+
614+
void check$java_io_FileWriter$(Class<?> callerClass, String name, boolean append);
615+
616+
void check$java_io_FileWriter$(Class<?> callerClass, String name, Charset charset);
617+
618+
void check$java_io_FileWriter$(Class<?> callerClass, String name, Charset charset, boolean append);
619+
620+
void check$java_io_RandomAccessFile$(Class<?> callerClass, String name, String mode);
621+
622+
void check$java_io_RandomAccessFile$(Class<?> callerClass, File file, String mode);
623+
583624
void check$java_util_Scanner$(Class<?> callerClass, File source);
584625

585626
void check$java_util_Scanner$(Class<?> callerClass, File source, String charsetName);

‎libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/FileCheckActions.java‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,22 @@
1313
import org.elasticsearch.entitlement.qa.entitled.EntitledActions;
1414

1515
import java.io.File;
16+
import java.io.FileDescriptor;
17+
import java.io.FileInputStream;
1618
import java.io.FileNotFoundException;
1719
import java.io.FileOutputStream;
20+
import java.io.FileReader;
21+
import java.io.FileWriter;
1822
import java.io.IOException;
23+
import java.io.RandomAccessFile;
1924
import java.nio.charset.StandardCharsets;
2025
import java.nio.file.Files;
2126
import java.nio.file.Path;
2227
import java.nio.file.Paths;
2328
import java.nio.file.attribute.UserPrincipal;
2429
import java.util.Scanner;
2530

31+
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.ALWAYS_DENIED;
2632
import static org.elasticsearch.entitlement.qa.test.EntitlementTest.ExpectedAccess.PLUGINS;
2733

2834
@SuppressForbidden(reason = "Explicitly checking APIs that are forbidden")
@@ -216,6 +222,21 @@ static void createScannerFileWithCharsetName() throws FileNotFoundException {
216222
new Scanner(readFile().toFile(), "UTF-8");
217223
}
218224

225+
@EntitlementTest(expectedAccess = PLUGINS)
226+
static void createFileInputStreamFile() throws IOException {
227+
new FileInputStream(readFile().toFile()).close();
228+
}
229+
230+
@EntitlementTest(expectedAccess = ALWAYS_DENIED)
231+
static void createFileInputStreamFileDescriptor() throws IOException {
232+
new FileInputStream(FileDescriptor.in).close();
233+
}
234+
235+
@EntitlementTest(expectedAccess = PLUGINS)
236+
static void createFileInputStreamString() throws IOException {
237+
new FileInputStream(readFile().toString()).close();
238+
}
239+
219240
@EntitlementTest(expectedAccess = PLUGINS)
220241
static void createFileOutputStreamString() throws IOException {
221242
new FileOutputStream(readWriteFile().toString()).close();
@@ -236,6 +257,96 @@ static void createFileOutputStreamFileWithAppend() throws IOException {
236257
new FileOutputStream(readWriteFile().toFile(), false).close();
237258
}
238259

260+
@EntitlementTest(expectedAccess = ALWAYS_DENIED)
261+
static void createFileOutputStreamFileDescriptor() throws IOException {
262+
new FileOutputStream(FileDescriptor.out).close();
263+
}
264+
265+
@EntitlementTest(expectedAccess = PLUGINS)
266+
static void createFileReaderFile() throws IOException {
267+
new FileReader(readFile().toFile()).close();
268+
}
269+
270+
@EntitlementTest(expectedAccess = PLUGINS)
271+
static void createFileReaderFileCharset() throws IOException {
272+
new FileReader(readFile().toFile(), StandardCharsets.UTF_8).close();
273+
}
274+
275+
@EntitlementTest(expectedAccess = ALWAYS_DENIED)
276+
static void createFileReaderFileDescriptor() throws IOException {
277+
new FileReader(FileDescriptor.in).close();
278+
}
279+
280+
@EntitlementTest(expectedAccess = PLUGINS)
281+
static void createFileReaderString() throws IOException {
282+
new FileReader(readFile().toString()).close();
283+
}
284+
285+
@EntitlementTest(expectedAccess = PLUGINS)
286+
static void createFileReaderStringCharset() throws IOException {
287+
new FileReader(readFile().toString(), StandardCharsets.UTF_8).close();
288+
}
289+
290+
@EntitlementTest(expectedAccess = PLUGINS)
291+
static void createFileWriterFile() throws IOException {
292+
new FileWriter(readWriteFile().toFile()).close();
293+
}
294+
295+
@EntitlementTest(expectedAccess = PLUGINS)
296+
static void createFileWriterFileWithAppend() throws IOException {
297+
new FileWriter(readWriteFile().toFile(), false).close();
298+
}
299+
300+
@EntitlementTest(expectedAccess = PLUGINS)
301+
static void createFileWriterFileCharsetWithAppend() throws IOException {
302+
new FileWriter(readWriteFile().toFile(), StandardCharsets.UTF_8, false).close();
303+
}
304+
305+
@EntitlementTest(expectedAccess = ALWAYS_DENIED)
306+
static void createFileWriterFileDescriptor() throws IOException {
307+
new FileWriter(FileDescriptor.out).close();
308+
}
309+
310+
@EntitlementTest(expectedAccess = PLUGINS)
311+
static void createFileWriterString() throws IOException {
312+
new FileWriter(readWriteFile().toString()).close();
313+
}
314+
315+
@EntitlementTest(expectedAccess = PLUGINS)
316+
static void createFileWriterStringWithAppend() throws IOException {
317+
new FileWriter(readWriteFile().toString(), false).close();
318+
}
319+
320+
@EntitlementTest(expectedAccess = PLUGINS)
321+
static void createFileWriterStringCharset() throws IOException {
322+
new FileWriter(readWriteFile().toString(), StandardCharsets.UTF_8).close();
323+
}
324+
325+
@EntitlementTest(expectedAccess = PLUGINS)
326+
static void createFileWriterStringCharsetWithAppend() throws IOException {
327+
new FileWriter(readWriteFile().toString(), StandardCharsets.UTF_8, false).close();
328+
}
329+
330+
@EntitlementTest(expectedAccess = PLUGINS)
331+
static void createRandomAccessFileStringRead() throws IOException {
332+
new RandomAccessFile(readFile().toString(), "r").close();
333+
}
334+
335+
@EntitlementTest(expectedAccess = PLUGINS)
336+
static void createRandomAccessFileStringReadWrite() throws IOException {
337+
new RandomAccessFile(readWriteFile().toString(), "rw").close();
338+
}
339+
340+
@EntitlementTest(expectedAccess = PLUGINS)
341+
static void createRandomAccessFileRead() throws IOException {
342+
new RandomAccessFile(readFile().toFile(), "r").close();
343+
}
344+
345+
@EntitlementTest(expectedAccess = PLUGINS)
346+
static void createRandomAccessFileReadWrite() throws IOException {
347+
new RandomAccessFile(readWriteFile().toFile(), "rw").close();
348+
}
349+
239350
@EntitlementTest(expectedAccess = PLUGINS)
240351
static void filesGetOwner() throws IOException {
241352
Files.getOwner(readFile());

0 commit comments

Comments
 (0)