Working on gRPC issue
This commit is contained in:
@@ -29,6 +29,8 @@ using Serilog;
|
||||
using StackExchange.Redis;
|
||||
using NATS.Client.Core;
|
||||
using NATS.Client.Hosting;
|
||||
using System.Net;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.WebSockets;
|
||||
using Microsoft.AspNetCore.Server.Kestrel.Core;
|
||||
using SOR.Auth.Handlers;
|
||||
@@ -59,13 +61,27 @@ var builder = WebApplication.CreateBuilder(args);
|
||||
// Local cleartext gRPC requires a dedicated HTTP/2 listener.
|
||||
// When Auth is enabled in this process and Services:Auth points to a loopback http:// URL,
|
||||
// bind that port explicitly so Gateway can reach the Auth gRPC handler over h2c.
|
||||
// Kestrel ignores URLS once explicit listeners are configured, so preserve the existing
|
||||
// URLS binding as an explicit listener too.
|
||||
if (IsEnabled("auth") &&
|
||||
Uri.TryCreate(builder.Configuration["Services:Auth"], UriKind.Absolute, out var authServiceUri) &&
|
||||
string.Equals(authServiceUri.Scheme, Uri.UriSchemeHttp, StringComparison.OrdinalIgnoreCase) &&
|
||||
authServiceUri.IsLoopback)
|
||||
{
|
||||
var configuredUrls = builder.WebHost.GetSetting(WebHostDefaults.ServerUrlsKey);
|
||||
|
||||
builder.WebHost.ConfigureKestrel(options =>
|
||||
{
|
||||
foreach (var rawUrl in (configuredUrls ?? string.Empty).Split(
|
||||
';',
|
||||
StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
|
||||
{
|
||||
if (!Uri.TryCreate(rawUrl, UriKind.Absolute, out var configuredUri))
|
||||
continue;
|
||||
|
||||
ListenOnConfiguredUrl(options, configuredUri);
|
||||
}
|
||||
|
||||
options.ListenLocalhost(authServiceUri.Port, listenOptions =>
|
||||
{
|
||||
listenOptions.Protocols = HttpProtocols.Http2;
|
||||
@@ -73,6 +89,29 @@ if (IsEnabled("auth") &&
|
||||
});
|
||||
}
|
||||
|
||||
static void ListenOnConfiguredUrl(KestrelServerOptions options, Uri uri)
|
||||
{
|
||||
if (!string.Equals(uri.Scheme, Uri.UriSchemeHttp, StringComparison.OrdinalIgnoreCase))
|
||||
return;
|
||||
|
||||
if (uri.Host == "+" || uri.Host == "*" || uri.Host == "0.0.0.0")
|
||||
{
|
||||
options.ListenAnyIP(uri.Port, listenOptions => listenOptions.Protocols = HttpProtocols.Http1);
|
||||
return;
|
||||
}
|
||||
|
||||
if (string.Equals(uri.Host, "localhost", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
options.ListenLocalhost(uri.Port, listenOptions => listenOptions.Protocols = HttpProtocols.Http1);
|
||||
return;
|
||||
}
|
||||
|
||||
if (IPAddress.TryParse(uri.Host, out var ipAddress))
|
||||
{
|
||||
options.Listen(ipAddress, uri.Port, listenOptions => listenOptions.Protocols = HttpProtocols.Http1);
|
||||
}
|
||||
}
|
||||
|
||||
// ── Logging ───────────────────────────────────────────────────────────────────
|
||||
// Replace .NET's default logger with Serilog.
|
||||
// Configuration comes from the "Serilog" section of appsettings.json.
|
||||
|
||||
Reference in New Issue
Block a user