8000 App Policy Bundle by jjngx · Pull Request #3560 · nginx/kubernetes-ingress · GitHub
[go: up one dir, main page]
Skip to content

App Policy Bundle #3560

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

Merged
merged 8 commits into from
Feb 23, 2023
Merged

App Policy Bundle #3560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a8c0795
App Policy Bundle
jjngx Feb 16, 2023
54a0c80
Merge branch 'main' into poc/appolicyblob
jjngx Feb 16, 2023
8261f67
Merge branch 'main' into poc/appolicyblob
jjngx Feb 17, 2023
3926a61
Merge branch 'main' into poc/appolicyblob
jjngx Feb 20, 2023
d4e64c5
Update expected mount path to bundles
jjngx Feb 21, 2023
3773e99
Update policy bundle path
jjngx Feb 22, 2023
6d2b589
Merge branch 'main' into poc/appolicyblob
jjngx Feb 22, 2023
edcabad
Merge branch 'main' into poc/appolicyblob
jjngx Feb 23, 2023
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 deployments/common/crds/k8s.nginx.org_policies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ spec:
description: WAF defines an WAF policy.
type: object
properties:
apBundle:
type: string
apPolicy:
type: string
enable:
Expand Down
2 changes: 2 additions & 0 deletions deployments/helm-chart/crds/k8s.nginx.org_policies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ spec:
description: WAF defines an WAF policy.
type: object
properties:
apBundle:
type: string
apPolicy:
type: string
enable:
Expand Down
1 change: 1 addition & 0 deletions internal/configs/configurator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (

const (
pemFileNameForWildcardTLSSecret = "/etc/nginx/secrets/wildcard" // #nosec G101
appProtectBundleFolder = "/etc/nginx/waf/bundles/"
appProtectPolicyFolder = "/etc/nginx/waf/nac-policies/"
appProtectLogConfFolder = "/etc/nginx/waf/nac-logconfs/"
appProtectUserSigFolder = "/etc/nginx/waf/nac-usersigs/"
Expand Down
1 change: 1 addition & 0 deletions internal/configs/version2/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ type OIDC struct {
type WAF struct {
Enable string
ApPolicy string
ApBundle string
ApSecurityLogEnable bool
ApLogConf []string
}
Expand Down
8 changes: 8 additions & 0 deletions internal/configs/version2/nginx-plus.virtualserver.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,10 @@ server {
app_protect_policy_file {{ .ApPolicy }};
{{ end }}

{{ if .ApBundle }}
app_protect_policy_file {{ .ApBundle }};
{{ end }}

{{ if .ApSecurityLogEnable }}
app_protect_security_log_enable on;
{{ range $logconf := .ApLogConf }}
Expand Down Expand Up @@ -429,6 +433,10 @@ server {
app_protect_policy_file {{ .ApPolicy }};
{{ end }}

{{ if .ApBundle }}
app_protect_policy_file {{ .ApBundle }};
{{ end }}

{{ if .ApSecurityLogEnable }}
app_protect_security_log_enable on;
{{ range $logconf := .ApLogConf }}
Expand Down
Loading
0