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
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,11 +45,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_INT64.celOverloadDecl(),
(ctx, typeSystem, sink, arg) ->
Expand All@@ -72,11 +72,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_UINT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_UINT64),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DOUBLE_AXIOM =
Expand All@@ -87,14 +87,15 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE))
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE),
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom STRING_AXIOM =
Expand All@@ -105,31 +106,31 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BOOL_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BOOL_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BYTES_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BYTES_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.TIMESTAMP_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DURATION_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DURATION_TO_STRING),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom BYTES_AXIOM =
Expand All@@ -140,7 +141,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BYTES.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BYTES),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DYN_AXIOM =
Expand All@@ -158,7 +159,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DURATION.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DURATION),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom TIMESTAMP_AXIOM =
Expand All@@ -169,7 +170,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_TIMESTAMP.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_TIMESTAMP),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.INT64_TO_TIMESTAMP.celOverloadDecl(),
(ctx, typeSystem, sink, arg) -> {
Expand All@@ -188,7 +189,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BOOL.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BOOL),
true)
/* isApproximated= */ true)
.build();

static final ImmutableList<CelZ3FunctionAxiom> ALL_AXIOMS =
Expand All@@ -213,56 +214,53 @@ private static CelZ3FunctionAxiom.UnaryTranslator createUninterpretedConversion(
typeSystem.celValueSort());
Expr<?> res = ctx.mkApp(funcDecl, arg);

BoolExpr isValid;
switch (conversion.celOverloadDecl().resultType().kind()) {
case INT:
BoolExpr intValid =
isValid =
ctx.mkAnd(
typeSystem.isInt(res),
ctx.mkNot(typeSystem.checkIntOverflow(typeSystem.getInt(res))));
sink.accept(intValid);
break;
case TIMESTAMP:
BoolExpr timestampValid =
isValid =
ctx.mkAnd(
typeSystem.isTimestamp(res),
ctx.mkNot(typeSystem.checkTimestampOverflow(typeSystem.getTimestamp(res))));
sink.accept(timestampValid);
break;
case DURATION:
BoolExpr durationValid =
isValid =
ctx.mkAnd(
typeSystem.isDuration(res),
ctx.mkNot(typeSystem.checkDurationOverflow(typeSystem.getDuration(res))));
sink.accept(durationValid);
break;
case UINT:
BoolExpr uintValid =
isValid =
ctx.mkAnd(
typeSystem.isUint(res),
ctx.mkNot(typeSystem.checkUintOverflow(typeSystem.getUint(res))));
sink.accept(uintValid);
break;
case DOUBLE:
BoolExpr doubleValid =
isValid =
ctx.mkAnd(
typeSystem.isDouble(res), ctx.mkNot(ctx.mkFPIsNaN(typeSystem.getDouble(res))));
sink.accept(doubleValid);
break;
case STRING:
sink.accept(typeSystem.isString(res));
isValid = typeSystem.isString(res);
break;
case BYTES:
sink.accept(typeSystem.isBytes(res));
isValid = typeSystem.isBytes(res);
break;
case BOOL:
sink.accept(typeSystem.isBool(res));
isValid = typeSystem.isBool(res);
break;
default:
throw new IllegalArgumentException(
"Unsupported uninterpreted conversion result type: "
+ conversion.celOverloadDecl().resultType());
}

sink.accept(ctx.mkOr(isValid, typeSystem.isError(res)));
return Optional.of(res);
};
}
Expand Down
53 changes: 24 additions & 29 deletions verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public final class CelVerifierZ3ImplTest {
.addVar("b", SimpleType.BOOL)
.addVar("role", SimpleType.STRING)
.addVar("country", SimpleType.STRING)
.addVar("string_var", SimpleType.STRING)
.addVar("port", SimpleType.INT)
.addVar("dur", SimpleType.DURATION)
.addVar("ts", SimpleType.TIMESTAMP)
Expand DownExpand Up@@ -325,13 +326,6 @@ public void isSatisfiable_timeout_throwsException() throws Exception {

private enum IsAlwaysTrueTestCase {
LOGICAL_OR_CONSTANTS("true || false"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')"),
DURATION_STRING_CONVERSION_VALID("duration('100s') == duration('100s')"),
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
TIMESTAMP_GREATER_EQUALS("timestamp(200) >= timestamp(100)"),
DURATION_GREATER_EQUALS(
"(timestamp(200) - timestamp(100)) >= (timestamp(150) - timestamp(100))"),
Expand DownExpand Up@@ -675,29 +669,7 @@ private enum IsAlwaysTrueTestCase {
TYPE_CONVERSION_DYN_IDENTITY("dyn(1) == 1"),
TYPE_CONVERSION_UINT_TO_INT("int(1u) == 1"),
TYPE_CONVERSION_INT_TO_UINT("uint(1) == 1u"),
TYPE_CONVERSION_INT_FROM_DOUBLE("int(1.0) == int(1.0)"),
TYPE_CONVERSION_INT_FROM_STRING("int('1') == int('1')"),
TYPE_CONVERSION_INT_FROM_TIMESTAMP(
"int(timestamp('1970-01-01T00:00:00Z')) == int(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_UINT_FROM_DOUBLE("uint(1.0) == uint(1.0)"),
TYPE_CONVERSION_UINT_FROM_STRING("uint('1') == uint('1')"),
TYPE_CONVERSION_DOUBLE_FROM_INT("double(1) == double(1)"),
TYPE_CONVERSION_DOUBLE_FROM_UINT("double(1u) == double(1u)"),
TYPE_CONVERSION_DOUBLE_FROM_STRING("double('1.0') == double('1.0')"),
TYPE_CONVERSION_STRING_FROM_INT("string(1) == string(1)"),
TYPE_CONVERSION_STRING_FROM_UINT("string(1u) == string(1u)"),
TYPE_CONVERSION_STRING_FROM_DOUBLE("string(1.0) == string(1.0)"),
TYPE_CONVERSION_STRING_FROM_BOOL("string(true) == string(true)"),
TYPE_CONVERSION_STRING_FROM_BYTES("string(b'foo') == string(b'foo')"),
TYPE_CONVERSION_STRING_FROM_TIMESTAMP(
"string(timestamp('1970-01-01T00:00:00Z')) == string(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_STRING_FROM_DURATION("string(duration('1s')) == string(duration('1s'))"),
TYPE_CONVERSION_BYTES_FROM_STRING("bytes('foo') == bytes('foo')"),
TYPE_CONVERSION_DURATION_FROM_STRING("duration('1s') == duration('1s')"),
TYPE_CONVERSION_TIMESTAMP_FROM_STRING(
"timestamp('1970-01-01T00:00:00Z') == timestamp('1970-01-01T00:00:00Z')"),
TYPE_CONVERSION_TIMESTAMP_FROM_INT("timestamp(1) == timestamp(1)"),
TYPE_CONVERSION_BOOL_FROM_STRING("bool('true') == bool('true')"),
TYPE_CONVERSION_INT_TO_UINT_ZERO("uint(0) == 0u"),

TYPE_AXIOM_OPTIONAL("type(optional.of(1)) == optional_type"),
Expand DownExpand Up@@ -1369,6 +1341,24 @@ private enum IsAlwaysTrueViolationTestCase {
"Counterexample input:",
"x = -9223372036854775808",
"y = -1"),
UNINTERPRETED_CONVERSION_CAN_ERROR_INT_FROM_STRING(
"int(string_var) == int(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_TIMESTAMP_FROM_STRING(
"timestamp(string_var) == timestamp(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_DURATION_FROM_STRING(
"duration(string_var) == duration(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')",
"Condition is not always true\\."),
DURATION_STRING_CONVERSION_VALID(
"duration('100s') == duration('100s')", "Condition is not always true\\."),
;

final String expr;
Expand All@@ -1395,6 +1385,11 @@ public void isAlwaysTrue_violation_returnsFalse(

private enum IsInconclusiveTestCase {
TIMESTAMP_ADD_DURATION_OVERFLOW("timestamp(253402300799) + duration('100s') > timestamp(0)"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
UNINTERPRETED_FUNCTION("request.matches('^[a-z]+$')"),
INT_STRING_UNINTERPRETED("int('123') == 123"),
LIST_WITH_APPROXIMATE_ELEMENT("[request.matches('a')]"),
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
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,11 +45,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_INT64.celOverloadDecl(),
(ctx, typeSystem, sink, arg) ->
Expand All@@ -72,11 +72,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_UINT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_UINT64),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DOUBLE_AXIOM =
Expand All@@ -87,14 +87,15 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE))
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE),
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom STRING_AXIOM =
Expand All@@ -105,31 +106,31 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BOOL_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BOOL_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BYTES_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BYTES_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.TIMESTAMP_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DURATION_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DURATION_TO_STRING),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom BYTES_AXIOM =
Expand All@@ -140,7 +141,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BYTES.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BYTES),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DYN_AXIOM =
Expand All@@ -158,7 +159,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DURATION.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DURATION),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom TIMESTAMP_AXIOM =
Expand All@@ -169,7 +170,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_TIMESTAMP.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_TIMESTAMP),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.INT64_TO_TIMESTAMP.celOverloadDecl(),
(ctx, typeSystem, sink, arg) -> {
Expand All@@ -188,7 +189,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BOOL.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BOOL),
true)
/* isApproximated= */ true)
.build();

