Skip to content
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.

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

Fix stack overflow in FilterExpression.ValidForProperties #3946

Merged
merged 16 commits into from
Aug 24, 2022
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
98 changes: 72 additions & 26 deletions src/Microsoft.TestPlatform.Common/Filtering/FilterExpression.cs
Original file line number Diff line number Diff line change
Expand Up @@ -119,27 +119,27 @@ private static void ProcessOperator(Stack<FilterExpression> filterStack, Operato
/// </summary>
internal string[]? ValidForProperties(IEnumerable<string>? properties, Func<string, TestProperty?>? propertyProvider)
{
string[]? invalidProperties = null;

if (null == properties)
{
// if null, initialize to empty list so that invalid properties can be found.
properties = Enumerable.Empty<string>();
}

bool valid = false;
if (_condition != null)
return IterateFilterExpression<string[]?>((current, result) =>
{
valid = _condition.ValidForProperties(properties, propertyProvider);
if (!valid)
// Only the leaves have a condition value.
if (current._condition != null)
{
invalidProperties = new string[1] { _condition.Name };
bool valid = false;
valid = current._condition.ValidForProperties(properties, propertyProvider);
// If it's not valid will add it to the function's return array.
return !valid ? new string[1] { current._condition.Name } : null;
}
}
else
{
invalidProperties = _left!.ValidForProperties(properties, propertyProvider);
var invalidRight = _right!.ValidForProperties(properties, propertyProvider);

// Concatenate the children node's result to get their parent result.
var invalidRight = current._right != null ? result.Pop() : null;
var invalidProperties = current._left != null ? result.Pop() : null;

if (null == invalidProperties)
{
invalidProperties = invalidRight;
Expand All @@ -148,9 +148,10 @@ private static void ProcessOperator(Stack<FilterExpression> filterStack, Operato
{
invalidProperties = invalidProperties.Concat(invalidRight).ToArray();
}
}

return invalidProperties;
return invalidProperties;
});

}

/// <summary>
Expand Down Expand Up @@ -265,7 +266,46 @@ internal static FilterExpression Parse(string filterString, out FastFilter? fast

return filterStack.Pop();
}
private T IterateFilterExpression<T>(Func<FilterExpression, Stack<T>, T> getNodeValue)
{
FilterExpression? current = this;
// Will have the nodes.
Stack<FilterExpression> filterStack = new();
// Will contain the nodes results to use them in thier parent result's calculation
// and at the end will have the root result.
Stack<T> result = new();

do
{
// Push root's right child and then root to stack then Set root as root's left child.
while (current != null)
{
if (current._right != null)
{
filterStack.Push(current._right);
}
filterStack.Push(current);
current = current._left;
}

// If the popped item has a right child and the right child is at top of stack,
// then remove the right child from stack, push the root back and set root as root's right child.
current = filterStack.Pop();
if (filterStack.Count > 0 && current._right == filterStack.Peek())
{
filterStack.Pop();
filterStack.Push(current);
current = current._right;
continue;
}

result.Push(getNodeValue(current, result));
current = null;
} while (filterStack.Count > 0);

TPDebug.Assert(result.Count == 1, "Result stack should have one element at the end.");
return result.Peek();
}
/// <summary>
/// Evaluate filterExpression with given propertyValueProvider.
/// </summary>
Expand All @@ -274,19 +314,25 @@ internal static FilterExpression Parse(string filterString, out FastFilter? fast
internal bool Evaluate(Func<string, object?> propertyValueProvider)
{
ValidateArg.NotNull(propertyValueProvider, nameof(propertyValueProvider));
bool filterResult = false;
if (null != _condition)
{
filterResult = _condition.Evaluate(propertyValueProvider);
}
else

return IterateFilterExpression<bool>((current, result) =>
{
// & or | operator
bool leftResult = _left!.Evaluate(propertyValueProvider);
bool rightResult = _right!.Evaluate(propertyValueProvider);
filterResult = _areJoinedByAnd ? leftResult && rightResult : leftResult || rightResult;
}
return filterResult;
bool filterResult = false;
// Only the leaves have a condition value.
if (null != current._condition)
{
filterResult = current._condition.Evaluate(propertyValueProvider);
}
else
Evangelink marked this conversation as resolved.
Show resolved Hide resolved
{
// & or | operator
bool rightResult = current._right != null ? result.Pop() : false;
bool leftResult = current._left != null ? result.Pop() : false;
// Concatenate the children node's result to get their parent result.
filterResult = current._areJoinedByAnd ? leftResult && rightResult : leftResult || rightResult;
}
return filterResult;
});
}

internal static IEnumerable<string> TokenizeFilterExpressionString(string str)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Text;

using Microsoft.VisualStudio.TestPlatform.Common.Filtering;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
Expand Down Expand Up @@ -90,6 +91,38 @@ public void FastFilterWithSingleEqualsClause()
Assert.IsFalse(fastFilter.Evaluate(s => "Test2"));
}

[TestMethod]
public void ValidForPropertiesHandlesBigFilteringExpressions()
{
StringBuilder testCaseFilter = new("Category=Test1");

for (int i = 0; i < 1e5; i++) // creating a 100k filter cases string
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for (int i = 0; i < 1e5; i++) // creating a 100k filter cases string
// Create filter with 100k conditions.
for (int i = 0; i < 100_000; i++)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just a nitpick.

{
testCaseFilter.Append("|Test2");
}

var filterExpressionWrapper = new FilterExpressionWrapper(testCaseFilter.ToString());
string[]? invalidProperties = filterExpressionWrapper.ValidForProperties(new List<string>() { "FullyQualifiedName" }, null);

Assert.IsNotNull(invalidProperties);
Assert.AreEqual(invalidProperties.Length, 1);
Assert.AreEqual(invalidProperties[0], "Category");
}

[TestMethod]
public void EvaluateHandlesBigFilteringExpressions()
{
StringBuilder testCaseFilter = new("Test1");
// Create filter with 100k conditions.
for (int i = 0; i < 1e5; i++)
{
testCaseFilter.Append("|Test2");
}

var filterExpressionWrapper = new FilterExpressionWrapper(testCaseFilter.ToString());
Assert.IsTrue(filterExpressionWrapper.Evaluate(s => "Test1"));
}

[TestMethod]
public void FastFilterWithMultipleEqualsClause()
{
Expand Down