Skip to content

Add feature.wrangler.secure.jexl.enabled flag for secure JEXL feature in Wrangler directives #16202

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

Open
riyaa14 wants to merge 1 commit into
base: develop
Choose a base branch
from
+22 −7
Open

Add feature.wrangler.secure.jexl.enabled flag for secure JEXL feature in Wrangler directives #16202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions cdap-common/src/main/resources/cdap-default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6774,4 +6774,12 @@
</description>
</property>

<property>
<name>feature.wrangler.secure.jexl.enabled</name>
Comment thread
riyaa14 marked this conversation as resolved.
<value>false</value>
<description>
If true, Wrangler will enforce secure by default model for JEXL scripts
in Wrangler directives allowing only whitelisted classes, methods and properties.
</description>
</property>
</configuration>
21 changes: 14 additions & 7 deletions cdap-features/src/main/java/io/cdap/cdap/features/Feature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@
import io.cdap.cdap.api.feature.FeatureFlagsProvider;

/**
* Defines Features Flags to be used in CDAP. Features take the version that they were introduced as
* a first parameter. Optionally they can take a second parameter to define their default behavior
* if they are not present in configuration. By default, features default to enabled after they are
* Defines Features Flags to be used in CDAP. Features take the version that
* they were introduced as
* a first parameter. Optionally they can take a second parameter to define
* their default behavior
* if they are not present in configuration. By default, features default to
* enabled after they are
* introduced, and disabled before they were introduced
*/
public enum Feature {
Expand All @@ -46,7 +49,8 @@ public enum Feature {
NAMESPACED_SERVICE_ACCOUNTS("6.10.0"),
WRANGLER_KRYO_SERIALIZATION("6.10.1"),
SOURCE_CONTROL_MANAGEMENT_GITLAB_BITBUCKET("6.10.1"),
DATAPLANE_AUDIT_LOGGING("6.10.1");
DATAPLANE_AUDIT_LOGGING("6.10.1"),
WRANGLER_SECURE_JEXL("6.12.0", false);

private final PlatformInfo.Version versionIntroduced;
private final boolean defaultAfterIntroduction;
Expand All @@ -63,9 +67,12 @@ public enum Feature {
}

/**
* Returns if the feature flag should be enabled. First it checks featureFlagProvider to see if
* the feature flag has been defined. If not defined then it uses when the feature flag was first
* introduced, if the platform version is before or equal to when it was introduced it returns
* Returns if the feature flag should be enabled. First it checks
* featureFlagProvider to see if
* the feature flag has been defined. If not defined then it uses when the
* feature flag was first
* introduced, if the platform version is before or equal to when it was
* introduced it returns
* false, otherwise it returns defaultAfterIntroduction.
*
* @param featureFlagsProvider provides which feature flags have been set.
Expand Down
Loading