Use a controlled external origin in redirection tests (#68782)

Author: ilonatommy

src/Components/test/E2ETest/ServerRenderingTests/RedirectionTest.cs

@@ -12,16 +12,24 @@
 
 namespace Microsoft.AspNetCore.Components.E2ETests.ServerRenderingTests;
 
-public class RedirectionTest : ServerTestBase<BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<App>>>
+public class RedirectionTest :
+    ServerTestBase<BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<App>>>,
+    IClassFixture<BasicTestAppServerSiteFixture<ExternalNavigationStartup>>
 {
+    private readonly Uri _externalNavigationTargetUri;
+    private readonly Uri _externalNavigationTargetUriWithQuery;
     private IWebElement _originalH1Element;
 
     public RedirectionTest(
         BrowserFixture browserFixture,
         BasicTestAppServerSiteFixture<RazorComponentEndpointsStartup<App>> serverFixture,
+        BasicTestAppServerSiteFixture<ExternalNavigationStartup> externalNavigationFixture,
         ITestOutputHelper output)
         : base(browserFixture, serverFixture, output)
     {
+        _externalNavigationTargetUri = new Uri(externalNavigationFixture.RootUri, "/external-navigation-target");
+        _externalNavigationTargetUriWithQuery = new Uri($"{_externalNavigationTargetUri}?foo=🙂");
+        serverFixture.AdditionalArguments.Add($"--ExternalNavigationTargetUri={_externalNavigationTargetUri.AbsoluteUri}");
     }
 
     public override async Task InitializeAsync()
@@ -55,12 +63,11 @@ public void RedirectStreamingGetToInternal(bool disableThrowNavigationException)
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/66969")]
     public void RedirectStreamingGetToExternal(bool disableThrowNavigationException)
     {
         AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
         Browser.Exists(By.LinkText("Streaming GET with external redirection")).Click();
-        Browser.Contains("microsoft.com", () => Browser.Url);
+        AssertExternalNavigationCompleted();
     }
 
     [Theory]
@@ -85,12 +92,11 @@ public void RedirectStreamingPostToInternal(bool disableThrowNavigationException
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/67342")]
     public void RedirectStreamingPostToExternal(bool disableThrowNavigationException)
     {
         AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
         Browser.Exists(By.CssSelector("#form-streaming-external button")).Click();
-        Browser.Contains("microsoft.com", () => Browser.Url);
+        AssertExternalNavigationCompleted();
     }
 
     [Theory]
@@ -119,12 +125,11 @@ public void RedirectEnhancedGetToInternal(bool disableThrowNavigationException)
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/67738")]
     public void RedirectEnhancedGetToExternal(bool disableThrowNavigationException)
     {
         AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
         Browser.Exists(By.LinkText("Enhanced GET with external redirection")).Click();
-        Browser.Contains("microsoft.com", () => Browser.Url);
+        AssertExternalNavigationCompleted();
     }
 
     [Theory]
@@ -148,12 +153,11 @@ public void RedirectEnhancedPostToInternal(bool disableThrowNavigationException)
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/67444")]
     public void RedirectEnhancedPostToExternal(bool disableThrowNavigationException)
     {
         AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
         Browser.Exists(By.CssSelector("#form-enhanced-external button")).Click();
-        Browser.Contains("microsoft.com", () => Browser.Url);
+        AssertExternalNavigationCompleted();
     }
 
     [Theory]
@@ -177,13 +181,12 @@ public void RedirectStreamingEnhancedGetToInternal(bool disableThrowNavigationEx
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/66969")]
     public void RedirectStreamingEnhancedGetToExternal(bool disableThrowNavigationException)
     {
         AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
 
         Browser.Exists(By.LinkText("Streaming enhanced GET with external redirection")).Click();
-        Browser.Contains("microsoft.com", () => Browser.Url);
+        AssertExternalNavigationCompleted();
     }
 
     [Theory]
@@ -207,13 +210,12 @@ public void RedirectStreamingEnhancedPostToInternal(bool disableThrowNavigationE
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/66869")]
     public void RedirectStreamingEnhancedPostToExternal(bool disableThrowNavigationException)
     {
         AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
 
         Browser.Exists(By.CssSelector("#form-streaming-enhanced-external button")).Click();
-        Browser.Contains("microsoft.com", () => Browser.Url);
+        AssertExternalNavigationCompleted();
     }
 
     [Theory]
@@ -238,13 +240,12 @@ public void RedirectEnhancedNonBlazorGetToInternal(bool disableThrowNavigationEx
     [Theory]
     [InlineData(true)]
     [InlineData(false)]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/67342")]
     public void RedirectEnhancedNonBlazorGetToExternal(bool disableThrowNavigationException)
     {
         AppContext.SetSwitch("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.DisableThrowNavigationException", disableThrowNavigationException);
 
         Browser.Exists(By.LinkText("Enhanced GET to non-Blazor endpoint with external redirection")).Click();
-        Browser.Contains("microsoft.com", () => Browser.Url);
+        AssertExternalNavigationCompleted(hasQuery: false);
     }
 
     [Theory]
@@ -322,4 +323,11 @@ private void AssertElementRemoved(IWebElement element)
             return false;
         });
     }
+
+    private void AssertExternalNavigationCompleted(bool hasQuery = true)
+    {
+        var expectedUri = hasQuery ? _externalNavigationTargetUriWithQuery : _externalNavigationTargetUri;
+        Browser.Equal(expectedUri, () => new Uri(Browser.Url));
+        Browser.Exists(By.Id("external-navigation-target"));
+    }
 }

src/Components/test/testassets/Components.TestServer/ExternalNavigationStartup.cs

@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace TestServer;
+
+public class ExternalNavigationStartup
+{
+    public void Configure(IApplicationBuilder app)
+    {
+        app.Run(async context =>
+        {
+            context.Response.ContentType = "text/html";
+            await context.Response.WriteAsync(
+                """
+                <!DOCTYPE html>
+                <html>
+                <body>
+                    <h1 id="external-navigation-target">External navigation target</h1>
+                </body>
+                </html>
+                """);
+        });
+    }
+}

src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs

@@ -8,6 +8,7 @@
 using Components.TestServer.RazorComponents;
 using Components.TestServer.RazorComponents.Pages.Forms;
 using Components.TestServer.RazorComponents.Pages.PersistentState;
+using Components.TestServer.RazorComponents.Pages.Redirections;
 using Components.TestServer.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Components;
@@ -53,6 +54,7 @@ public void ConfigureServices(IServiceCollection services)
         }
         services.AddSingleton<IStringLocalizerFactory>(
             new TestStringLocalizerFactory(ClientValidationLocalizationData.Translations));
+        services.AddSingleton<ExternalNavigationTarget>();
         services.AddValidation(options =>
             options.Resolvers.Add(new BasicTestApp.FormsTest.AsyncValidationResolver()));
 
@@ -396,10 +398,13 @@ private static void MapEnhancedNavigationEndpoints(IEndpointRouteBuilder endpoin
 
         endpoints.Map("/test-formaction", () => "Formaction url");
 
-        static Task PerformRedirection(HttpRequest request, HttpResponse response)
+        static Task PerformRedirection(
+            HttpRequest request,
+            HttpResponse response,
+            ExternalNavigationTarget externalNavigationTarget)
         {
             response.Redirect(request.Query["external"] == "true"
-                ? "https://microsoft.com"
+                ? externalNavigationTarget.Uri.AbsoluteUri
                 : $"{request.PathBase}/nav/scroll-to-hash#some-content");
             return Task.CompletedTask;
         }

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Redirections/ExternalNavigationTarget.cs

@@ -0,0 +1,19 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.AspNetCore.WebUtilities;
+
+namespace Components.TestServer.RazorComponents.Pages.Redirections;
+
+internal sealed class ExternalNavigationTarget
+{
+    public ExternalNavigationTarget(IConfiguration configuration)
+    {
+        Uri = new Uri(configuration["ExternalNavigationTargetUri"] ?? "https://microsoft.com");
+        UriWithQuery = QueryHelpers.AddQueryString(Uri.AbsoluteUri, "foo", "🙂");
+    }
+
+    public Uri Uri { get; }
+
+    public string UriWithQuery { get; }
+}

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Redirections/RedirectGet.razor

@@ -1,5 +1,6 @@
 @page "/redirect/get"
 @inject NavigationManager Nav
+@inject ExternalNavigationTarget ExternalNavigationTarget
 
 <h1>Nonstreaming GET</h1>
 
@@ -10,6 +11,6 @@
     protected override async Task OnInitializedAsync()
     {
         await Task.Delay(500);
-        Nav.NavigateTo(External ? "https://microsoft.com?foo=🙂" : "nav/scroll-to-hash?foo=🙂#some-content");
+        Nav.NavigateTo(External ? ExternalNavigationTarget.UriWithQuery : "nav/scroll-to-hash?foo=🙂#some-content");
     }
 }

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Redirections/RedirectPost.razor

@@ -1,5 +1,6 @@
 @page "/redirect/post"
 @inject NavigationManager Nav
+@inject ExternalNavigationTarget ExternalNavigationTarget
 @using Microsoft.AspNetCore.Components.Forms
 
 <h1>Nonstreaming POST</h1>
@@ -12,6 +13,6 @@
     private async Task DoRedirectionAsync()
     {
         await Task.Delay(500);
-        Nav.NavigateTo(External ? "https://microsoft.com?foo=🙂" : "nav/scroll-to-hash?foo=🙂#some-content");
+        Nav.NavigateTo(External ? ExternalNavigationTarget.UriWithQuery : "nav/scroll-to-hash?foo=🙂#some-content");
     }
 }

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Redirections/RedirectStreamingGet.razor

