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.

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

Properly validate functions that accept a collection of function parameter values #252

Merged
merged 2 commits into from
Feb 2, 2024
Merged

Properly validate functions that accept a collection of function parameter values #252

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ee20ac
Properly handle key-value with colletions
millicentachieng Feb 1, 2024
9d51b5d
Merge branch 'master' into validate-key-value-params-with-collection
millicentachieng Feb 2, 2024
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
6 changes: 4 additions & 2 deletions ApiDoctor.Publishing/CSDL/csdlextensionmethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ namespace ApiDoctor.Publishing.CSDL
internal static class CsdlExtensionMethods
{
private static readonly Regex GuidRegex = new(@"[0-9a-f\-]{32,36}", RegexOptions.Compiled | RegexOptions.IgnoreCase);

private static readonly Regex FunctionParamsRegex = new(@",(?![^\[]*])", RegexOptions.Compiled | RegexOptions.IgnoreCase);
public static string RequestUriPathOnly(this MethodDefinition method, IssueLogger issues = null)
{
issues ??= new IssueLogger();
Expand Down Expand Up @@ -121,9 +123,9 @@ public static string RequestUriPathOnly(this MethodDefinition method, IssueLogge

private static string NormalizeFunctionParameters(string funcParams, IssueLogger issues)
{
// foo=bar, baz ='qux',x= 9
// foo=bar,baz='qux',x= 9,quux=['corge','grault']
var normalized = new StringBuilder();
var allParams = funcParams.Split(',');
var allParams = FunctionParamsRegex.Split(funcParams);
for (int i = 0; i < allParams.Length; i++)
{
var param = allParams[i].Trim();
Expand Down
Loading