From dff074bde19f023ae1165c00bd803bbfe213ca74 Mon Sep 17 00:00:00 2001
From: pm <pedro.maio@each-cs.com>
Date: Tue, 9 Jun 2026 08:10:00 +0000
Subject: [PATCH] Update .gitea/workflows/deploy.yml

---
 .gitea/workflows/deploy.yml | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index e6b92c5..e999ef3 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -16,20 +16,21 @@ jobs:
         run: docker build -f backend/Dockerfile -t apex-solutions:latest .
 
       # ==========================================
-      # BLOCO AGRUPADO: SAST, SCA e SECRET SCANNING
+      # ETAPAS ESTÁTICAS DE SEGURANÇA SEPARADAS
       # ==========================================
-      - name: 2. Static Security Scans (SAST, SCA, Secrets)
+
+      - name: 2. Secret Scanning (Gitleaks)
         run: |
-          echo ">>> 2.1 Iniciando Gitleaks (Secret Scanning)..."
           curl -sL https://github.com/gitleaks/gitleaks/releases/download/v8.18.2/gitleaks_8.18.2_linux_x64.tar.gz | tar -xz -C /tmp
-          # Removido o log-opts="-1" para forçar um Full Scan. O || true impede que a pipeline pare aqui.
           /tmp/gitleaks detect --source . --verbose --redact --exit-code 1 || echo "[ALERTA] Credenciais detetadas! Ignorado temporariamente."
-          
-          echo ">>> 2.2 Iniciando Trivy (SCA)..."
+
+      - name: 3. Software Composition Analysis (Trivy)
+        run: |
           curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin
-          trivy image --severity HIGH,CRITICAL apex-solutions:latest || echo "[ALERTA] Vulnerabilidades na imagem!"
-          
-          echo ">>> 2.3 Iniciando SonarQube (SAST)..."
+          trivy image --severity HIGH,CRITICAL apex-solutions:latest || echo "[ALERTA] Vulnerabilidades de infraestrutura encontradas!"
+
+      - name: 4. Static Application Security Testing (SonarQube)
+        run: |
           curl -sL https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-5.0.1.3006-linux.zip -o sonar-scanner.zip
           unzip -q sonar-scanner.zip
           ./sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner \
@@ -40,9 +41,10 @@ jobs:
             -Dsonar.qualitygate.wait=true || echo "[ALERTA] SonarQube falhou no Quality Gate."
 
       # ==========================================
-      # BLOCO AGRUPADO: DAST (ZAP + SANDBOX)
+      # ETAPAS DINÂMICAS E DEPLOY
       # ==========================================
-      - name: 3. Dynamic Security Scan (OWASP ZAP)
+
+      - name: 5. Dynamic Security Scan (OWASP ZAP)
         run: |
           echo ">>> Lançando Sandbox Efêmero..."
           docker rm -f apex-sandbox || true
@@ -55,7 +57,6 @@ jobs:
           docker volume rm zap-reports || true
           docker volume create zap-reports
           
-          # A flag -I faz o ZAP ignorar os avisos (warnings) e apenas reportar no HTML
           docker run --user root --name zap-scanner \
             --link apex-sandbox:apex-sandbox \
             -v zap-reports:/zap/wrk/:rw \
@@ -71,10 +72,7 @@ jobs:
           docker volume rm zap-reports || true
           docker rm -f apex-sandbox || true
 
-      # ==========================================
-      # BLOCO AGRUPADO: DEPLOY DE PRODUÇÃO
-      # ==========================================
-      - name: 4. Production Deployment & Local Reports
+      - name: 6. Production Deployment & Local Reports
         run: |
           echo ">>> Atualizando Produção..."
           docker rm -f portal-corporativo || true
@@ -85,10 +83,7 @@ jobs:
           echo ">>> Publicando Relatório ZAP no servidor Web..."
           docker cp qatests/report.html portal-corporativo:/usr/src/app/frontend/zap-report.html || true
 
-      # ==========================================
-      # ARQUIVO DE RELATÓRIOS
-      # ==========================================
-      - name: 5. Archive ZAP Report (Gitea Artifacts)
+      - name: 7. Archive ZAP Report (Gitea Artifacts)
         if: always()
         uses: actions/upload-artifact@v3
         with: