Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ maven_install(
"com.google.guava:guava-testlib:33.3.1-jre",
"com.google.protobuf:protobuf-java:4.28.3",
"com.google.protobuf:protobuf-java-util:4.28.3",
"com.google.re2j:re2j:1.7",
"com.google.re2j:re2j:1.8",
"com.google.testparameterinjector:test-parameter-injector:1.18",
"com.google.truth.extensions:truth-java8-extension:1.4.4",
"com.google.truth.extensions:truth-proto-extension:1.4.4",
Expand Down
33 changes: 33 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2032,6 +2032,39 @@ public void program_comprehensionDisabled_throws() throws Exception {
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ITERATION_BUDGET_EXCEEDED);
}

@Test
public void program_regexProgramSizeUnderLimit_success() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(7).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

assertThat(cel.createProgram(ast).eval()).isEqualTo(false);
}

@Test
public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(6).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e)
.hasMessageThat()
.contains(
"evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
+ " 7");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
}

@Test
public void toBuilder_isImmutable() {
CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down
20 changes: 18 additions & 2 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ public enum ProtoUnsetFieldOptions {
// Do not bind a field if it is unset. Repeated fields are bound as empty list.
SKIP,
// Bind the (proto api) default value for a field.
BIND_DEFAULT;
BIND_DEFAULT
}

public static final CelOptions DEFAULT = current().build();
Expand DownExpand Up@@ -121,6 +121,8 @@ public enum ProtoUnsetFieldOptions {

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();

public abstract Builder toBuilder();

public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -218,7 +220,8 @@ public static Builder newBuilder() {
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true);
.enableComprehension(true)
.maxRegexProgramSize(-1);
}

/**
Expand DownExpand Up@@ -571,6 +574,19 @@ public abstract static class Builder {
*/
public abstract Builder enableComprehension(boolean value);

/**
* Set maximum program size for RE2J regex.
*
* <p>The program size is a very approximate measure of a regexp's "cost". Larger numbers are
* more expensive than smaller numbers.
*
* <p>A negative {@code value} will disable the check.
*
* <p>There's no guarantee that RE2 program size has the exact same value across other CEL
* implementations (C++ and Go).
*/
public abstract Builder maxRegexProgramSize(int value);

public abstract CelOptions build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@
import com.google.protobuf.Timestamp;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import com.google.re2j.PatternSyntaxException;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.internal.ComparisonFunctions;
Expand DownExpand Up@@ -1000,7 +999,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand All@@ -1015,7 +1014,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand Down
16 changes: 13 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,12 +74,22 @@ public static boolean matches(String string, String regexp) {
}

public static boolean matches(String string, String regexp, CelOptions celOptions) {
Pattern pattern = Pattern.compile(regexp);
int maxProgramSize = celOptions.maxRegexProgramSize();
if (maxProgramSize >= 0 && pattern.programSize() > maxProgramSize) {
throw new IllegalArgumentException(
String.format(
"Regex pattern exceeds allowed program size. Allowed: %d, Provided: %d",
maxProgramSize, pattern.programSize()));
}

if (!celOptions.enableRegexPartialMatch()) {
// Uses re2 for consistency across languages.
return Pattern.matches(regexp, string);
return pattern.matcher(string).matches();
}
// Return an unanchored match for the presence of the regexp anywher in the string.
return Pattern.compile(regexp).matcher(string).find();

// Return an unanchored match for the presence of the regexp anywhere in the string.
return pattern.matcher(string).find();
}

/** Create a compiled pattern for the given regular expression. */
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ maven_install(
"com.google.guava:guava-testlib:33.3.1-jre",
"com.google.protobuf:protobuf-java:4.28.3",
"com.google.protobuf:protobuf-java-util:4.28.3",
"com.google.re2j:re2j:1.7",
"com.google.re2j:re2j:1.8",
"com.google.testparameterinjector:test-parameter-injector:1.18",
"com.google.truth.extensions:truth-java8-extension:1.4.4",
"com.google.truth.extensions:truth-proto-extension:1.4.4",
Expand Down
33 changes: 33 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2032,6 +2032,39 @@ public void program_comprehensionDisabled_throws() throws Exception {
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ITERATION_BUDGET_EXCEEDED);
}

@Test
public void program_regexProgramSizeUnderLimit_success() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(7).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

assertThat(cel.createProgram(ast).eval()).isEqualTo(false);
}

