Skip to content

Commit 2532691

Browse files
AlexFenlonAlexFenlon
authored
Update WAF to 5.9.0 (#8339)
1 parent ab3ec13 commit 2532691

File tree

10 files changed

+50
-52
lines changed

10 files changed

+50
-52
lines changed

‎.github/workflows/regression.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ jobs:
275275
276276
- name: Generate WAF v5 tgz from JSON
277277
run: |
278-
docker run --rm --user root -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}/tests/data/ap-waf-v5:/data gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/nap/waf-compiler:5.8.0 -p /data/wafv5.json -o /data/wafv5.tgz
278+
docker run --rm --user root -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}/tests/data/ap-waf-v5:/data gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/nap/waf-compiler:5.9.0 -p /data/wafv5.json -o /data/wafv5.tgz
279279
if: ${{ contains(matrix.images.image, 'nap-v5')}}
280280

281281
- name: Run Regression Tests

‎.github/workflows/setup-smoke.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152

153153
- name: Generate WAF v5 tgz from JSON
154154
run: |
155-
docker run --rm --user root -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}/tests/data/ap-waf-v5:/data gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/nap/waf-compiler:5.8.0 -p /data/wafv5.json -o /data/wafv5.tgz
155+
docker run --rm --user root -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}/tests/data/ap-waf-v5:/data gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/nap/waf-compiler:5.9.0 -p /data/wafv5.json -o /data/wafv5.tgz
156156
if: ${{ contains(inputs.image, 'nap-v5')}}
157157

158158
- name: Run Smoke Tests

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ GIT_TAG = $(shell git describe --exact-match --tags || echo untagged)
44
VERSION = $(VER)-SNAPSHOT
55
NGINX_OSS_VERSION ?= 1.29
66
NGINX_PLUS_VERSION ?= R35
7-
NAP_WAF_VERSION ?= 35+5.498
8-
NAP_WAF_COMMON_VERSION ?= 11.533
9-
NAP_WAF_PLUGIN_VERSION ?= 6.20.0
7+
NAP_WAF_VERSION ?= 35+5.527
8+
NAP_WAF_COMMON_VERSION ?= 11.559
9+
NAP_WAF_PLUGIN_VERSION ?= 6.23.0
1010
NGINX_AGENT_VERSION ?= 3.3
1111
PLUS_ARGS = --build-arg NGINX_PLUS_VERSION=$(NGINX_PLUS_VERSION) --secret id=nginx-repo.crt,src=nginx-repo.crt --secret id=nginx-repo.key,src=nginx-repo.key
1212

‎build/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
ARG BUILD_OS=debian
33
ARG NGINX_OSS_VERSION=1.29
44
ARG NGINX_PLUS_VERSION=R35
5-
ARG NAP_WAF_VERSION=35+5.498
6-
ARG NAP_WAF_COMMON_VERSION=11.533
7-
ARG NAP_WAF_PLUGIN_VERSION=6.20.0
5+
ARG NAP_WAF_VERSION=35+5.527
6+
ARG NAP_WAF_COMMON_VERSION=11.559
7+
ARG NAP_WAF_PLUGIN_VERSION=6.23.0
88
ARG NGINX_AGENT_VERSION=3.3
99
ARG DOWNLOAD_TAG=edge
1010
ARG DEBIAN_FRONTEND=noninteractive