static final ImmutableList<CelZ3FunctionAxiom> ALL_AXIOMS =
Expand All@@ -213,56 +214,53 @@ private static CelZ3FunctionAxiom.UnaryTranslator createUninterpretedConversion(
typeSystem.celValueSort());
Expr<?> res = ctx.mkApp(funcDecl, arg);

BoolExpr isValid;
switch (conversion.celOverloadDecl().resultType().kind()) {
case INT:
BoolExpr intValid =
isValid =
ctx.mkAnd(
typeSystem.isInt(res),
ctx.mkNot(typeSystem.checkIntOverflow(typeSystem.getInt(res))));
sink.accept(intValid);
break;
case TIMESTAMP:
BoolExpr timestampValid =
isValid =
ctx.mkAnd(
typeSystem.isTimestamp(res),
ctx.mkNot(typeSystem.checkTimestampOverflow(typeSystem.getTimestamp(res))));
sink.accept(timestampValid);
break;
case DURATION:
BoolExpr durationValid =
isValid =
ctx.mkAnd(
typeSystem.isDuration(res),
ctx.mkNot(typeSystem.checkDurationOverflow(typeSystem.getDuration(res))));
sink.accept(durationValid);
break;
case UINT:
BoolExpr uintValid =
isValid =
ctx.mkAnd(
typeSystem.isUint(res),
ctx.mkNot(typeSystem.checkUintOverflow(typeSystem.getUint(res))));
sink.accept(uintValid);
break;
case DOUBLE:
BoolExpr doubleValid =
isValid =
ctx.mkAnd(
typeSystem.isDouble(res), ctx.mkNot(ctx.mkFPIsNaN(typeSystem.getDouble(res))));
sink.accept(doubleValid);
break;
case STRING:
sink.accept(typeSystem.isString(res));
isValid = typeSystem.isString(res);
break;
case BYTES:
sink.accept(typeSystem.isBytes(res));
isValid = typeSystem.isBytes(res);
break;
case BOOL:
sink.accept(typeSystem.isBool(res));
isValid = typeSystem.isBool(res);
break;
default:
throw new IllegalArgumentException(
"Unsupported uninterpreted conversion result type: "
+ conversion.celOverloadDecl().resultType());
}

sink.accept(ctx.mkOr(isValid, typeSystem.isError(res)));
return Optional.of(res);
};
}
Expand Down
53 changes: 24 additions & 29 deletions verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public final class CelVerifierZ3ImplTest {
.addVar("b", SimpleType.BOOL)
.addVar("role", SimpleType.STRING)
.addVar("country", SimpleType.STRING)
.addVar("string_var", SimpleType.STRING)
.addVar("port", SimpleType.INT)
.addVar("dur", SimpleType.DURATION)
.addVar("ts", SimpleType.TIMESTAMP)
Expand DownExpand Up@@ -325,13 +326,6 @@ public void isSatisfiable_timeout_throwsException() throws Exception {

private enum IsAlwaysTrueTestCase {
LOGICAL_OR_CONSTANTS("true || false"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')"),
DURATION_STRING_CONVERSION_VALID("duration('100s') == duration('100s')"),
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
TIMESTAMP_GREATER_EQUALS("timestamp(200) >= timestamp(100)"),
DURATION_GREATER_EQUALS(
"(timestamp(200) - timestamp(100)) >= (timestamp(150) - timestamp(100))"),
Expand DownExpand Up@@ -675,29 +669,7 @@ private enum IsAlwaysTrueTestCase {
TYPE_CONVERSION_DYN_IDENTITY("dyn(1) == 1"),
TYPE_CONVERSION_UINT_TO_INT("int(1u) == 1"),
TYPE_CONVERSION_INT_TO_UINT("uint(1) == 1u"),
TYPE_CONVERSION_INT_FROM_DOUBLE("int(1.0) == int(1.0)"),
TYPE_CONVERSION_INT_FROM_STRING("int('1') == int('1')"),
TYPE_CONVERSION_INT_FROM_TIMESTAMP(
"int(timestamp('1970-01-01T00:00:00Z')) == int(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_UINT_FROM_DOUBLE("uint(1.0) == uint(1.0)"),
TYPE_CONVERSION_UINT_FROM_STRING("uint('1') == uint('1')"),
TYPE_CONVERSION_DOUBLE_FROM_INT("double(1) == double(1)"),
TYPE_CONVERSION_DOUBLE_FROM_UINT("double(1u) == double(1u)"),
TYPE_CONVERSION_DOUBLE_FROM_STRING("double('1.0') == double('1.0')"),
TYPE_CONVERSION_STRING_FROM_INT("string(1) == string(1)"),
TYPE_CONVERSION_STRING_FROM_UINT("string(1u) == string(1u)"),
TYPE_CONVERSION_STRING_FROM_DOUBLE("string(1.0) == string(1.0)"),
TYPE_CONVERSION_STRING_FROM_BOOL("string(true) == string(true)"),
TYPE_CONVERSION_STRING_FROM_BYTES("string(b'foo') == string(b'foo')"),
TYPE_CONVERSION_STRING_FROM_TIMESTAMP(
"string(timestamp('1970-01-01T00:00:00Z')) == string(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_STRING_FROM_DURATION("string(duration('1s')) == string(duration('1s'))"),
TYPE_CONVERSION_BYTES_FROM_STRING("bytes('foo') == bytes('foo')"),
TYPE_CONVERSION_DURATION_FROM_STRING("duration('1s') == duration('1s')"),
TYPE_CONVERSION_TIMESTAMP_FROM_STRING(
"timestamp('1970-01-01T00:00:00Z') == timestamp('1970-01-01T00:00:00Z')"),
TYPE_CONVERSION_TIMESTAMP_FROM_INT("timestamp(1) == timestamp(1)"),
TYPE_CONVERSION_BOOL_FROM_STRING("bool('true') == bool('true')"),
TYPE_CONVERSION_INT_TO_UINT_ZERO("uint(0) == 0u"),

TYPE_AXIOM_OPTIONAL("type(optional.of(1)) == optional_type"),
Expand DownExpand Up@@ -1369,6 +1341,24 @@ private enum IsAlwaysTrueViolationTestCase {
"Counterexample input:",
"x = -9223372036854775808",
"y = -1"),
UNINTERPRETED_CONVERSION_CAN_ERROR_INT_FROM_STRING(
"int(string_var) == int(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_TIMESTAMP_FROM_STRING(
"timestamp(string_var) == timestamp(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_DURATION_FROM_STRING(
"duration(string_var) == duration(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')",
"Condition is not always true\\."),
DURATION_STRING_CONVERSION_VALID(
"duration('100s') == duration('100s')", "Condition is not always true\\."),
;

final String expr;
Expand All@@ -1395,6 +1385,11 @@ public void isAlwaysTrue_violation_returnsFalse(

private enum IsInconclusiveTestCase {
TIMESTAMP_ADD_DURATION_OVERFLOW("timestamp(253402300799) + duration('100s') > timestamp(0)"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
UNINTERPRETED_FUNCTION("request.matches('^[a-z]+$')"),
INT_STRING_UNINTERPRETED("int('123') == 123"),
LIST_WITH_APPROXIMATE_ELEMENT("[request.matches('a')]"),
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
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,11 +45,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_INT64.celOverloadDecl(),
(ctx, typeSystem, sink, arg) ->
Expand All@@ -72,11 +72,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_UINT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_UINT64),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DOUBLE_AXIOM =
Expand All@@ -87,14 +87,15 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE))
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE),
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom STRING_AXIOM =
Expand All@@ -105,31 +106,31 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BOOL_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BOOL_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BYTES_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BYTES_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.TIMESTAMP_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DURATION_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DURATION_TO_STRING),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom BYTES_AXIOM =
Expand All@@ -140,7 +141,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BYTES.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BYTES),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DYN_AXIOM =
Expand All@@ -158,7 +159,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DURATION.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DURATION),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom TIMESTAMP_AXIOM =
Expand All@@ -169,7 +170,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_TIMESTAMP.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_TIMESTAMP),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.INT64_TO_TIMESTAMP.celOverloadDecl(),
(ctx, typeSystem, sink, arg) -> {
Expand All@@ -188,7 +189,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BOOL.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BOOL),
true)
/* isApproximated= */ true)
.build();

