Skip to content

Commit 38485f1

Browse files
committed
Revert "🐛 DomainMatch"
This reverts commit 008ab5f.
1 parent 008ab5f commit 38485f1

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Models/ReverseProxyConfig.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,17 @@ static string GetDomainPatternString(string s)
148148
// return result;
149149
//}
150150

151-
public bool TryGetDomainConfig(string url, [MaybeNullWhen(false)] out IDomainConfig value)
151+
public bool TryGetDomainConfig(string domain, [MaybeNullWhen(false)] out IDomainConfig value)
152152
{
153153
//value = domainConfigCache.GetOrAdd(domain.Host, GetDomainConfig);
154154

155-
var uri = new Uri(url);
155+
var uri = new UriBuilder(domain).Uri;
156156

157157
domainConfigCache.TryGetValue(uri.Host, out value);
158158
if (value != null)
159159
return true;
160160

161-
value = GetDomainConfig(uri.Host);
161+
value = GetDomainConfig(domain);
162162
if (value == null)
163163
return false;
164164

src/BD.WTTS.Client.Plugins.Accelerator.ReverseProxy/Services.Implementation/HttpServer/Middleware/HttpReverseProxyMiddleware.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ var protocol when protocol.StartsWith("HTTP/3") => System.Net.HttpVersion.Versio
9393
}
9494

9595
if (domainConfig.Items.Any_Nullable())
96-
domainConfig = RecursionMatchDomainConfig(context.Request.Host.Host, domainConfig);
96+
domainConfig = RecursionMatchDomainConfig(url, domainConfig);
9797

9898
if (domainConfig.Response == null)
9999
{
@@ -158,16 +158,16 @@ var protocol when protocol.StartsWith("HTTP/3") => System.Net.HttpVersion.Versio
158158
/// <summary>
159159
/// 递归匹配子域名配置
160160
/// </summary>
161-
/// <param name="domain"></param>
161+
/// <param name="url"></param>
162162
/// <param name="domainConfig"></param>
163163
/// <returns></returns>
164-
static IDomainConfig RecursionMatchDomainConfig(string domain, IDomainConfig domainConfig)
164+
static IDomainConfig RecursionMatchDomainConfig(string url, IDomainConfig domainConfig)
165165
{
166166
if (domainConfig.Items.Any_Nullable())
167167
{
168-
var item = domainConfig.Items.FirstOrDefault(s => s.Key.IsMatch(domain)).Value;
168+
var item = domainConfig.Items.FirstOrDefault(s => s.Key.IsMatch(url)).Value;
169169
if (item != null)
170-
return RecursionMatchDomainConfig(domain, item);
170+
return RecursionMatchDomainConfig(url, item);
171171
}
172172
return domainConfig;
173173
}

0 commit comments

Comments
 (0)