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

Jump to bottom

Skip processing of media root path by MediaFileStoreResolverMiddleware #16760

Merged
merged 6 commits into from
Sep 20, 2024
Merged

Skip processing of media root path by MediaFileStoreResolverMiddleware #16760

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9eabb73
Skip processing of media root path
AndreySurkov Sep 19, 2024
e9018ca
Update src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileSt…
hishamco Sep 19, 2024
1a1b001
Merge branch 'main' into empty_media_request
hishamco Sep 19, 2024
3d0c3e8
Merge branch 'main' into empty_media_request
hishamco Sep 20, 2024
3457579
Remove useless debug message
AndreySurkov Sep 20, 2024
39f9234
Update src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileSt…
hishamco Sep 20, 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
5 changes: 3 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Media/Services/MediaFileStoreResolverMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using OrchardCore.FileStorage;
using OrchardCore.Routing;

namespace OrchardCore.Media.Services;
Expand Down Expand Up @@ -50,10 +51,10 @@ public async Task Invoke(HttpContext context)
}

var validatePath = context.Request.Path.StartsWithNormalizedSegments(_assetsRequestPath, StringComparison.OrdinalIgnoreCase, out var subPath);
if (!validatePath)
if (!validatePath || string.IsNullOrEmpty(_mediaFileStore.NormalizePath(subPath)))
gvkries marked this conversation as resolved.
Show resolved Hide resolved
{
_logger.LogDebug("Request path {Path} does not match the assets request path {RequestPath}", subPath, _assetsRequestPath);
await _next(context);

return;
hishamco marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down