Add CelStandardFunctions to allow environment subsetting for the runtime#461

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
copybara-service merged 1 commit into from
Nov 21, 2024
Merged

Add CelStandardFunctions to allow environment subsetting for the runtime #461

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
5 changes: 5 additions & 0 deletions common/src/main/java/dev/cel/common/CelException.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,11 @@ public CelException(String message, Throwable cause) {
super(message, cause);
}

public CelException(String message, CelErrorCode errorCode) {
super(message);
this.errorCode = errorCode;
}

public CelException(String message, Throwable cause, CelErrorCode errorCode) {
super(message, cause);
this.errorCode = errorCode;
Expand Down
8 changes: 6 additions & 2 deletions runtime/src/main/java/dev/cel/runtime/BUILD.bazel
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
tags = [
],
deps = [
":runtime_helper",
"//:auto_value",
"//common",
"//common:error_codes",
Expand All@@ -61,13 +60,13 @@ java_library(
"//common/internal:safe_string_formatter",
"//common/types",
"//common/types:type_providers",
"//runtime:runtime_helper",
"@cel_spec//proto/cel/expr:expr_java_proto",
"@maven//:com_google_code_findbugs_annotations",
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:com_google_re2j_re2j",
"@maven//:org_jspecify_jspecify",
],
)
Expand DownExpand Up@@ -145,6 +144,7 @@ RUNTIME_SOURCES = [
"CelRuntimeFactory.java",
"CelRuntimeLegacyImpl.java",
"CelRuntimeLibrary.java",
"CelStandardFunctions.java",
"CelVariableResolver.java",
"HierarchicalVariableResolver.java",
"UnknownContext.java",
Expand All@@ -157,6 +157,7 @@ java_library(
],
deps = [
":evaluation_listener",
":runtime_helper",
":runtime_type_provider_legacy",
":unknown_attributes",
"//:auto_value",
Expand All@@ -165,6 +166,7 @@ java_library(
"//common:options",
"//common/annotations",
"//common/internal:cel_descriptor_pools",
"//common/internal:comparison_functions",
"//common/internal:default_message_factory",
"//common/internal:dynamic_proto",
"//common/internal:proto_message_factory",
Expand All@@ -176,6 +178,8 @@ java_library(
"@maven//:com_google_errorprone_error_prone_annotations",
"@maven//:com_google_guava_guava",
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_google_protobuf_protobuf_java_util",
"@maven//:com_google_re2j_re2j",
"@maven//:org_jspecify_jspecify",
],
)
Expand Down
6 changes: 5 additions & 1 deletion runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,12 @@ public CelEvaluationException(String message, Throwable cause, CelErrorCode erro
super(message, cause, errorCode);
}

public CelEvaluationException(String message, CelErrorCode errorCode) {
super(message, errorCode);
}

CelEvaluationException(InterpreterException cause) {
super(cause.getMessage(), cause.getCause());
this(cause, cause.getErrorCode());
}

CelEvaluationException(InterpreterException cause, CelErrorCode errorCode) {
Expand Down
8 changes: 8 additions & 0 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeBuilder.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -153,6 +153,14 @@ public interface CelRuntimeBuilder {
@CanIgnoreReturnValue
CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value);

/**
* Override the standard functions for the runtime. This can be used to subset the standard
* environment to only expose the desired function overloads to the runtime. {@link
* #setStandardEnvironmentEnabled(boolean)} must be set to false for this to take effect.
*/
@CanIgnoreReturnValue
CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions);

/** Adds one or more libraries for runtime. */
@CanIgnoreReturnValue
CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries);
Expand Down
119 changes: 94 additions & 25 deletions runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,8 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Comparison;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand DownExpand Up@@ -87,7 +89,7 @@ public static CelRuntimeBuilder newBuilder() {
public static final class Builder implements CelRuntimeBuilder {

private final ImmutableSet.Builder<FileDescriptor> fileTypes;
private final HashMap<String, CelFunctionBinding> functionBindings;
private final HashMap<String, CelFunctionBinding> customFunctionBindings;
private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

@SuppressWarnings("unused")
Expand All@@ -97,6 +99,7 @@ public static final class Builder implements CelRuntimeBuilder {
private Function<String, Message.Builder> customTypeFactory;
private ExtensionRegistry extensionRegistry;
private CelValueProvider celValueProvider;
private CelStandardFunctions overriddenStandardFunctions;

@Override
public CelRuntimeBuilder setOptions(CelOptions options) {
Expand All@@ -111,7 +114,7 @@ public CelRuntimeBuilder addFunctionBindings(CelFunctionBinding... bindings) {

@Override
public CelRuntimeBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
bindings.forEach(o -> functionBindings.putIfAbsent(o.getOverloadId(), o));
bindings.forEach(o -> customFunctionBindings.putIfAbsent(o.getOverloadId(), o));
return this;
}

Expand DownExpand Up@@ -160,6 +163,12 @@ public CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value) {
return this;
}

@Override
public CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions) {
this.overriddenStandardFunctions = standardFunctions;
return this;
}

@Override
public CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries) {
checkNotNull(libraries);
Expand All@@ -184,7 +193,7 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
// and shouldn't be exposed to the public.
@VisibleForTesting
Map<String, CelFunctionBinding> getFunctionBindings() {
return this.functionBindings;
return this.customFunctionBindings;
}

@VisibleForTesting
Expand All@@ -200,6 +209,11 @@ ImmutableSet.Builder<FileDescriptor> getFileTypes() {
/** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
@Override
public CelRuntimeLegacyImpl build() {
if (standardEnvironmentEnabled && overriddenStandardFunctions != null) {
throw new IllegalArgumentException(
"setStandardEnvironmentEnabled must be set to false to override standard function"
+ " bindings.");
}
// Add libraries, such as extensions
celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

Expand DownExpand Up@@ -227,26 +241,33 @@ public CelRuntimeLegacyImpl build() {

DynamicProto dynamicProto = DynamicProto.create(runtimeTypeFactory);

DefaultDispatcher dispatcher =
DefaultDispatcher.create(options, dynamicProto, standardEnvironmentEnabled);

ImmutableMap<String, CelFunctionBinding> functionBindingMap =
ImmutableMap.copyOf(functionBindings);
functionBindingMap.forEach(
(String overloadId, CelFunctionBinding func) ->
dispatcher.add(
overloadId,
func.getArgTypes(),
(args) -> {
try {
return func.getDefinition().apply(args);
} catch (CelEvaluationException e) {
throw new InterpreterException.Builder(e.getMessage())
.setCause(e)
.setErrorCode(e.getErrorCode())
.build();
}
}));
ImmutableMap.Builder<String, CelFunctionBinding> functionBindingsBuilder =
ImmutableMap.builder();
for (CelFunctionBinding standardFunctionBinding : newStandardFunctionBindings(dynamicProto)) {
functionBindingsBuilder.put(
standardFunctionBinding.getOverloadId(), standardFunctionBinding);
}

functionBindingsBuilder.putAll(customFunctionBindings);

DefaultDispatcher dispatcher = DefaultDispatcher.create();
functionBindingsBuilder
.buildOrThrow()
.forEach(
(String overloadId, CelFunctionBinding func) ->
dispatcher.add(
overloadId,
func.getArgTypes(),
(args) -> {
try {
return func.getDefinition().apply(args);
} catch (CelEvaluationException e) {
throw new InterpreterException.Builder(e.getMessage())
.setCause(e)
.setErrorCode(e.getErrorCode())
.build();
}
}));

RuntimeTypeProvider runtimeTypeProvider;

Expand All@@ -271,6 +292,54 @@ public CelRuntimeLegacyImpl build() {
this);
}

private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
DynamicProto dynamicProto) {
CelStandardFunctions celStandardFunctions;
if (standardEnvironmentEnabled) {
celStandardFunctions =
CelStandardFunctions.newBuilder()
.filterFunctions(
(standardFunction, standardOverload) -> {
switch (standardFunction) {
case INT:
if (standardOverload.equals(Conversions.INT64_TO_INT64)) {
// Note that we require UnsignedLong flag here to avoid ambiguous
// overloads against "uint64_to_int64", because they both use the same
// Java Long class. We skip adding this identity function if the flag is
// disabled.
return options.enableUnsignedLongs();
}
break;
case TIMESTAMP:
// TODO: Remove this flag guard once the feature has been
// auto-enabled.
if (standardOverload.equals(Conversions.INT64_TO_TIMESTAMP)) {
return options.enableTimestampEpoch();
}
break;
default:
if (standardOverload instanceof Comparison
&& !options.enableHeterogeneousNumericComparisons()) {
Comparison comparison = (Comparison) standardOverload;
if (comparison.isHeterogeneousComparison()) {
return false;
}
}
break;
}

return true;
})
.build();
} else if (overriddenStandardFunctions != null) {
celStandardFunctions = overriddenStandardFunctions;
} else {
return ImmutableSet.of();
}

return celStandardFunctions.newFunctionBindings(dynamicProto, options);
}

private static CelDescriptorPool newDescriptorPool(
CelDescriptors celDescriptors,
ExtensionRegistry extensionRegistry) {
Expand All@@ -294,7 +363,7 @@ private static ProtoMessageFactory maybeCombineMessageFactory(
private Builder() {
this.options = CelOptions.newBuilder().build();
this.fileTypes = ImmutableSet.builder();
this.functionBindings = new HashMap<>();
this.customFunctionBindings = new HashMap<>();
this.celRuntimeLibraries = ImmutableSet.builder();
this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
this.customTypeFactory = null;
Expand All@@ -311,7 +380,7 @@ private Builder(Builder builder) {
// The following needs to be deep copied as they are collection builders
this.fileTypes = deepCopy(builder.fileTypes);
this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
this.functionBindings = new HashMap<>(builder.functionBindings);
this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
}

private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add CelStandardFunctions to allow environment subsetting for the runtime#461

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

copybara-service
merged 1 commit into

from

Nov 21, 2024
 Merged


Add CelStandardFunctions to allow environment subsetting for the runtime
#461
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


5 changes: 5 additions & 0 deletions
common/src/main/java/dev/cel/common/CelException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,11 @@ public CelException(String message, Throwable cause) {
 super(message, cause);
 }

 public CelException(String message, CelErrorCode errorCode) {
 super(message);
 this.errorCode = errorCode;
 }

 public CelException(String message, Throwable cause, CelErrorCode errorCode) {
 super(message, cause);
 this.errorCode = errorCode;
Expand Down

8 changes: 6 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 tags = [
 ],
 deps = [
 ":runtime_helper",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -61,13 +60,13 @@ java_library(
 "//common/internal:safe_string_formatter",
 "//common/types",
 "//common/types:type_providers",
 "//runtime:runtime_helper",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand DownExpand Up@@ -145,6 +144,7 @@ RUNTIME_SOURCES = [
 "CelRuntimeFactory.java",
 "CelRuntimeLegacyImpl.java",
 "CelRuntimeLibrary.java",
 "CelStandardFunctions.java",
 "CelVariableResolver.java",
 "HierarchicalVariableResolver.java",
 "UnknownContext.java",
Expand All@@ -157,6 +157,7 @@ java_library(
 ],
 deps = [
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
 ":unknown_attributes",
 "//:auto_value",
Expand All@@ -165,6 +166,7 @@ java_library(
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:comparison_functions",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
Expand All@@ -176,6 +178,8 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,12 @@ public CelEvaluationException(String message, Throwable cause, CelErrorCode erro
 super(message, cause, errorCode);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(message, errorCode);
 }

 CelEvaluationException(InterpreterException cause) {
super(cause.getMessage(), cause.getCause());
this(cause, cause.getErrorCode());
 }

 CelEvaluationException(InterpreterException cause, CelErrorCode errorCode) {
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,6 +153,14 @@ public interface CelRuntimeBuilder {
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value);

 /**
 * Override the standard functions for the runtime. This can be used to subset the standard
 * environment to only expose the desired function overloads to the runtime. {@link
 * #setStandardEnvironmentEnabled(boolean)} must be set to false for this to take effect.
 */
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions);

 /** Adds one or more libraries for runtime. */
 @CanIgnoreReturnValue
 CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries);
Expand Down

119 changes: 94 additions & 25 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,8 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Comparison;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand DownExpand Up@@ -87,7 +89,7 @@ public static CelRuntimeBuilder newBuilder() {
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, CelFunctionBinding> functionBindings;
 private final HashMap<String, CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @SuppressWarnings("unused")
Expand All@@ -97,6 +99,7 @@ public static final class Builder implements CelRuntimeBuilder {
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand All@@ -111,7 +114,7 @@ public CelRuntimeBuilder addFunctionBindings(CelFunctionBinding... bindings) {

 @Override
 public CelRuntimeBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
 bindings.forEach(o -> functionBindings.putIfAbsent(o.getOverloadId(), o));
 bindings.forEach(o -> customFunctionBindings.putIfAbsent(o.getOverloadId(), o));
 return this;
 }

Expand DownExpand Up@@ -160,6 +163,12 @@ public CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value) {
 return this;
 }

 @Override
 public CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions) {
 this.overriddenStandardFunctions = standardFunctions;
 return this;
 }

 @Override
 public CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries) {
 checkNotNull(libraries);
Expand All@@ -184,7 +193,7 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, CelFunctionBinding> getFunctionBindings() {
 return this.functionBindings;
 return this.customFunctionBindings;
 }

 @VisibleForTesting
Expand All@@ -200,6 +209,11 @@ ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
 if (standardEnvironmentEnabled && overriddenStandardFunctions != null) {
 throw new IllegalArgumentException(
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }
 // Add libraries, such as extensions
 celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

Expand DownExpand Up@@ -227,26 +241,33 @@ public CelRuntimeLegacyImpl build() {

 DynamicProto dynamicProto = DynamicProto.create(runtimeTypeFactory);

 DefaultDispatcher dispatcher =
 DefaultDispatcher.create(options, dynamicProto, standardEnvironmentEnabled);

 ImmutableMap<String, CelFunctionBinding> functionBindingMap =
 ImmutableMap.copyOf(functionBindings);
 functionBindingMap.forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));
 ImmutableMap.Builder<String, CelFunctionBinding> functionBindingsBuilder =
 ImmutableMap.builder();
 for (CelFunctionBinding standardFunctionBinding : newStandardFunctionBindings(dynamicProto)) {
 functionBindingsBuilder.put(
 standardFunctionBinding.getOverloadId(), standardFunctionBinding);
 }

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));

 RuntimeTypeProvider runtimeTypeProvider;

Expand All@@ -271,6 +292,54 @@ public CelRuntimeLegacyImpl build() {
 this);
 }

 private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
 DynamicProto dynamicProto) {
 CelStandardFunctions celStandardFunctions;
 if (standardEnvironmentEnabled) {
 celStandardFunctions =
 CelStandardFunctions.newBuilder()
 .filterFunctions(
 (standardFunction, standardOverload) -> {
 switch (standardFunction) {
 case INT:
 if (standardOverload.equals(Conversions.INT64_TO_INT64)) {
 // Note that we require UnsignedLong flag here to avoid ambiguous
 // overloads against "uint64_to_int64", because they both use the same
 // Java Long class. We skip adding this identity function if the flag is
 // disabled.
 return options.enableUnsignedLongs();
 }
 break;
 case TIMESTAMP:
 // TODO: Remove this flag guard once the feature has been
 // auto-enabled.
 if (standardOverload.equals(Conversions.INT64_TO_TIMESTAMP)) {
 return options.enableTimestampEpoch();
 }
 break;
 default:
 if (standardOverload instanceof Comparison
 && !options.enableHeterogeneousNumericComparisons()) {
 Comparison comparison = (Comparison) standardOverload;
 if (comparison.isHeterogeneousComparison()) {
 return false;
 }
 }
 break;
 }

 return true;
 })
 .build();
 } else if (overriddenStandardFunctions != null) {
 celStandardFunctions = overriddenStandardFunctions;
 } else {
 return ImmutableSet.of();
 }

 return celStandardFunctions.newFunctionBindings(dynamicProto, options);
 }

 private static CelDescriptorPool newDescriptorPool(
 CelDescriptors celDescriptors,
 ExtensionRegistry extensionRegistry) {
Expand All@@ -294,7 +363,7 @@ private static ProtoMessageFactory maybeCombineMessageFactory(
 private Builder() {
 this.options = CelOptions.newBuilder().build();
 this.fileTypes = ImmutableSet.builder();
 this.functionBindings = new HashMap<>();
 this.customFunctionBindings = new HashMap<>();
 this.celRuntimeLibraries = ImmutableSet.builder();
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
Expand All@@ -311,7 +380,7 @@ private Builder(Builder builder) {
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.functionBindings = new HashMap<>(builder.functionBindings);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add CelStandardFunctions to allow environment subsetting for the runtime#461

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

copybara-service
merged 1 commit into

from

Nov 21, 2024
 Merged


Add CelStandardFunctions to allow environment subsetting for the runtime
#461
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


5 changes: 5 additions & 0 deletions
common/src/main/java/dev/cel/common/CelException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,11 @@ public CelException(String message, Throwable cause) {
 super(message, cause);
 }

 public CelException(String message, CelErrorCode errorCode) {
 super(message);
 this.errorCode = errorCode;
 }

 public CelException(String message, Throwable cause, CelErrorCode errorCode) {
 super(message, cause);
 this.errorCode = errorCode;
Expand Down

8 changes: 6 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 tags = [
 ],
 deps = [
 ":runtime_helper",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -61,13 +60,13 @@ java_library(
 "//common/internal:safe_string_formatter",
 "//common/types",
 "//common/types:type_providers",
 "//runtime:runtime_helper",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand DownExpand Up@@ -145,6 +144,7 @@ RUNTIME_SOURCES = [
 "CelRuntimeFactory.java",
 "CelRuntimeLegacyImpl.java",
 "CelRuntimeLibrary.java",
 "CelStandardFunctions.java",
 "CelVariableResolver.java",
 "HierarchicalVariableResolver.java",
 "UnknownContext.java",
Expand All@@ -157,6 +157,7 @@ java_library(
 ],
 deps = [
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
 ":unknown_attributes",
 "//:auto_value",
Expand All@@ -165,6 +166,7 @@ java_library(
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:comparison_functions",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
Expand All@@ -176,6 +178,8 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,12 @@ public CelEvaluationException(String message, Throwable cause, CelErrorCode erro
 super(message, cause, errorCode);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(message, errorCode);
 }

 CelEvaluationException(InterpreterException cause) {
super(cause.getMessage(), cause.getCause());
this(cause, cause.getErrorCode());
 }

 CelEvaluationException(InterpreterException cause, CelErrorCode errorCode) {
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,6 +153,14 @@ public interface CelRuntimeBuilder {
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value);

 /**
 * Override the standard functions for the runtime. This can be used to subset the standard
 * environment to only expose the desired function overloads to the runtime. {@link
 * #setStandardEnvironmentEnabled(boolean)} must be set to false for this to take effect.
 */
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions);

 /** Adds one or more libraries for runtime. */
 @CanIgnoreReturnValue
 CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries);
Expand Down

119 changes: 94 additions & 25 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,8 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Comparison;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand DownExpand Up@@ -87,7 +89,7 @@ public static CelRuntimeBuilder newBuilder() {
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, CelFunctionBinding> functionBindings;
 private final HashMap<String, CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @SuppressWarnings("unused")
Expand All@@ -97,6 +99,7 @@ public static final class Builder implements CelRuntimeBuilder {
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand All@@ -111,7 +114,7 @@ public CelRuntimeBuilder addFunctionBindings(CelFunctionBinding... bindings) {

 @Override
 public CelRuntimeBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
 bindings.forEach(o -> functionBindings.putIfAbsent(o.getOverloadId(), o));
 bindings.forEach(o -> customFunctionBindings.putIfAbsent(o.getOverloadId(), o));
 return this;
 }

Expand DownExpand Up@@ -160,6 +163,12 @@ public CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value) {
 return this;
 }

 @Override
 public CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions) {
 this.overriddenStandardFunctions = standardFunctions;
 return this;
 }

 @Override
 public CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries) {
 checkNotNull(libraries);
Expand All@@ -184,7 +193,7 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, CelFunctionBinding> getFunctionBindings() {
 return this.functionBindings;
 return this.customFunctionBindings;
 }

 @VisibleForTesting
Expand All@@ -200,6 +209,11 @@ ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
 if (standardEnvironmentEnabled && overriddenStandardFunctions != null) {
 throw new IllegalArgumentException(
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }
 // Add libraries, such as extensions
 celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

Expand DownExpand Up@@ -227,26 +241,33 @@ public CelRuntimeLegacyImpl build() {

 DynamicProto dynamicProto = DynamicProto.create(runtimeTypeFactory);

 DefaultDispatcher dispatcher =
 DefaultDispatcher.create(options, dynamicProto, standardEnvironmentEnabled);

 ImmutableMap<String, CelFunctionBinding> functionBindingMap =
 ImmutableMap.copyOf(functionBindings);
 functionBindingMap.forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));
 ImmutableMap.Builder<String, CelFunctionBinding> functionBindingsBuilder =
 ImmutableMap.builder();
 for (CelFunctionBinding standardFunctionBinding : newStandardFunctionBindings(dynamicProto)) {
 functionBindingsBuilder.put(
 standardFunctionBinding.getOverloadId(), standardFunctionBinding);
 }

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));

 RuntimeTypeProvider runtimeTypeProvider;

Expand All@@ -271,6 +292,54 @@ public CelRuntimeLegacyImpl build() {
 this);
 }

 private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
 DynamicProto dynamicProto) {
 CelStandardFunctions celStandardFunctions;
 if (standardEnvironmentEnabled) {
 celStandardFunctions =
 CelStandardFunctions.newBuilder()
 .filterFunctions(
 (standardFunction, standardOverload) -> {
 switch (standardFunction) {
 case INT:
 if (standardOverload.equals(Conversions.INT64_TO_INT64)) {
 // Note that we require UnsignedLong flag here to avoid ambiguous
 // overloads against "uint64_to_int64", because they both use the same
 // Java Long class. We skip adding this identity function if the flag is
 // disabled.
 return options.enableUnsignedLongs();
 }
 break;
 case TIMESTAMP:
 // TODO: Remove this flag guard once the feature has been
 // auto-enabled.
 if (standardOverload.equals(Conversions.INT64_TO_TIMESTAMP)) {
 return options.enableTimestampEpoch();
 }
 break;
 default:
 if (standardOverload instanceof Comparison
 && !options.enableHeterogeneousNumericComparisons()) {
 Comparison comparison = (Comparison) standardOverload;
 if (comparison.isHeterogeneousComparison()) {
 return false;
 }
 }
 break;
 }

 return true;
 })
 .build();
 } else if (overriddenStandardFunctions != null) {
 celStandardFunctions = overriddenStandardFunctions;
 } else {
 return ImmutableSet.of();
 }

 return celStandardFunctions.newFunctionBindings(dynamicProto, options);
 }

 private static CelDescriptorPool newDescriptorPool(
 CelDescriptors celDescriptors,
 ExtensionRegistry extensionRegistry) {
Expand All@@ -294,7 +363,7 @@ private static ProtoMessageFactory maybeCombineMessageFactory(
 private Builder() {
 this.options = CelOptions.newBuilder().build();
 this.fileTypes = ImmutableSet.builder();
 this.functionBindings = new HashMap<>();
 this.customFunctionBindings = new HashMap<>();
 this.celRuntimeLibraries = ImmutableSet.builder();
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
Expand All@@ -311,7 +380,7 @@ private Builder(Builder builder) {
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.functionBindings = new HashMap<>(builder.functionBindings);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add CelStandardFunctions to allow environment subsetting for the runtime#461

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

copybara-service
merged 1 commit into

from

Nov 21, 2024
 Merged


Add CelStandardFunctions to allow environment subsetting for the runtime
#461
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


5 changes: 5 additions & 0 deletions
common/src/main/java/dev/cel/common/CelException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,11 @@ public CelException(String message, Throwable cause) {
 super(message, cause);
 }

 public CelException(String message, CelErrorCode errorCode) {
 super(message);
 this.errorCode = errorCode;
 }

 public CelException(String message, Throwable cause, CelErrorCode errorCode) {
 super(message, cause);
 this.errorCode = errorCode;
Expand Down

8 changes: 6 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 tags = [
 ],
 deps = [
 ":runtime_helper",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -61,13 +60,13 @@ java_library(
 "//common/internal:safe_string_formatter",
 "//common/types",
 "//common/types:type_providers",
 "//runtime:runtime_helper",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand DownExpand Up@@ -145,6 +144,7 @@ RUNTIME_SOURCES = [
 "CelRuntimeFactory.java",
 "CelRuntimeLegacyImpl.java",
 "CelRuntimeLibrary.java",
 "CelStandardFunctions.java",
 "CelVariableResolver.java",
 "HierarchicalVariableResolver.java",
 "UnknownContext.java",
Expand All@@ -157,6 +157,7 @@ java_library(
 ],
 deps = [
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
 ":unknown_attributes",
 "//:auto_value",
Expand All@@ -165,6 +166,7 @@ java_library(
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:comparison_functions",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
Expand All@@ -176,6 +178,8 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,12 @@ public CelEvaluationException(String message, Throwable cause, CelErrorCode erro
 super(message, cause, errorCode);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(message, errorCode);
 }

 CelEvaluationException(InterpreterException cause) {
super(cause.getMessage(), cause.getCause());
this(cause, cause.getErrorCode());
 }

 CelEvaluationException(InterpreterException cause, CelErrorCode errorCode) {
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,6 +153,14 @@ public interface CelRuntimeBuilder {
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value);

 /**
 * Override the standard functions for the runtime. This can be used to subset the standard
 * environment to only expose the desired function overloads to the runtime. {@link
 * #setStandardEnvironmentEnabled(boolean)} must be set to false for this to take effect.
 */
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions);

 /** Adds one or more libraries for runtime. */
 @CanIgnoreReturnValue
 CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries);
Expand Down

119 changes: 94 additions & 25 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,8 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Comparison;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand DownExpand Up@@ -87,7 +89,7 @@ public static CelRuntimeBuilder newBuilder() {
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, CelFunctionBinding> functionBindings;
 private final HashMap<String, CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @SuppressWarnings("unused")
Expand All@@ -97,6 +99,7 @@ public static final class Builder implements CelRuntimeBuilder {
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand All@@ -111,7 +114,7 @@ public CelRuntimeBuilder addFunctionBindings(CelFunctionBinding... bindings) {

 @Override
 public CelRuntimeBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
 bindings.forEach(o -> functionBindings.putIfAbsent(o.getOverloadId(), o));
 bindings.forEach(o -> customFunctionBindings.putIfAbsent(o.getOverloadId(), o));
 return this;
 }

Expand DownExpand Up@@ -160,6 +163,12 @@ public CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value) {
 return this;
 }

 @Override
 public CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions) {
 this.overriddenStandardFunctions = standardFunctions;
 return this;
 }

 @Override
 public CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries) {
 checkNotNull(libraries);
Expand All@@ -184,7 +193,7 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, CelFunctionBinding> getFunctionBindings() {
 return this.functionBindings;
 return this.customFunctionBindings;
 }

 @VisibleForTesting
Expand All@@ -200,6 +209,11 @@ ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
 if (standardEnvironmentEnabled && overriddenStandardFunctions != null) {
 throw new IllegalArgumentException(
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }
 // Add libraries, such as extensions
 celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

Expand DownExpand Up@@ -227,26 +241,33 @@ public CelRuntimeLegacyImpl build() {

 DynamicProto dynamicProto = DynamicProto.create(runtimeTypeFactory);

 DefaultDispatcher dispatcher =
 DefaultDispatcher.create(options, dynamicProto, standardEnvironmentEnabled);

 ImmutableMap<String, CelFunctionBinding> functionBindingMap =
 ImmutableMap.copyOf(functionBindings);
 functionBindingMap.forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));
 ImmutableMap.Builder<String, CelFunctionBinding> functionBindingsBuilder =
 ImmutableMap.builder();
 for (CelFunctionBinding standardFunctionBinding : newStandardFunctionBindings(dynamicProto)) {
 functionBindingsBuilder.put(
 standardFunctionBinding.getOverloadId(), standardFunctionBinding);
 }

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));

 RuntimeTypeProvider runtimeTypeProvider;

Expand All@@ -271,6 +292,54 @@ public CelRuntimeLegacyImpl build() {
 this);
 }

 private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
 DynamicProto dynamicProto) {
 CelStandardFunctions celStandardFunctions;
 if (standardEnvironmentEnabled) {
 celStandardFunctions =
 CelStandardFunctions.newBuilder()
 .filterFunctions(
 (standardFunction, standardOverload) -> {
 switch (standardFunction) {
 case INT:
 if (standardOverload.equals(Conversions.INT64_TO_INT64)) {
 // Note that we require UnsignedLong flag here to avoid ambiguous
 // overloads against "uint64_to_int64", because they both use the same
 // Java Long class. We skip adding this identity function if the flag is
 // disabled.
 return options.enableUnsignedLongs();
 }
 break;
 case TIMESTAMP:
 // TODO: Remove this flag guard once the feature has been
 // auto-enabled.
 if (standardOverload.equals(Conversions.INT64_TO_TIMESTAMP)) {
 return options.enableTimestampEpoch();
 }
 break;
 default:
 if (standardOverload instanceof Comparison
 && !options.enableHeterogeneousNumericComparisons()) {
 Comparison comparison = (Comparison) standardOverload;
 if (comparison.isHeterogeneousComparison()) {
 return false;
 }
 }
 break;
 }

 return true;
 })
 .build();
 } else if (overriddenStandardFunctions != null) {
 celStandardFunctions = overriddenStandardFunctions;
 } else {
 return ImmutableSet.of();
 }

 return celStandardFunctions.newFunctionBindings(dynamicProto, options);
 }

 private static CelDescriptorPool newDescriptorPool(
 CelDescriptors celDescriptors,
 ExtensionRegistry extensionRegistry) {
Expand All@@ -294,7 +363,7 @@ private static ProtoMessageFactory maybeCombineMessageFactory(
 private Builder() {
 this.options = CelOptions.newBuilder().build();
 this.fileTypes = ImmutableSet.builder();
 this.functionBindings = new HashMap<>();
 this.customFunctionBindings = new HashMap<>();
 this.celRuntimeLibraries = ImmutableSet.builder();
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
Expand All@@ -311,7 +380,7 @@ private Builder(Builder builder) {
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.functionBindings = new HashMap<>(builder.functionBindings);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add CelStandardFunctions to allow environment subsetting for the runtime#461

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

copybara-service
merged 1 commit into

from

Nov 21, 2024
 Merged


Add CelStandardFunctions to allow environment subsetting for the runtime
#461
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


5 changes: 5 additions & 0 deletions
common/src/main/java/dev/cel/common/CelException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,11 @@ public CelException(String message, Throwable cause) {
 super(message, cause);
 }

 public CelException(String message, CelErrorCode errorCode) {
 super(message);
 this.errorCode = errorCode;
 }

 public CelException(String message, Throwable cause, CelErrorCode errorCode) {
 super(message, cause);
 this.errorCode = errorCode;
Expand Down

8 changes: 6 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 tags = [
 ],
 deps = [
 ":runtime_helper",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -61,13 +60,13 @@ java_library(
 "//common/internal:safe_string_formatter",
 "//common/types",
 "//common/types:type_providers",
 "//runtime:runtime_helper",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand DownExpand Up@@ -145,6 +144,7 @@ RUNTIME_SOURCES = [
 "CelRuntimeFactory.java",
 "CelRuntimeLegacyImpl.java",
 "CelRuntimeLibrary.java",
 "CelStandardFunctions.java",
 "CelVariableResolver.java",
 "HierarchicalVariableResolver.java",
 "UnknownContext.java",
Expand All@@ -157,6 +157,7 @@ java_library(
 ],
 deps = [
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
 ":unknown_attributes",
 "//:auto_value",
Expand All@@ -165,6 +166,7 @@ java_library(
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:comparison_functions",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
Expand All@@ -176,6 +178,8 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,12 @@ public CelEvaluationException(String message, Throwable cause, CelErrorCode erro
 super(message, cause, errorCode);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(message, errorCode);
 }

 CelEvaluationException(InterpreterException cause) {
super(cause.getMessage(), cause.getCause());
this(cause, cause.getErrorCode());
 }

 CelEvaluationException(InterpreterException cause, CelErrorCode errorCode) {
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,6 +153,14 @@ public interface CelRuntimeBuilder {
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value);

 /**
 * Override the standard functions for the runtime. This can be used to subset the standard
 * environment to only expose the desired function overloads to the runtime. {@link
 * #setStandardEnvironmentEnabled(boolean)} must be set to false for this to take effect.
 */
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions);

 /** Adds one or more libraries for runtime. */
 @CanIgnoreReturnValue
 CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries);
Expand Down

119 changes: 94 additions & 25 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,8 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Comparison;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand DownExpand Up@@ -87,7 +89,7 @@ public static CelRuntimeBuilder newBuilder() {
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, CelFunctionBinding> functionBindings;
 private final HashMap<String, CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @SuppressWarnings("unused")
Expand All@@ -97,6 +99,7 @@ public static final class Builder implements CelRuntimeBuilder {
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand All@@ -111,7 +114,7 @@ public CelRuntimeBuilder addFunctionBindings(CelFunctionBinding... bindings) {

 @Override
 public CelRuntimeBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
 bindings.forEach(o -> functionBindings.putIfAbsent(o.getOverloadId(), o));
 bindings.forEach(o -> customFunctionBindings.putIfAbsent(o.getOverloadId(), o));
 return this;
 }

Expand DownExpand Up@@ -160,6 +163,12 @@ public CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value) {
 return this;
 }

 @Override
 public CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions) {
 this.overriddenStandardFunctions = standardFunctions;
 return this;
 }

 @Override
 public CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries) {
 checkNotNull(libraries);
Expand All@@ -184,7 +193,7 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, CelFunctionBinding> getFunctionBindings() {
 return this.functionBindings;
 return this.customFunctionBindings;
 }

 @VisibleForTesting
Expand All@@ -200,6 +209,11 @@ ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
 if (standardEnvironmentEnabled && overriddenStandardFunctions != null) {
 throw new IllegalArgumentException(
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }
 // Add libraries, such as extensions
 celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

Expand DownExpand Up@@ -227,26 +241,33 @@ public CelRuntimeLegacyImpl build() {

 DynamicProto dynamicProto = DynamicProto.create(runtimeTypeFactory);

 DefaultDispatcher dispatcher =
 DefaultDispatcher.create(options, dynamicProto, standardEnvironmentEnabled);

 ImmutableMap<String, CelFunctionBinding> functionBindingMap =
 ImmutableMap.copyOf(functionBindings);
 functionBindingMap.forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));
 ImmutableMap.Builder<String, CelFunctionBinding> functionBindingsBuilder =
 ImmutableMap.builder();
 for (CelFunctionBinding standardFunctionBinding : newStandardFunctionBindings(dynamicProto)) {
 functionBindingsBuilder.put(
 standardFunctionBinding.getOverloadId(), standardFunctionBinding);
 }

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));

 RuntimeTypeProvider runtimeTypeProvider;

Expand All@@ -271,6 +292,54 @@ public CelRuntimeLegacyImpl build() {
 this);
 }

 private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
 DynamicProto dynamicProto) {
 CelStandardFunctions celStandardFunctions;
 if (standardEnvironmentEnabled) {
 celStandardFunctions =
 CelStandardFunctions.newBuilder()
 .filterFunctions(
 (standardFunction, standardOverload) -> {
 switch (standardFunction) {
 case INT:
 if (standardOverload.equals(Conversions.INT64_TO_INT64)) {
 // Note that we require UnsignedLong flag here to avoid ambiguous
 // overloads against "uint64_to_int64", because they both use the same
 // Java Long class. We skip adding this identity function if the flag is
 // disabled.
 return options.enableUnsignedLongs();
 }
 break;
 case TIMESTAMP:
 // TODO: Remove this flag guard once the feature has been
 // auto-enabled.
 if (standardOverload.equals(Conversions.INT64_TO_TIMESTAMP)) {
 return options.enableTimestampEpoch();
 }
 break;
 default:
 if (standardOverload instanceof Comparison
 && !options.enableHeterogeneousNumericComparisons()) {
 Comparison comparison = (Comparison) standardOverload;
 if (comparison.isHeterogeneousComparison()) {
 return false;
 }
 }
 break;
 }

 return true;
 })
 .build();
 } else if (overriddenStandardFunctions != null) {
 celStandardFunctions = overriddenStandardFunctions;
 } else {
 return ImmutableSet.of();
 }

 return celStandardFunctions.newFunctionBindings(dynamicProto, options);
 }

 private static CelDescriptorPool newDescriptorPool(
 CelDescriptors celDescriptors,
 ExtensionRegistry extensionRegistry) {
Expand All@@ -294,7 +363,7 @@ private static ProtoMessageFactory maybeCombineMessageFactory(
 private Builder() {
 this.options = CelOptions.newBuilder().build();
 this.fileTypes = ImmutableSet.builder();
 this.functionBindings = new HashMap<>();
 this.customFunctionBindings = new HashMap<>();
 this.celRuntimeLibraries = ImmutableSet.builder();
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
Expand All@@ -311,7 +380,7 @@ private Builder(Builder builder) {
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.functionBindings = new HashMap<>(builder.functionBindings);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add CelStandardFunctions to allow environment subsetting for the runtime#461

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

copybara-service
merged 1 commit into

from

Nov 21, 2024
 Merged


Add CelStandardFunctions to allow environment subsetting for the runtime
#461
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


5 changes: 5 additions & 0 deletions
common/src/main/java/dev/cel/common/CelException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,11 @@ public CelException(String message, Throwable cause) {
 super(message, cause);
 }

 public CelException(String message, CelErrorCode errorCode) {
 super(message);
 this.errorCode = errorCode;
 }

 public CelException(String message, Throwable cause, CelErrorCode errorCode) {
 super(message, cause);
 this.errorCode = errorCode;
Expand Down

8 changes: 6 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 tags = [
 ],
 deps = [
 ":runtime_helper",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -61,13 +60,13 @@ java_library(
 "//common/internal:safe_string_formatter",
 "//common/types",
 "//common/types:type_providers",
 "//runtime:runtime_helper",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand DownExpand Up@@ -145,6 +144,7 @@ RUNTIME_SOURCES = [
 "CelRuntimeFactory.java",
 "CelRuntimeLegacyImpl.java",
 "CelRuntimeLibrary.java",
 "CelStandardFunctions.java",
 "CelVariableResolver.java",
 "HierarchicalVariableResolver.java",
 "UnknownContext.java",
Expand All@@ -157,6 +157,7 @@ java_library(
 ],
 deps = [
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
 ":unknown_attributes",
 "//:auto_value",
Expand All@@ -165,6 +166,7 @@ java_library(
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:comparison_functions",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
Expand All@@ -176,6 +178,8 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,12 @@ public CelEvaluationException(String message, Throwable cause, CelErrorCode erro
 super(message, cause, errorCode);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(message, errorCode);
 }

 CelEvaluationException(InterpreterException cause) {
super(cause.getMessage(), cause.getCause());
this(cause, cause.getErrorCode());
 }

 CelEvaluationException(InterpreterException cause, CelErrorCode errorCode) {
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,6 +153,14 @@ public interface CelRuntimeBuilder {
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value);

 /**
 * Override the standard functions for the runtime. This can be used to subset the standard
 * environment to only expose the desired function overloads to the runtime. {@link
 * #setStandardEnvironmentEnabled(boolean)} must be set to false for this to take effect.
 */
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions);

 /** Adds one or more libraries for runtime. */
 @CanIgnoreReturnValue
 CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries);
Expand Down

119 changes: 94 additions & 25 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,8 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Comparison;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand DownExpand Up@@ -87,7 +89,7 @@ public static CelRuntimeBuilder newBuilder() {
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, CelFunctionBinding> functionBindings;
 private final HashMap<String, CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @SuppressWarnings("unused")
Expand All@@ -97,6 +99,7 @@ public static final class Builder implements CelRuntimeBuilder {
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand All@@ -111,7 +114,7 @@ public CelRuntimeBuilder addFunctionBindings(CelFunctionBinding... bindings) {

 @Override
 public CelRuntimeBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
 bindings.forEach(o -> functionBindings.putIfAbsent(o.getOverloadId(), o));
 bindings.forEach(o -> customFunctionBindings.putIfAbsent(o.getOverloadId(), o));
 return this;
 }

Expand DownExpand Up@@ -160,6 +163,12 @@ public CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value) {
 return this;
 }

 @Override
 public CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions) {
 this.overriddenStandardFunctions = standardFunctions;
 return this;
 }

 @Override
 public CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries) {
 checkNotNull(libraries);
Expand All@@ -184,7 +193,7 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, CelFunctionBinding> getFunctionBindings() {
 return this.functionBindings;
 return this.customFunctionBindings;
 }

 @VisibleForTesting
Expand All@@ -200,6 +209,11 @@ ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
 if (standardEnvironmentEnabled && overriddenStandardFunctions != null) {
 throw new IllegalArgumentException(
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }
 // Add libraries, such as extensions
 celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

Expand DownExpand Up@@ -227,26 +241,33 @@ public CelRuntimeLegacyImpl build() {

 DynamicProto dynamicProto = DynamicProto.create(runtimeTypeFactory);

 DefaultDispatcher dispatcher =
 DefaultDispatcher.create(options, dynamicProto, standardEnvironmentEnabled);

 ImmutableMap<String, CelFunctionBinding> functionBindingMap =
 ImmutableMap.copyOf(functionBindings);
 functionBindingMap.forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));
 ImmutableMap.Builder<String, CelFunctionBinding> functionBindingsBuilder =
 ImmutableMap.builder();
 for (CelFunctionBinding standardFunctionBinding : newStandardFunctionBindings(dynamicProto)) {
 functionBindingsBuilder.put(
 standardFunctionBinding.getOverloadId(), standardFunctionBinding);
 }

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));

 RuntimeTypeProvider runtimeTypeProvider;

Expand All@@ -271,6 +292,54 @@ public CelRuntimeLegacyImpl build() {
 this);
 }

 private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
 DynamicProto dynamicProto) {
 CelStandardFunctions celStandardFunctions;
 if (standardEnvironmentEnabled) {
 celStandardFunctions =
 CelStandardFunctions.newBuilder()
 .filterFunctions(
 (standardFunction, standardOverload) -> {
 switch (standardFunction) {
 case INT:
 if (standardOverload.equals(Conversions.INT64_TO_INT64)) {
 // Note that we require UnsignedLong flag here to avoid ambiguous
 // overloads against "uint64_to_int64", because they both use the same
 // Java Long class. We skip adding this identity function if the flag is
 // disabled.
 return options.enableUnsignedLongs();
 }
 break;
 case TIMESTAMP:
 // TODO: Remove this flag guard once the feature has been
 // auto-enabled.
 if (standardOverload.equals(Conversions.INT64_TO_TIMESTAMP)) {
 return options.enableTimestampEpoch();
 }
 break;
 default:
 if (standardOverload instanceof Comparison
 && !options.enableHeterogeneousNumericComparisons()) {
 Comparison comparison = (Comparison) standardOverload;
 if (comparison.isHeterogeneousComparison()) {
 return false;
 }
 }
 break;
 }

 return true;
 })
 .build();
 } else if (overriddenStandardFunctions != null) {
 celStandardFunctions = overriddenStandardFunctions;
 } else {
 return ImmutableSet.of();
 }

 return celStandardFunctions.newFunctionBindings(dynamicProto, options);
 }

 private static CelDescriptorPool newDescriptorPool(
 CelDescriptors celDescriptors,
 ExtensionRegistry extensionRegistry) {
Expand All@@ -294,7 +363,7 @@ private static ProtoMessageFactory maybeCombineMessageFactory(
 private Builder() {
 this.options = CelOptions.newBuilder().build();
 this.fileTypes = ImmutableSet.builder();
 this.functionBindings = new HashMap<>();
 this.customFunctionBindings = new HashMap<>();
 this.celRuntimeLibraries = ImmutableSet.builder();
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
Expand All@@ -311,7 +380,7 @@ private Builder(Builder builder) {
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.functionBindings = new HashMap<>(builder.functionBindings);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add CelStandardFunctions to allow environment subsetting for the runtime#461

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

copybara-service
merged 1 commit into

from

Nov 21, 2024
 Merged


Add CelStandardFunctions to allow environment subsetting for the runtime
#461
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


5 changes: 5 additions & 0 deletions
common/src/main/java/dev/cel/common/CelException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,11 @@ public CelException(String message, Throwable cause) {
 super(message, cause);
 }

 public CelException(String message, CelErrorCode errorCode) {
 super(message);
 this.errorCode = errorCode;
 }

 public CelException(String message, Throwable cause, CelErrorCode errorCode) {
 super(message, cause);
 this.errorCode = errorCode;
Expand Down

8 changes: 6 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 tags = [
 ],
 deps = [
 ":runtime_helper",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -61,13 +60,13 @@ java_library(
 "//common/internal:safe_string_formatter",
 "//common/types",
 "//common/types:type_providers",
 "//runtime:runtime_helper",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand DownExpand Up@@ -145,6 +144,7 @@ RUNTIME_SOURCES = [
 "CelRuntimeFactory.java",
 "CelRuntimeLegacyImpl.java",
 "CelRuntimeLibrary.java",
 "CelStandardFunctions.java",
 "CelVariableResolver.java",
 "HierarchicalVariableResolver.java",
 "UnknownContext.java",
Expand All@@ -157,6 +157,7 @@ java_library(
 ],
 deps = [
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
 ":unknown_attributes",
 "//:auto_value",
Expand All@@ -165,6 +166,7 @@ java_library(
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:comparison_functions",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
Expand All@@ -176,6 +178,8 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,12 @@ public CelEvaluationException(String message, Throwable cause, CelErrorCode erro
 super(message, cause, errorCode);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(message, errorCode);
 }

 CelEvaluationException(InterpreterException cause) {
super(cause.getMessage(), cause.getCause());
this(cause, cause.getErrorCode());
 }

 CelEvaluationException(InterpreterException cause, CelErrorCode errorCode) {
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,6 +153,14 @@ public interface CelRuntimeBuilder {
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value);

 /**
 * Override the standard functions for the runtime. This can be used to subset the standard
 * environment to only expose the desired function overloads to the runtime. {@link
 * #setStandardEnvironmentEnabled(boolean)} must be set to false for this to take effect.
 */
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions);

 /** Adds one or more libraries for runtime. */
 @CanIgnoreReturnValue
 CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries);
Expand Down

119 changes: 94 additions & 25 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,8 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Comparison;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand DownExpand Up@@ -87,7 +89,7 @@ public static CelRuntimeBuilder newBuilder() {
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, CelFunctionBinding> functionBindings;
 private final HashMap<String, CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @SuppressWarnings("unused")
Expand All@@ -97,6 +99,7 @@ public static final class Builder implements CelRuntimeBuilder {
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand All@@ -111,7 +114,7 @@ public CelRuntimeBuilder addFunctionBindings(CelFunctionBinding... bindings) {

 @Override
 public CelRuntimeBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
 bindings.forEach(o -> functionBindings.putIfAbsent(o.getOverloadId(), o));
 bindings.forEach(o -> customFunctionBindings.putIfAbsent(o.getOverloadId(), o));
 return this;
 }

Expand DownExpand Up@@ -160,6 +163,12 @@ public CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value) {
 return this;
 }

 @Override
 public CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions) {
 this.overriddenStandardFunctions = standardFunctions;
 return this;
 }

 @Override
 public CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries) {
 checkNotNull(libraries);
Expand All@@ -184,7 +193,7 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, CelFunctionBinding> getFunctionBindings() {
 return this.functionBindings;
 return this.customFunctionBindings;
 }

 @VisibleForTesting
Expand All@@ -200,6 +209,11 @@ ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
 if (standardEnvironmentEnabled && overriddenStandardFunctions != null) {
 throw new IllegalArgumentException(
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }
 // Add libraries, such as extensions
 celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

Expand DownExpand Up@@ -227,26 +241,33 @@ public CelRuntimeLegacyImpl build() {

 DynamicProto dynamicProto = DynamicProto.create(runtimeTypeFactory);

 DefaultDispatcher dispatcher =
 DefaultDispatcher.create(options, dynamicProto, standardEnvironmentEnabled);

 ImmutableMap<String, CelFunctionBinding> functionBindingMap =
 ImmutableMap.copyOf(functionBindings);
 functionBindingMap.forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));
 ImmutableMap.Builder<String, CelFunctionBinding> functionBindingsBuilder =
 ImmutableMap.builder();
 for (CelFunctionBinding standardFunctionBinding : newStandardFunctionBindings(dynamicProto)) {
 functionBindingsBuilder.put(
 standardFunctionBinding.getOverloadId(), standardFunctionBinding);
 }

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));

 RuntimeTypeProvider runtimeTypeProvider;

Expand All@@ -271,6 +292,54 @@ public CelRuntimeLegacyImpl build() {
 this);
 }

 private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
 DynamicProto dynamicProto) {
 CelStandardFunctions celStandardFunctions;
 if (standardEnvironmentEnabled) {
 celStandardFunctions =
 CelStandardFunctions.newBuilder()
 .filterFunctions(
 (standardFunction, standardOverload) -> {
 switch (standardFunction) {
 case INT:
 if (standardOverload.equals(Conversions.INT64_TO_INT64)) {
 // Note that we require UnsignedLong flag here to avoid ambiguous
 // overloads against "uint64_to_int64", because they both use the same
 // Java Long class. We skip adding this identity function if the flag is
 // disabled.
 return options.enableUnsignedLongs();
 }
 break;
 case TIMESTAMP:
 // TODO: Remove this flag guard once the feature has been
 // auto-enabled.
 if (standardOverload.equals(Conversions.INT64_TO_TIMESTAMP)) {
 return options.enableTimestampEpoch();
 }
 break;
 default:
 if (standardOverload instanceof Comparison
 && !options.enableHeterogeneousNumericComparisons()) {
 Comparison comparison = (Comparison) standardOverload;
 if (comparison.isHeterogeneousComparison()) {
 return false;
 }
 }
 break;
 }

 return true;
 })
 .build();
 } else if (overriddenStandardFunctions != null) {
 celStandardFunctions = overriddenStandardFunctions;
 } else {
 return ImmutableSet.of();
 }

 return celStandardFunctions.newFunctionBindings(dynamicProto, options);
 }

 private static CelDescriptorPool newDescriptorPool(
 CelDescriptors celDescriptors,
 ExtensionRegistry extensionRegistry) {
Expand All@@ -294,7 +363,7 @@ private static ProtoMessageFactory maybeCombineMessageFactory(
 private Builder() {
 this.options = CelOptions.newBuilder().build();
 this.fileTypes = ImmutableSet.builder();
 this.functionBindings = new HashMap<>();
 this.customFunctionBindings = new HashMap<>();
 this.celRuntimeLibraries = ImmutableSet.builder();
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
Expand All@@ -311,7 +380,7 @@ private Builder(Builder builder) {
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.functionBindings = new HashMap<>(builder.functionBindings);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add CelStandardFunctions to allow environment subsetting for the runtime#461

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

copybara-service
merged 1 commit into

from

Nov 21, 2024
 Merged


Add CelStandardFunctions to allow environment subsetting for the runtime
#461
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


5 changes: 5 additions & 0 deletions
common/src/main/java/dev/cel/common/CelException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,11 @@ public CelException(String message, Throwable cause) {
 super(message, cause);
 }

 public CelException(String message, CelErrorCode errorCode) {
 super(message);
 this.errorCode = errorCode;
 }

 public CelException(String message, Throwable cause, CelErrorCode errorCode) {
 super(message, cause);
 this.errorCode = errorCode;
Expand Down

8 changes: 6 additions & 2 deletions
runtime/src/main/java/dev/cel/runtime/BUILD.bazel

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,7 +47,6 @@ java_library(
 tags = [
 ],
 deps = [
 ":runtime_helper",
 "//:auto_value",
 "//common",
 "//common:error_codes",
Expand All@@ -61,13 +60,13 @@ java_library(
 "//common/internal:safe_string_formatter",
 "//common/types",
 "//common/types:type_providers",
 "//runtime:runtime_helper",
 "@cel_spec//proto/cel/expr:expr_java_proto",
 "@maven//:com_google_code_findbugs_annotations",
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand DownExpand Up@@ -145,6 +144,7 @@ RUNTIME_SOURCES = [
 "CelRuntimeFactory.java",
 "CelRuntimeLegacyImpl.java",
 "CelRuntimeLibrary.java",
 "CelStandardFunctions.java",
 "CelVariableResolver.java",
 "HierarchicalVariableResolver.java",
 "UnknownContext.java",
Expand All@@ -157,6 +157,7 @@ java_library(
 ],
 deps = [
 ":evaluation_listener",
 ":runtime_helper",
 ":runtime_type_provider_legacy",
 ":unknown_attributes",
 "//:auto_value",
Expand All@@ -165,6 +166,7 @@ java_library(
 "//common:options",
 "//common/annotations",
 "//common/internal:cel_descriptor_pools",
 "//common/internal:comparison_functions",
 "//common/internal:default_message_factory",
 "//common/internal:dynamic_proto",
 "//common/internal:proto_message_factory",
Expand All@@ -176,6 +178,8 @@ java_library(
 "@maven//:com_google_errorprone_error_prone_annotations",
 "@maven//:com_google_guava_guava",
 "@maven//:com_google_protobuf_protobuf_java",
 "@maven//:com_google_protobuf_protobuf_java_util",
 "@maven//:com_google_re2j_re2j",
 "@maven//:org_jspecify_jspecify",
 ],
)
Expand Down

6 changes: 5 additions & 1 deletion
runtime/src/main/java/dev/cel/runtime/CelEvaluationException.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,12 @@ public CelEvaluationException(String message, Throwable cause, CelErrorCode erro
 super(message, cause, errorCode);
 }

 public CelEvaluationException(String message, CelErrorCode errorCode) {
 super(message, errorCode);
 }

 CelEvaluationException(InterpreterException cause) {
super(cause.getMessage(), cause.getCause());
this(cause, cause.getErrorCode());
 }

 CelEvaluationException(InterpreterException cause, CelErrorCode errorCode) {
Expand Down

8 changes: 8 additions & 0 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeBuilder.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -153,6 +153,14 @@ public interface CelRuntimeBuilder {
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value);

 /**
 * Override the standard functions for the runtime. This can be used to subset the standard
 * environment to only expose the desired function overloads to the runtime. {@link
 * #setStandardEnvironmentEnabled(boolean)} must be set to false for this to take effect.
 */
 @CanIgnoreReturnValue
 CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions);

 /** Adds one or more libraries for runtime. */
 @CanIgnoreReturnValue
 CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries);
Expand Down

119 changes: 94 additions & 25 deletions
runtime/src/main/java/dev/cel/runtime/CelRuntimeLegacyImpl.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,8 @@
import dev.cel.common.types.CelTypes;
import dev.cel.common.values.CelValueProvider;
import dev.cel.common.values.ProtoMessageValueProvider;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Comparison;
import dev.cel.runtime.CelStandardFunctions.StandardFunction.Overload.Conversions;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
Expand DownExpand Up@@ -87,7 +89,7 @@ public static CelRuntimeBuilder newBuilder() {
 public static final class Builder implements CelRuntimeBuilder {

 private final ImmutableSet.Builder<FileDescriptor> fileTypes;
 private final HashMap<String, CelFunctionBinding> functionBindings;
 private final HashMap<String, CelFunctionBinding> customFunctionBindings;
 private final ImmutableSet.Builder<CelRuntimeLibrary> celRuntimeLibraries;

 @SuppressWarnings("unused")
Expand All@@ -97,6 +99,7 @@ public static final class Builder implements CelRuntimeBuilder {
 private Function<String, Message.Builder> customTypeFactory;
 private ExtensionRegistry extensionRegistry;
 private CelValueProvider celValueProvider;
 private CelStandardFunctions overriddenStandardFunctions;

 @Override
 public CelRuntimeBuilder setOptions(CelOptions options) {
Expand All@@ -111,7 +114,7 @@ public CelRuntimeBuilder addFunctionBindings(CelFunctionBinding... bindings) {

 @Override
 public CelRuntimeBuilder addFunctionBindings(Iterable<CelFunctionBinding> bindings) {
 bindings.forEach(o -> functionBindings.putIfAbsent(o.getOverloadId(), o));
 bindings.forEach(o -> customFunctionBindings.putIfAbsent(o.getOverloadId(), o));
 return this;
 }

Expand DownExpand Up@@ -160,6 +163,12 @@ public CelRuntimeBuilder setStandardEnvironmentEnabled(boolean value) {
 return this;
 }

 @Override
 public CelRuntimeBuilder setStandardFunctions(CelStandardFunctions standardFunctions) {
 this.overriddenStandardFunctions = standardFunctions;
 return this;
 }

 @Override
 public CelRuntimeBuilder addLibraries(CelRuntimeLibrary... libraries) {
 checkNotNull(libraries);
Expand All@@ -184,7 +193,7 @@ public CelRuntimeBuilder setExtensionRegistry(ExtensionRegistry extensionRegistr
 // and shouldn't be exposed to the public.
 @VisibleForTesting
 Map<String, CelFunctionBinding> getFunctionBindings() {
 return this.functionBindings;
 return this.customFunctionBindings;
 }

 @VisibleForTesting
Expand All@@ -200,6 +209,11 @@ ImmutableSet.Builder<FileDescriptor> getFileTypes() {
 /** Build a new {@code CelRuntimeLegacyImpl} instance from the builder config. */
 @Override
 public CelRuntimeLegacyImpl build() {
 if (standardEnvironmentEnabled && overriddenStandardFunctions != null) {
 throw new IllegalArgumentException(
 "setStandardEnvironmentEnabled must be set to false to override standard function"
 + " bindings.");
 }
 // Add libraries, such as extensions
 celRuntimeLibraries.build().forEach(celLibrary -> celLibrary.setRuntimeOptions(this));

Expand DownExpand Up@@ -227,26 +241,33 @@ public CelRuntimeLegacyImpl build() {

 DynamicProto dynamicProto = DynamicProto.create(runtimeTypeFactory);

 DefaultDispatcher dispatcher =
 DefaultDispatcher.create(options, dynamicProto, standardEnvironmentEnabled);

 ImmutableMap<String, CelFunctionBinding> functionBindingMap =
 ImmutableMap.copyOf(functionBindings);
 functionBindingMap.forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));
 ImmutableMap.Builder<String, CelFunctionBinding> functionBindingsBuilder =
 ImmutableMap.builder();
 for (CelFunctionBinding standardFunctionBinding : newStandardFunctionBindings(dynamicProto)) {
 functionBindingsBuilder.put(
 standardFunctionBinding.getOverloadId(), standardFunctionBinding);
 }

 functionBindingsBuilder.putAll(customFunctionBindings);

 DefaultDispatcher dispatcher = DefaultDispatcher.create();
 functionBindingsBuilder
 .buildOrThrow()
 .forEach(
 (String overloadId, CelFunctionBinding func) ->
 dispatcher.add(
 overloadId,
 func.getArgTypes(),
 (args) -> {
 try {
 return func.getDefinition().apply(args);
 } catch (CelEvaluationException e) {
 throw new InterpreterException.Builder(e.getMessage())
 .setCause(e)
 .setErrorCode(e.getErrorCode())
 .build();
 }
 }));

 RuntimeTypeProvider runtimeTypeProvider;

Expand All@@ -271,6 +292,54 @@ public CelRuntimeLegacyImpl build() {
 this);
 }

 private ImmutableSet<CelFunctionBinding> newStandardFunctionBindings(
 DynamicProto dynamicProto) {
 CelStandardFunctions celStandardFunctions;
 if (standardEnvironmentEnabled) {
 celStandardFunctions =
 CelStandardFunctions.newBuilder()
 .filterFunctions(
 (standardFunction, standardOverload) -> {
 switch (standardFunction) {
 case INT:
 if (standardOverload.equals(Conversions.INT64_TO_INT64)) {
 // Note that we require UnsignedLong flag here to avoid ambiguous
 // overloads against "uint64_to_int64", because they both use the same
 // Java Long class. We skip adding this identity function if the flag is
 // disabled.
 return options.enableUnsignedLongs();
 }
 break;
 case TIMESTAMP:
 // TODO: Remove this flag guard once the feature has been
 // auto-enabled.
 if (standardOverload.equals(Conversions.INT64_TO_TIMESTAMP)) {
 return options.enableTimestampEpoch();
 }
 break;
 default:
 if (standardOverload instanceof Comparison
 && !options.enableHeterogeneousNumericComparisons()) {
 Comparison comparison = (Comparison) standardOverload;
 if (comparison.isHeterogeneousComparison()) {
 return false;
 }
 }
 break;
 }

 return true;
 })
 .build();
 } else if (overriddenStandardFunctions != null) {
 celStandardFunctions = overriddenStandardFunctions;
 } else {
 return ImmutableSet.of();
 }

 return celStandardFunctions.newFunctionBindings(dynamicProto, options);
 }

 private static CelDescriptorPool newDescriptorPool(
 CelDescriptors celDescriptors,
 ExtensionRegistry extensionRegistry) {
Expand All@@ -294,7 +363,7 @@ private static ProtoMessageFactory maybeCombineMessageFactory(
 private Builder() {
 this.options = CelOptions.newBuilder().build();
 this.fileTypes = ImmutableSet.builder();
 this.functionBindings = new HashMap<>();
 this.customFunctionBindings = new HashMap<>();
 this.celRuntimeLibraries = ImmutableSet.builder();
 this.extensionRegistry = ExtensionRegistry.getEmptyRegistry();
 this.customTypeFactory = null;
Expand All@@ -311,7 +380,7 @@ private Builder(Builder builder) {
 // The following needs to be deep copied as they are collection builders
 this.fileTypes = deepCopy(builder.fileTypes);
 this.celRuntimeLibraries = deepCopy(builder.celRuntimeLibraries);
 this.functionBindings = new HashMap<>(builder.functionBindings);
 this.customFunctionBindings = new HashMap<>(builder.customFunctionBindings);
 }

 private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
Expand Down
Loading