Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/main/java/com/hubspot/jinjava/el/ext/AllowlistGroup.java
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ String[] allowedDeclaredMethodsFromClasses() {
}
},
JinjavaFilters {
private static final String[] ARRAY = { Filter.class.getPackageName() };
private static final String[] ARRAY = { Filter.class.getPackageName() + '.' };

@Override
String[] allowedDeclaredMethodsFromCanonicalClassPrefixes() {
Expand All @@ -169,7 +169,7 @@ String[] allowedReturnTypeClasses() {
}
},
JinjavaExpTests {
private static final String[] ARRAY = { ExpTest.class.getPackageName() };
private static final String[] ARRAY = { ExpTest.class.getPackageName() + '.' };

@Override
String[] allowedDeclaredMethodsFromCanonicalClassPrefixes() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class BannedAllowlistOptions {

private static final Set<String> ALLOWED_JINJAVA_PREFIXES = Stream
.concat(
Stream.of("com.hubspot.jinjava.testobjects"),
Stream.of("com.hubspot.jinjava.testobjects."),
Arrays
.stream(AllowlistGroup.values())
.flatMap(g ->
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/hubspot/jinjava/BaseJinjavaTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public abstract class BaseJinjavaTest {
.builder()
.addDefaultAllowlistGroups()
.addAllowedDeclaredMethodsFromCanonicalClassPrefixes(
"com.hubspot.jinjava.testobjects"
"com.hubspot.jinjava.testobjects."
)
.build()
);
Expand All @@ -23,7 +23,7 @@ public abstract class BaseJinjavaTest {
ReturnTypeValidatorConfig
.builder()
.addDefaultAllowlistGroups()
.addAllowedCanonicalClassPrefixes("com.hubspot.jinjava.testobjects")
.addAllowedCanonicalClassPrefixes("com.hubspot.jinjava.testobjects.")
.build()
);
public Jinjava jinjava;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
import com.hubspot.jinjava.lib.exptest.ExpTest;
import com.hubspot.jinjava.lib.filter.Filter;
import java.lang.reflect.Method;
import org.junit.Test;

Expand Down Expand Up @@ -119,6 +121,34 @@ public void itRejectsJacksonDatabindPackageInAllowedDeclaredMethodPrefixes() {
.hasMessageContaining("Banned classes or prefixes");
}

@Test
public void itRejectsEvilJinjavaFilterPathInAllowedDeclaredMethodPrefixes() {
assertThatThrownBy(() ->
MethodValidatorConfig
.builder()
.addAllowedDeclaredMethodsFromCanonicalClassPrefixes(
Filter.class.getPackageName() + "_evil"
)
.build()
)
.isInstanceOf(IllegalStateException.class)
.hasMessageContaining("Banned classes or prefixes");
}

@Test
public void itRejectsEvilJinjavaExptestPathInAllowedDeclaredMethodPrefixes() {
assertThatThrownBy(() ->
MethodValidatorConfig
.builder()
.addAllowedDeclaredMethodsFromCanonicalClassPrefixes(
ExpTest.class.getPackageName() + "_evil"
)
.build()
)
.isInstanceOf(IllegalStateException.class)
.hasMessageContaining("Banned classes or prefixes");
}

// ReturnTypeValidatorConfig: allowedCanonicalClassNames() path

@Test
Expand Down
Loading