Skip to content

Commit e02e553

Browse files
committed
Remove restrictedMethods and restrictedProperties from JinjavaConfig
These per-config restriction lists are replaced by the static DEFAULT_RESTRICTED_* sets in JinjavaBeanELResolver in preparation for the more robust validator system coming in the next branch.
1 parent f1e2e19 commit e02e553

2 files changed

Lines changed: 2 additions & 15 deletions

File tree

src/main/java/com/hubspot/jinjava/JinjavaConfig.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@ default TokenScannerSymbols getTokenScannerSymbols() {
159159
return new DefaultTokenScannerSymbols();
160160
}
161161

162-
ImmutableSet<String> getRestrictedMethods();
163-
164-
ImmutableSet<String> getRestrictedProperties();
165-
166162
@Value.Default
167163
default ELResolver getElResolver() {
168164
return isDefaultReadOnlyResolver()

src/main/java/com/hubspot/jinjava/el/ext/JinjavaBeanELResolver.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,7 @@ public Object invoke(
112112
) {
113113
JinjavaInterpreter interpreter = JinjavaInterpreter.getCurrent();
114114

115-
if (
116-
method == null ||
117-
DEFAULT_RESTRICTED_METHODS.contains(method.toString()) ||
118-
(interpreter != null &&
119-
interpreter.getConfig().getRestrictedMethods().contains(method.toString()))
120-
) {
115+
if (method == null || DEFAULT_RESTRICTED_METHODS.contains(method.toString())) {
121116
throw new MethodNotFoundException(
122117
"Cannot find method '" + method + "' in " + base.getClass()
123118
);
@@ -226,11 +221,7 @@ private String validatePropertyName(Object property) {
226221

227222
JinjavaInterpreter interpreter = JinjavaInterpreter.getCurrent();
228223

229-
if (
230-
DEFAULT_RESTRICTED_PROPERTIES.contains(propertyName) ||
231-
(interpreter != null &&
232-
interpreter.getConfig().getRestrictedProperties().contains(propertyName))
233-
) {
224+
if (DEFAULT_RESTRICTED_PROPERTIES.contains(propertyName)) {
234225
return null;
235226
}
236227

0 commit comments

Comments
 (0)