Skip to content

Commit

Permalink
Dont anonymize known custom functions (#2614)
Browse files Browse the repository at this point in the history
We are adding a way for the hosts to declare a list of non-core public
functions that should be kept plain when getting function names from an
expression.
  • Loading branch information
anderson-joyle authored Aug 28, 2024
1 parent 1a6f9c4 commit 0089d2f
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 11 deletions.
18 changes: 17 additions & 1 deletion src/libraries/Microsoft.PowerFx.Core/Public/CheckResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -720,9 +720,25 @@ public IEnumerable<string> GetFunctionNames()
return GetFunctionNames(false);
}

/// <summary>
/// Get all function names used in the expression.
/// </summary>
/// <param name="anonymizeUnknownPublicFunctions">If true, anonymize the name of unknown public functions.</param>
/// <returns></returns>
public IEnumerable<string> GetFunctionNames(bool anonymizeUnknownPublicFunctions)
{
return ListFunctionVisitor.Run(ApplyParse(), anonymizeUnknownPublicFunctions);
return GetFunctionNames(anonymizeUnknownPublicFunctions, null);
}

/// <summary>
/// Get all function names used in the expression.
/// </summary>
/// <param name="anonymizeUnknownPublicFunctions">If true, anonymize the name of unknown public functions.</param>
/// <param name="customKnownFunctions">List containing custom functions names that will not be anonymized.</param>
/// <returns></returns>
public IEnumerable<string> GetFunctionNames(bool anonymizeUnknownPublicFunctions, ICollection<string> customKnownFunctions)
{
return ListFunctionVisitor.Run(ApplyParse(), anonymizeUnknownPublicFunctions, customKnownFunctions);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,35 @@ internal class ListFunctionVisitor : IdentityTexlVisitor
// FullName --> Name
// Use Fullname as key because it's unique.
private readonly HashSet<string> _functionNames = new HashSet<string>();
private readonly Dictionary<string, string> _unknownFunctionNames = new Dictionary<string, string>();
private readonly ICollection<string> _customPublicFunctionNames;
private readonly Dictionary<string, string> _unknownFunctionNames = new Dictionary<string, string>();
private readonly bool _anonymizedUnknownPublicFunctions;

public static IEnumerable<string> Run(ParseResult parse, bool anonymizeUnknownPublicFunctions = false)
public static IEnumerable<string> Run(ParseResult parse, bool anonymizeUnknownPublicFunctions = false, ICollection<string> customPublicFunctionNames = null)
{
var visitor = new ListFunctionVisitor(anonymizeUnknownPublicFunctions);
var visitor = new ListFunctionVisitor(anonymizeUnknownPublicFunctions, customPublicFunctionNames);
parse.Root.Accept(visitor);
return visitor._functionNames;
}

private ListFunctionVisitor(bool anonymizeUnknownPublicFunctions)
private ListFunctionVisitor(bool anonymizeUnknownPublicFunctions, ICollection<string> customPublicFunctionNames)
{
_anonymizedUnknownPublicFunctions = anonymizeUnknownPublicFunctions;
_customPublicFunctionNames = customPublicFunctionNames;
}

private bool IsKnownFunction(string name)
{
bool knownCustomFunction = _customPublicFunctionNames != null && _customPublicFunctionNames.Contains(name);
return BuiltinFunctionsCore.IsKnownPublicFunction(name) || knownCustomFunction;
}

public override bool PreVisit(CallNode node)
{
var hasNamespace = node.Head.Namespace.Length > 0;
var name = node.Head.Name;

if (_anonymizedUnknownPublicFunctions && !BuiltinFunctionsCore.IsKnownPublicFunction(name))
if (_anonymizedUnknownPublicFunctions && !IsKnownFunction(name))
{
// An expression can have multiple unknown function names.
// Track them all to ensure they are uniquely anonymized.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT license.

using System;
using System.Collections.Generic;
using Xunit;

namespace Microsoft.PowerFx.Core.Tests
Expand All @@ -17,9 +18,10 @@ public class ListFunctionVisitorTests : PowerFxTest
[InlineData("SomeNameSpace.Foo() + SomeNameSpace.Bar() + SomeNameSpace.Foo()", "$#CustomFunction1#$,$#CustomFunction2#$", true)]
[InlineData("Foo() + Abs(1) + Foo()", "$#CustomFunction1#$,Abs", true)]
[InlineData("true And true", "")]
[InlineData("If(true, Blank(),Error())", "If,Blank,Error")]
[InlineData("If(true, Blank(),Error())", "If,Blank,Error")]
[InlineData("If(true && CustomKnownFunction() && CustomPrivateFunction(), Blank(),Error())", "If,CustomKnownFunction,$#CustomFunction1#$,Blank,Error", true)]
public void ListFunctionNamesTest(string expression, string expectedNames, bool anonymizeUnknownPublicFunctions = false)
{
{
foreach (var textFirst in new bool[] { false, true })
{
if (textFirst)
Expand Down Expand Up @@ -51,10 +53,12 @@ private static void CheckFunctionNames(bool textFirst, string expression, string
var options = new ParserOptions() { TextFirst = textFirst };
var engine = new Engine();
var check = engine.Check(expression, options);
var checkResult = new CheckResult(engine).SetText(expression, options);
var checkResult = new CheckResult(engine).SetText(expression, options);

var knownFunctionNames = new HashSet<string> { "CustomKnownFunction" };

var functionsNames1 = check.GetFunctionNames(anonymizeUnknownPublicFunctions);
var functionsNames2 = checkResult.GetFunctionNames(anonymizeUnknownPublicFunctions);
var functionsNames1 = check.GetFunctionNames(anonymizeUnknownPublicFunctions, knownFunctionNames);
var functionsNames2 = checkResult.GetFunctionNames(anonymizeUnknownPublicFunctions, knownFunctionNames);

var actualNames1 = string.Join(",", functionsNames1);
var actualNames2 = string.Join(",", functionsNames2);
Expand Down

0 comments on commit 0089d2f

Please sign in to comment.