@@ -1,6 +1,7 @@
 @page "/redirect/streaming/get"
 @attribute [StreamRendering]
 @inject NavigationManager Nav
+@inject ExternalNavigationTarget ExternalNavigationTarget
 
 <h1>Streaming GET</h1>
 
@@ -11,6 +12,6 @@
     protected override async Task OnInitializedAsync()
     {
         await Task.Delay(500);
-        Nav.NavigateTo(External ? "https://microsoft.com?foo=🙂" : "nav/scroll-to-hash?foo=🙂#some-content");
+        Nav.NavigateTo(External ? ExternalNavigationTarget.UriWithQuery : "nav/scroll-to-hash?foo=🙂#some-content");
     }
 }

src/Components/test/testassets/Components.TestServer/RazorComponents/Pages/Redirections/RedirectStreamingPost.razor

@@ -1,6 +1,7 @@
 @page "/redirect/streaming/post"
 @attribute [StreamRendering]
 @inject NavigationManager Nav
+@inject ExternalNavigationTarget ExternalNavigationTarget
 @using Microsoft.AspNetCore.Components.Forms
 
 <h1>Streaming POST</h1>
@@ -13,6 +14,6 @@
     private async Task DoRedirectionAsync()
     {
         await Task.Delay(500);
-        Nav.NavigateTo(External ? "https://microsoft.com?foo=🙂" : "nav/scroll-to-hash?foo=🙂#some-content");
+        Nav.NavigateTo(External ? ExternalNavigationTarget.UriWithQuery : "nav/scroll-to-hash?foo=🙂#some-content");
     }
 }