Local relative paths allow "./" prefix #6202

ryanbrandenburg · 2017-04-24T22:56:16Z

Fixes #6190 by allowing ./ relative paths.

rynowak · 2017-04-24T23:04:23Z

src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs

@@ -457,6 +457,11 @@ private static object CalculatePageName(ActionContext actionContext, string page
                    throw new InvalidOperationException(Resources.FormatUrlHelper_RelativePagePathIsNotSupported(pageName));
                }

+                if(pageName.StartsWith("./"))


StringComparison.Ordinal

Should we do back-slashes too? ViewEnginePath allows ..\ for path navigation.

pranavkm · 2017-04-24T23:15:48Z

src/Microsoft.AspNetCore.Mvc.Core/Resources.resx

@@ -404,6 +404,6 @@
    <value>No page named '{0}' matches the supplied values.</value>
  </data>
  <data name="UrlHelper_RelativePagePathIsNotSupported" xml:space="preserve">
-    <value>The relative page path '{0}' can only can only be used while executing a Razor Page. Specify a root relative path with a leading '/' to generate a URL outside of a Razor Page.</value>
+    <value>The relative page path '{0}' can only be used while executing a Razor Page. Specify a root relative path with a leading '/' to generate a URL outside of a Razor Page.</value>


pranavkm · 2017-04-24T23:15:54Z

src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs

@@ -457,6 +457,11 @@ private static object CalculatePageName(ActionContext actionContext, string page
                    throw new InvalidOperationException(Resources.FormatUrlHelper_RelativePagePathIsNotSupported(pageName));
                }

+                if(pageName.StartsWith("./"))


StringComparison.Ordinal

pranavkm · 2017-04-24T23:16:10Z

src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs

@@ -457,6 +457,11 @@ private static object CalculatePageName(ActionContext actionContext, string page
                    throw new InvalidOperationException(Resources.FormatUrlHelper_RelativePagePathIsNotSupported(pageName));
                }

+                if(pageName.StartsWith("./"))
+                {
+                    pageName = pageName.Substring(2, pageName.Length - 2);


pageName = pageName.Substring(2);

pranavkm · 2017-04-24T23:18:41Z

src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs

@@ -457,6 +457,11 @@ private static object CalculatePageName(ActionContext actionContext, string page
                    throw new InvalidOperationException(Resources.FormatUrlHelper_RelativePagePathIsNotSupported(pageName));
                }

+                if(pageName.StartsWith("./"))


Should we do back-slashes too? ViewEnginePath allows ..\ for path navigation.

ryanbrandenburg · 2017-04-24T23:44:32Z

test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml

@@ -8,4 +8,6 @@
    public IActionResult OnGetRedirectToSubDir() => RedirectToPage("SubDir/SubDirPage");

    public IActionResult OnGetRedirectToParent() => RedirectToPage("../Conventions/AuthFolder/Index");
+
+    public IActionResult OnGetRedirectToDotSlash() => RedirectToPage("./SubDir/SubDirPage");


Double check my thinking that /Pages/Redirects/SubDir/SubDirPage is the correct outcome of this (as tested above). This seems correct to me but some instinct keeps wanting the correct outcome to be /Pages/Redirects/RedirectToSibling/SubDir/SubDirPage.

Yep. The last segment always gets trimmed.

ryanbrandenburg · 2017-04-24T23:45:15Z

🆙📅

pranavkm · 2017-04-25T13:52:40Z

src/Microsoft.AspNetCore.Mvc.Core/Internal/ViewEnginePath.cs

@@ -70,6 +71,11 @@ public static string ResolvePath(string path)
                    }
                    pathSegments.RemoveAt(pathSegments.Count - 1);
                }
+                else if (segment.Equals(CurrentDirectoryToken, StringComparison.Ordinal))


Can you add a test in https://github.com/aspnet/Mvc/blob/dev/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs#L1475 if we're changing ViewEnginePath

ViewEngine test?

Added here.

pranavkm · 2017-04-25T13:53:24Z

test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs

-var expected = 
-@"<form method=""post"" action=""/Pages/TagHelper/SubDir/SubDirPage""></form>
+            var expected =
+            @"<form method=""post"" action=""/Pages/TagHelper/SubDir/SubDirPage""></form>


Could you leave this untabbed?

As discussed in person, leaving this because it's a VS formatting thing.

ryanbrandenburg · 2017-04-25T17:17:23Z

🆙📅

dnfclas added the cla-already-signed label Apr 24, 2017

ryanbrandenburg requested review from pranavkm and rynowak April 24, 2017 22:56

rynowak reviewed Apr 24, 2017

View reviewed changes

pranavkm approved these changes Apr 24, 2017

View reviewed changes

ryanbrandenburg force-pushed the rybrande/LocalRelativePaths branch from 975517b to 2f693bd Compare April 24, 2017 23:38

ryanbrandenburg commented Apr 24, 2017

View reviewed changes

pranavkm suggested changes Apr 25, 2017

View reviewed changes

ryanbrandenburg force-pushed the rybrande/LocalRelativePaths branch from 8d73d6b to 6d9ad07 Compare April 25, 2017 17:15

pranavkm approved these changes Apr 25, 2017

View reviewed changes

ryanbrandenburg force-pushed the rybrande/LocalRelativePaths branch from 6d9ad07 to 7bd801a Compare April 25, 2017 18:46

./ paths relative on page.

42b988a

ryanbrandenburg force-pushed the rybrande/LocalRelativePaths branch from 7bd801a to 42b988a Compare April 25, 2017 18:58

ryanbrandenburg merged commit 42b988a into dev Apr 25, 2017

smitpatel deleted the rybrande/LocalRelativePaths branch June 28, 2017 21:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Local relative paths allow "./" prefix #6202

Local relative paths allow "./" prefix #6202

ryanbrandenburg commented Apr 24, 2017

rynowak Apr 24, 2017

pranavkm Apr 24, 2017

pranavkm Apr 24, 2017

pranavkm Apr 24, 2017

pranavkm Apr 24, 2017

pranavkm Apr 24, 2017

pranavkm Apr 24, 2017

ryanbrandenburg Apr 24, 2017

rynowak Apr 25, 2017

ryanbrandenburg commented Apr 24, 2017

pranavkm Apr 25, 2017

pranavkm Apr 25, 2017

ryanbrandenburg Apr 25, 2017

pranavkm Apr 25, 2017

ryanbrandenburg Apr 25, 2017

ryanbrandenburg commented Apr 25, 2017

Local relative paths allow "./" prefix #6202

Local relative paths allow "./" prefix #6202

Conversation

ryanbrandenburg commented Apr 24, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryanbrandenburg commented Apr 24, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ryanbrandenburg commented Apr 25, 2017