Skip to content

[ISSUE #10877] fix(filter): convert boolean string operands safely #10887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuluo-yx wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[ISSUE #10877] fix(filter): convert boolean string operands safely #10887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion filter/src/main/java/org/apache/rocketmq/filter/expression/ComparisonExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ protected static int __compare(Comparable lv, Comparable rv, boolean convertStri
try {
if (lc == Boolean.class) {
if (convertStringExpressions && rc == String.class) {
lv = Boolean.valueOf((String) lv).booleanValue();
rv = Boolean.valueOf((String) rv);
} else {
return -1;
}
Expand Down
11 changes: 11 additions & 0 deletions filter/src/test/java/org/apache/rocketmq/filter/ExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,17 @@ public void testEvaluate_boolean() throws Exception {
eval(expression, context, Boolean.FALSE);
}

@Test
public void testEvaluate_booleanConstantComparedToStringProperty() throws Exception {
EvaluationContext trueContext = genContext(KeyValue.c("a", "true"));
EvaluationContext falseContext = genContext(KeyValue.c("a", "false"));

eval(genExp("TRUE=a"), trueContext, Boolean.TRUE);
eval(genExp("TRUE<>a"), falseContext, Boolean.TRUE);
eval(genExp("FALSE=a"), falseContext, Boolean.TRUE);
eval(genExp("FALSE<>a"), trueContext, Boolean.TRUE);
}

@Test
public void testEvaluate_equal() throws Exception {
Expression expression = genExp(equalExpression);
Expand Down
Loading