static final ImmutableList<CelZ3FunctionAxiom> ALL_AXIOMS =
Expand All@@ -213,56 +214,53 @@ private static CelZ3FunctionAxiom.UnaryTranslator createUninterpretedConversion(
typeSystem.celValueSort());
Expr<?> res = ctx.mkApp(funcDecl, arg);

BoolExpr isValid;
switch (conversion.celOverloadDecl().resultType().kind()) {
case INT:
BoolExpr intValid =
isValid =
ctx.mkAnd(
typeSystem.isInt(res),
ctx.mkNot(typeSystem.checkIntOverflow(typeSystem.getInt(res))));
sink.accept(intValid);
break;
case TIMESTAMP:
BoolExpr timestampValid =
isValid =
ctx.mkAnd(
typeSystem.isTimestamp(res),
ctx.mkNot(typeSystem.checkTimestampOverflow(typeSystem.getTimestamp(res))));
sink.accept(timestampValid);
break;
case DURATION:
BoolExpr durationValid =
isValid =
ctx.mkAnd(
typeSystem.isDuration(res),
ctx.mkNot(typeSystem.checkDurationOverflow(typeSystem.getDuration(res))));
sink.accept(durationValid);
break;
case UINT:
BoolExpr uintValid =
isValid =
ctx.mkAnd(
typeSystem.isUint(res),
ctx.mkNot(typeSystem.checkUintOverflow(typeSystem.getUint(res))));
sink.accept(uintValid);
break;
case DOUBLE:
BoolExpr doubleValid =
isValid =
ctx.mkAnd(
typeSystem.isDouble(res), ctx.mkNot(ctx.mkFPIsNaN(typeSystem.getDouble(res))));
sink.accept(doubleValid);
break;
case STRING:
sink.accept(typeSystem.isString(res));
isValid = typeSystem.isString(res);
break;
case BYTES:
sink.accept(typeSystem.isBytes(res));
isValid = typeSystem.isBytes(res);
break;
case BOOL:
sink.accept(typeSystem.isBool(res));
isValid = typeSystem.isBool(res);
break;
default:
throw new IllegalArgumentException(
"Unsupported uninterpreted conversion result type: "
+ conversion.celOverloadDecl().resultType());
}

sink.accept(ctx.mkOr(isValid, typeSystem.isError(res)));
return Optional.of(res);
};
}
Expand Down
53 changes: 24 additions & 29 deletions verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public final class CelVerifierZ3ImplTest {
.addVar("b", SimpleType.BOOL)
.addVar("role", SimpleType.STRING)
.addVar("country", SimpleType.STRING)
.addVar("string_var", SimpleType.STRING)
.addVar("port", SimpleType.INT)
.addVar("dur", SimpleType.DURATION)
.addVar("ts", SimpleType.TIMESTAMP)
Expand DownExpand Up@@ -325,13 +326,6 @@ public void isSatisfiable_timeout_throwsException() throws Exception {

private enum IsAlwaysTrueTestCase {
LOGICAL_OR_CONSTANTS("true || false"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')"),
DURATION_STRING_CONVERSION_VALID("duration('100s') == duration('100s')"),
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
TIMESTAMP_GREATER_EQUALS("timestamp(200) >= timestamp(100)"),
DURATION_GREATER_EQUALS(
"(timestamp(200) - timestamp(100)) >= (timestamp(150) - timestamp(100))"),
Expand DownExpand Up@@ -675,29 +669,7 @@ private enum IsAlwaysTrueTestCase {
TYPE_CONVERSION_DYN_IDENTITY("dyn(1) == 1"),
TYPE_CONVERSION_UINT_TO_INT("int(1u) == 1"),
TYPE_CONVERSION_INT_TO_UINT("uint(1) == 1u"),
TYPE_CONVERSION_INT_FROM_DOUBLE("int(1.0) == int(1.0)"),
TYPE_CONVERSION_INT_FROM_STRING("int('1') == int('1')"),
TYPE_CONVERSION_INT_FROM_TIMESTAMP(
"int(timestamp('1970-01-01T00:00:00Z')) == int(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_UINT_FROM_DOUBLE("uint(1.0) == uint(1.0)"),
TYPE_CONVERSION_UINT_FROM_STRING("uint('1') == uint('1')"),
TYPE_CONVERSION_DOUBLE_FROM_INT("double(1) == double(1)"),
TYPE_CONVERSION_DOUBLE_FROM_UINT("double(1u) == double(1u)"),
TYPE_CONVERSION_DOUBLE_FROM_STRING("double('1.0') == double('1.0')"),
TYPE_CONVERSION_STRING_FROM_INT("string(1) == string(1)"),
TYPE_CONVERSION_STRING_FROM_UINT("string(1u) == string(1u)"),
TYPE_CONVERSION_STRING_FROM_DOUBLE("string(1.0) == string(1.0)"),
TYPE_CONVERSION_STRING_FROM_BOOL("string(true) == string(true)"),
TYPE_CONVERSION_STRING_FROM_BYTES("string(b'foo') == string(b'foo')"),
TYPE_CONVERSION_STRING_FROM_TIMESTAMP(
"string(timestamp('1970-01-01T00:00:00Z')) == string(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_STRING_FROM_DURATION("string(duration('1s')) == string(duration('1s'))"),
TYPE_CONVERSION_BYTES_FROM_STRING("bytes('foo') == bytes('foo')"),
TYPE_CONVERSION_DURATION_FROM_STRING("duration('1s') == duration('1s')"),
TYPE_CONVERSION_TIMESTAMP_FROM_STRING(
"timestamp('1970-01-01T00:00:00Z') == timestamp('1970-01-01T00:00:00Z')"),
TYPE_CONVERSION_TIMESTAMP_FROM_INT("timestamp(1) == timestamp(1)"),
TYPE_CONVERSION_BOOL_FROM_STRING("bool('true') == bool('true')"),
TYPE_CONVERSION_INT_TO_UINT_ZERO("uint(0) == 0u"),

TYPE_AXIOM_OPTIONAL("type(optional.of(1)) == optional_type"),
Expand DownExpand Up@@ -1369,6 +1341,24 @@ private enum IsAlwaysTrueViolationTestCase {
"Counterexample input:",
"x = -9223372036854775808",
"y = -1"),
UNINTERPRETED_CONVERSION_CAN_ERROR_INT_FROM_STRING(
"int(string_var) == int(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_TIMESTAMP_FROM_STRING(
"timestamp(string_var) == timestamp(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_DURATION_FROM_STRING(
"duration(string_var) == duration(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')",
"Condition is not always true\\."),
DURATION_STRING_CONVERSION_VALID(
"duration('100s') == duration('100s')", "Condition is not always true\\."),
;

final String expr;
Expand All@@ -1395,6 +1385,11 @@ public void isAlwaysTrue_violation_returnsFalse(

private enum IsInconclusiveTestCase {
TIMESTAMP_ADD_DURATION_OVERFLOW("timestamp(253402300799) + duration('100s') > timestamp(0)"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
UNINTERPRETED_FUNCTION("request.matches('^[a-z]+$')"),
INT_STRING_UNINTERPRETED("int('123') == 123"),
LIST_WITH_APPROXIMATE_ELEMENT("[request.matches('a')]"),
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
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,11 +45,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_INT64.celOverloadDecl(),
(ctx, typeSystem, sink, arg) ->
Expand All@@ -72,11 +72,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_UINT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_UINT64),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DOUBLE_AXIOM =
Expand All@@ -87,14 +87,15 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE))
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE),
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom STRING_AXIOM =
Expand All@@ -105,31 +106,31 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BOOL_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BOOL_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BYTES_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BYTES_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.TIMESTAMP_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DURATION_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DURATION_TO_STRING),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom BYTES_AXIOM =
Expand All@@ -140,7 +141,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BYTES.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BYTES),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DYN_AXIOM =
Expand All@@ -158,7 +159,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DURATION.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DURATION),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom TIMESTAMP_AXIOM =
Expand All@@ -169,7 +170,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_TIMESTAMP.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_TIMESTAMP),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.INT64_TO_TIMESTAMP.celOverloadDecl(),
(ctx, typeSystem, sink, arg) -> {
Expand All@@ -188,7 +189,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BOOL.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BOOL),
true)
/* isApproximated= */ true)
.build();

