Skip to content

[pull] main from zaproxy:main #37

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
pull merged 2 commits into from
Jul 31, 2025
Merged

[pull] main from zaproxy:main #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0db3b4
Replace full paths in AF itest plans
thc202 Jul 31, 2025
7e88cab
Merge pull request #9017 from thc202/itests/remove-abs-paths
kingthorin Jul 31, 2025
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: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-ajax-simple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-client-script-ajax-spider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
authentication:
method: client
parameters:
script: /zap/wrk/configs/scripts/auth/clientScriptAuth.zst
script: ../scripts/auth/clientScriptAuth.zst
scriptEngine: Mozilla Zest
verification:
method: poll
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-client-script-client-spider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
authentication:
method: client
parameters:
script: /zap/wrk/configs/scripts/auth/clientScriptAuth.zst
script: ../scripts/auth/clientScriptAuth.zst
scriptEngine: Mozilla Zest
verification:
method: poll
Expand Down
4 changes: 2 additions & 2 deletions ...gration_tests/configs/plans/auth-client-script-simple-json-blocking-ui-scroll-fields.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
parameters:
loginPageUrl: "http://localhost:9091/auth/simple-json-blocking-ui-scroll-fields/"
loginPageWait: 5
script: /zap/wrk/configs/scripts/auth/clientScriptAuthBlockingScrolls.zst
script: ../scripts/auth/clientScriptAuthBlockingScrolls.zst
scriptEngine: Mozilla Zest
verification:
method: "autodetect"
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
4 changes: 2 additions & 2 deletions docker/integration_tests/configs/plans/auth-client-script-simple-json-blocking-ui.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
parameters:
loginPageUrl: "http://localhost:9091/auth/simple-json-blocking-ui/"
loginPageWait: 5
script: /zap/wrk/configs/scripts/auth/clientScriptAuthBlocking.zst
script: ../scripts/auth/clientScriptAuthBlocking.zst
scriptEngine: Mozilla Zest
verification:
method: "autodetect"
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-client-simple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-json-bearer-cookie.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-json-bearer-js-cookie.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-json-bearer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-json-diff-cookies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-non-std-json-bearer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-password-added-json.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-password-hidden-json.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-password-new-json.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-simple-json-shadow-dom.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/auth-simple-json.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/jigsaw-basic-user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/petstore-openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/seq-simple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- type: sequence-import
parameters:
name: seq-simple
path: /zap/wrk/configs/plans/data/seq-simple.har
path: data/seq-simple.har
assertCode: true
assertLength: 10
- type: sequence-activeScan
Expand Down
2 changes: 1 addition & 1 deletion docker/integration_tests/configs/plans/testfire-form-user.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
engine: "ECMAScript : Graal.js"
name: "af-diags.js"
target: ""
source: "/zap/wrk/configs/scripts/standalone/af-diags.js"
source: "../scripts/standalone/af-diags.js"
name: "script"
type: "script"
- parameters:
Expand Down
Loading