@Test
public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(6).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e)
.hasMessageThat()
.contains(
"evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
+ " 7");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
}

@Test
public void toBuilder_isImmutable() {
CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down
20 changes: 18 additions & 2 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ public enum ProtoUnsetFieldOptions {
// Do not bind a field if it is unset. Repeated fields are bound as empty list.
SKIP,
// Bind the (proto api) default value for a field.
BIND_DEFAULT;
BIND_DEFAULT
}

public static final CelOptions DEFAULT = current().build();
Expand DownExpand Up@@ -121,6 +121,8 @@ public enum ProtoUnsetFieldOptions {

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();

public abstract Builder toBuilder();

public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -218,7 +220,8 @@ public static Builder newBuilder() {
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true);
.enableComprehension(true)
.maxRegexProgramSize(-1);
}

/**
Expand DownExpand Up@@ -571,6 +574,19 @@ public abstract static class Builder {
*/
public abstract Builder enableComprehension(boolean value);

/**
* Set maximum program size for RE2J regex.
*
* <p>The program size is a very approximate measure of a regexp's "cost". Larger numbers are
* more expensive than smaller numbers.
*
* <p>A negative {@code value} will disable the check.
*
* <p>There's no guarantee that RE2 program size has the exact same value across other CEL
* implementations (C++ and Go).
*/
public abstract Builder maxRegexProgramSize(int value);

public abstract CelOptions build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@
import com.google.protobuf.Timestamp;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import com.google.re2j.PatternSyntaxException;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.internal.ComparisonFunctions;
Expand DownExpand Up@@ -1000,7 +999,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand All@@ -1015,7 +1014,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand Down
16 changes: 13 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,12 +74,22 @@ public static boolean matches(String string, String regexp) {
}

public static boolean matches(String string, String regexp, CelOptions celOptions) {
Pattern pattern = Pattern.compile(regexp);
int maxProgramSize = celOptions.maxRegexProgramSize();
if (maxProgramSize >= 0 && pattern.programSize() > maxProgramSize) {
throw new IllegalArgumentException(
String.format(
"Regex pattern exceeds allowed program size. Allowed: %d, Provided: %d",
maxProgramSize, pattern.programSize()));
}

if (!celOptions.enableRegexPartialMatch()) {
// Uses re2 for consistency across languages.
return Pattern.matches(regexp, string);
return pattern.matcher(string).matches();
}
// Return an unanchored match for the presence of the regexp anywher in the string.
return Pattern.compile(regexp).matcher(string).find();

// Return an unanchored match for the presence of the regexp anywhere in the string.
return pattern.matcher(string).find();
}

/** Create a compiled pattern for the given regular expression. */
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ maven_install(
"com.google.guava:guava-testlib:33.3.1-jre",
"com.google.protobuf:protobuf-java:4.28.3",
"com.google.protobuf:protobuf-java-util:4.28.3",
"com.google.re2j:re2j:1.7",
"com.google.re2j:re2j:1.8",
"com.google.testparameterinjector:test-parameter-injector:1.18",
"com.google.truth.extensions:truth-java8-extension:1.4.4",
"com.google.truth.extensions:truth-proto-extension:1.4.4",
Expand Down
33 changes: 33 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2032,6 +2032,39 @@ public void program_comprehensionDisabled_throws() throws Exception {
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ITERATION_BUDGET_EXCEEDED);
}

@Test
public void program_regexProgramSizeUnderLimit_success() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(7).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

assertThat(cel.createProgram(ast).eval()).isEqualTo(false);
}

@Test
public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(6).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e)
.hasMessageThat()
.contains(
"evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
+ " 7");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
}

