NewLife
/
Stardust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

加强对异常请求头的支持

This commit is contained in:
智能大石头 2025-06-18 10:09:11 +08:00
parent 059101ede5
commit 1f464f3b7b
2 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Stardust.Extensions/TracerMiddleware.cs
View File

@ -227,14 +227,16 @@ public class TracerMiddleware
var uri = ctx.Request.GetRawUrl();
if (uri == null) return;
// 排除本机地址
var host = uri.Authority;
if (host.IsNullOrEmpty()) return;
// 排除本机地址
var p = host.LastIndexOf(':');
if (p >= 0) host = host[..p];
if (host.EqualIgnoreCase("127.0.0.1", "localhost", "[::1]")) return;
if (host.StartsWith("127.0.")) return;
var baseAddress = $"{uri.Scheme}://{uri.Authority}";
var baseAddress = $"{uri.Scheme}://{host}";
var set = NewLife.Setting.Current;
var ss = set.ServiceAddress?.Split(",").ToList() ?? [];

47
Stardust.Extensions/WebHelper.cs
View File

@ -1,6 +1,7 @@
using System;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions;
using NewLife.Log;
namespace NewLife.Web;
@ -11,39 +12,51 @@ static class WebHelper
/// <summary>获取原始请求Url，支持反向代理</summary>
/// <param name="request"></param>
/// <returns></returns>
public static Uri GetRawUrl(this HttpRequest request)
public static UriInfo GetRawUrl(this HttpRequest request)
{
Uri? uri = null;
UriInfo? uri = null;
// 取请求头
if (uri == null)
var url = request.GetEncodedUrl();
try
{
var url = request.GetEncodedUrl();
uri = new Uri(url);
uri = new UriInfo(url);
}
catch (Exception ex)
{
DefaultSpan.Current?.AppendTag($"GetRawUrl：{url} 失败：{ex.Message}");
uri = new UriInfo("")
{
Scheme = request.Scheme,
Host = request.Host.Host,
Port = request.Host.Port ?? (request.Scheme == "https" ? 443 : 80),
AbsolutePath = request.PathBase + request.Path,
Query = request.QueryString.ToUriComponent()
};
}
return GetRawUrl(uri, k => request.Headers[k]);
}
private static Uri GetRawUrl(Uri uri, Func<String, String?> headers)
private static UriInfo GetRawUrl(UriInfo uri, Func<String, String?> headers)
{
var str = headers("HTTP_X_REQUEST_URI");
if (str.IsNullOrEmpty()) str = headers("X-Request-Uri");
if (str.IsNullOrEmpty())
{
// 阿里云CDN默认支持 X-Client-Scheme: https
var scheme = headers("HTTP_X_CLIENT_SCHEME");
if (scheme.IsNullOrEmpty()) scheme = headers("X-Client-Scheme");
if (!str.IsNullOrEmpty()) uri = new UriInfo(str);
// nginx
if (scheme.IsNullOrEmpty()) scheme = headers("HTTP_X_FORWARDED_PROTO");
if (scheme.IsNullOrEmpty()) scheme = headers("X-Forwarded-Proto");
// 阿里云CDN默认支持 X-Client-Scheme: https
var scheme = headers("HTTP_X_CLIENT_SCHEME");
if (scheme.IsNullOrEmpty()) scheme = headers("X-Client-Scheme");
if (!scheme.IsNullOrEmpty()) str = scheme + "://" + uri.ToString().Substring("://");
}
// nginx
if (scheme.IsNullOrEmpty()) scheme = headers("HTTP_X_FORWARDED_PROTO");
if (scheme.IsNullOrEmpty()) scheme = headers("X-Forwarded-Proto");
if (!str.IsNullOrEmpty()) uri = new Uri(uri, str);
//if (!scheme.IsNullOrEmpty()) str = scheme + "://" + uri.ToString().Substring("://");
if (!scheme.IsNullOrEmpty()) uri.Scheme = scheme;
//if (!str.IsNullOrEmpty()) uri = new Uri(uri, str);
return uri;
}