Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion src/Microsoft.AspNetCore.SystemWebAdapters/HttpRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,13 @@ public bool IsLocal

public string ApplicationPath => Request.HttpContext.RequestServices.GetRequiredService<IOptions<SystemWebAdaptersOptions>>().Value.AppDomainAppVirtualPath;

public Uri? UrlReferrer => TypedHeaders.Referer;
// ASP.NET Framework would assume a relative referer is relative to the current app
public Uri? UrlReferrer => TypedHeaders.Referer switch
{
{ IsAbsoluteUri: true } abs => abs,
{ } relative => new Uri(Url, relative),
null => null,
};

public int TotalBytes => (int)InputStream.Length;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using System.Web;
using AutoFixture;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.SystemWebAdapters.Features;
using Microsoft.AspNetCore.SystemWebAdapters.Internal;
Expand Down Expand Up @@ -535,10 +536,52 @@ public void UrlReferrer()
// Act
var result = request.UrlReferrer;

// AssertexpectedResult
// Assert
Assert.Equal(new Uri(referrer), result);
}

[Fact]
public void UrlRelativeReferrer()
{
// Arrange
var referrer = "/some-relative-url";
var headers = new HeaderDictionary
{
{ HeaderNames.Referer, referrer },
};

var coreRequest = new Mock<HttpRequestCore>();
coreRequest.Setup(c => c.Scheme).Returns("https");
coreRequest.Setup(c => c.Host).Returns(new HostString("microsoft.com"));
coreRequest.Setup(c => c.Headers).Returns(headers);

var request = new HttpRequest(coreRequest.Object);

// Act
var result = request.UrlReferrer;

// Assert
Assert.NotNull(result);
Assert.True(result.IsAbsoluteUri);
Assert.Equal(new Uri("https://microsoft.com/some-relative-url"), result);
}

[Fact]
public void NoReferer()
{
// Arrange
var coreRequest = new Mock<HttpRequestCore>();
coreRequest.Setup(c => c.Headers).Returns(new HeaderDictionary());

var request = new HttpRequest(coreRequest.Object);

// Act
var result = request.UrlReferrer;

// Assert
Assert.Null(result);
}

[Fact]
public void TotalBytes()
{
Expand Down