@Test
public void toBuilder_isImmutable() {
CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down
20 changes: 18 additions & 2 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ public enum ProtoUnsetFieldOptions {
// Do not bind a field if it is unset. Repeated fields are bound as empty list.
SKIP,
// Bind the (proto api) default value for a field.
BIND_DEFAULT;
BIND_DEFAULT
}

public static final CelOptions DEFAULT = current().build();
Expand DownExpand Up@@ -121,6 +121,8 @@ public enum ProtoUnsetFieldOptions {

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();

public abstract Builder toBuilder();

public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -218,7 +220,8 @@ public static Builder newBuilder() {
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true);
.enableComprehension(true)
.maxRegexProgramSize(-1);
}

/**
Expand DownExpand Up@@ -571,6 +574,19 @@ public abstract static class Builder {
*/
public abstract Builder enableComprehension(boolean value);

/**
* Set maximum program size for RE2J regex.
*
* <p>The program size is a very approximate measure of a regexp's "cost". Larger numbers are
* more expensive than smaller numbers.
*
* <p>A negative {@code value} will disable the check.
*
* <p>There's no guarantee that RE2 program size has the exact same value across other CEL
* implementations (C++ and Go).
*/
public abstract Builder maxRegexProgramSize(int value);

public abstract CelOptions build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@
import com.google.protobuf.Timestamp;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import com.google.re2j.PatternSyntaxException;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.internal.ComparisonFunctions;
Expand DownExpand Up@@ -1000,7 +999,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand All@@ -1015,7 +1014,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand Down
16 changes: 13 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,12 +74,22 @@ public static boolean matches(String string, String regexp) {
}

public static boolean matches(String string, String regexp, CelOptions celOptions) {
Pattern pattern = Pattern.compile(regexp);
int maxProgramSize = celOptions.maxRegexProgramSize();
if (maxProgramSize >= 0 && pattern.programSize() > maxProgramSize) {
throw new IllegalArgumentException(
String.format(
"Regex pattern exceeds allowed program size. Allowed: %d, Provided: %d",
maxProgramSize, pattern.programSize()));
}

if (!celOptions.enableRegexPartialMatch()) {
// Uses re2 for consistency across languages.
return Pattern.matches(regexp, string);
return pattern.matcher(string).matches();
}
// Return an unanchored match for the presence of the regexp anywher in the string.
return Pattern.compile(regexp).matcher(string).find();

// Return an unanchored match for the presence of the regexp anywhere in the string.
return pattern.matcher(string).find();
}

/** Create a compiled pattern for the given regular expression. */
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ maven_install(
"com.google.guava:guava-testlib:33.3.1-jre",
"com.google.protobuf:protobuf-java:4.28.3",
"com.google.protobuf:protobuf-java-util:4.28.3",
"com.google.re2j:re2j:1.7",
"com.google.re2j:re2j:1.8",
"com.google.testparameterinjector:test-parameter-injector:1.18",
"com.google.truth.extensions:truth-java8-extension:1.4.4",
"com.google.truth.extensions:truth-proto-extension:1.4.4",
Expand Down
33 changes: 33 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2032,6 +2032,39 @@ public void program_comprehensionDisabled_throws() throws Exception {
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ITERATION_BUDGET_EXCEEDED);
}

@Test
public void program_regexProgramSizeUnderLimit_success() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(7).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

assertThat(cel.createProgram(ast).eval()).isEqualTo(false);
}

@Test
public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(6).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e)
.hasMessageThat()
.contains(
"evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
+ " 7");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
}