static final ImmutableList<CelZ3FunctionAxiom> ALL_AXIOMS =
Expand All@@ -213,56 +214,53 @@ private static CelZ3FunctionAxiom.UnaryTranslator createUninterpretedConversion(
typeSystem.celValueSort());
Expr<?> res = ctx.mkApp(funcDecl, arg);

BoolExpr isValid;
switch (conversion.celOverloadDecl().resultType().kind()) {
case INT:
BoolExpr intValid =
isValid =
ctx.mkAnd(
typeSystem.isInt(res),
ctx.mkNot(typeSystem.checkIntOverflow(typeSystem.getInt(res))));
sink.accept(intValid);
break;
case TIMESTAMP:
BoolExpr timestampValid =
isValid =
ctx.mkAnd(
typeSystem.isTimestamp(res),
ctx.mkNot(typeSystem.checkTimestampOverflow(typeSystem.getTimestamp(res))));
sink.accept(timestampValid);
break;
case DURATION:
BoolExpr durationValid =
isValid =
ctx.mkAnd(
typeSystem.isDuration(res),
ctx.mkNot(typeSystem.checkDurationOverflow(typeSystem.getDuration(res))));
sink.accept(durationValid);
break;
case UINT:
BoolExpr uintValid =
isValid =
ctx.mkAnd(
typeSystem.isUint(res),
ctx.mkNot(typeSystem.checkUintOverflow(typeSystem.getUint(res))));
sink.accept(uintValid);
break;
case DOUBLE:
BoolExpr doubleValid =
isValid =
ctx.mkAnd(
typeSystem.isDouble(res), ctx.mkNot(ctx.mkFPIsNaN(typeSystem.getDouble(res))));
sink.accept(doubleValid);
break;
case STRING:
sink.accept(typeSystem.isString(res));
isValid = typeSystem.isString(res);
break;
case BYTES:
sink.accept(typeSystem.isBytes(res));
isValid = typeSystem.isBytes(res);
break;
case BOOL:
sink.accept(typeSystem.isBool(res));
isValid = typeSystem.isBool(res);
break;
default:
throw new IllegalArgumentException(
"Unsupported uninterpreted conversion result type: "
+ conversion.celOverloadDecl().resultType());
}

sink.accept(ctx.mkOr(isValid, typeSystem.isError(res)));
return Optional.of(res);
};
}
Expand Down
53 changes: 24 additions & 29 deletions verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public final class CelVerifierZ3ImplTest {
.addVar("b", SimpleType.BOOL)
.addVar("role", SimpleType.STRING)
.addVar("country", SimpleType.STRING)
.addVar("string_var", SimpleType.STRING)
.addVar("port", SimpleType.INT)
.addVar("dur", SimpleType.DURATION)
.addVar("ts", SimpleType.TIMESTAMP)
Expand DownExpand Up@@ -325,13 +326,6 @@ public void isSatisfiable_timeout_throwsException() throws Exception {

private enum IsAlwaysTrueTestCase {
LOGICAL_OR_CONSTANTS("true || false"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')"),
DURATION_STRING_CONVERSION_VALID("duration('100s') == duration('100s')"),
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
TIMESTAMP_GREATER_EQUALS("timestamp(200) >= timestamp(100)"),
DURATION_GREATER_EQUALS(
"(timestamp(200) - timestamp(100)) >= (timestamp(150) - timestamp(100))"),
Expand DownExpand Up@@ -675,29 +669,7 @@ private enum IsAlwaysTrueTestCase {
TYPE_CONVERSION_DYN_IDENTITY("dyn(1) == 1"),
TYPE_CONVERSION_UINT_TO_INT("int(1u) == 1"),
TYPE_CONVERSION_INT_TO_UINT("uint(1) == 1u"),
TYPE_CONVERSION_INT_FROM_DOUBLE("int(1.0) == int(1.0)"),
TYPE_CONVERSION_INT_FROM_STRING("int('1') == int('1')"),
TYPE_CONVERSION_INT_FROM_TIMESTAMP(
"int(timestamp('1970-01-01T00:00:00Z')) == int(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_UINT_FROM_DOUBLE("uint(1.0) == uint(1.0)"),
TYPE_CONVERSION_UINT_FROM_STRING("uint('1') == uint('1')"),
TYPE_CONVERSION_DOUBLE_FROM_INT("double(1) == double(1)"),
TYPE_CONVERSION_DOUBLE_FROM_UINT("double(1u) == double(1u)"),
TYPE_CONVERSION_DOUBLE_FROM_STRING("double('1.0') == double('1.0')"),
TYPE_CONVERSION_STRING_FROM_INT("string(1) == string(1)"),
TYPE_CONVERSION_STRING_FROM_UINT("string(1u) == string(1u)"),
TYPE_CONVERSION_STRING_FROM_DOUBLE("string(1.0) == string(1.0)"),
TYPE_CONVERSION_STRING_FROM_BOOL("string(true) == string(true)"),
TYPE_CONVERSION_STRING_FROM_BYTES("string(b'foo') == string(b'foo')"),
TYPE_CONVERSION_STRING_FROM_TIMESTAMP(
"string(timestamp('1970-01-01T00:00:00Z')) == string(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_STRING_FROM_DURATION("string(duration('1s')) == string(duration('1s'))"),
TYPE_CONVERSION_BYTES_FROM_STRING("bytes('foo') == bytes('foo')"),
TYPE_CONVERSION_DURATION_FROM_STRING("duration('1s') == duration('1s')"),
TYPE_CONVERSION_TIMESTAMP_FROM_STRING(
"timestamp('1970-01-01T00:00:00Z') == timestamp('1970-01-01T00:00:00Z')"),
TYPE_CONVERSION_TIMESTAMP_FROM_INT("timestamp(1) == timestamp(1)"),
TYPE_CONVERSION_BOOL_FROM_STRING("bool('true') == bool('true')"),
TYPE_CONVERSION_INT_TO_UINT_ZERO("uint(0) == 0u"),

TYPE_AXIOM_OPTIONAL("type(optional.of(1)) == optional_type"),
Expand DownExpand Up@@ -1369,6 +1341,24 @@ private enum IsAlwaysTrueViolationTestCase {
"Counterexample input:",
"x = -9223372036854775808",
"y = -1"),
UNINTERPRETED_CONVERSION_CAN_ERROR_INT_FROM_STRING(
"int(string_var) == int(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_TIMESTAMP_FROM_STRING(
"timestamp(string_var) == timestamp(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_DURATION_FROM_STRING(
"duration(string_var) == duration(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')",
"Condition is not always true\\."),
DURATION_STRING_CONVERSION_VALID(
"duration('100s') == duration('100s')", "Condition is not always true\\."),
;

final String expr;
Expand All@@ -1395,6 +1385,11 @@ public void isAlwaysTrue_violation_returnsFalse(

private enum IsInconclusiveTestCase {
TIMESTAMP_ADD_DURATION_OVERFLOW("timestamp(253402300799) + duration('100s') > timestamp(0)"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
UNINTERPRETED_FUNCTION("request.matches('^[a-z]+$')"),
INT_STRING_UNINTERPRETED("int('123') == 123"),
LIST_WITH_APPROXIMATE_ELEMENT("[request.matches('a')]"),
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
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,11 +45,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_INT64.celOverloadDecl(),
(ctx, typeSystem, sink, arg) ->
Expand All@@ -72,11 +72,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_UINT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_UINT64),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DOUBLE_AXIOM =
Expand All@@ -87,14 +87,15 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE))
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE),
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom STRING_AXIOM =
Expand All@@ -105,31 +106,31 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BOOL_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BOOL_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BYTES_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BYTES_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.TIMESTAMP_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DURATION_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DURATION_TO_STRING),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom BYTES_AXIOM =
Expand All@@ -140,7 +141,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BYTES.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BYTES),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DYN_AXIOM =
Expand All@@ -158,7 +159,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DURATION.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DURATION),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom TIMESTAMP_AXIOM =
Expand All@@ -169,7 +170,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_TIMESTAMP.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_TIMESTAMP),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.INT64_TO_TIMESTAMP.celOverloadDecl(),
(ctx, typeSystem, sink, arg) -> {
Expand All@@ -188,7 +189,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BOOL.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BOOL),
true)
/* isApproximated= */ true)
.build();

