bit-badger/myWebLog
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 11 Activity

Verify regex rules work correctly (#39)

Browse Source 
- Remove debug for plain-text rules
- Update htmx libs to 1.9.4
This commit is contained in:
Daniel J. Summers 2023-07-31 20:56:27 -04:00
parent 693a1df34f
commit f43c431278
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/MyWebLog/MyWebLog.fsproj
View File

@ -26,8 +26,8 @@
<PackageReference Include="BitBadger.AspNetCore.CanonicalDomains" Version="1.0.0" /> <PackageReference Include="BitBadger.AspNetCore.CanonicalDomains" Version="1.0.0" />
<PackageReference Include="DotLiquid" Version="2.2.692" /> <PackageReference Include="DotLiquid" Version="2.2.692" />
<PackageReference Include="Giraffe" Version="6.2.0" /> <PackageReference Include="Giraffe" Version="6.2.0" />
<PackageReference Include="Giraffe.Htmx" Version="1.9.2" /> <PackageReference Include="Giraffe.Htmx" Version="1.9.4" />
<PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.9.2" /> <PackageReference Include="Giraffe.ViewEngine.Htmx" Version="1.9.4" />
<PackageReference Include="NeoSmart.Caching.Sqlite" Version="6.1.0" /> <PackageReference Include="NeoSmart.Caching.Sqlite" Version="6.1.0" />
<PackageReference Include="RethinkDB.DistributedCache" Version="1.0.0-rc1" /> <PackageReference Include="RethinkDB.DistributedCache" Version="1.0.0-rc1" />
<PackageReference Include="System.ServiceModel.Syndication" Version="7.0.0" /> <PackageReference Include="System.ServiceModel.Syndication" Version="7.0.0" />

1
src/MyWebLog/Program.fs
View File

@ -40,7 +40,6 @@ type RedirectRuleMiddleware (next : RequestDelegate, log : ILogger<RedirectRuleM
|> List.tryPick (fun rule -> |> List.tryPick (fun rule ->
match rule with match rule with
| WebLogCache.CachedRedirectRule.Text (urlFrom, urlTo) -> | WebLogCache.CachedRedirectRule.Text (urlFrom, urlTo) ->
log.LogInformation $"Checking {path} against from={urlFrom} and to={urlTo}"
if ciEquals path urlFrom then Some urlTo else None if ciEquals path urlFrom then Some urlTo else None
| WebLogCache.CachedRedirectRule.RegEx (regExFrom, patternTo) -> | WebLogCache.CachedRedirectRule.RegEx (regExFrom, patternTo) ->
if regExFrom.IsMatch path then Some (regExFrom.Replace (path, patternTo)) else None) if regExFrom.IsMatch path then Some (regExFrom.Replace (path, patternTo)) else None)