Skip to content

Core: Prevent AIOOBE for negative policy codes in PredefinedPolicyType #2486

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

Merged
merged 3 commits into from
Sep 3, 2025
Merged

Core: Prevent AIOOBE for negative policy codes in PredefinedPolicyType #2486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2345c54
Core: Prevent AIOOBE for negative policy codes in PredefinedPolicyTyp…
Sep 2, 2025
65ac17a
Resolve comments
Sep 3, 2025
55808c2
fix style issue
Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion polaris-core/src/main/java/org/apache/polaris/core/policy/PredefinedPolicyTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public boolean isInheritable() {
*/
@JsonCreator
public static @Nullable PredefinedPolicyTypes fromCode(int code) {
if (code >= REVERSE_CODE_MAPPING_ARRAY.length) {
if (code < 0 || code >= REVERSE_CODE_MAPPING_ARRAY.length) {
return null;
}

Expand Down
13 changes: 13 additions & 0 deletions polaris-core/src/test/java/org/apache/polaris/core/policy/PolicyTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@
*/
package org.apache.polaris.core.policy;

import static org.assertj.core.api.Assertions.assertThat;

import java.util.stream.Stream;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
Expand Down Expand Up @@ -53,4 +56,14 @@ public void testPredefinedPolicyTypeFromName(int code, String name, boolean isIn
Assertions.assertThat(policyType.getName()).isEqualTo(name);
Assertions.assertThat(policyType.isInheritable()).isEqualTo(isInheritable);
}

@Test
void fromCodeReturnsNullForNegative() {
assertThat(PolicyType.fromCode(-1)).isNull();
}

@Test
void fromNameReturnsNullForUnknown() {
assertThat(PolicyType.fromName("__unknown__")).isNull();
}
Comment on lines +65 to +68
Copy link
Contributor

@singhpk234 singhpk234 Sep 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this test required for this fix ?

Copy link
Contributor Author

@flyrain flyrain Sep 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessarily related, but good to have :)

}