mahdium/VDR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Refactor and optimize route handling, clean up code structure, and apply minor improvements

Browse Source
This commit is contained in:
Mohammad Mahdi
2025-08-20 13:52:52 +03:30
parent 64e025d9f7
commit 462f10ffb2
4 changed files with 60 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VirtualDDNSRouter.Server/Context/YamlStaticContext.cs
View File

@@ -5,6 +5,6 @@ namespace VirtualDDNSRouter.Server.Context;
[YamlStaticContext]
[YamlSerializable(typeof(Rule))]
public partial class YamlStaticContext : YamlDotNet.Serialization.StaticContext
public partial class YamlStaticContext : StaticContext
{
}

12
VirtualDDNSRouter.Server/Models/Rule.cs
View File

@@ -1,5 +1,4 @@
using System.Net;
using YamlDotNet.Serialization;
namespace VirtualDDNSRouter.Server.Models;
@@ -9,16 +8,19 @@ public record Rule
public string apiKey { get; set; } = string.Empty;
public string path { get; set; } = string.Empty;
public Rule() { } // Needed for AOT static deserializer
public Rule()
{
} // Needed for AOT static deserializer
}
public record Route
{
public string path { get; set; } = string.Empty;
public IPAddress ipAddress { get; set; } = IPAddress.None;
public UInt16 port { get; set; } = 80;
public ushort port { get; set; } = 80;
public Route() { }
public Route()
{
}
}

57
VirtualDDNSRouter.Server/Program.cs
View File

@@ -19,46 +19,41 @@ app.UseForwardedHeaders(new ForwardedHeadersOptions
ForwardedHeaders.XForwardedProto
});
if (app.Environment.IsDevelopment())
{
app.MapOpenApi();
}
if (app.Environment.IsDevelopment()) app.MapOpenApi();
List<Route> routes = new List<Route>();
var routes = new List<Route>();
app.MapGet("/setip/{path}/{port}/{apiKey}", async (IYamlParser yamlParser ,HttpContext context, string path, UInt16 port, string apiKey) =>
{
var rules = await yamlParser.GetRules();
app.Logger.LogInformation($"New setip request for {path} with port {port}.");
var ruleValid = rules.Any(r => r.path == path && r.apiKey == apiKey);
if (!ruleValid)
{
app.Logger.LogInformation($"Invalid rule for {path} with port {port}.");
return Results.StatusCode(StatusCodes.Status403Forbidden);
}
var clientIp = context.Connection.RemoteIpAddress;
if (clientIp is null)
{
app.Logger.LogInformation($"Could not get the client ip address for {path} with port {port}.");
return Results.BadRequest("Could not get the client ip address");
}
var existingRoute = routes.FirstOrDefault(r => r.path == path);
if (existingRoute is not null)
{
existingRoute.ipAddress = clientIp;
existingRoute.port = port;
}
else
app.MapGet("/setip/{path}/{port}/{apiKey}",
async (IYamlParser yamlParser, HttpContext context, string path, ushort port, string apiKey) =>
{
var rules = await yamlParser.GetRules();
app.Logger.LogInformation($"New setip request for {path} with port {port}.");
var ruleValid = rules.Any(r => r.path == path && r.apiKey == apiKey);
if (!ruleValid)
{
app.Logger.LogInformation($"Invalid rule for {path} with port {port}.");
return Results.StatusCode(StatusCodes.Status403Forbidden);
}
var clientIp = context.Connection.RemoteIpAddress;
if (clientIp is null)
{
app.Logger.LogInformation($"Could not get the client ip address for {path} with port {port}.");
return Results.BadRequest("Could not get the client ip address");
}
var existingRoute = routes.FirstOrDefault(r => r.path == path);
if (existingRoute is not null) routes.Remove(existingRoute);
routes.Add(new Route
{
ipAddress = clientIp,
path = path,
port = port
});
}
return Results.Ok($"goto/{path}");
});
return Results.Ok($"goto/{path}");
});
app.MapGet("/goto/{path}", (string path) =>
{

46
VirtualDDNSRouter.Server/VirtualDDNSRouter.Server.csproj
View File

@@ -1,25 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<!-- <TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
<InvariantGlobalization>true</InvariantGlobalization>
<!-- <TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
<InvariantGlobalization>true</InvariantGlobalization>
&lt;!&ndash; Publish settings &ndash;&gt;
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<PublishTrimmed>true</PublishTrimmed>
<TrimMode>full</TrimMode>
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
<PublishReadyToRun>true</PublishReadyToRun>
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
<OptimizationLevel>Release</OptimizationLevel>
<TieredPGO>true</TieredPGO>
<IlcOptimizationPreference>Size</IlcOptimizationPreference>-->
&lt;!&ndash; Publish settings &ndash;&gt;
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<PublishTrimmed>true</PublishTrimmed>
<TrimMode>full</TrimMode>
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
<PublishReadyToRun>true</PublishReadyToRun>
<DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols>
<OptimizationLevel>Release</OptimizationLevel>
<TieredPGO>true</TieredPGO>
<IlcOptimizationPreference>Size</IlcOptimizationPreference>-->
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
@@ -33,14 +33,14 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0-preview.6.25358.103"/>
<PackageReference Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.3.0" />
<PackageReference Include="YamlDotNet" Version="16.3.0" />
<PackageReference Include="Vecc.YamlDotNet.Analyzers.StaticGenerator" Version="16.3.0"/>
<PackageReference Include="YamlDotNet" Version="16.3.0"/>
</ItemGroup>
<ItemGroup>
<Content Include="..\.dockerignore">
<Link>.dockerignore</Link>
</Content>
<Content Include="..\.dockerignore">
<Link>.dockerignore</Link>
</Content>
</ItemGroup>
</Project>