static final ImmutableList<CelZ3FunctionAxiom> ALL_AXIOMS =
Expand All@@ -213,56 +214,53 @@ private static CelZ3FunctionAxiom.UnaryTranslator createUninterpretedConversion(
typeSystem.celValueSort());
Expr<?> res = ctx.mkApp(funcDecl, arg);

BoolExpr isValid;
switch (conversion.celOverloadDecl().resultType().kind()) {
case INT:
BoolExpr intValid =
isValid =
ctx.mkAnd(
typeSystem.isInt(res),
ctx.mkNot(typeSystem.checkIntOverflow(typeSystem.getInt(res))));
sink.accept(intValid);
break;
case TIMESTAMP:
BoolExpr timestampValid =
isValid =
ctx.mkAnd(
typeSystem.isTimestamp(res),
ctx.mkNot(typeSystem.checkTimestampOverflow(typeSystem.getTimestamp(res))));
sink.accept(timestampValid);
break;
case DURATION:
BoolExpr durationValid =
isValid =
ctx.mkAnd(
typeSystem.isDuration(res),
ctx.mkNot(typeSystem.checkDurationOverflow(typeSystem.getDuration(res))));
sink.accept(durationValid);
break;
case UINT:
BoolExpr uintValid =
isValid =
ctx.mkAnd(
typeSystem.isUint(res),
ctx.mkNot(typeSystem.checkUintOverflow(typeSystem.getUint(res))));
sink.accept(uintValid);
break;
case DOUBLE:
BoolExpr doubleValid =
isValid =
ctx.mkAnd(
typeSystem.isDouble(res), ctx.mkNot(ctx.mkFPIsNaN(typeSystem.getDouble(res))));
sink.accept(doubleValid);
break;
case STRING:
sink.accept(typeSystem.isString(res));
isValid = typeSystem.isString(res);
break;
case BYTES:
sink.accept(typeSystem.isBytes(res));
isValid = typeSystem.isBytes(res);
break;
case BOOL:
sink.accept(typeSystem.isBool(res));
isValid = typeSystem.isBool(res);
break;
default:
throw new IllegalArgumentException(
"Unsupported uninterpreted conversion result type: "
+ conversion.celOverloadDecl().resultType());
}

sink.accept(ctx.mkOr(isValid, typeSystem.isError(res)));
return Optional.of(res);
};
}
Expand Down
53 changes: 24 additions & 29 deletions verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public final class CelVerifierZ3ImplTest {
.addVar("b", SimpleType.BOOL)
.addVar("role", SimpleType.STRING)
.addVar("country", SimpleType.STRING)
.addVar("string_var", SimpleType.STRING)
.addVar("port", SimpleType.INT)
.addVar("dur", SimpleType.DURATION)
.addVar("ts", SimpleType.TIMESTAMP)
Expand DownExpand Up@@ -325,13 +326,6 @@ public void isSatisfiable_timeout_throwsException() throws Exception {

private enum IsAlwaysTrueTestCase {
LOGICAL_OR_CONSTANTS("true || false"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')"),
DURATION_STRING_CONVERSION_VALID("duration('100s') == duration('100s')"),
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
TIMESTAMP_GREATER_EQUALS("timestamp(200) >= timestamp(100)"),
DURATION_GREATER_EQUALS(
"(timestamp(200) - timestamp(100)) >= (timestamp(150) - timestamp(100))"),
Expand DownExpand Up@@ -675,29 +669,7 @@ private enum IsAlwaysTrueTestCase {
TYPE_CONVERSION_DYN_IDENTITY("dyn(1) == 1"),
TYPE_CONVERSION_UINT_TO_INT("int(1u) == 1"),
TYPE_CONVERSION_INT_TO_UINT("uint(1) == 1u"),
TYPE_CONVERSION_INT_FROM_DOUBLE("int(1.0) == int(1.0)"),
TYPE_CONVERSION_INT_FROM_STRING("int('1') == int('1')"),
TYPE_CONVERSION_INT_FROM_TIMESTAMP(
"int(timestamp('1970-01-01T00:00:00Z')) == int(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_UINT_FROM_DOUBLE("uint(1.0) == uint(1.0)"),
TYPE_CONVERSION_UINT_FROM_STRING("uint('1') == uint('1')"),
TYPE_CONVERSION_DOUBLE_FROM_INT("double(1) == double(1)"),
TYPE_CONVERSION_DOUBLE_FROM_UINT("double(1u) == double(1u)"),
TYPE_CONVERSION_DOUBLE_FROM_STRING("double('1.0') == double('1.0')"),
TYPE_CONVERSION_STRING_FROM_INT("string(1) == string(1)"),
TYPE_CONVERSION_STRING_FROM_UINT("string(1u) == string(1u)"),
TYPE_CONVERSION_STRING_FROM_DOUBLE("string(1.0) == string(1.0)"),
TYPE_CONVERSION_STRING_FROM_BOOL("string(true) == string(true)"),
TYPE_CONVERSION_STRING_FROM_BYTES("string(b'foo') == string(b'foo')"),
TYPE_CONVERSION_STRING_FROM_TIMESTAMP(
"string(timestamp('1970-01-01T00:00:00Z')) == string(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_STRING_FROM_DURATION("string(duration('1s')) == string(duration('1s'))"),
TYPE_CONVERSION_BYTES_FROM_STRING("bytes('foo') == bytes('foo')"),
TYPE_CONVERSION_DURATION_FROM_STRING("duration('1s') == duration('1s')"),
TYPE_CONVERSION_TIMESTAMP_FROM_STRING(
"timestamp('1970-01-01T00:00:00Z') == timestamp('1970-01-01T00:00:00Z')"),
TYPE_CONVERSION_TIMESTAMP_FROM_INT("timestamp(1) == timestamp(1)"),
TYPE_CONVERSION_BOOL_FROM_STRING("bool('true') == bool('true')"),
TYPE_CONVERSION_INT_TO_UINT_ZERO("uint(0) == 0u"),

TYPE_AXIOM_OPTIONAL("type(optional.of(1)) == optional_type"),
Expand DownExpand Up@@ -1369,6 +1341,24 @@ private enum IsAlwaysTrueViolationTestCase {
"Counterexample input:",
"x = -9223372036854775808",
"y = -1"),
UNINTERPRETED_CONVERSION_CAN_ERROR_INT_FROM_STRING(
"int(string_var) == int(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_TIMESTAMP_FROM_STRING(
"timestamp(string_var) == timestamp(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_DURATION_FROM_STRING(
"duration(string_var) == duration(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')",
"Condition is not always true\\."),
DURATION_STRING_CONVERSION_VALID(
"duration('100s') == duration('100s')", "Condition is not always true\\."),
;

final String expr;
Expand All@@ -1395,6 +1385,11 @@ public void isAlwaysTrue_violation_returnsFalse(

private enum IsInconclusiveTestCase {
TIMESTAMP_ADD_DURATION_OVERFLOW("timestamp(253402300799) + duration('100s') > timestamp(0)"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
UNINTERPRETED_FUNCTION("request.matches('^[a-z]+$')"),
INT_STRING_UNINTERPRETED("int('123') == 123"),
LIST_WITH_APPROXIMATE_ELEMENT("[request.matches('a')]"),
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
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,11 +45,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_INT64.celOverloadDecl(),
(ctx, typeSystem, sink, arg) ->
Expand All@@ -72,11 +72,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_UINT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_UINT64),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DOUBLE_AXIOM =
Expand All@@ -87,14 +87,15 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE))
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE),
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom STRING_AXIOM =
Expand All@@ -105,31 +106,31 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BOOL_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BOOL_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BYTES_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BYTES_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.TIMESTAMP_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DURATION_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DURATION_TO_STRING),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom BYTES_AXIOM =
Expand All@@ -140,7 +141,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BYTES.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BYTES),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DYN_AXIOM =
Expand All@@ -158,7 +159,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DURATION.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DURATION),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom TIMESTAMP_AXIOM =
Expand All@@ -169,7 +170,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_TIMESTAMP.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_TIMESTAMP),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.INT64_TO_TIMESTAMP.celOverloadDecl(),
(ctx, typeSystem, sink, arg) -> {
Expand All@@ -188,7 +189,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BOOL.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BOOL),
true)
/* isApproximated= */ true)
.build();

