Skip to content

Add ModSecurity-specific validation configuration options #127

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add ModSecurity-specific validation configuration options #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions cmd/api-firewall/internal/handlers/proxy/routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,22 @@ func Handlers(lock *sync.RWMutex, cfg *config.ProxyMode, serverURL *url.URL, shu
Logger: logger,
}

// Use ModSecurity-specific validation settings if defined, otherwise fall back to global settings
modSecRequestValidation := cfg.ModSecurity.RequestValidation
if modSecRequestValidation == "" {
modSecRequestValidation = cfg.RequestValidation
}
modSecResponseValidation := cfg.ModSecurity.ResponseValidation
if modSecResponseValidation == "" {
modSecResponseValidation = cfg.ResponseValidation
}

modSecOptions := mid.ModSecurityOptions{
Mode: web.ProxyMode,
WAF: waf,
Logger: logger,
RequestValidation: cfg.RequestValidation,
ResponseValidation: cfg.ResponseValidation,
RequestValidation: modSecRequestValidation,
ResponseValidation: modSecResponseValidation,
CustomBlockStatusCode: cfg.CustomBlockStatusCode,
}

Expand Down
6 changes: 4 additions & 2 deletions internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,10 @@ type ShadowAPI struct {
}

type ModSecurity struct {
ConfFiles []string `conf:"env:MODSEC_CONF_FILES"`
RulesDir string `conf:"env:MODSEC_RULES_DIR"`
ConfFiles []string `conf:"env:MODSEC_CONF_FILES"`
RulesDir string `conf:"env:MODSEC_RULES_DIR"`
RequestValidation string `conf:"env:MODSEC_REQUEST_VALIDATION validate:"required,oneof=DISABLE BLOCK LOG_ONLY"`
ResponseValidation string `conf:"env:MODSEC_RESPONSE_VALIDATION" validate:"required,oneof=DISABLE BLOCK LOG_ONLY"`
}

type GraphQL struct {
Expand Down