Add HttpRequest.FilePath and HttpRequest.PathInfo

src/Microsoft.AspNetCore.SystemWebAdapters/Adapters/IPathInfoFeature.cs

@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#if NET6_0_OR_GREATER
+namespace Microsoft.AspNetCore.SystemWebAdapters;
+
+internal interface IPathInfoFeature
+{
+    string PathInfo { get; }
+
+    string FileInfo { get; }
+}
+#endif

src/Microsoft.AspNetCore.SystemWebAdapters/Generated/Ref.Standard.cs

@@ -161,6 +161,7 @@ internal HttpRequest() { }
         public int ContentLength { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public string ContentType { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} set { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public System.Web.HttpCookieCollection Cookies { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
+        public string FilePath { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public System.Web.HttpFileCollection Files { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public System.Collections.Specialized.NameValueCollection Form { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public System.Collections.Specialized.NameValueCollection Headers { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
@@ -173,6 +174,7 @@ internal HttpRequest() { }
         public System.Security.Principal.IIdentity LogonUserIdentity { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public System.Collections.Specialized.NameValueCollection Params { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public string Path { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
+        public string PathInfo { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public System.Collections.Specialized.NameValueCollection QueryString { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public string RawUrl { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }
         public System.Web.ReadEntityBodyMode ReadEntityBodyMode { get { throw new System.PlatformNotSupportedException("Only supported when running on ASP.NET Core or System.Web");} }

src/Microsoft.AspNetCore.SystemWebAdapters/HttpRequest.cs

@@ -50,6 +50,10 @@ internal HttpRequest(HttpRequestCore request)
 
         public string? Path => _request.Path.Value;
 
+        public string? PathInfo => _request.HttpContext.Features.Get<IPathInfoFeature>()?.PathInfo ?? string.Empty;
+
+        public string? FilePath => _request.HttpContext.Features.Get<IPathInfoFeature>()?.FileInfo ?? Path;
+
         public NameValueCollection Headers => _headers ??= _request.Headers.ToNameValueCollection();
 
         public Uri Url => new(_request.GetEncodedUrl());
@@ -180,7 +184,7 @@ public bool IsLocal
             }
         }
 
-        public string AppRelativeCurrentExecutionFilePath => $"~{_request.Path.Value}";
+        public string AppRelativeCurrentExecutionFilePath => $"~{FilePath}";
 
         public string ApplicationPath => _request.HttpContext.RequestServices.GetRequiredService<IHttpRuntime>().AppDomainAppVirtualPath;
 

test/Microsoft.AspNetCore.SystemWebAdapters.Tests/HttpRequestTests.cs

@@ -45,7 +45,7 @@ public HttpRequestTests()
         public void Path()
         {
             // Arrange
-            var path = new PathString("/" + _fixture.Create<string>());
+            var path = new PathString(CreateRandomPath());
             var coreRequest = new Mock<HttpRequestCore>();
             coreRequest.Setup(c => c.Path).Returns(path);
 
@@ -58,6 +58,101 @@ public void Path()
             Assert.Equal(path.Value, result);
         }
 
+        [Fact]
+        public void FilePathNoFeature()
+        {
+            // Arrange
+            var context = new Mock<HttpContextCore>();
+            context.Setup(c => c.Features).Returns(new FeatureCollection());
+
+            var coreRequest = new Mock<HttpRequestCore>();
+            var path = new PathString(CreateRandomPath());
+            coreRequest.Setup(c => c.Path).Returns(path);
+            coreRequest.Setup(c => c.HttpContext).Returns(context.Object);
+
+            var request = new HttpRequest(coreRequest.Object);
+
+            // Act
+            var result = request.FilePath;
+
+            // Assert
+            Assert.Equal(path, result);
+        }
+
+        [Fact]
+        public void FilePathFeature()
+        {
+            // Arrange
+            var feature = new Mock<IPathInfoFeature>();
+            var path = CreateRandomPath();
+            feature.Setup(f => f.FileInfo).Returns(path);
+
+            var features = new FeatureCollection();
+            features.Set(feature.Object);
+
+            var context = new Mock<HttpContextCore>();
+            context.Setup(c => c.Features).Returns(features);
+
+            var coreRequest = new Mock<HttpRequestCore>();
+            coreRequest.Setup(c => c.Path).Returns(CreateRandomPath());
+            coreRequest.Setup(c => c.HttpContext).Returns(context.Object);
+
+            var request = new HttpRequest(coreRequest.Object);
+
+            // Act
+            var result = request.FilePath;
+
+            // Assert
+            Assert.Equal(path, result);
+        }
+
+        [Fact]
+        public void PathInfoNoFeature()
+        {
+            // Arrange
+            var context = new Mock<HttpContextCore>();
+            context.Setup(c => c.Features).Returns(new FeatureCollection());
+
+            var coreRequest = new Mock<HttpRequestCore>();
+            coreRequest.Setup(c => c.Path).Returns(CreateRandomPath());
+            coreRequest.Setup(c => c.HttpContext).Returns(context.Object);
+
+            var request = new HttpRequest(coreRequest.Object);
+
+            // Act
+            var result = request.PathInfo;
+
+            // Assert
+            Assert.Same(string.Empty, result);
+        }
+
+        [Fact]
+        public void PathInfoFeature()
+        {
+            // Arrange
+            var feature = new Mock<IPathInfoFeature>();
+            var path = CreateRandomPath();
+            feature.Setup(f => f.PathInfo).Returns(path);
+
+            var features = new FeatureCollection();
+            features.Set(feature.Object);
+
+            var context = new Mock<HttpContextCore>();
+            context.Setup(c => c.Features).Returns(features);
+
+            var coreRequest = new Mock<HttpRequestCore>();
+            coreRequest.Setup(c => c.Path).Returns(CreateRandomPath());
+            coreRequest.Setup(c => c.HttpContext).Returns(context.Object);
+
+            var request = new HttpRequest(coreRequest.Object);
+
+            // Act
+            var result = request.PathInfo;
+
+            // Assert
+            Assert.Equal(path, result);
+        }
+
         [Fact]
         public void Url()
         {
@@ -395,17 +490,20 @@ public void IsLocalNullLocal(bool isLoopback)
         public void AppRelativeCurrentExecutionFilePath()
         {
             // Arrange
+            var context = new Mock<HttpContextCore>();
+            context.Setup(c => c.Features).Returns(new FeatureCollection());
+
             var coreRequest = new Mock<HttpRequestCore>();
             coreRequest.Setup(c => c.Scheme).Returns("http");
             coreRequest.Setup(c => c.Host).Returns(new HostString("www.A.com"));
             coreRequest.Setup(c => c.Path).Returns("/B/ C");
             coreRequest.Setup(c => c.QueryString).Returns(new QueryString("?D=E"));
             coreRequest.Setup(c => c.PathBase).Returns("/F");
+            coreRequest.Setup(c => c.HttpContext).Returns(context.Object);
 
             var request = new HttpRequest(coreRequest.Object);
 
             // Act
-            var url = request.Url;
             var result = request.AppRelativeCurrentExecutionFilePath;
 
             // Assert
@@ -1134,5 +1232,7 @@ public void EntityReadMode(ReadEntityBodyMode mode)
             // Assert
             Assert.Equal(mode, result);
         }
+
+        private string CreateRandomPath() => "/" + _fixture.Create<string>();
     }
 }