‎charts/nginx-ingress/values.schema.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,10 @@
350350
},
351351
"tag": {
352352
"type": "string",
353-
"default": "5.8.0",
353+
"default": "5.9.0",
354354
"title": "The tag of the App Protect WAF v5 Enforcer image",
355355
"examples": [
356-
"5.8.0"
356+
"5.9.0"
357357
]
358358
},
359359
"digest": {
@@ -389,7 +389,7 @@
389389
"examples": [
390390
{
391391
"repository": "private-registry.nginx.com/nap/waf-enforcer",
392-
"tag": "5.8.0",
392+
"tag": "5.9.0",
393393
"pullPolicy": "IfNotPresent"
394394
}
395395
]
@@ -422,10 +422,10 @@
422422
},
423423
"tag": {
424424
"type": "string",
425-
"default": "5.8.0",
425+
"default": "5.9.0",
426426
"title": "The tag of the App Protect WAF v5 Config Manager image",
427427
"examples": [
428-
"5.8.0"
428+
"5.9.0"
429429
]
430430
},
431431
"digest": {
@@ -461,7 +461,7 @@
461461
"examples": [
462462
{
463463
"repository": "private-registry.nginx.com/nap/waf-config-mgr",
464-
"tag": "5.8.0",
464+
"tag": "5.9.0",
465465
"pullPolicy": "IfNotPresent"
466466
}
467467
]
@@ -2020,15 +2020,15 @@
20202020
"port": 50000,
20212021
"image": {
20222022
"repository": "private-registry.nginx.com/nap/waf-enforcer",
2023-
"tag": "5.8.0",
2023+
"tag": "5.9.0",
20242024
"pullPolicy": "IfNotPresent"
20252025
},
20262026
"securityContext": {}
20272027
},
20282028
"configManager": {
20292029
"image": {
20302030
"repository": "private-registry.nginx.com/nap/waf-config-mgr",
2031-
"tag": "5.8.0",
2031+
"tag": "5.9.0",
20322032
"pullPolicy": "IfNotPresent"
20332033
},
20342034
"securityContext": {
@@ -2660,15 +2660,15 @@
26602660
"port": 50000,
26612661
"image": {
26622662
"repository": "private-registry.nginx.com/nap/waf-enforcer",
2663-
"tag": "5.8.0",
2663+
"tag": "5.9.0",
26642664
"pullPolicy": "IfNotPresent"
26652665
},
26662666
"securityContext": {}
26672667
},
26682668
"configManager": {
26692669
"image": {
26702670
"repository": "private-registry.nginx.com/nap/waf-config-mgr",
2671-
"tag": "5.8.0",
2671+
"tag": "5.9.0",
26722672
"pullPolicy": "IfNotPresent"
26732673
},
26742674
"securityContext": {

‎charts/nginx-ingress/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ controller:
8484
repository: private-registry.nginx.com/nap/waf-enforcer
8585

8686
## The tag of the App Protect WAF v5 Enforcer image.
87-
tag: "5.8.0"
87+
tag: "5.9.0"
8888
## The digest of the App Protect WAF v5 Enforcer image.
8989
## If digest is specified it has precedence over tag and will be used instead
9090
# digest: "sha256:CHANGEME"
@@ -100,7 +100,7 @@ controller:
100100
repository: private-registry.nginx.com/nap/waf-config-mgr
101101

102102
## The tag of the App Protect WAF v5 Configuration Manager image.
103-
tag: "5.8.0"
103+
tag: "5.9.0"
104104
## The digest of the App Protect WAF v5 Configuration Manager image.
105105
## If digest is specified it has precedence over tag and will be used instead
106106
# digest: "sha256:CHANGEME"

‎charts/tests/__snapshots__/helmunit_test.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,7 +1936,7 @@ spec:
19361936
- -weight-changes-dynamic-reload=false
19371937

19381938
- name: waf-enforcer
1939-
image: my.private.reg/nap/waf-enforcer:5.8.0
1939+
image: my.private.reg/nap/waf-enforcer:5.9.0
19401940
imagePullPolicy: "IfNotPresent"
19411941
env:
19421942
- name: ENFORCER_PORT
@@ -1947,7 +1947,7 @@ spec:
19471947
- name: app-protect-bd-config
19481948
mountPath: /opt/app_protect/bd_config
19491949
- name: waf-config-mgr
1950-
image: my.private.reg/nap/waf-config-mgr:5.8.0
1950+
image: my.private.reg/nap/waf-config-mgr:5.9.0
19511951
imagePullPolicy: "IfNotPresent"
19521952
securityContext:
19531953

@@ -2519,7 +2519,7 @@ spec:
25192519
- -agent-instance-group=app-protect-wafv5-agentv2-nginx-ingress-controller
25202520

25212521
- name: waf-enforcer
2522-
image: my.private.reg/nap/waf-enforcer:5.8.0
2522+
image: my.private.reg/nap/waf-enforcer:5.9.0
25232523
imagePullPolicy: "IfNotPresent"
25242524
env:
25252525
- name: ENFORCER_PORT
@@ -2530,7 +2530,7 @@ spec:
25302530
- name: app-protect-bd-config
25312531
mountPath: /opt/app_protect/bd_config
25322532
- name: waf-config-mgr
2533-
image: my.private.reg/nap/waf-config-mgr:5.8.0
2533+
image: my.private.reg/nap/waf-config-mgr:5.9.0
25342534
imagePullPolicy: "IfNotPresent"
25352535
securityContext:
25362536

‎cmd/nginx-ingress/main.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"os/signal"
1313
"path/filepath"
1414
"reflect"
15-
"regexp"
1615
"runtime"
1716
"strings"
1817
"syscall"
@@ -146,8 +145,7 @@ func main() {
146145
if *appProtect {
147146
appProtectVersion = getAppProtectVersionInfo(ctx)
148147

149-
r := regexp.MustCompile("^5.*")
150-
if r.MatchString(appProtectVersion) {
148+
if _, err := os.Stat("/opt/app_protect/VERSION.common"); os.IsNotExist(err) {
151149
appProtectV5 = true
152150
appProtectBundlePath = appProtectv5BundleFolder
153151
}

‎tests/data/modules/data.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@
8080
},
8181
{
8282
"name": "nginx-plus-module-appprotect",
83-
"version": "35+5.498"
83+
"version": "35+5.527"
8484
},
8585
{
8686
"name": "app-protect",
87-
"version": "35+5.498"
87+
"version": "35+5.527"
8888
},
8989
{
9090
"name": "app-protect-attack-signatures",
@@ -126,15 +126,15 @@
126126
},
127127
{
128128
"name": "nginx-plus-module-appprotect",
129-
"version": "35+5.498"
129+
"version": "35+5.527"
130130
},
131131
{
132132
"name": "app-protect-module-plus",
133-
"version": "35+5.498"
133+
"version": "35+5.527"
134134
},
135135
{
136136
"name": "app-protect-plugin",
137-
"version": "6.20.0"
137+
"version": "6.23.0"
138138
},
139139
{
140140
"name": "nginx-agent",
@@ -202,11 +202,11 @@
202202
},
203203
{
204204
"name": "nginx-plus-module-appprotect",
205-
"version": "35+5.498"
205+
"version": "35+5.527"
206206
},
207207
{
208208
"name": "app-protect",
209-
"version": "35+5.498"
209+
"version": "35+5.527"
210210
},
211211
{
212212
"name": "app-protect-attack-signatures",
@@ -349,11 +349,11 @@
349349
},
350350
{
351351
"name": "nginx-plus-module-appprotect",
352-
"version": "35.5.498"
352+
"version": "35.5.527"
353353
},
354354
{
355355
"name": "app-protect",
356-
"version": "35.5.498"
356+
"version": "35.5.527"
357357
},
358358
{
359359
"name": "app-protect-attack-signatures",
@@ -395,15 +395,15 @@
395395
},
396396
{
397397
"name": "nginx-plus-module-appprotect",
398-
"version": "35.5.498"
398+
"version": "35.5.527"
399399
},
400400
{
401401
"name": "app-protect-module-plus",
402-
"version": "35.5.498"
402+
"version": "35.5.527"
403403
},
404404
{
405405
"name": "app-protect-plugin",
406-
"version": "6.20.0"
406+
"version": "6.23.0"
407407
}
408408
],
409409
"system": "alpine",
@@ -495,11 +495,11 @@
495495
},
496496
{
497497
"name": "nginx-plus-module-appprotect",
498-
"version": "35+5.498"
498+
"version": "35+5.527"
499499
},
500500
{
501501
"name": "app-protect",
502-
"version": "35+5.498"
502+
"version": "35+5.527"
503503
},
504504
{
505505
"name": "app-protect-attack-signatures",
@@ -541,15 +541,15 @@
541541
},
542542
{
543543
"name": "nginx-plus-module-appprotect",
544-
"version": "35+5.498"
544+
"version": "35+5.527"
545545
},
546546
{
547547
"name": "app-protect-module-plus",
548-
"version": "35+5.498"
548+
"version": "35+5.527"
549549
},
550550
{
551551
"name": "app-protect-plugin",
552-
"version": "6.20.0"
552+
"version": "6.23.0"
553553
}
554554
],
555555
"system": "ubi",
@@ -583,11 +583,11 @@
583583
},
584584
{
585585
"name": "nginx-plus-module-appprotect",
586-
"version": "35+5.498"
586+
"version": "35+5.527"
587587
},
588588
{
589589
"name": "app-protect",
590-
"version": "35+5.498"
590+
"version": "35+5.527"
591591
},
592592
{
593593
"name": "app-protect-attack-signatures",
@@ -629,15 +629,15 @@
629629
},
630630
{
631631
"name": "nginx-plus-module-appprotect",
632-
"version": "35+5.498"
632+
"version": "35+5.527"
633633
},
634634
{
635635
"name": "app-protect-module-plus",
636-
"version": "35+5.498"
636+
"version": "35+5.527"
637637
},
638638
{
639639
"name": "app-protect-plugin",
640-
"version": "6.20.0"
640+
"version": "6.23.0"
641641
}
642642
],
643643
"system": "ubi",
@@ -701,7 +701,7 @@
701701
},
702702
{
703703
"name": "nginx-plus-module-appprotect",
704-
"version": "35+5.498"
704+
"version": "35+5.527"
705705
},
706706
{
707707
"name": "nginx-plus-module-appprotectdos",
@@ -713,7 +713,7 @@
713713
},
714714
{
715715
"name": "app-protect",
716-
"version": "35+5.498"
716+
"version": "35+5.527"
717717
},
718718
{
719719
"name": "app-protect-attack-signatures",

‎tests/settings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
# Nginx registry address to pull waf components from
3434
NGX_REG = "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr"
3535
# WAF component version to pull from above registry
36-
WAF_V5_VERSION = "5.8.0"
36+
WAF_V5_VERSION = "5.9.0"

0 commit comments

Comments
 (0)