@Test
public void toBuilder_isImmutable() {
CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down
20 changes: 18 additions & 2 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ public enum ProtoUnsetFieldOptions {
// Do not bind a field if it is unset. Repeated fields are bound as empty list.
SKIP,
// Bind the (proto api) default value for a field.
BIND_DEFAULT;
BIND_DEFAULT
}

public static final CelOptions DEFAULT = current().build();
Expand DownExpand Up@@ -121,6 +121,8 @@ public enum ProtoUnsetFieldOptions {

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();

public abstract Builder toBuilder();

public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -218,7 +220,8 @@ public static Builder newBuilder() {
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true);
.enableComprehension(true)
.maxRegexProgramSize(-1);
}

/**
Expand DownExpand Up@@ -571,6 +574,19 @@ public abstract static class Builder {
*/
public abstract Builder enableComprehension(boolean value);

/**
* Set maximum program size for RE2J regex.
*
* <p>The program size is a very approximate measure of a regexp's "cost". Larger numbers are
* more expensive than smaller numbers.
*
* <p>A negative {@code value} will disable the check.
*
* <p>There's no guarantee that RE2 program size has the exact same value across other CEL
* implementations (C++ and Go).
*/
public abstract Builder maxRegexProgramSize(int value);

public abstract CelOptions build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@
import com.google.protobuf.Timestamp;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import com.google.re2j.PatternSyntaxException;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.internal.ComparisonFunctions;
Expand DownExpand Up@@ -1000,7 +999,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand All@@ -1015,7 +1014,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand Down
16 changes: 13 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,12 +74,22 @@ public static boolean matches(String string, String regexp) {
}

public static boolean matches(String string, String regexp, CelOptions celOptions) {
Pattern pattern = Pattern.compile(regexp);
int maxProgramSize = celOptions.maxRegexProgramSize();
if (maxProgramSize >= 0 && pattern.programSize() > maxProgramSize) {
throw new IllegalArgumentException(
String.format(
"Regex pattern exceeds allowed program size. Allowed: %d, Provided: %d",
maxProgramSize, pattern.programSize()));
}

if (!celOptions.enableRegexPartialMatch()) {
// Uses re2 for consistency across languages.
return Pattern.matches(regexp, string);
return pattern.matcher(string).matches();
}
// Return an unanchored match for the presence of the regexp anywher in the string.
return Pattern.compile(regexp).matcher(string).find();

// Return an unanchored match for the presence of the regexp anywhere in the string.
return pattern.matcher(string).find();
}

/** Create a compiled pattern for the given regular expression. */
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ maven_install(
"com.google.guava:guava-testlib:33.3.1-jre",
"com.google.protobuf:protobuf-java:4.28.3",
"com.google.protobuf:protobuf-java-util:4.28.3",
"com.google.re2j:re2j:1.7",
"com.google.re2j:re2j:1.8",
"com.google.testparameterinjector:test-parameter-injector:1.18",
"com.google.truth.extensions:truth-java8-extension:1.4.4",
"com.google.truth.extensions:truth-proto-extension:1.4.4",
Expand Down
33 changes: 33 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2032,6 +2032,39 @@ public void program_comprehensionDisabled_throws() throws Exception {
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ITERATION_BUDGET_EXCEEDED);
}

@Test
public void program_regexProgramSizeUnderLimit_success() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(7).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

assertThat(cel.createProgram(ast).eval()).isEqualTo(false);
}

@Test
public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(6).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e)
.hasMessageThat()
.contains(
"evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
+ " 7");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
}

@Test
public void toBuilder_isImmutable() {
CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down
20 changes: 18 additions & 2 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ public enum ProtoUnsetFieldOptions {
// Do not bind a field if it is unset. Repeated fields are bound as empty list.
SKIP,
// Bind the (proto api) default value for a field.
BIND_DEFAULT;
BIND_DEFAULT
}

public static final CelOptions DEFAULT = current().build();
Expand DownExpand Up@@ -121,6 +121,8 @@ public enum ProtoUnsetFieldOptions {

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();

public abstract Builder toBuilder();

public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -218,7 +220,8 @@ public static Builder newBuilder() {
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true);
.enableComprehension(true)
.maxRegexProgramSize(-1);
}

/**
Expand DownExpand Up@@ -571,6 +574,19 @@ public abstract static class Builder {
*/
public abstract Builder enableComprehension(boolean value);

/**
* Set maximum program size for RE2J regex.
*
* <p>The program size is a very approximate measure of a regexp's "cost". Larger numbers are
* more expensive than smaller numbers.
*
* <p>A negative {@code value} will disable the check.
*
* <p>There's no guarantee that RE2 program size has the exact same value across other CEL
* implementations (C++ and Go).
*/
public abstract Builder maxRegexProgramSize(int value);

public abstract CelOptions build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@
import com.google.protobuf.Timestamp;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import com.google.re2j.PatternSyntaxException;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.internal.ComparisonFunctions;
Expand DownExpand Up@@ -1000,7 +999,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand All@@ -1015,7 +1014,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand Down
16 changes: 13 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,12 +74,22 @@ public static boolean matches(String string, String regexp) {
}

public static boolean matches(String string, String regexp, CelOptions celOptions) {
Pattern pattern = Pattern.compile(regexp);
int maxProgramSize = celOptions.maxRegexProgramSize();
if (maxProgramSize >= 0 && pattern.programSize() > maxProgramSize) {
throw new IllegalArgumentException(
String.format(
"Regex pattern exceeds allowed program size. Allowed: %d, Provided: %d",
maxProgramSize, pattern.programSize()));
}

if (!celOptions.enableRegexPartialMatch()) {
// Uses re2 for consistency across languages.
return Pattern.matches(regexp, string);
return pattern.matcher(string).matches();
}
// Return an unanchored match for the presence of the regexp anywher in the string.
return Pattern.compile(regexp).matcher(string).find();

// Return an unanchored match for the presence of the regexp anywhere in the string.
return pattern.matcher(string).find();
}

/** Create a compiled pattern for the given regular expression. */
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ maven_install(
"com.google.guava:guava-testlib:33.3.1-jre",
"com.google.protobuf:protobuf-java:4.28.3",
"com.google.protobuf:protobuf-java-util:4.28.3",
"com.google.re2j:re2j:1.7",
"com.google.re2j:re2j:1.8",
"com.google.testparameterinjector:test-parameter-injector:1.18",
"com.google.truth.extensions:truth-java8-extension:1.4.4",
"com.google.truth.extensions:truth-proto-extension:1.4.4",
Expand Down
33 changes: 33 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2032,6 +2032,39 @@ public void program_comprehensionDisabled_throws() throws Exception {
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ITERATION_BUDGET_EXCEEDED);
}

@Test
public void program_regexProgramSizeUnderLimit_success() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(7).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

assertThat(cel.createProgram(ast).eval()).isEqualTo(false);
}