static final ImmutableList<CelZ3FunctionAxiom> ALL_AXIOMS =
Expand All@@ -213,56 +214,53 @@ private static CelZ3FunctionAxiom.UnaryTranslator createUninterpretedConversion(
typeSystem.celValueSort());
Expr<?> res = ctx.mkApp(funcDecl, arg);

BoolExpr isValid;
switch (conversion.celOverloadDecl().resultType().kind()) {
case INT:
BoolExpr intValid =
isValid =
ctx.mkAnd(
typeSystem.isInt(res),
ctx.mkNot(typeSystem.checkIntOverflow(typeSystem.getInt(res))));
sink.accept(intValid);
break;
case TIMESTAMP:
BoolExpr timestampValid =
isValid =
ctx.mkAnd(
typeSystem.isTimestamp(res),
ctx.mkNot(typeSystem.checkTimestampOverflow(typeSystem.getTimestamp(res))));
sink.accept(timestampValid);
break;
case DURATION:
BoolExpr durationValid =
isValid =
ctx.mkAnd(
typeSystem.isDuration(res),
ctx.mkNot(typeSystem.checkDurationOverflow(typeSystem.getDuration(res))));
sink.accept(durationValid);
break;
case UINT:
BoolExpr uintValid =
isValid =
ctx.mkAnd(
typeSystem.isUint(res),
ctx.mkNot(typeSystem.checkUintOverflow(typeSystem.getUint(res))));
sink.accept(uintValid);
break;
case DOUBLE:
BoolExpr doubleValid =
isValid =
ctx.mkAnd(
typeSystem.isDouble(res), ctx.mkNot(ctx.mkFPIsNaN(typeSystem.getDouble(res))));
sink.accept(doubleValid);
break;
case STRING:
sink.accept(typeSystem.isString(res));
isValid = typeSystem.isString(res);
break;
case BYTES:
sink.accept(typeSystem.isBytes(res));
isValid = typeSystem.isBytes(res);
break;
case BOOL:
sink.accept(typeSystem.isBool(res));
isValid = typeSystem.isBool(res);
break;
default:
throw new IllegalArgumentException(
"Unsupported uninterpreted conversion result type: "
+ conversion.celOverloadDecl().resultType());
}

sink.accept(ctx.mkOr(isValid, typeSystem.isError(res)));
return Optional.of(res);
};
}
Expand Down
53 changes: 24 additions & 29 deletions verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public final class CelVerifierZ3ImplTest {
.addVar("b", SimpleType.BOOL)
.addVar("role", SimpleType.STRING)
.addVar("country", SimpleType.STRING)
.addVar("string_var", SimpleType.STRING)
.addVar("port", SimpleType.INT)
.addVar("dur", SimpleType.DURATION)
.addVar("ts", SimpleType.TIMESTAMP)
Expand DownExpand Up@@ -325,13 +326,6 @@ public void isSatisfiable_timeout_throwsException() throws Exception {

private enum IsAlwaysTrueTestCase {
LOGICAL_OR_CONSTANTS("true || false"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')"),
DURATION_STRING_CONVERSION_VALID("duration('100s') == duration('100s')"),
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
TIMESTAMP_GREATER_EQUALS("timestamp(200) >= timestamp(100)"),
DURATION_GREATER_EQUALS(
"(timestamp(200) - timestamp(100)) >= (timestamp(150) - timestamp(100))"),
Expand DownExpand Up@@ -675,29 +669,7 @@ private enum IsAlwaysTrueTestCase {
TYPE_CONVERSION_DYN_IDENTITY("dyn(1) == 1"),
TYPE_CONVERSION_UINT_TO_INT("int(1u) == 1"),
TYPE_CONVERSION_INT_TO_UINT("uint(1) == 1u"),
TYPE_CONVERSION_INT_FROM_DOUBLE("int(1.0) == int(1.0)"),
TYPE_CONVERSION_INT_FROM_STRING("int('1') == int('1')"),
TYPE_CONVERSION_INT_FROM_TIMESTAMP(
"int(timestamp('1970-01-01T00:00:00Z')) == int(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_UINT_FROM_DOUBLE("uint(1.0) == uint(1.0)"),
TYPE_CONVERSION_UINT_FROM_STRING("uint('1') == uint('1')"),
TYPE_CONVERSION_DOUBLE_FROM_INT("double(1) == double(1)"),
TYPE_CONVERSION_DOUBLE_FROM_UINT("double(1u) == double(1u)"),
TYPE_CONVERSION_DOUBLE_FROM_STRING("double('1.0') == double('1.0')"),
TYPE_CONVERSION_STRING_FROM_INT("string(1) == string(1)"),
TYPE_CONVERSION_STRING_FROM_UINT("string(1u) == string(1u)"),
TYPE_CONVERSION_STRING_FROM_DOUBLE("string(1.0) == string(1.0)"),
TYPE_CONVERSION_STRING_FROM_BOOL("string(true) == string(true)"),
TYPE_CONVERSION_STRING_FROM_BYTES("string(b'foo') == string(b'foo')"),
TYPE_CONVERSION_STRING_FROM_TIMESTAMP(
"string(timestamp('1970-01-01T00:00:00Z')) == string(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_STRING_FROM_DURATION("string(duration('1s')) == string(duration('1s'))"),
TYPE_CONVERSION_BYTES_FROM_STRING("bytes('foo') == bytes('foo')"),
TYPE_CONVERSION_DURATION_FROM_STRING("duration('1s') == duration('1s')"),
TYPE_CONVERSION_TIMESTAMP_FROM_STRING(
"timestamp('1970-01-01T00:00:00Z') == timestamp('1970-01-01T00:00:00Z')"),
TYPE_CONVERSION_TIMESTAMP_FROM_INT("timestamp(1) == timestamp(1)"),
TYPE_CONVERSION_BOOL_FROM_STRING("bool('true') == bool('true')"),
TYPE_CONVERSION_INT_TO_UINT_ZERO("uint(0) == 0u"),

TYPE_AXIOM_OPTIONAL("type(optional.of(1)) == optional_type"),
Expand DownExpand Up@@ -1369,6 +1341,24 @@ private enum IsAlwaysTrueViolationTestCase {
"Counterexample input:",
"x = -9223372036854775808",
"y = -1"),
UNINTERPRETED_CONVERSION_CAN_ERROR_INT_FROM_STRING(
"int(string_var) == int(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_TIMESTAMP_FROM_STRING(
"timestamp(string_var) == timestamp(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_DURATION_FROM_STRING(
"duration(string_var) == duration(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')",
"Condition is not always true\\."),
DURATION_STRING_CONVERSION_VALID(
"duration('100s') == duration('100s')", "Condition is not always true\\."),
;

final String expr;
Expand All@@ -1395,6 +1385,11 @@ public void isAlwaysTrue_violation_returnsFalse(

private enum IsInconclusiveTestCase {
TIMESTAMP_ADD_DURATION_OVERFLOW("timestamp(253402300799) + duration('100s') > timestamp(0)"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
UNINTERPRETED_FUNCTION("request.matches('^[a-z]+$')"),
INT_STRING_UNINTERPRETED("int('123') == 123"),
LIST_WITH_APPROXIMATE_ELEMENT("[request.matches('a')]"),
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
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,11 +45,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_INT64.celOverloadDecl(),
(ctx, typeSystem, sink, arg) ->
Expand All@@ -72,11 +72,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_UINT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_UINT64),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DOUBLE_AXIOM =
Expand All@@ -87,14 +87,15 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE))
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE),
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom STRING_AXIOM =
Expand All@@ -105,31 +106,31 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BOOL_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BOOL_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BYTES_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BYTES_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.TIMESTAMP_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DURATION_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DURATION_TO_STRING),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom BYTES_AXIOM =
Expand All@@ -140,7 +141,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BYTES.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BYTES),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DYN_AXIOM =
Expand All@@ -158,7 +159,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DURATION.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DURATION),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom TIMESTAMP_AXIOM =
Expand All@@ -169,7 +170,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_TIMESTAMP.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_TIMESTAMP),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.INT64_TO_TIMESTAMP.celOverloadDecl(),
(ctx, typeSystem, sink, arg) -> {
Expand All@@ -188,7 +189,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BOOL.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BOOL),
true)
/* isApproximated= */ true)
.build();

static final ImmutableList<CelZ3FunctionAxiom> ALL_AXIOMS =
Expand All@@ -213,56 +214,53 @@ private static CelZ3FunctionAxiom.UnaryTranslator createUninterpretedConversion(
typeSystem.celValueSort());
Expr<?> res = ctx.mkApp(funcDecl, arg);

