TheSunIsLeaking/DorkNet
3
0
Fork 0
mirror of https://github.com/DorkSquadRR/DorkNet.git synced 2026-10-26 07:28:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Support bearer auth on hyphen hosts

Browse Source
This commit is contained in:
Alexa
2026-06-30 16:15:52 +03:00
parent 8ec79ad06c
commit 926a5c9bba
2 changed files with 84 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DorkNet.Server/Auth/IdentityServerIntegration.cs
+11 -17
View File
@@ -274,7 +274,10 @@ internal static class RecRoomIdentityServerConfig
];
}
public sealed class IdentityServerGameTokenRequestMiddleware(RequestDelegate next, DomainConfig domain)
public sealed class IdentityServerGameTokenRequestMiddleware(
RequestDelegate next,
DomainConfig domain,
IConfiguration config)
{
public async Task InvokeAsync(HttpContext context)
{
@@ -397,6 +400,13 @@ public sealed class IdentityServerGameTokenRequestMiddleware(RequestDelegate nex
private string? ResolveCookieDomain(string host)
{
var configuredCookieDomain =
Environment.GetEnvironmentVariable("DORKNET_AUTH_COOKIE_DOMAIN")
?? config["Auth:CookieDomain"]
?? config["IdentityServer:CookieDomain"];
if (!string.IsNullOrWhiteSpace(configuredCookieDomain))
return configuredCookieDomain.Trim().TrimStart('.') is { Length: > 0 } value ? "." + value : null;
var apex = domain.Apex.Trim().TrimStart('.');
if (string.IsNullOrWhiteSpace(apex) ||
apex.Equals("localhost", StringComparison.OrdinalIgnoreCase) ||
@@ -406,12 +416,6 @@ public sealed class IdentityServerGameTokenRequestMiddleware(RequestDelegate nex
return null;
}
if (domain.UsesHyphenSubdomains && host.EndsWith("-" + apex, StringComparison.OrdinalIgnoreCase))
{
var parentDomain = ResolveParentDomain(apex);
return parentDomain is null ? null : "." + parentDomain;
}
if (host.Equals(apex, StringComparison.OrdinalIgnoreCase) ||
host.EndsWith("." + apex, StringComparison.OrdinalIgnoreCase))
{
@@ -421,16 +425,6 @@ public sealed class IdentityServerGameTokenRequestMiddleware(RequestDelegate nex
return null;
}
private static string? ResolveParentDomain(string host)
{
var firstDot = host.IndexOf('.');
if (firstDot <= 0 || firstDot == host.Length - 1)
return null;
var parent = host[(firstDot + 1)..];
return parent.Contains('.') ? parent : null;
}
private static bool IsTokenRequest(HttpContext context) =>
HttpMethods.IsPost(context.Request.Method)
&& context.Request.Path.Equals("/connect/token", StringComparison.OrdinalIgnoreCase)