@Test
public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(6).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e)
.hasMessageThat()
.contains(
"evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
+ " 7");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
}

@Test
public void toBuilder_isImmutable() {
CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down
20 changes: 18 additions & 2 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ public enum ProtoUnsetFieldOptions {
// Do not bind a field if it is unset. Repeated fields are bound as empty list.
SKIP,
// Bind the (proto api) default value for a field.
BIND_DEFAULT;
BIND_DEFAULT
}

public static final CelOptions DEFAULT = current().build();
Expand DownExpand Up@@ -121,6 +121,8 @@ public enum ProtoUnsetFieldOptions {

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();

public abstract Builder toBuilder();

public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -218,7 +220,8 @@ public static Builder newBuilder() {
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true);
.enableComprehension(true)
.maxRegexProgramSize(-1);
}

/**
Expand DownExpand Up@@ -571,6 +574,19 @@ public abstract static class Builder {
*/
public abstract Builder enableComprehension(boolean value);

/**
* Set maximum program size for RE2J regex.
*
* <p>The program size is a very approximate measure of a regexp's "cost". Larger numbers are
* more expensive than smaller numbers.
*
* <p>A negative {@code value} will disable the check.
*
* <p>There's no guarantee that RE2 program size has the exact same value across other CEL
* implementations (C++ and Go).
*/
public abstract Builder maxRegexProgramSize(int value);

public abstract CelOptions build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@
import com.google.protobuf.Timestamp;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import com.google.re2j.PatternSyntaxException;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.internal.ComparisonFunctions;
Expand DownExpand Up@@ -1000,7 +999,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand All@@ -1015,7 +1014,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand Down
16 changes: 13 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,12 +74,22 @@ public static boolean matches(String string, String regexp) {
}

public static boolean matches(String string, String regexp, CelOptions celOptions) {
Pattern pattern = Pattern.compile(regexp);
int maxProgramSize = celOptions.maxRegexProgramSize();
if (maxProgramSize >= 0 && pattern.programSize() > maxProgramSize) {
throw new IllegalArgumentException(
String.format(
"Regex pattern exceeds allowed program size. Allowed: %d, Provided: %d",
maxProgramSize, pattern.programSize()));
}

if (!celOptions.enableRegexPartialMatch()) {
// Uses re2 for consistency across languages.
return Pattern.matches(regexp, string);
return pattern.matcher(string).matches();
}
// Return an unanchored match for the presence of the regexp anywher in the string.
return Pattern.compile(regexp).matcher(string).find();

// Return an unanchored match for the presence of the regexp anywhere in the string.
return pattern.matcher(string).find();
}

/** Create a compiled pattern for the given regular expression. */
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ maven_install(
"com.google.guava:guava-testlib:33.3.1-jre",
"com.google.protobuf:protobuf-java:4.28.3",
"com.google.protobuf:protobuf-java-util:4.28.3",
"com.google.re2j:re2j:1.7",
"com.google.re2j:re2j:1.8",
"com.google.testparameterinjector:test-parameter-injector:1.18",
"com.google.truth.extensions:truth-java8-extension:1.4.4",
"com.google.truth.extensions:truth-proto-extension:1.4.4",
Expand Down
33 changes: 33 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2032,6 +2032,39 @@ public void program_comprehensionDisabled_throws() throws Exception {
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ITERATION_BUDGET_EXCEEDED);
}

@Test
public void program_regexProgramSizeUnderLimit_success() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(7).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

assertThat(cel.createProgram(ast).eval()).isEqualTo(false);
}

