Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add HSTS to F# ApiServer and BwdServer #3665

Merged
merged 14 commits into from
Apr 21, 2022
Merged

Add HSTS to F# ApiServer and BwdServer #3665

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d1889ba
Add HSTS to F# ApiServer and BwdServer
StachuDotNet Apr 8, 2022
a123217
Format code
StachuDotNet Apr 15, 2022
e654257
Add ApiServer HSTS test; tidy ApiServer tests
StachuDotNet Apr 15, 2022
b46391f
Provide commentary in BwdServer.Tests.fs
StachuDotNet Apr 15, 2022
f785fcf
Adjust BwdServer HSTS set-up, including tests
StachuDotNet Apr 18, 2022
620b7cd
Merge branch 'main' into add-hsts-to-fsharp-backends
StachuDotNet Apr 18, 2022
af6294f
Format code
StachuDotNet Apr 18, 2022
38725cb
Update code comment
StachuDotNet Apr 18, 2022
a4873e2
Fix bwdserver test (remove FSHARPONLY)
StachuDotNet Apr 19, 2022
9c806ea
Add HSTS header to serve-latest.test
StachuDotNet Apr 19, 2022
151faf0
Expand HSTS testing of ApiServer
StachuDotNet Apr 19, 2022
0ee37c4
Extract HSTS string setting to relevant module
StachuDotNet Apr 19, 2022
2894999
Provide additional commentary on BwdServer HSTS setup
StachuDotNet Apr 20, 2022
d8e19d9
Merge branch 'main' into add-hsts-to-fsharp-backends
StachuDotNet Apr 21, 2022
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
2 changes: 2 additions & 0 deletions fsharp-backend/src/ApiServer/ApiServer.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ let configureApp (packages : Packages) (appBuilder : WebApplication) =
|> fun app ->
LibService.Rollbar.AspNet.addRollbarToApp app rollbarCtxToMetadata None
|> fun app -> app.UseHttpsRedirection()
|> fun app -> app.UseHsts()
|> fun app -> app.UseRouting()
// must go after UseRouting
|> LibService.Kubernetes.configureApp LibService.Config.apiServerKubernetesPort
Expand All @@ -189,6 +190,7 @@ let configureServices (services : IServiceCollection) : unit =
LibService.Telemetry.TraceDBQueries
|> LibService.Kubernetes.configureServices [ LibBackend.Init.legacyServerCheck ]
|> fun s -> s.AddServerTiming()
|> fun s -> s.AddHsts(LibService.HSTS.setConfig)
|> ignore<IServiceCollection>

let run (packages : Packages) : unit =
Expand Down
2 changes: 2 additions & 0 deletions fsharp-backend/src/BwdServer/Server.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,13 +480,15 @@ let configureApp (healthCheckPort : int) (app : IApplicationBuilder) =
|> fun app -> app.UseRouting()
// must go after UseRouting
|> Kubernetes.configureApp healthCheckPort
|> fun app -> app.UseHsts()
|> fun app -> app.Run(RequestDelegate handler)

let configureServices (services : IServiceCollection) : unit =
services
|> Kubernetes.configureServices [ LibBackend.Init.legacyServerCheck ]
|> Rollbar.AspNet.addRollbarToServices
|> Telemetry.AspNet.addTelemetryToServices "BwdServer" Telemetry.TraceDBQueries
|> fun s -> s.AddHsts(LibService.HSTS.setConfig)
|> ignore<IServiceCollection>

let noLogger (builder : ILoggingBuilder) : unit =
Expand Down
9 changes: 9 additions & 0 deletions fsharp-backend/src/LibService/HSTS.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module LibService.HSTS

open System
open Microsoft.AspNetCore.HttpsPolicy

let setConfig (options : HstsOptions) =
options.Preload <- true
options.IncludeSubDomains <- true
options.MaxAge <- TimeSpan.FromDays 365
1 change: 1 addition & 0 deletions fsharp-backend/src/LibService/LibService.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<Compile Include="Kubernetes.fs" />
<Compile Include="HeapAnalytics.fs" />
<Compile Include="Kestrel.fs" />
<Compile Include="HSTS.fs" />
<Compile Include="Init.fs" />
</ItemGroup>
<ItemGroup>
Expand Down
Loading