支持由代理软件设置的 Protocol 与 Hostname

Jijie Chen · Jijie Chen · commit 1cb0998ffbdb · 2019-07-30T21:23:16.000+08:00
diff --git a/src/Discussion.Web/Services/UserManagement/Avatar/UrlGenerators/StorageFileAvatarUrlGenerator.cs b/src/Discussion.Web/Services/UserManagement/Avatar/UrlGenerators/StorageFileAvatarUrlGenerator.cs
@@ -1,25 +1,30 @@
 using Discussion.Core.Models.UserAvatar;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Discussion.Web.Services.UserManagement.Avatar.UrlGenerators
 {
     public class StorageFileAvatarUrlGenerator : IUserAvatarUrlGenerator<StorageFileAvatar>
     {
         private readonly IUrlHelper _urlHelper;
+        private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public StorageFileAvatarUrlGenerator(IUrlHelper urlHelper)
+        public StorageFileAvatarUrlGenerator(IUrlHelper urlHelper, IHttpContextAccessor httpContextAccessor)
         {
             _urlHelper = urlHelper;
+            _httpContextAccessor = httpContextAccessor;
         }
         
         public string GetUserAvatarUrl(StorageFileAvatar avatar)
         {
+            var request = _httpContextAccessor.HttpContext.Request;
             // ReSharper disable Mvc.ActionNotResolved
             // ReSharper disable Mvc.ControllerNotResolved
             return _urlHelper.Action("DownloadFile", 
                 "Common", 
                 new {slug = avatar.StorageFileSlug}, 
-                _urlHelper.ActionContext.HttpContext.Request.Scheme);
+                request.Scheme, 
+                request.Host.ToString());
         }
     }
 }
diff --git a/src/Discussion.Web/Startup.cs b/src/Discussion.Web/Startup.cs
@@ -28,6 +28,7 @@
 using Discussion.Core.Logging;
 using Discussion.Core.Middleware;
 using Discussion.Core.Utilities;
+using Microsoft.AspNetCore.HttpOverrides;
 
 namespace Discussion.Web
 {
@@ -57,6 +58,12 @@ private static void Main()
         // ConfigureServices is invoked before Configure
         public void ConfigureServices(IServiceCollection services)
         {
+            services.Configure<ForwardedHeadersOptions>(options =>
+            {
+                options.ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto | ForwardedHeaders.XForwardedHost;
+                options.KnownNetworks.Clear();
+                options.KnownProxies.Clear();
+            });
             services.AddLazySupport();
             services.AddLogging();
             services.AddSingleton(HtmlEncoder.Create(UnicodeRanges.BasicLatin, UnicodeRanges.CjkUnifiedIdeographs));
@@ -107,6 +114,7 @@ public void ConfigureServices(IServiceCollection services)
         
         public void Configure(IApplicationBuilder app)
         {
+            app.UseForwardedHeaders();
             app.UseTracingId();
             SetupGlobalExceptionHandling(app);
             SetupHttpsSupport(app);
diff --git a/test/Discussion.Web.Tests/Specs/Services/UserAvatarServiceSpecs.cs b/test/Discussion.Web.Tests/Specs/Services/UserAvatarServiceSpecs.cs
@@ -80,9 +80,12 @@ private static IUrlHelper CreateMockUrlHelper(string slug = null)
         private static IServiceProvider CreateServices(IUrlHelper urlHelper)
         {
             var services = new ServiceCollection();
+            var mockAccessor = new Mock<IHttpContextAccessor>();
+            mockAccessor.SetupGet(m => m.HttpContext).Returns(new DefaultHttpContext());
             
             services.AddScoped(sp => urlHelper);
             services.AddSingleton<IAvatarUrlService, DispatchAvatarUrlService>();
+            services.AddSingleton(mockAccessor.Object);
             services.AddScoped<IUserAvatarUrlGenerator<DefaultAvatar>, DefaultAvatarUrlGenerator>();
             services.AddScoped<IUserAvatarUrlGenerator<StorageFileAvatar>, StorageFileAvatarUrlGenerator>();
             services.AddScoped<IUserAvatarUrlGenerator<GravatarAvatar>, GravatarAvatarUrlGenerator>();

Original file line number	Diff line number	Diff line change
`@@ -1,25 +1,30 @@`
`1`	`1`	`using Discussion.Core.Models.UserAvatar;`
	`2`	`+using Microsoft.AspNetCore.Http;`
`2`	`3`	`using Microsoft.AspNetCore.Mvc;`
`3`	`4`
`4`	`5`	`namespace Discussion.Web.Services.UserManagement.Avatar.UrlGenerators`
`5`	`6`	`{`
`6`	`7`	`public class StorageFileAvatarUrlGenerator : IUserAvatarUrlGenerator<StorageFileAvatar>`
`7`	`8`	`{`
`8`	`9`	`private readonly IUrlHelper _urlHelper;`
	`10`	`+ private readonly IHttpContextAccessor _httpContextAccessor;`
`9`	`11`
`10`		`- public StorageFileAvatarUrlGenerator(IUrlHelper urlHelper)`
	`12`	`+ public StorageFileAvatarUrlGenerator(IUrlHelper urlHelper, IHttpContextAccessor httpContextAccessor)`
`11`	`13`	`{`
`12`	`14`	`_urlHelper = urlHelper;`
	`15`	`+ _httpContextAccessor = httpContextAccessor;`
`13`	`16`	`}`
`14`	`17`
`15`	`18`	`public string GetUserAvatarUrl(StorageFileAvatar avatar)`
`16`	`19`	`{`
	`20`	`+ var request = _httpContextAccessor.HttpContext.Request;`
`17`	`21`	`// ReSharper disable Mvc.ActionNotResolved`
`18`	`22`	`// ReSharper disable Mvc.ControllerNotResolved`
`19`	`23`	`return _urlHelper.Action("DownloadFile",`
`20`	`24`	`"Common",`
`21`	`25`	`new {slug = avatar.StorageFileSlug},`
`22`		`- _urlHelper.ActionContext.HttpContext.Request.Scheme);`
	`26`	`+ request.Scheme,`
	`27`	`+ request.Host.ToString());`
`23`	`28`	`}`
`24`	`29`	`}`
`25`	`30`	`}`