diff --git a/.github/workflows/build+publish-all-pds-solutions.yml b/.github/workflows/build+publish-all-pds-solutions.yml index 0d4731b81b..a0adfe70e8 100644 --- a/.github/workflows/build+publish-all-pds-solutions.yml +++ b/.github/workflows/build+publish-all-pds-solutions.yml @@ -51,10 +51,10 @@ jobs: pds-solution: multi pds-version: ${{ inputs.pds-version }} - call_build_pds-owasp-zap: + call_build_pds-owaspzap: uses: mercedes-benz/sechub/.github/workflows/_build+publish-pds-solution.yml@develop with: - pds-solution: owasp-zap + pds-solution: owaspzap pds-version: ${{ inputs.pds-version }} call_build-and-publish-pmd: diff --git a/sechub-doc/src/docs/asciidoc/documents/operations/02_security_products.adoc b/sechub-doc/src/docs/asciidoc/documents/operations/02_security_products.adoc index e7df62f434..83fd1c298a 100644 --- a/sechub-doc/src/docs/asciidoc/documents/operations/02_security_products.adoc +++ b/sechub-doc/src/docs/asciidoc/documents/operations/02_security_products.adoc @@ -44,9 +44,9 @@ This solution does integrate multiple SAST tools: It can be found at https://github.com/mercedes-benz/sechub/tree/develop/sechub-pds-solutions/multi -===== Owasp-Zap +===== OWASP ZAP This solution does integrate the https://www.zaproxy.org/ (web application scanner) - please look at -https://github.com/mercedes-benz/sechub/blob/develop/sechub-pds-solutions/owasp-zap/ +https://github.com/mercedes-benz/sechub/blob/develop/sechub-pds-solutions/owaspzap/ ===== PMD https://pmd.github.io/ stand normally for quality checks, but it does also provide some security check mechanism. The integration can be found at diff --git a/sechub-doc/src/docs/asciidoc/documents/shared/infrastructure/products/07_03_01_infra_security_products_netsparker.adoc b/sechub-doc/src/docs/asciidoc/documents/shared/infrastructure/products/07_03_01_infra_security_products_netsparker.adoc index 179482546e..0a4e23448f 100644 --- a/sechub-doc/src/docs/asciidoc/documents/shared/infrastructure/products/07_03_01_infra_security_products_netsparker.adoc +++ b/sechub-doc/src/docs/asciidoc/documents/shared/infrastructure/products/07_03_01_infra_security_products_netsparker.adoc @@ -5,7 +5,7 @@ [WARNING] ==== Netsparker support inside {sechub} is deprecated and will vanish. As a replacement we have: -{pds-solutions-projectsite}/owasp-zap +{pds-solutions-projectsite}/owaspzap ==== Netsparker is a web scanner. diff --git a/sechub-pds-solutions/owasp-zap/01-start-single-docker-compose.sh b/sechub-pds-solutions/owaspzap/01-start-single-docker-compose.sh similarity index 100% rename from sechub-pds-solutions/owasp-zap/01-start-single-docker-compose.sh rename to sechub-pds-solutions/owaspzap/01-start-single-docker-compose.sh diff --git a/sechub-pds-solutions/owasp-zap/05-start-single-sechub-network-docker-compose.sh b/sechub-pds-solutions/owaspzap/05-start-single-sechub-network-docker-compose.sh similarity index 100% rename from sechub-pds-solutions/owasp-zap/05-start-single-sechub-network-docker-compose.sh rename to sechub-pds-solutions/owaspzap/05-start-single-sechub-network-docker-compose.sh diff --git a/sechub-pds-solutions/owasp-zap/09-compute-image-tag.sh b/sechub-pds-solutions/owaspzap/09-compute-image-tag.sh similarity index 100% rename from sechub-pds-solutions/owasp-zap/09-compute-image-tag.sh rename to sechub-pds-solutions/owaspzap/09-compute-image-tag.sh diff --git a/sechub-pds-solutions/owasp-zap/10-create-image.sh b/sechub-pds-solutions/owaspzap/10-create-image.sh similarity index 100% rename from sechub-pds-solutions/owasp-zap/10-create-image.sh rename to sechub-pds-solutions/owaspzap/10-create-image.sh diff --git a/sechub-pds-solutions/owasp-zap/20-push-image.sh b/sechub-pds-solutions/owaspzap/20-push-image.sh similarity index 100% rename from sechub-pds-solutions/owasp-zap/20-push-image.sh rename to sechub-pds-solutions/owaspzap/20-push-image.sh diff --git a/sechub-pds-solutions/owasp-zap/50-start-multiple-docker-compose.sh b/sechub-pds-solutions/owaspzap/50-start-multiple-docker-compose.sh similarity index 100% rename from sechub-pds-solutions/owasp-zap/50-start-multiple-docker-compose.sh rename to sechub-pds-solutions/owaspzap/50-start-multiple-docker-compose.sh diff --git a/sechub-pds-solutions/owasp-zap/51-start-multiple-object-storage-docker-compose.sh b/sechub-pds-solutions/owaspzap/51-start-multiple-object-storage-docker-compose.sh similarity index 100% rename from sechub-pds-solutions/owasp-zap/51-start-multiple-object-storage-docker-compose.sh rename to sechub-pds-solutions/owaspzap/51-start-multiple-object-storage-docker-compose.sh diff --git a/sechub-pds-solutions/owasp-zap/70-test-webscan.sh b/sechub-pds-solutions/owaspzap/70-test-webscan.sh similarity index 100% rename from sechub-pds-solutions/owasp-zap/70-test-webscan.sh rename to sechub-pds-solutions/owaspzap/70-test-webscan.sh diff --git a/sechub-pds-solutions/owasp-zap/README.adoc b/sechub-pds-solutions/owaspzap/README.adoc similarity index 90% rename from sechub-pds-solutions/owasp-zap/README.adoc rename to sechub-pds-solutions/owaspzap/README.adoc index 04fbbc2269..96e84e81ea 100644 --- a/sechub-pds-solutions/owasp-zap/README.adoc +++ b/sechub-pds-solutions/owaspzap/README.adoc @@ -54,7 +54,7 @@ IMPORTANT: Make sure the SecHub container is running. The steps required to scan with the PDS. -==== Scan Script +==== Scan Script WARNING: Scan only targets you have permission to scan. @@ -102,12 +102,12 @@ or ---- { "apiVersion" : "1.0", - "sechubJobUUID": "288607bf-ac81-4088-842c-005d5702a9e9", + "sechubJobUUID": "288607bf-ac81-4088-842c-005d5702a9e9", "productId": "PDS_OWASP_ZAP", "parameters": [ { "key" : "pds.scan.target.url", - "value" : "https://my.juiceshop.org" + "value" : "https://my.juiceshop.org" }, { "key" : "zap.activescan.enabled", @@ -180,7 +180,7 @@ This section contains information about how to troubleshoot PDS+OWSAP-Zap if som ==== Access the container ---- -docker exec -it pds-owasp-zap-debian bash +docker exec -it pds-owaspzap-debian bash ---- ==== Java Application Remote Debugging of PDS @@ -209,7 +209,7 @@ Build container images and push them to registry to run PDS+OWSAP-Zap on virtual Build the container image. -. Using the default image: +. Using the default image: + ---- ./10-create-image.sh my.registry.example.org/sechub/pds_owasp_zap v0.1 @@ -300,7 +300,7 @@ To generate passwords use `tr -dc A-Za-z0-9 install…` to install the helm chart into ---- kubectl get pods NAME READY STATUS RESTARTS AGE -pds-owasp-zap-759ffc8dfb-8jj8f 1/1 Running 0 75s +pds-owaspzap-759ffc8dfb-8jj8f 1/1 Running 0 75s ---- . Forward port of one of the pods to own machine + ---- -kubectl port-forward pds-owasp-zap-759ffc8dfb-8jj8f 8444:8444 +kubectl port-forward pds-owaspzap-759ffc8dfb-8jj8f 8444:8444 ---- . Scan as explained in the <> section. @@ -327,23 +327,23 @@ kubectl port-forward pds-owasp-zap-759ffc8dfb-8jj8f 8444:8444 In case, `my-values.yaml` was changed. Simply, use `helm upgrade` to update the deployment. `helm` will handle scaling up and down as well as changing the configuration. ---- -helm upgrade --values my-values.yaml pds-owasp-zap helm/pds-owasp-zap/ +helm upgrade --values my-values.yaml pds-owaspzap helm/pds-owaspzap/ ---- -==== Uninstall +==== Uninstall . Helm list + ---- helm list NAME NAMESPACE REVISION UPDATED STATUS CHART APP VERSION -pds-owasp-zap my-namespace 1 2021-11-05 18:42:23.613991303 +0100 CET deployed pds-owasp-zap-0.1.0 0.24.0 +pds-owaspzap my-namespace 1 2021-11-05 18:42:23.613991303 +0100 CET deployed pds-owaspzap-0.1.0 0.24.0 ---- . Helm uninstall + ---- -helm uninstall pds-owasp-zap +helm uninstall pds-owaspzap ---- === Troubleshooting @@ -351,22 +351,22 @@ helm uninstall pds-owasp-zap * Access deployment events. + ---- -kubectl describe pod pds-owasp-zap-759ffc8dfb-8jj8f +kubectl describe pod pds-owaspzap-759ffc8dfb-8jj8f … Events: Type Reason Age From Message ---- ------ ---- ---- ------- - Normal Scheduled 6m52s default-scheduler Successfully assigned sechub-zap/pds-owasp-zap-759ffc8dfb-8jj8f to c06p043-md-cc8c675cb-bqtpb + Normal Scheduled 6m52s default-scheduler Successfully assigned sechub-zap/pds-owaspzap-759ffc8dfb-8jj8f to c06p043-md-cc8c675cb-bqtpb Normal Pulling 6m52s kubelet Pulling image "my.registry.org/sechub/pds_owasp_zap:latest" Normal Pulled 6m31s kubelet Successfully pulled image "my.registry.org/sechub/pds_owasp_zap:latest" in 21.303104727s - Normal Created 6m30s kubelet Created container pds-owasp-zap - Normal Started 6m30s kubelet Started container pds-owasp-zap + Normal Created 6m30s kubelet Created container pds-owaspzap + Normal Started 6m30s kubelet Started container pds-owaspzap ---- * Access container logs. + ---- -kubectl logs pds-owasp-zap-759ffc8dfb-8jj8f +kubectl logs pds-owaspzap-759ffc8dfb-8jj8f . ____ _ __ _ _ /\\ / ___'_ __ _ _(_)_ __ __ _ \ \ \ \ @@ -376,7 +376,7 @@ kubectl logs pds-owasp-zap-759ffc8dfb-8jj8f =========|_|==============|___/=/_/_/_/ :: Spring Boot :: (v2.5.2) -2021-11-05 17:42:47.697 INFO 7 --- [ main] d.s.p.ProductDelegationServerApplication : Starting ProductDelegationServerApplication using Java 11.0.11 on pds-owasp-zap-759ffc8dfb-8jj8f with PID 7 (/pds/sechub-pds-0.24.0.jar started by zap in /workspace) +2021-11-05 17:42:47.697 INFO 7 --- [ main] d.s.p.ProductDelegationServerApplication : Starting ProductDelegationServerApplication using Java 11.0.11 on pds-owaspzap-759ffc8dfb-8jj8f with PID 7 (/pds/sechub-pds-0.24.0.jar started by zap in /workspace) 2021-11-05 17:42:47.702 INFO 7 --- [ main] d.s.p.ProductDelegationServerApplication : The following profiles are active: pds_localserver 2021-11-05 17:42:53.054 WARN 7 --- [ main] o.apache.tomcat.util.net.SSLHostConfig : The protocol [TLSv1.3] was added to the list of protocols on the SSLHostConfig named [_default_]. Check if a +/- prefix is missing. 2021-11-05 17:42:53.131 INFO 7 --- [ main] o.apache.catalina.core.StandardService : Starting service [Tomcat] @@ -392,5 +392,5 @@ kubectl logs pds-owasp-zap-759ffc8dfb-8jj8f 2021-11-05 17:42:58.375 INFO 7 --- [ main] d.s.p.ProductDelegationServerApplication : Started ProductDelegationServerApplication in 13.2 seconds (JVM running for 14.465) 2021-11-05 17:42:59.394 INFO 7 --- [ scheduling-1] c.d.s.p.m.PDSHeartBeatTriggerService : Heartbeat will be initialized 2021-11-05 17:42:59.394 INFO 7 --- [ scheduling-1] c.d.s.p.m.PDSHeartBeatTriggerService : Create new server hearbeat -2021-11-05 17:42:59.467 INFO 7 --- [ scheduling-1] c.d.s.p.m.PDSHeartBeatTriggerService : heartbeat update - serverid:OWASP_ZAP_CLUSTER, heartbeatuuid:d6b06e92-e3e6-4f39-aefb-eb70fee49ce7, cluster-member-data:{"hostname":"pds-owasp-zap-759ffc8dfb-8jj8f","ip":"192.168.128.4","port":8444,"heartBeatTimestamp":"2021-11-05T17:42:59.395871","executionState":{"queueMax":50,"jobsInQueue":0,"entries":[]}} +2021-11-05 17:42:59.467 INFO 7 --- [ scheduling-1] c.d.s.p.m.PDSHeartBeatTriggerService : heartbeat update - serverid:OWASP_ZAP_CLUSTER, heartbeatuuid:d6b06e92-e3e6-4f39-aefb-eb70fee49ce7, cluster-member-data:{"hostname":"pds-owaspzap-759ffc8dfb-8jj8f","ip":"192.168.128.4","port":8444,"heartBeatTimestamp":"2021-11-05T17:42:59.395871","executionState":{"queueMax":50,"jobsInQueue":0,"entries":[]}} ---- \ No newline at end of file diff --git a/sechub-pds-solutions/owasp-zap/cluster_object_storage.svg b/sechub-pds-solutions/owaspzap/cluster_object_storage.svg similarity index 100% rename from sechub-pds-solutions/owasp-zap/cluster_object_storage.svg rename to sechub-pds-solutions/owaspzap/cluster_object_storage.svg diff --git a/sechub-pds-solutions/owasp-zap/cluster_shared_volume.svg b/sechub-pds-solutions/owaspzap/cluster_shared_volume.svg similarity index 100% rename from sechub-pds-solutions/owasp-zap/cluster_shared_volume.svg rename to sechub-pds-solutions/owaspzap/cluster_shared_volume.svg diff --git a/sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap.yaml b/sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap.yaml similarity index 88% rename from sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap.yaml rename to sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap.yaml index e49fbf8bf0..db50e6055f 100644 --- a/sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap.yaml +++ b/sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap.yaml @@ -2,13 +2,13 @@ version: "3" services: - pds-owasp-zap: + pds-owaspzap: build: args: - BASE_IMAGE=${BASE_IMAGE} context: docker/ dockerfile: Owasp-Zap-Debian.dockerfile - container_name: pds-owasp-zap + container_name: pds-owaspzap env_file: - .env ports: diff --git a/sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap_cluster.yaml b/sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap_cluster.yaml similarity index 91% rename from sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap_cluster.yaml rename to sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap_cluster.yaml index 1310284397..aadb040f4d 100644 --- a/sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap_cluster.yaml +++ b/sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap_cluster.yaml @@ -2,7 +2,7 @@ version: "3" services: - pds-owasp-zap: + pds-owaspzap: build: args: - BASE_IMAGE=${BASE_IMAGE} @@ -23,13 +23,13 @@ services: build: context: ../shared/docker/loadbalancer args: - - PDS_SOLUTION=pds-owasp-zap + - PDS_SOLUTION=pds-owaspzap env_file: - .env-cluster networks: - "internal" depends_on: - - pds-owasp-zap + - pds-owaspzap ports: - "127.0.0.1:8444:8444" diff --git a/sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap_cluster_object_storage.yaml b/sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap_cluster_object_storage.yaml similarity index 94% rename from sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap_cluster_object_storage.yaml rename to sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap_cluster_object_storage.yaml index feb1c0dd78..9838d40085 100644 --- a/sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap_cluster_object_storage.yaml +++ b/sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap_cluster_object_storage.yaml @@ -2,7 +2,7 @@ version: "3" services: - pds-owasp-zap: + pds-owaspzap: build: args: - BASE_IMAGE=${BASE_IMAGE} @@ -23,13 +23,13 @@ services: build: context: ../shared/docker/loadbalancer args: - - PDS_SOLUTION=pds-owasp-zap + - PDS_SOLUTION=pds-owaspzap env_file: - .env-cluster-object-storage networks: - internal depends_on: - - pds-owasp-zap + - pds-owaspzap ports: - "127.0.0.1:8444:8444" diff --git a/sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap_external_network.yaml b/sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap_external_network.yaml similarity index 81% rename from sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap_external_network.yaml rename to sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap_external_network.yaml index bb6216d4b6..6ef72c4df4 100644 --- a/sechub-pds-solutions/owasp-zap/docker-compose_pds_owasp_zap_external_network.yaml +++ b/sechub-pds-solutions/owaspzap/docker-compose_pds_owasp_zap_external_network.yaml @@ -2,14 +2,14 @@ version: "3" services: - pds-owasp-zap: + pds-owaspzap: build: args: - BASE_IMAGE=${BASE_IMAGE} context: docker/ dockerfile: Owasp-Zap-Debian.dockerfile - container_name: pds-owasp-zap - hostname: pds-owasp-zap + container_name: pds-owaspzap + hostname: pds-owaspzap env_file: - .env networks: diff --git a/sechub-pds-solutions/owasp-zap/docker/Owasp-Zap-Debian.dockerfile b/sechub-pds-solutions/owaspzap/docker/Owasp-Zap-Debian.dockerfile similarity index 100% rename from sechub-pds-solutions/owasp-zap/docker/Owasp-Zap-Debian.dockerfile rename to sechub-pds-solutions/owaspzap/docker/Owasp-Zap-Debian.dockerfile diff --git a/sechub-pds-solutions/owasp-zap/docker/mocks/mock.sarif.json b/sechub-pds-solutions/owaspzap/docker/mocks/mock.sarif.json similarity index 100% rename from sechub-pds-solutions/owasp-zap/docker/mocks/mock.sarif.json rename to sechub-pds-solutions/owaspzap/docker/mocks/mock.sarif.json diff --git a/sechub-pds-solutions/owasp-zap/docker/owasp-zap-full-ruleset-all-release-status.json b/sechub-pds-solutions/owaspzap/docker/owasp-zap-full-ruleset-all-release-status.json similarity index 100% rename from sechub-pds-solutions/owasp-zap/docker/owasp-zap-full-ruleset-all-release-status.json rename to sechub-pds-solutions/owaspzap/docker/owasp-zap-full-ruleset-all-release-status.json diff --git a/sechub-pds-solutions/owasp-zap/docker/pds-config.json b/sechub-pds-solutions/owaspzap/docker/pds-config.json similarity index 100% rename from sechub-pds-solutions/owasp-zap/docker/pds-config.json rename to sechub-pds-solutions/owaspzap/docker/pds-config.json diff --git a/sechub-pds-solutions/owasp-zap/docker/scripts/owasp-zap-mock.sh b/sechub-pds-solutions/owaspzap/docker/scripts/owasp-zap-mock.sh similarity index 100% rename from sechub-pds-solutions/owasp-zap/docker/scripts/owasp-zap-mock.sh rename to sechub-pds-solutions/owaspzap/docker/scripts/owasp-zap-mock.sh diff --git a/sechub-pds-solutions/owasp-zap/docker/scripts/owasp-zap.sh b/sechub-pds-solutions/owaspzap/docker/scripts/owasp-zap.sh similarity index 100% rename from sechub-pds-solutions/owasp-zap/docker/scripts/owasp-zap.sh rename to sechub-pds-solutions/owaspzap/docker/scripts/owasp-zap.sh diff --git a/sechub-pds-solutions/owasp-zap/docker/zap-addons.txt b/sechub-pds-solutions/owaspzap/docker/zap-addons.txt similarity index 100% rename from sechub-pds-solutions/owasp-zap/docker/zap-addons.txt rename to sechub-pds-solutions/owaspzap/docker/zap-addons.txt diff --git a/sechub-pds-solutions/owasp-zap/env b/sechub-pds-solutions/owaspzap/env similarity index 100% rename from sechub-pds-solutions/owasp-zap/env rename to sechub-pds-solutions/owaspzap/env diff --git a/sechub-pds-solutions/owasp-zap/env-database b/sechub-pds-solutions/owaspzap/env-database similarity index 100% rename from sechub-pds-solutions/owasp-zap/env-database rename to sechub-pds-solutions/owaspzap/env-database diff --git a/sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/.helmignore b/sechub-pds-solutions/owaspzap/helm/pds-owaspzap/.helmignore similarity index 100% rename from sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/.helmignore rename to sechub-pds-solutions/owaspzap/helm/pds-owaspzap/.helmignore diff --git a/sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/Chart.yaml b/sechub-pds-solutions/owaspzap/helm/pds-owaspzap/Chart.yaml similarity index 92% rename from sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/Chart.yaml rename to sechub-pds-solutions/owaspzap/helm/pds-owaspzap/Chart.yaml index c2c7bd74f3..e0ea4bb8b0 100644 --- a/sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/Chart.yaml +++ b/sechub-pds-solutions/owaspzap/helm/pds-owaspzap/Chart.yaml @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT apiVersion: v2 -name: pds-owasp-zap +name: pds-owaspzap description: The OWASP ZAP + PDS as Helm chart for Kubernetes type: application @@ -13,4 +13,4 @@ maintainers: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.16.0 +version: 0.17.0 diff --git a/sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/LICENSE b/sechub-pds-solutions/owaspzap/helm/pds-owaspzap/LICENSE similarity index 100% rename from sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/LICENSE rename to sechub-pds-solutions/owaspzap/helm/pds-owaspzap/LICENSE diff --git a/sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/README.md b/sechub-pds-solutions/owaspzap/helm/pds-owaspzap/README.md similarity index 100% rename from sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/README.md rename to sechub-pds-solutions/owaspzap/helm/pds-owaspzap/README.md diff --git a/sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/templates/deployment.yaml b/sechub-pds-solutions/owaspzap/helm/pds-owaspzap/templates/deployment.yaml similarity index 100% rename from sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/templates/deployment.yaml rename to sechub-pds-solutions/owaspzap/helm/pds-owaspzap/templates/deployment.yaml diff --git a/sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/templates/networkpolicy.yaml b/sechub-pds-solutions/owaspzap/helm/pds-owaspzap/templates/networkpolicy.yaml similarity index 100% rename from sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/templates/networkpolicy.yaml rename to sechub-pds-solutions/owaspzap/helm/pds-owaspzap/templates/networkpolicy.yaml diff --git a/sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/templates/service.yaml b/sechub-pds-solutions/owaspzap/helm/pds-owaspzap/templates/service.yaml similarity index 100% rename from sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/templates/service.yaml rename to sechub-pds-solutions/owaspzap/helm/pds-owaspzap/templates/service.yaml diff --git a/sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/values.yaml b/sechub-pds-solutions/owaspzap/helm/pds-owaspzap/values.yaml similarity index 97% rename from sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/values.yaml rename to sechub-pds-solutions/owaspzap/helm/pds-owaspzap/values.yaml index c7924cc323..b0c88cff75 100644 --- a/sechub-pds-solutions/owasp-zap/helm/pds-owasp-zap/values.yaml +++ b/sechub-pds-solutions/owaspzap/helm/pds-owaspzap/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 image: - registry: "my.registry.example.org/pds-owasp-zap" + registry: "ghcr.io/mercedes-benz/sechub/pds-owaspzap" tag: "latest" resources: diff --git a/sechub-solution/setup-pds/executors/owasp-zap.json b/sechub-solution/setup-pds/executors/owasp-zap.json index f4d8ba6cfb..accc3d460c 100644 --- a/sechub-solution/setup-pds/executors/owasp-zap.json +++ b/sechub-solution/setup-pds/executors/owasp-zap.json @@ -1,67 +1,67 @@ { - "name": "pds-owasp-zap", - "productIdentifier": "PDS_WEBSCAN", - "executorVersion": 1, - "enabled": true, - "setup": { - "baseURL": "https://pds-owasp-zap:8444", - "credentials": { - "user": "techuser", - "password": "pds-apitoken" - }, - "jobParameters": [ - { - "key": "pds.config.productidentifier", - "value": "PDS_OWASP_ZAP" - }, - { - "key": "pds.config.use.sechub.storage", - "value": false - }, - { - "key": "pds.mocking.disabled", - "value": true - }, - { - "key": "pds.productexecutor.timeout.minutes", - "value": 180 - }, - { - "key": "pds.productexecutor.timetowait.nextcheck.milliseconds", - "value": 15000 - }, - { - "key": "pds.productexecutor.trustall.certificates", - "value": true - }, - { - "key": "zap.activescan.enabled", - "value": true - }, - { - "key": "zap.ajaxcrawler.enabled", - "value": true - }, - { - "key": "zap.deactivated.rule.references", - "value": "Timestamp-Disclosure-10096,Cross-Site-Scripting-(DOM-Based)-40026" - }, - { - "key": "zap.use.proxy", - "value": false - }, - { - "key": "zap.proxy.for.pds.target.type", - "value": "INTRANET" - }, - { - "key": "pds.config.cancel.event.checkinterval.milliseconds", - "value": 2000 - }, - { - "key": "pds.config.cancel.maximum.waittime.seconds", - "value": 120 - } - ] - } -} + "name": "pds-owaspzap", + "productIdentifier": "PDS_WEBSCAN", + "executorVersion": 1, + "enabled": true, + "setup": { + "baseURL": "https://pds-owaspzap:8444", + "credentials": { + "user": "techuser", + "password": "pds-apitoken" + }, + "jobParameters": [ + { + "key": "pds.config.productidentifier", + "value": "PDS_OWASP_ZAP" + }, + { + "key": "pds.config.use.sechub.storage", + "value": false + }, + { + "key": "pds.mocking.disabled", + "value": true + }, + { + "key": "pds.productexecutor.timeout.minutes", + "value": 180 + }, + { + "key": "pds.productexecutor.timetowait.nextcheck.milliseconds", + "value": 15000 + }, + { + "key": "pds.productexecutor.trustall.certificates", + "value": true + }, + { + "key": "zap.activescan.enabled", + "value": true + }, + { + "key": "zap.ajaxcrawler.enabled", + "value": true + }, + { + "key": "zap.deactivated.rule.references", + "value": "Timestamp-Disclosure-10096,Cross-Site-Scripting-(DOM-Based)-40026" + }, + { + "key": "zap.use.proxy", + "value": false + }, + { + "key": "zap.proxy.for.pds.target.type", + "value": "INTRANET" + }, + { + "key": "pds.config.cancel.event.checkinterval.milliseconds", + "value": 2000 + }, + { + "key": "pds.config.cancel.maximum.waittime.seconds", + "value": 120 + } + ] + } +} \ No newline at end of file