Fix hy2 fmt (#10044)

This commit is contained in:
DHR60
2026-08-27 07:31:39 +00:00
committed by GitHub
parent 007adb6403
commit 0a2f3e4f22
2 changed files with 36 additions and 0 deletions

View File

@@ -223,6 +223,11 @@ public class Hysteria2Fmt : BaseFmt
var sha = item.CertSha;
dicQuery.Add("pinSHA256", Utils.UrlEncode(sha));
}
else if (!item.Cert.IsNullOrEmpty()
&& CertPemManager.GetLeafCertSha256Thumbprint(item.Cert) is { Length: > 0 } thumbprint)
{
dicQuery.Add("pinSHA256", Utils.UrlEncode(thumbprint));
}
if (!item.EchConfigList.IsNullOrEmpty())
{
dicQuery.Add("ech", Utils.UrlEncode(item.EchConfigList));

View File

@@ -281,6 +281,37 @@ public class CertPemManager
}
}
public static string GetLeafCertSha256Thumbprint(string pemCertChain, bool includeColon = false)
{
var certs = ParsePemChain(pemCertChain);
if (certs.Count == 0)
{
return string.Empty;
}
foreach (var certStr in certs)
{
try
{
var cert = X509Certificate2.CreateFromPem(certStr);
var extension = cert.Extensions
.OfType<X509BasicConstraintsExtension>()
.FirstOrDefault();
var isCa = extension?.CertificateAuthority == true;
if (isCa)
{
continue;
}
var thumbprint = cert.GetCertHashString(HashAlgorithmName.SHA256);
return includeColon ? string.Join(":", thumbprint.Chunk(2).Select(c => new string(c))) : thumbprint;
}
catch
{
// Ignore
}
}
return string.Empty;
}
private static readonly Lazy<X509Certificate2Collection> _chromeRootCerts = new(() =>
{
var pemText = EmbedUtils.GetEmbedText(Global.ChromeRootCertFileName);