@Test
public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(6).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e)
.hasMessageThat()
.contains(
"evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
+ " 7");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
}

@Test
public void toBuilder_isImmutable() {
CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down
20 changes: 18 additions & 2 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ public enum ProtoUnsetFieldOptions {
// Do not bind a field if it is unset. Repeated fields are bound as empty list.
SKIP,
// Bind the (proto api) default value for a field.
BIND_DEFAULT;
BIND_DEFAULT
}

public static final CelOptions DEFAULT = current().build();
Expand DownExpand Up@@ -121,6 +121,8 @@ public enum ProtoUnsetFieldOptions {

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();

public abstract Builder toBuilder();

public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -218,7 +220,8 @@ public static Builder newBuilder() {
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true);
.enableComprehension(true)
.maxRegexProgramSize(-1);
}

/**
Expand DownExpand Up@@ -571,6 +574,19 @@ public abstract static class Builder {
*/
public abstract Builder enableComprehension(boolean value);

/**
* Set maximum program size for RE2J regex.
*
* <p>The program size is a very approximate measure of a regexp's "cost". Larger numbers are
* more expensive than smaller numbers.
*
* <p>A negative {@code value} will disable the check.
*
* <p>There's no guarantee that RE2 program size has the exact same value across other CEL
* implementations (C++ and Go).
*/
public abstract Builder maxRegexProgramSize(int value);

public abstract CelOptions build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@
import com.google.protobuf.Timestamp;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import com.google.re2j.PatternSyntaxException;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.internal.ComparisonFunctions;
Expand DownExpand Up@@ -1000,7 +999,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand All@@ -1015,7 +1014,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand Down
16 changes: 13 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,12 +74,22 @@ public static boolean matches(String string, String regexp) {
}

public static boolean matches(String string, String regexp, CelOptions celOptions) {
Pattern pattern = Pattern.compile(regexp);
int maxProgramSize = celOptions.maxRegexProgramSize();
if (maxProgramSize >= 0 && pattern.programSize() > maxProgramSize) {
throw new IllegalArgumentException(
String.format(
"Regex pattern exceeds allowed program size. Allowed: %d, Provided: %d",
maxProgramSize, pattern.programSize()));
}

if (!celOptions.enableRegexPartialMatch()) {
// Uses re2 for consistency across languages.
return Pattern.matches(regexp, string);
return pattern.matcher(string).matches();
}
// Return an unanchored match for the presence of the regexp anywher in the string.
return Pattern.compile(regexp).matcher(string).find();

// Return an unanchored match for the presence of the regexp anywhere in the string.
return pattern.matcher(string).find();
}

/** Create a compiled pattern for the given regular expression. */
Expand Down
, '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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,7 +78,7 @@ maven_install(
"com.google.guava:guava-testlib:33.3.1-jre",
"com.google.protobuf:protobuf-java:4.28.3",
"com.google.protobuf:protobuf-java-util:4.28.3",
"com.google.re2j:re2j:1.7",
"com.google.re2j:re2j:1.8",
"com.google.testparameterinjector:test-parameter-injector:1.18",
"com.google.truth.extensions:truth-java8-extension:1.4.4",
"com.google.truth.extensions:truth-proto-extension:1.4.4",
Expand Down
33 changes: 33 additions & 0 deletions bundle/src/test/java/dev/cel/bundle/CelImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -2032,6 +2032,39 @@ public void program_comprehensionDisabled_throws() throws Exception {
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.ITERATION_BUDGET_EXCEEDED);
}

@Test
public void program_regexProgramSizeUnderLimit_success() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(7).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

assertThat(cel.createProgram(ast).eval()).isEqualTo(false);
}

