-
Notifications
You must be signed in to change notification settings - Fork 3
feat: add experimental HTTP template server #109
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.
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
Open
LaurenceJJones
wants to merge
3
commits into
main
Choose a base branch
from
feature/http-template-server
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ import ( | |
| "github.com/crowdsecurity/crowdsec-spoa/pkg/cfg" | ||
| "github.com/crowdsecurity/crowdsec-spoa/pkg/dataset" | ||
| "github.com/crowdsecurity/crowdsec-spoa/pkg/host" | ||
| "github.com/crowdsecurity/crowdsec-spoa/pkg/httptemplate" | ||
| "github.com/crowdsecurity/crowdsec-spoa/pkg/metrics" | ||
| "github.com/crowdsecurity/crowdsec-spoa/pkg/spoa" | ||
| csbouncer "github.com/crowdsecurity/go-cs-bouncer" | ||
|
|
@@ -194,6 +195,24 @@ func Execute() error { | |
| } | ||
| } | ||
|
|
||
| // Create and start HTTP template server if enabled (after HostManager is created) | ||
| var httpTemplateServer *httptemplate.Server | ||
| if config.HTTPTemplateServer.Enabled { | ||
| httpTemplateLogger := log.WithField("component", "http_template_server") | ||
| var err error | ||
| httpTemplateServer, err = httptemplate.NewServer(&config.HTTPTemplateServer, HostManager, httpTemplateLogger) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to create HTTP template server: %w", err) | ||
| } | ||
|
|
||
| g.Go(func() error { | ||
| if err := httpTemplateServer.Serve(ctx); err != nil { | ||
| return fmt.Errorf("HTTP template server failed: %w", err) | ||
| } | ||
| return nil | ||
| }) | ||
| } | ||
|
Comment on lines
+198
to
+214
|
||
|
|
||
| if config.HostsDir != "" { | ||
| if err := HostManager.LoadFromDirectory(config.HostsDir); err != nil { | ||
| return fmt.Errorf("failed to load hosts from directory: %w", err) | ||
|
|
@@ -252,6 +271,14 @@ func Execute() error { | |
| log.Errorf("Failed to shutdown SPOA: %v", shutdownErr) | ||
| } | ||
|
|
||
| // Shutdown HTTP template server if it was started | ||
| if httpTemplateServer != nil { | ||
| log.Info("Shutting down HTTP template server") | ||
| if shutdownErr := httpTemplateServer.Shutdown(shutdownCtx); shutdownErr != nil { | ||
| log.Errorf("Failed to shutdown HTTP template server: %v", shutdownErr) | ||
| } | ||
| } | ||
|
|
||
| // Return error only if it was unexpected | ||
| if err != nil && !isExpectedShutdown { | ||
| return err | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,74 @@ | ||||||||||||||||||||||
| # https://www.haproxy.com/documentation/hapee/latest/onepage/#home | ||||||||||||||||||||||
| # HAProxy configuration example using HTTP Template Server instead of Lua | ||||||||||||||||||||||
| # This demonstrates the experimental HTTP template server feature | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| global | ||||||||||||||||||||||
| log stdout format raw local0 | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| defaults | ||||||||||||||||||||||
| log global | ||||||||||||||||||||||
| option httplog | ||||||||||||||||||||||
| timeout client 1m | ||||||||||||||||||||||
| timeout server 1m | ||||||||||||||||||||||
| timeout connect 10s | ||||||||||||||||||||||
| timeout http-keep-alive 2m | ||||||||||||||||||||||
| timeout queue 15s | ||||||||||||||||||||||
| timeout tunnel 4h # for websocket | ||||||||||||||||||||||
|
Comment on lines
+12
to
+16
|
||||||||||||||||||||||
| timeout server 1m | |
| timeout connect 10s | |
| timeout http-keep-alive 2m | |
| timeout queue 15s | |
| timeout tunnel 4h # for websocket | |
| timeout server 1m | |
| timeout connect 10s | |
| timeout http-keep-alive 2m | |
| timeout queue 15s | |
| timeout tunnel 4h # for websocket |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,68 @@ | ||||||||
| services: | ||||||||
| spoa: | ||||||||
| image: crowdsecurity/crowdsec-spoa:latest | ||||||||
| build: | ||||||||
| context: . | ||||||||
| dockerfile: Dockerfile | ||||||||
| depends_on: | ||||||||
| - crowdsec | ||||||||
| volumes: | ||||||||
| - sockets:/run/ | ||||||||
| - geodb:/var/lib/crowdsec/data/ | ||||||||
| - ./config/crowdsec-spoa-bouncer.yaml.local:/etc/crowdsec/bouncers/crowdsec-spoa-bouncer.yaml.local | ||||||||
|
||||||||
| - ./config/crowdsec-spoa-bouncer.yaml.local:/etc/crowdsec/bouncers/crowdsec-spoa-bouncer.yaml.local | |
| - ./config/crowdsec-spoa-bouncer.yaml.local:/etc/crowdsec/bouncers/crowdsec-spoa-bouncer.yaml.local | |
| - templates:/var/lib/crowdsec-haproxy-spoa-bouncer/html/ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Dockerfile now only copies
.tmpltemplate files explicitly, but the old Dockerfile copied all templates withtemplates/*which would have includedban.htmlandcaptcha.html. These HTML templates are still needed for Lua-based rendering (as evidenced by the HAProxy configs that setCROWDSEC_BAN_TEMPLATE_PATHto.htmlfiles). Either add explicit COPY commands for the.htmltemplates, or revert to usingtemplates/*to copy all template files.