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

[fix]修正SSL跳转问题

This commit is contained in:
大石头 2024-04-23 16:56:56 +08:00
parent 8408a18469
commit 4a5bfd9af3
2 changed files with 130 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
NewLife.CubeNC/WebMiddleware/MiddlewareHelper.cs
View File

@ -1,4 +1,5 @@
using NewLife.Web;
using NewLife.Log;
using NewLife.Web;
using HttpContext = Microsoft.AspNetCore.Http.HttpContext;
namespace NewLife.Cube.WebMiddleware;
@ -17,29 +18,75 @@ public static class MiddlewareHelper
if (set.ForceRedirect.IsNullOrEmpty()) return false;
// 分解跳转地址
var ss = set.ForceRedirect.Split("://", ":");
var scheme = ss.Length > 0 ? ss[0] : "";
var host = ss.Length > 1 ? ss[1] : ss[0];
var port = ss.Length > 2 ? ss[2].ToInt() : 0;
if (ss.Length == 1) scheme = null;
if (host == "*") host = null;
var u = new MyUri(set.ForceRedirect);
if (u.Host == "*") u.Host = null;
if (scheme.IsNullOrEmpty() && host.IsNullOrEmpty() && port == 0) return false;
if (u.Scheme.IsNullOrEmpty() && u.Host.IsNullOrEmpty() && u.Port == 0) return false;
var uri = ctx.Request.GetRawUrl();
if ((scheme.IsNullOrEmpty() || uri.Scheme.EqualIgnoreCase(scheme)) &&
(host.IsNullOrEmpty() || uri.Host.EqualIgnoreCase(host)) &&
(port == 0 || port == uri.Port)) return false;
if ((u.Scheme.IsNullOrEmpty() || uri.Scheme.EqualIgnoreCase(u.Scheme)) &&
(u.Host.IsNullOrEmpty() || uri.Host.EqualIgnoreCase(u.Host)) &&
(u.Port == 0 || u.Port == uri.Port)) return false;
using var span = DefaultTracer.Instance?.NewSpan("ForceRedirect", uri + "");
span?.AppendTag($"规则：{set.ForceRedirect}");
// 重建url
if (scheme.IsNullOrEmpty()) scheme = uri.Scheme;
if (host.IsNullOrEmpty()) host = uri.Host;
if (port == 0) port = uri.Port;
if (u.Scheme.IsNullOrEmpty()) u.Scheme = uri.Scheme;
if (u.Host.IsNullOrEmpty()) u.Host = uri.Host;
if (u.Port == 0) u.Port = uri.Port;
var url = $"{scheme}://{host}:{port}{uri.PathAndQuery}";
var url = u.Scheme.EqualIgnoreCase("http", "ws") && u.Port == 80 ||
u.Scheme.EqualIgnoreCase("https", "wss") && u.Port == 443 ?
$"{u.Scheme}://{u.Host}{uri.PathAndQuery}" :
$"{u.Scheme}://{u.Host}:{u.Port}{uri.PathAndQuery}";
span?.AppendTag($"跳转：{url}");
ctx.Response.Redirect(url);
return true;
}
}
class MyUri
{
public String Scheme { get; set; }
public String Host { get; set; }
public Int32 Port { get; set; }
public String PathAndQuery { get; set; }
public MyUri(String value)
{
// 先处理头尾，再处理中间的主机和端口
var p = value.IndexOf("://");
if (p >= 0)
{
Scheme = value[..p];
p += 3;
}
else
p = 0;
var p2 = value.IndexOf('/', p);
if (p2 > 0)
{
PathAndQuery = value[p2..];
value = value[p..p2];
}
else
value = value[p..];
// 拆分主机和端口，注意IPv6地址
p2 = value.LastIndexOf(':');
if (p2 > 0)
{
Host = value[..p2];
Port = value[(p2 + 1)..].ToInt();
}
else
{
Host = value;
}
}
}
}

67
XUnitTest/MyUriTests.cs Normal file
View File

@ -0,0 +1,67 @@
using System;
using Xunit;
namespace XUnitTest;
public class MyUriTests
{
[Theory]
[InlineData("http://localhost:8080/cube/info", "http", "localhost", 8080, "/cube/info")]
[InlineData("http://localhost:8080/", "http", "localhost", 8080, "/")]
[InlineData("Http://localhost/", "Http", "localhost", 0, "/")]
[InlineData("Http://localhost", "Http", "localhost", 0, null)]
[InlineData("localhost:8080/cube/info", null, "localhost", 8080, "/cube/info")]
[InlineData("localhost:8080/", null, "localhost", 8080, "/")]
[InlineData("localhost/", null, "localhost", 0, "/")]
[InlineData("localhost", null, "localhost", 0, null)]
public void Parse(String url, String schema, String host, Int32 port, String path)
{
var uri = new MyUri(url);
Assert.Equal(schema, uri.Scheme);
Assert.Equal(host, uri.Host);
Assert.Equal(port, uri.Port);
Assert.Equal(path, uri.PathAndQuery);
}
}
class MyUri
{
public String Scheme { get; set; }
public String Host { get; set; }
public Int32 Port { get; set; }
public String PathAndQuery { get; set; }
public MyUri(String value)
{
// 先处理头尾，再处理中间的主机和端口
var p = value.IndexOf("://");
if (p >= 0)
{
Scheme = value[..p];
p += 3;
}
else
p = 0;
var p2 = value.IndexOf('/', p);
if (p2 > 0)
{
PathAndQuery = value[p2..];
value = value[p..p2];
}
else
value = value[p..];
// 拆分主机和端口，注意IPv6地址
p2 = value.LastIndexOf(':');
if (p2 > 0)
{
Host = value[..p2];
Port = value[(p2 + 1)..].ToInt();
}
else
{
Host = value;
}
}
}