BoolExpr isValid;
switch (conversion.celOverloadDecl().resultType().kind()) {
case INT:
BoolExpr intValid =
isValid =
ctx.mkAnd(
typeSystem.isInt(res),
ctx.mkNot(typeSystem.checkIntOverflow(typeSystem.getInt(res))));
sink.accept(intValid);
break;
case TIMESTAMP:
BoolExpr timestampValid =
isValid =
ctx.mkAnd(
typeSystem.isTimestamp(res),
ctx.mkNot(typeSystem.checkTimestampOverflow(typeSystem.getTimestamp(res))));
sink.accept(timestampValid);
break;
case DURATION:
BoolExpr durationValid =
isValid =
ctx.mkAnd(
typeSystem.isDuration(res),
ctx.mkNot(typeSystem.checkDurationOverflow(typeSystem.getDuration(res))));
sink.accept(durationValid);
break;
case UINT:
BoolExpr uintValid =
isValid =
ctx.mkAnd(
typeSystem.isUint(res),
ctx.mkNot(typeSystem.checkUintOverflow(typeSystem.getUint(res))));
sink.accept(uintValid);
break;
case DOUBLE:
BoolExpr doubleValid =
isValid =
ctx.mkAnd(
typeSystem.isDouble(res), ctx.mkNot(ctx.mkFPIsNaN(typeSystem.getDouble(res))));
sink.accept(doubleValid);
break;
case STRING:
sink.accept(typeSystem.isString(res));
isValid = typeSystem.isString(res);
break;
case BYTES:
sink.accept(typeSystem.isBytes(res));
isValid = typeSystem.isBytes(res);
break;
case BOOL:
sink.accept(typeSystem.isBool(res));
isValid = typeSystem.isBool(res);
break;
default:
throw new IllegalArgumentException(
"Unsupported uninterpreted conversion result type: "
+ conversion.celOverloadDecl().resultType());
}

sink.accept(ctx.mkOr(isValid, typeSystem.isError(res)));
return Optional.of(res);
};
}
Expand Down
53 changes: 24 additions & 29 deletions verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public final class CelVerifierZ3ImplTest {
.addVar("b", SimpleType.BOOL)
.addVar("role", SimpleType.STRING)
.addVar("country", SimpleType.STRING)
.addVar("string_var", SimpleType.STRING)
.addVar("port", SimpleType.INT)
.addVar("dur", SimpleType.DURATION)
.addVar("ts", SimpleType.TIMESTAMP)
Expand DownExpand Up@@ -325,13 +326,6 @@ public void isSatisfiable_timeout_throwsException() throws Exception {

private enum IsAlwaysTrueTestCase {
LOGICAL_OR_CONSTANTS("true || false"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')"),
DURATION_STRING_CONVERSION_VALID("duration('100s') == duration('100s')"),
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
TIMESTAMP_GREATER_EQUALS("timestamp(200) >= timestamp(100)"),
DURATION_GREATER_EQUALS(
"(timestamp(200) - timestamp(100)) >= (timestamp(150) - timestamp(100))"),
Expand DownExpand Up@@ -675,29 +669,7 @@ private enum IsAlwaysTrueTestCase {
TYPE_CONVERSION_DYN_IDENTITY("dyn(1) == 1"),
TYPE_CONVERSION_UINT_TO_INT("int(1u) == 1"),
TYPE_CONVERSION_INT_TO_UINT("uint(1) == 1u"),
TYPE_CONVERSION_INT_FROM_DOUBLE("int(1.0) == int(1.0)"),
TYPE_CONVERSION_INT_FROM_STRING("int('1') == int('1')"),
TYPE_CONVERSION_INT_FROM_TIMESTAMP(
"int(timestamp('1970-01-01T00:00:00Z')) == int(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_UINT_FROM_DOUBLE("uint(1.0) == uint(1.0)"),
TYPE_CONVERSION_UINT_FROM_STRING("uint('1') == uint('1')"),
TYPE_CONVERSION_DOUBLE_FROM_INT("double(1) == double(1)"),
TYPE_CONVERSION_DOUBLE_FROM_UINT("double(1u) == double(1u)"),
TYPE_CONVERSION_DOUBLE_FROM_STRING("double('1.0') == double('1.0')"),
TYPE_CONVERSION_STRING_FROM_INT("string(1) == string(1)"),
TYPE_CONVERSION_STRING_FROM_UINT("string(1u) == string(1u)"),
TYPE_CONVERSION_STRING_FROM_DOUBLE("string(1.0) == string(1.0)"),
TYPE_CONVERSION_STRING_FROM_BOOL("string(true) == string(true)"),
TYPE_CONVERSION_STRING_FROM_BYTES("string(b'foo') == string(b'foo')"),
TYPE_CONVERSION_STRING_FROM_TIMESTAMP(
"string(timestamp('1970-01-01T00:00:00Z')) == string(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_STRING_FROM_DURATION("string(duration('1s')) == string(duration('1s'))"),
TYPE_CONVERSION_BYTES_FROM_STRING("bytes('foo') == bytes('foo')"),
TYPE_CONVERSION_DURATION_FROM_STRING("duration('1s') == duration('1s')"),
TYPE_CONVERSION_TIMESTAMP_FROM_STRING(
"timestamp('1970-01-01T00:00:00Z') == timestamp('1970-01-01T00:00:00Z')"),
TYPE_CONVERSION_TIMESTAMP_FROM_INT("timestamp(1) == timestamp(1)"),
TYPE_CONVERSION_BOOL_FROM_STRING("bool('true') == bool('true')"),
TYPE_CONVERSION_INT_TO_UINT_ZERO("uint(0) == 0u"),

TYPE_AXIOM_OPTIONAL("type(optional.of(1)) == optional_type"),
Expand DownExpand Up@@ -1369,6 +1341,24 @@ private enum IsAlwaysTrueViolationTestCase {
"Counterexample input:",
"x = -9223372036854775808",
"y = -1"),
UNINTERPRETED_CONVERSION_CAN_ERROR_INT_FROM_STRING(
"int(string_var) == int(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_TIMESTAMP_FROM_STRING(
"timestamp(string_var) == timestamp(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_DURATION_FROM_STRING(
"duration(string_var) == duration(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')",
"Condition is not always true\\."),
DURATION_STRING_CONVERSION_VALID(
"duration('100s') == duration('100s')", "Condition is not always true\\."),
;

final String expr;
Expand All@@ -1395,6 +1385,11 @@ public void isAlwaysTrue_violation_returnsFalse(

private enum IsInconclusiveTestCase {
TIMESTAMP_ADD_DURATION_OVERFLOW("timestamp(253402300799) + duration('100s') > timestamp(0)"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
UNINTERPRETED_FUNCTION("request.matches('^[a-z]+$')"),
INT_STRING_UNINTERPRETED("int('123') == 123"),
LIST_WITH_APPROXIMATE_ELEMENT("[request.matches('a')]"),
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
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,11 +45,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_INT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_INT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_INT64.celOverloadDecl(),
(ctx, typeSystem, sink, arg) ->
Expand All@@ -72,11 +72,11 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_UINT64),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_UINT64.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_UINT64),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DOUBLE_AXIOM =
Expand All@@ -87,14 +87,15 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_DOUBLE),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DOUBLE.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE))
createUninterpretedConversion(Conversions.STRING_TO_DOUBLE),
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom STRING_AXIOM =
Expand All@@ -105,31 +106,31 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.INT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.INT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.UINT64_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.UINT64_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DOUBLE_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DOUBLE_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BOOL_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BOOL_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.BYTES_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.BYTES_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.TIMESTAMP_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.TIMESTAMP_TO_STRING),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.DURATION_TO_STRING.celOverloadDecl(),
createUninterpretedConversion(Conversions.DURATION_TO_STRING),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom BYTES_AXIOM =
Expand All@@ -140,7 +141,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BYTES.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BYTES),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom DYN_AXIOM =
Expand All@@ -158,7 +159,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_DURATION.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_DURATION),
true)
/* isApproximated= */ true)
.build();

