Skip to content
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
13 changes: 11 additions & 2 deletions src/Microsoft.OpenApi/Services/OpenApiVisitorBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,19 @@ public virtual void Enter(string segment)
this._path.Push(string.Empty);
return;
}
this._path.Push(EncodeJsonPointerSegment(segment));
}

internal static string EncodeJsonPointerSegment(string? segment)
{
if (string.IsNullOrEmpty(segment))
{
return string.Empty;
}
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP1_0_OR_GREATER
this._path.Push(segment.Replace("~", "~0", StringComparison.Ordinal).Replace("/", "~1", StringComparison.OrdinalIgnoreCase));
return segment.Replace("~", "~0", StringComparison.Ordinal).Replace("/", "~1", StringComparison.OrdinalIgnoreCase);
#else
this._path.Push(segment.Replace("~", "~0").Replace("/", "~1"));
return segment!.Replace("~", "~0").Replace("/", "~1");
#endif
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static class OpenApiParameterRules
(context, parameter) =>
{
if (parameter.In == ParameterLocation.Path &&
!(context.PathString.Contains("{" + parameter.Name + "}") || context.PathString.Contains("#/components")))
!(context.PathString.Contains("{" + OpenApiVisitorBase.EncodeJsonPointerSegment(parameter.Name) + "}") || context.PathString.Contains("#/components")))
{
context.Enter("in");
context.CreateError(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void ValidateExamplesShouldNotHaveDataTypeMismatchForSimpleSchema()
// Act
var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
var walker = new OpenApiWalker(validator);
walker.Walk(header);
walker.Walk((IOpenApiHeader)header);

warnings = validator.Warnings;
var result = !warnings.Any();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void ValidateExampleShouldNotHaveDataTypeMismatchForSimpleSchema()
var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
validator.Enter("{parameter1}");
var walker = new OpenApiWalker(validator);
walker.Walk(parameter);
walker.Walk((IOpenApiParameter)parameter);

warnings = validator.Warnings;
var result = !warnings.Any();
Expand Down Expand Up @@ -203,13 +203,78 @@ public void PathParameterInThePathShouldBeOk()
validator.Enter("1");

var walker = new OpenApiWalker(validator);
walker.Walk(parameter);
walker.Walk((IOpenApiParameter)parameter);

errors = validator.Errors;
var result = errors.Any();

// Assert
Assert.False(result);
}

[Fact]
public void PathParameterInThePathShouldBeOkWithSlashInParameterName()
{
// Arrange
IEnumerable<OpenApiError> errors;

var parameter = new OpenApiParameter
{
Name = "parameter/1",
In = ParameterLocation.Path,
Required = true,
Schema = new OpenApiSchema()
{
Type = JsonSchemaType.String,
}
};

// Act
var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
validator.Enter("paths");
validator.Enter("/{parameter/1}");
validator.Enter("get");
validator.Enter("parameters");
validator.Enter("1");

var walker = new OpenApiWalker(validator);
walker.Walk((IOpenApiParameter)parameter);

errors = validator.Errors;
var result = errors.Any();

// Assert
Assert.False(result);
}

[Fact]
public void PathParameterValidationShouldNotThrowWithEmptyParameterName()
{
// Arrange
var parameter = new OpenApiParameter
{
Name = string.Empty,
In = ParameterLocation.Path,
Required = true,
Schema = new OpenApiSchema()
{
Type = JsonSchemaType.String,
}
};

// Act
var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
validator.Enter("paths");
validator.Enter("/{}");
validator.Enter("get");
validator.Enter("parameters");
validator.Enter("1");

var walker = new OpenApiWalker(validator);
var exception = Record.Exception(() => walker.Walk((IOpenApiParameter)parameter));

// Assert
Assert.Null(exception);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void ValidateDefaultShouldNotHaveDataTypeMismatchForSimpleSchema()
// Act
var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
var walker = new OpenApiWalker(validator);
walker.Walk(schema);
walker.Walk((IOpenApiSchema)schema);

warnings = validator.Warnings;
var result = !warnings.Any();
Expand All @@ -50,7 +50,7 @@ public void ValidateExampleAndDefaultShouldNotHaveDataTypeMismatchForSimpleSchem
// Act
var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
var walker = new OpenApiWalker(validator);
walker.Walk(schema);
walker.Walk((IOpenApiSchema)schema);

warnings = validator.Warnings;
bool result = !warnings.Any();
Expand Down Expand Up @@ -92,7 +92,7 @@ public void ValidateEnumShouldNotHaveDataTypeMismatchForSimpleSchema()
// Act
var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet());
var walker = new OpenApiWalker(validator);
walker.Walk(schema);
walker.Walk((IOpenApiSchema)schema);

warnings = validator.Warnings;
var result = !warnings.Any();
Expand Down
Loading