Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions Server/Components/Pages/ServerConfig.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,34 @@ private void AddBannedDevice()

private void AddKnownProxy()
{
// Ensure _knownProxyToAdd is not null or empty before proceeding
if (string.IsNullOrEmpty(_knownProxyToAdd))
{
ToastService.ShowToast2("Input cannot be null or empty.", Enums.ToastType.Warning);
return;
}
if (IPAddress.TryParse(_knownProxyToAdd, out _))
{
Input.KnownProxies.Add(_knownProxyToAdd);
}
else
else
{
// Allow for CIDR in Known Proxies
// If it's not an IP, attempt to parse it as a CIDR block (e.g., 192.168.1.0/24)
try
{
ToastService.ShowToast2("Invalid IP address.", Enums.ToastType.Warning);
var network = IPNetwork.Parse(_knownProxyToAdd);

// Convert the IPNetwork object to a string (CIDR format)
string networkString = network.ToString();

Input.KnownProxies.Add(networkString);
}
catch (FormatException)
{
// If it's neither a valid IP nor a valid CIDR block, show a warning toast
ToastService.ShowToast2("Invalid IP address or CIDR format.", Enums.ToastType.Warning);
}
}

_knownProxyToAdd = string.Empty;
Expand Down
16 changes: 16 additions & 0 deletions Server/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,22 @@
{
options.KnownProxies.Add(ip);
}
// Allow for CIDR in Known Proxies
else
{
// Try to parse the CIDR address
try
{
var network = Microsoft.AspNetCore.HttpOverrides.IPNetwork.Parse(proxy);
options.KnownNetworks.Add(network); // Add the network to KnownNetworks
}
catch (FormatException)
{
// Handle invalid CIDR format gracefully
// Log or throw an exception as needed
Console.WriteLine($"Invalid CIDR format: {proxy}");
}
}
}
}
});
Expand Down