Skip to content

Fix URL processing in InternalLoad method #2487

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

Merged
merged 5 commits into from
Sep 19, 2025
Merged

Fix URL processing in InternalLoad method #2487

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
99a58c7
Fix URL processing in InternalLoad method
jkporter Sep 8, 2025
4843338
Merge branch 'microsoft:main' into main
jkporter Sep 8, 2025
287abcc
Removed format detection by file extension per feedback.
jkporter Sep 19, 2025
1e8a819
Revert "Removed format detection by file extension per feedback."
jkporter Sep 19, 2025
33b3c9e
Add exception capture for URI construction so InvalidOperationExcepti…
jkporter Sep 19, 2025
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
22 changes: 17 additions & 5 deletions src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@
Stream stream;
string? format;

if (url.StartsWith("http", StringComparison.OrdinalIgnoreCase)
|| url.StartsWith("https", StringComparison.OrdinalIgnoreCase))
if (url.StartsWith("http:", StringComparison.OrdinalIgnoreCase)
|| url.StartsWith("https:", StringComparison.OrdinalIgnoreCase))
{
var response = await settings.HttpClient.GetAsync(url, token).ConfigureAwait(false);
var mediaType = response.Content.Headers.ContentType?.MediaType;
Expand All @@ -320,15 +320,27 @@
}
else
{
format = Path.GetExtension(url).Split('.').LastOrDefault();

try
{
var fileInput = new FileInfo(url);
string fileName;
if (url.StartsWith("file:", StringComparison.OrdinalIgnoreCase))
{
fileName = new Uri(url).LocalPath;
}
else
{
fileName = url;
}
Comment on lines +326 to +333

Check notice

Code scanning / CodeQL

Missed ternary opportunity Note

Both branches of this 'if' statement write to the same variable - consider using '?' to express intent better.

format = Path.GetExtension(fileName).Split('.').LastOrDefault();

var fileInput = new FileInfo(fileName);
stream = fileInput.OpenRead();
}
catch (Exception ex) when (
ex is
UriFormatException or
FormatException or
FileNotFoundException or
PathTooLongException or
DirectoryNotFoundException or
Expand Down
Loading