Merge pull request #216 from avast/strings-implicit-cast-to-bools

Allow strings to have implicit conversion to bool same as YARA
avast · May 30, 2022 · 6dda35b · 6dda35b
2 parents 93c9579 + a0d8a17
commit 6dda35b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/include/yaramod/builder/yara_expression_builder.h b/include/yaramod/builder/yara_expression_builder.h
@@ -131,7 +131,7 @@ class YaraExpressionBuilder
 
 	/// @name Detection methods
 	/// @{
-	bool canBeBool() const { return _expr->isBool() || _expr->isFloat() || _expr->isInt() || _expr->isUndefined(); }
+	bool canBeBool() const { return _expr->isBool() || _expr->isFloat() || _expr->isInt() || _expr->isString() || _expr->isUndefined(); }
 	/// @}
 
 	/// @name Builder method

diff --git a/tests/cpp/builder_tests.cpp b/tests/cpp/builder_tests.cpp
@@ -2140,5 +2140,35 @@ rule of_rule_builder
 )", yaraFile->getTextFormatted());
 }
 
+TEST_F(BuilderTests,
+StringAsBoolInConditionWorks) {
+	auto cond = (stringVal("abc") && stringVal("def")).get();
+
+	YaraRuleBuilder newRule;
+	auto rule = newRule
+			.withName("rule1")
+			.withCondition(std::move(cond))
+			.get();
+
+	YaraFileBuilder newFile;
+	auto yaraFile = newFile
+			.withRule(std::move(rule))
+			.get(true);
+
+	ASSERT_NE(nullptr, yaraFile);
+	EXPECT_EQ(R"(rule rule1 {
+	condition:
+		"abc" and "def"
+})", yaraFile->getText());
+
+	EXPECT_EQ(R"(rule rule1
+{
+	condition:
+		"abc" and
+		"def"
+}
+)", yaraFile->getTextFormatted());
+}
+
 }
 }