private static final CelZ3FunctionAxiom TIMESTAMP_AXIOM =
Expand All@@ -169,7 +170,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_TIMESTAMP.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_TIMESTAMP),
true)
/* isApproximated= */ true)
.addUnaryOverloadTranslator(
Conversions.INT64_TO_TIMESTAMP.celOverloadDecl(),
(ctx, typeSystem, sink, arg) -> {
Expand All@@ -188,7 +189,7 @@ final class TypeConversionAxioms {
.addUnaryOverloadTranslator(
Conversions.STRING_TO_BOOL.celOverloadDecl(),
createUninterpretedConversion(Conversions.STRING_TO_BOOL),
true)
/* isApproximated= */ true)
.build();

static final ImmutableList<CelZ3FunctionAxiom> ALL_AXIOMS =
Expand All@@ -213,56 +214,53 @@ private static CelZ3FunctionAxiom.UnaryTranslator createUninterpretedConversion(
typeSystem.celValueSort());
Expr<?> res = ctx.mkApp(funcDecl, arg);

BoolExpr isValid;
switch (conversion.celOverloadDecl().resultType().kind()) {
case INT:
BoolExpr intValid =
isValid =
ctx.mkAnd(
typeSystem.isInt(res),
ctx.mkNot(typeSystem.checkIntOverflow(typeSystem.getInt(res))));
sink.accept(intValid);
break;
case TIMESTAMP:
BoolExpr timestampValid =
isValid =
ctx.mkAnd(
typeSystem.isTimestamp(res),
ctx.mkNot(typeSystem.checkTimestampOverflow(typeSystem.getTimestamp(res))));
sink.accept(timestampValid);
break;
case DURATION:
BoolExpr durationValid =
isValid =
ctx.mkAnd(
typeSystem.isDuration(res),
ctx.mkNot(typeSystem.checkDurationOverflow(typeSystem.getDuration(res))));
sink.accept(durationValid);
break;
case UINT:
BoolExpr uintValid =
isValid =
ctx.mkAnd(
typeSystem.isUint(res),
ctx.mkNot(typeSystem.checkUintOverflow(typeSystem.getUint(res))));
sink.accept(uintValid);
break;
case DOUBLE:
BoolExpr doubleValid =
isValid =
ctx.mkAnd(
typeSystem.isDouble(res), ctx.mkNot(ctx.mkFPIsNaN(typeSystem.getDouble(res))));
sink.accept(doubleValid);
break;
case STRING:
sink.accept(typeSystem.isString(res));
isValid = typeSystem.isString(res);
break;
case BYTES:
sink.accept(typeSystem.isBytes(res));
isValid = typeSystem.isBytes(res);
break;
case BOOL:
sink.accept(typeSystem.isBool(res));
isValid = typeSystem.isBool(res);
break;
default:
throw new IllegalArgumentException(
"Unsupported uninterpreted conversion result type: "
+ conversion.celOverloadDecl().resultType());
}

sink.accept(ctx.mkOr(isValid, typeSystem.isError(res)));
return Optional.of(res);
};
}
Expand Down
53 changes: 24 additions & 29 deletions verifier/src/test/java/dev/cel/verifier/CelVerifierZ3ImplTest.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public final class CelVerifierZ3ImplTest {
.addVar("b", SimpleType.BOOL)
.addVar("role", SimpleType.STRING)
.addVar("country", SimpleType.STRING)
.addVar("string_var", SimpleType.STRING)
.addVar("port", SimpleType.INT)
.addVar("dur", SimpleType.DURATION)
.addVar("ts", SimpleType.TIMESTAMP)
Expand DownExpand Up@@ -325,13 +326,6 @@ public void isSatisfiable_timeout_throwsException() throws Exception {

private enum IsAlwaysTrueTestCase {
LOGICAL_OR_CONSTANTS("true || false"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')"),
DURATION_STRING_CONVERSION_VALID("duration('100s') == duration('100s')"),
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
TIMESTAMP_GREATER_EQUALS("timestamp(200) >= timestamp(100)"),
DURATION_GREATER_EQUALS(
"(timestamp(200) - timestamp(100)) >= (timestamp(150) - timestamp(100))"),
Expand DownExpand Up@@ -675,29 +669,7 @@ private enum IsAlwaysTrueTestCase {
TYPE_CONVERSION_DYN_IDENTITY("dyn(1) == 1"),
TYPE_CONVERSION_UINT_TO_INT("int(1u) == 1"),
TYPE_CONVERSION_INT_TO_UINT("uint(1) == 1u"),
TYPE_CONVERSION_INT_FROM_DOUBLE("int(1.0) == int(1.0)"),
TYPE_CONVERSION_INT_FROM_STRING("int('1') == int('1')"),
TYPE_CONVERSION_INT_FROM_TIMESTAMP(
"int(timestamp('1970-01-01T00:00:00Z')) == int(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_UINT_FROM_DOUBLE("uint(1.0) == uint(1.0)"),
TYPE_CONVERSION_UINT_FROM_STRING("uint('1') == uint('1')"),
TYPE_CONVERSION_DOUBLE_FROM_INT("double(1) == double(1)"),
TYPE_CONVERSION_DOUBLE_FROM_UINT("double(1u) == double(1u)"),
TYPE_CONVERSION_DOUBLE_FROM_STRING("double('1.0') == double('1.0')"),
TYPE_CONVERSION_STRING_FROM_INT("string(1) == string(1)"),
TYPE_CONVERSION_STRING_FROM_UINT("string(1u) == string(1u)"),
TYPE_CONVERSION_STRING_FROM_DOUBLE("string(1.0) == string(1.0)"),
TYPE_CONVERSION_STRING_FROM_BOOL("string(true) == string(true)"),
TYPE_CONVERSION_STRING_FROM_BYTES("string(b'foo') == string(b'foo')"),
TYPE_CONVERSION_STRING_FROM_TIMESTAMP(
"string(timestamp('1970-01-01T00:00:00Z')) == string(timestamp('1970-01-01T00:00:00Z'))"),
TYPE_CONVERSION_STRING_FROM_DURATION("string(duration('1s')) == string(duration('1s'))"),
TYPE_CONVERSION_BYTES_FROM_STRING("bytes('foo') == bytes('foo')"),
TYPE_CONVERSION_DURATION_FROM_STRING("duration('1s') == duration('1s')"),
TYPE_CONVERSION_TIMESTAMP_FROM_STRING(
"timestamp('1970-01-01T00:00:00Z') == timestamp('1970-01-01T00:00:00Z')"),
TYPE_CONVERSION_TIMESTAMP_FROM_INT("timestamp(1) == timestamp(1)"),
TYPE_CONVERSION_BOOL_FROM_STRING("bool('true') == bool('true')"),
TYPE_CONVERSION_INT_TO_UINT_ZERO("uint(0) == 0u"),

TYPE_AXIOM_OPTIONAL("type(optional.of(1)) == optional_type"),
Expand DownExpand Up@@ -1369,6 +1341,24 @@ private enum IsAlwaysTrueViolationTestCase {
"Counterexample input:",
"x = -9223372036854775808",
"y = -1"),
UNINTERPRETED_CONVERSION_CAN_ERROR_INT_FROM_STRING(
"int(string_var) == int(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_TIMESTAMP_FROM_STRING(
"timestamp(string_var) == timestamp(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
UNINTERPRETED_CONVERSION_CAN_ERROR_DURATION_FROM_STRING(
"duration(string_var) == duration(string_var)",
"Condition is not always true\\.",
"Counterexample input:"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_STRING_CONVERSION_VALID(
"timestamp('2023-01-01T00:00:00Z') == timestamp('2023-01-01T00:00:00Z')",
"Condition is not always true\\."),
DURATION_STRING_CONVERSION_VALID(
"duration('100s') == duration('100s')", "Condition is not always true\\."),
;

final String expr;
Expand All@@ -1395,6 +1385,11 @@ public void isAlwaysTrue_violation_returnsFalse(

private enum IsInconclusiveTestCase {
TIMESTAMP_ADD_DURATION_OVERFLOW("timestamp(253402300799) + duration('100s') > timestamp(0)"),
DYNAMIC_EQUALITY_TIMESTAMP_INT_COLLISION(
"type(dyn_var) == int && dyn_var == 0 ? dyn_var != timestamp('1970-01-01T00:00:00Z') :"
+ " true"),
// TODO: Implement RFC 3339 spec in conversion
TIMESTAMP_BOUNDS_VALID("timestamp('2023-01-01T00:00:00Z') <= timestamp(253402300799)"),
UNINTERPRETED_FUNCTION("request.matches('^[a-z]+$')"),
INT_STRING_UNINTERPRETED("int('123') == 123"),
LIST_WITH_APPROXIMATE_ELEMENT("[request.matches('a')]"),
Expand Down
Loading