@Test
public void program_regexProgramSizeExceedsLimit_throws() throws Exception {
Cel cel =
standardCelBuilderWithMacros()
.setOptions(CelOptions.current().maxRegexProgramSize(6).build())
.build();
// See
// https://github.com/google/re2j/blob/84237cbbd0fbd637c6eb6856717c1e248daae729/javatests/com/google/re2j/PatternTest.java#L175 for program size
CelAbstractSyntaxTree ast = cel.compile("'foo'.matches('(a+b)')").getAst();

CelEvaluationException e =
assertThrows(CelEvaluationException.class, () -> cel.createProgram(ast).eval());
assertThat(e)
.hasMessageThat()
.contains(
"evaluation error: Regex pattern exceeds allowed program size. Allowed: 6, Provided:"
+ " 7");
assertThat(e.getErrorCode()).isEqualTo(CelErrorCode.INVALID_ARGUMENT);
}

@Test
public void toBuilder_isImmutable() {
CelBuilder celBuilder = CelFactory.standardCelBuilder();
Expand Down
20 changes: 18 additions & 2 deletions common/src/main/java/dev/cel/common/CelOptions.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@ public enum ProtoUnsetFieldOptions {
// Do not bind a field if it is unset. Repeated fields are bound as empty list.
SKIP,
// Bind the (proto api) default value for a field.
BIND_DEFAULT;
BIND_DEFAULT
}

public static final CelOptions DEFAULT = current().build();
Expand DownExpand Up@@ -121,6 +121,8 @@ public enum ProtoUnsetFieldOptions {

public abstract boolean enableComprehension();

public abstract int maxRegexProgramSize();

public abstract Builder toBuilder();

public ImmutableSet<ExprFeatures> toExprFeatures() {
Expand DownExpand Up@@ -218,7 +220,8 @@ public static Builder newBuilder() {
.enableStringConversion(true)
.enableStringConcatenation(true)
.enableListConcatenation(true)
.enableComprehension(true);
.enableComprehension(true)
.maxRegexProgramSize(-1);
}

/**
Expand DownExpand Up@@ -571,6 +574,19 @@ public abstract static class Builder {
*/
public abstract Builder enableComprehension(boolean value);

/**
* Set maximum program size for RE2J regex.
*
* <p>The program size is a very approximate measure of a regexp's "cost". Larger numbers are
* more expensive than smaller numbers.
*
* <p>A negative {@code value} will disable the check.
*
* <p>There's no guarantee that RE2 program size has the exact same value across other CEL
* implementations (C++ and Go).
*/
public abstract Builder maxRegexProgramSize(int value);

public abstract CelOptions build();
}
}
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,6 @@
import com.google.protobuf.Timestamp;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import com.google.re2j.PatternSyntaxException;
import dev.cel.common.CelErrorCode;
import dev.cel.common.CelOptions;
import dev.cel.common.internal.ComparisonFunctions;
Expand DownExpand Up@@ -1000,7 +999,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand All@@ -1015,7 +1014,7 @@ public enum StringMatchers implements StandardOverload {
(String string, String regexp) -> {
try {
return RuntimeHelpers.matches(string, regexp, bindingHelper.celOptions);
} catch (PatternSyntaxException e) {
} catch (RuntimeException e) {
throw new CelEvaluationException(
e.getMessage(), e, CelErrorCode.INVALID_ARGUMENT);
}
Expand Down
16 changes: 13 additions & 3 deletions runtime/src/main/java/dev/cel/runtime/RuntimeHelpers.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,12 +74,22 @@ public static boolean matches(String string, String regexp) {
}

public static boolean matches(String string, String regexp, CelOptions celOptions) {
Pattern pattern = Pattern.compile(regexp);
int maxProgramSize = celOptions.maxRegexProgramSize();
if (maxProgramSize >= 0 && pattern.programSize() > maxProgramSize) {
throw new IllegalArgumentException(
String.format(
"Regex pattern exceeds allowed program size. Allowed: %d, Provided: %d",
maxProgramSize, pattern.programSize()));
}

if (!celOptions.enableRegexPartialMatch()) {
// Uses re2 for consistency across languages.
return Pattern.matches(regexp, string);
return pattern.matcher(string).matches();
}
// Return an unanchored match for the presence of the regexp anywher in the string.
return Pattern.compile(regexp).matcher(string).find();

// Return an unanchored match for the presence of the regexp anywhere in the string.
return pattern.matcher(string).find();
}

/** Create a compiled pattern for the given regular expression. */
Expand Down