fix

.gitlab-ci.yml

@@ -38,11 +38,31 @@ test-zap:
   script:
     # - curl --header "url: 'http://localhost:9005'" --header "apikey: '8tm221jcqtolmprhbt2dq2q8ev'" http://localhost:8080/JSON/ascan/action/scan/
     - Invoke-RestMethod -Method GET -Uri "http://localhost:8080/JSON/core/view/alerts/?baseurl=localhost:9005&apikey=8tm221jcqtolmprhbt2dq2q8ev"
+
+
+    # Выполнение пассивного сканирования
+    - Invoke-RestMethod -Method GET -Uri "http://localhost:8080/JSON/ascan/action/scan/?url=localhost:9005&apikey=8tm221jcqtolmprhbt2dq2q8ev"
+
+    # Выполнение активного сканирования
+    - curl "http://localhost:8080/JSON/ascan/action/scan/?url=localhost:9005&apikey=8tm221jcqtolmprhbt2dq2q8ev"
+
+    # Ожидание завершения сканирования
+    - |
+      SCAN_STATUS=$( Invoke-RestMethod -Method GET -Uri "http://localhost:8080/JSON/ascan/view/status/?apikey=8tm221jcqtolmprhbt2dq2q8ev")
+      while [ "$SCAN_STATUS" != "100" ]; do
+          echo "Сканирование на $SCAN_STATUS% завершено..."
+          sleep 5
+          SCAN_STATUS=$( Invoke-RestMethod -Method GET -Uri "http://localhost:8080/JSON/ascan/view/status/?apikey=8tm221jcqtolmprhbt2dq2q8ev")
+      done
+
+    # Получение и сохранение результатов сканирования
+    - RESULTS=$(Invoke-RestMethod -Method GET -Uri "http://localhost:8080/JSON/core/view/alerts/?baseurl=localhost:9005&apikey=8tm221jcqtolmprhbt2dq2q8ev")
+    - echo "Результаты сканирования: $RESULTS"
     # - sleep 60
     # - 'curl --request GET "http://localhost:8080/JSON/core/view/alerts/?baseurl=localhost:9005&apikey=8tm221jcqtolmprhbt2dq2q8ev"'
     # - ./zap/zap.sh -daemon -port ${ZAP_PORT} -config api.key=$ZAP_API_KEY &
     # - chmod +x ./zapTest.sh
-    - bash ./zapTest.sh
+    # - bash ./zapTest.sh
     # - 'curl "http://localhost:8080/JSON/ascan/action/scan/?url=localhost:9005&apikey=8tm221jcqtolmprhbt2dq2q8ev"'
     # - 'curl "http://localhost:8080/JSON/core/view/alerts/?baseurl=localhost:9005&apikey=8tm221jcqtolmprhbt2dq2q8ev"''
 # sonarqube-vulnerability-report: