ebolo/CaddyManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: refactor project structure by removing .cursorignore and updating references to use Contracts in test files
All checks were successful
Caddy Manager CI build / docker (push) Successful in 52s
Details

Browse Source
This commit is contained in:
Duy Dao
2025-07-23 11:50:12 +07:00
parent 85e556fe46
commit 063ed041b0
16 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CaddyManager.Services/Caddy/CaddyConfigurationParsingService.cs
View File

@@ -10,14 +10,14 @@ public partial class CaddyConfigurationParsingService: ICaddyConfigurationParsin
/// Regex to help parse hostnames from a Caddyfile.
/// </summary>
/// <returns></returns>
[GeneratedRegex(@"(?m)^[\w.-]+(?:\s*,\s*[\w.-]+)*(?=\s*\{)", RegexOptions.Multiline)]
[GeneratedRegex(@"(?m)^\s*([^\{\r\n]+?)\s*\{", RegexOptions.Multiline)]
private static partial Regex HostnamesRegex();
/// <summary>
/// Regex to help parse hostnames being used in reverse proxy directives.
/// </summary>
/// <returns></returns>
[GeneratedRegex(@"(?m)reverse_proxy .*", RegexOptions.Multiline)]
[GeneratedRegex(@"(?m)reverse_proxy\s+([^\s\{\}]+)(?:\s*\{)?", RegexOptions.Multiline)]
private static partial Regex ReverseProxyRegex();
/// <inheritdoc />
@@ -29,7 +29,7 @@ public partial class CaddyConfigurationParsingService: ICaddyConfigurationParsin
foreach (Match match in matches)
{
// Split the matched string by commas and trim whitespace
var splitHostnames = match.Value.Split(',')
var splitHostnames = match.Groups[1].Value.Split(',')
.Select(h => h.Trim())
.Where(h => !string.IsNullOrWhiteSpace(h))
.ToList();
@@ -47,8 +47,8 @@ public partial class CaddyConfigurationParsingService: ICaddyConfigurationParsin
var match = reverseProxyRegex.Match(caddyfileContent);
if (!match.Success) return string.Empty;
var parts = match.Value.TrimEnd('}').Trim().Split(' ');
var targetPart = parts.LastOrDefault(string.Empty);
// Use the captured group which contains the target (e.g., pikachu:3011)
var targetPart = match.Groups[1].Value.Trim();
if (string.IsNullOrEmpty(targetPart)) return string.Empty;
var targetComponents = targetPart.Split(':');