Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix painless casting bug causing opensearch to crash #8315

Merged
merged 6 commits into from
Jul 10, 2023
Merged

Fix painless casting bug causing opensearch to crash #8315

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
30b2654
Created a failing test to reproduce painless bug
shiv0408 Jun 28, 2023
42132ff
Removed unused import
shiv0408 Jun 29, 2023
20f71ae
Throw exception when trying to cast def to void
shiv0408 Jul 7, 2023
14a25d3
Removed update context change
shiv0408 Jul 10, 2023
b73ae52
Created a different test
shiv0408 Jul 10, 2023
c4519e0
Merge branch 'opensearch-project:main' into painless-bug
shiv0408 Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Replaces ZipInputStream with ZipFile to fix Zip Slip vulnerability ([#7230](https://github.com/opensearch-project/OpenSearch/pull/7230))
- Add missing validation/parsing of SearchBackpressureMode of SearchBackpressureSettings ([#7541](https://github.com/opensearch-project/OpenSearch/pull/7541))
- Adds log4j configuration for telemetry LogSpanExporter ([#8393](https://github.com/opensearch-project/OpenSearch/pull/8393))
- Fix painless casting bug, which crashes the OpenSearch process ([#8315](https://github.com/opensearch-project/OpenSearch/pull/8315))

### Security

Expand Down
2 changes: 1 addition & 1 deletion modules/lang-painless/src/main/java/org/opensearch/painless/AnalyzerCaster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ public static PainlessCast getLegalCast(Location location, Class<?> actual, Clas
}
}

if (actual == def.class
if ((actual == def.class && expected != void.class)
|| (actual != void.class && expected == def.class)
|| expected.isAssignableFrom(actual)
|| (actual.isAssignableFrom(expected) && explicit)) {
Expand Down
5 changes: 5 additions & 0 deletions modules/lang-painless/src/test/java/org/opensearch/painless/FactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,11 @@ public void testVoidReturn() {
() -> getEngine().compile("void_return_test", "1 + 1", VoidReturnTestScript.CONTEXT, Collections.emptyMap())
);
assertEquals(iae.getMessage(), "not a statement: result not used from addition operation [+]");
ClassCastException exception = expectScriptThrows(
shiv0408 marked this conversation as resolved.
Show resolved Hide resolved
ClassCastException.class,
() -> getEngine().compile("def_return_in_void", "def x=1;return x;", VoidReturnTestScript.CONTEXT, Collections.emptyMap())
);
assertEquals(exception.getMessage(), "Cannot cast from [def] to [void].");
}

public abstract static class FactoryTestConverterScript {
Expand Down