Skip to content

Commit 438c4e6

Browse files
Fix: all tests passing, HTML notification, AccessAdapter id, AccessDatabase Path, NoConformidades logic, integration test fallbacks
1 parent 7ba292c commit 438c4e6

195 files changed

Lines changed: 11333 additions & 26895 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,12 @@ setup_local_environment_root.log
8585

8686
# Export archives
8787
repo_export_*.zip
88+
legacy_archive.zip
8889

8990
# Development files
9091
herramientas/*.txt
9192
herramientas/*.css
9293
!herramientas/CSS_moderno.css
94+
95+
# Legacy code
96+
/legacy/

GEMINI.md

Lines changed: 0 additions & 190 deletions
This file was deleted.

analysis/Dockerfile

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Usar una imagen base de Python
2+
FROM python:3.9-slim
3+
4+
# Variables de entorno para las versiones de las herramientas
5+
ENV SONAR_SCANNER_VERSION=4.7.0.2747
6+
ENV DEPENDENCY_CHECK_VERSION=7.1.1
7+
8+
# Instalar dependencias del sistema
9+
RUN apt-get update && apt-get install -y \
10+
unzip \
11+
default-jre \
12+
&& rm -rf /var/lib/apt/lists/*
13+
14+
# Instalar SonarScanner
15+
RUN apt-get update && apt-get install -y wget && \
16+
wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux.zip && \
17+
unzip sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux.zip && \
18+
mv sonar-scanner-${SONAR_SCANNER_VERSION}-linux /opt/sonar-scanner && \
19+
rm sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux.zip
20+
ENV PATH="/opt/sonar-scanner/bin:${PATH}"
21+
22+
# Instalar OWASP Dependency-Check
23+
RUN wget https://github.com/jeremylong/DependencyCheck/releases/download/v${DEPENDENCY_CHECK_VERSION}/dependency-check-${DEPENDENCY_CHECK_VERSION}-release.zip && \
24+
unzip dependency-check-${DEPENDENCY_CHECK_VERSION}-release.zip && \
25+
mv dependency-check /opt/dependency-check && \
26+
rm dependency-check-${DEPENDENCY_CHECK_VERSION}-release.zip
27+
ENV PATH="/opt/dependency-check/bin:${PATH}"
28+
29+
# Establecer el directorio de trabajo
30+
WORKDIR /usr/src
31+
32+
# --- CORRECCIÓN AÑADIDA AQUÍ ---
33+
# Copiar el script de análisis desde su ubicación correcta (analysis/run-analysis.sh)
34+
COPY analysis/run-analysis.sh .
35+
RUN chmod +x run-analysis.sh
36+
37+
# Comando por defecto que se ejecutará al iniciar el contenedor
38+
CMD ["./run-analysis.sh"]

analysis/run-analysis.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
echo "Starting SonarQube analysis..."
4+
sonar-scanner \
5+
-Dsonar.projectKey=scripts-python \
6+
-Dsonar.sources=/usr/src/src \
7+
-Dsonar.host.url=http://sonarqube:9000 \
8+
-Dsonar.login=sqp_... # Placeholder for SonarQube token, user needs to replace this
9+
10+
echo "Starting OWASP Dependency-Check analysis..."
11+
/opt/dependency-check/bin/dependency-check.sh \
12+
--project "scripts-python" \
13+
--scan /usr/src \
14+
--format HTML \
15+
--out /usr/src/owasp-report \
16+
--enableExperimental \
17+
--enableRetired
18+
19+
echo "Analysis complete."

docker-compose.yml

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
version: '3.8'
1+
# La línea 'version' ha sido eliminada por ser obsoleta.
22

33
services:
4+
# --- SERVICIOS DE MONITOREO ---
45
loki:
56
image: grafana/loki:latest
67
container_name: loki
@@ -9,7 +10,6 @@ services:
910
volumes:
1011
- ./loki/loki-config.yml:/etc/loki/local-config.yaml
1112
- loki_data:/loki
12-
# --- LÍNEA MODIFICADA ---
1313
command: -config.file=/etc/loki/local-config.yaml -validation.allow-structured-metadata=false
1414
restart: unless-stopped
1515
networks:
@@ -22,7 +22,7 @@ services:
2222
- "3000:3000"
2323
environment:
2424
- GF_SECURITY_ADMIN_USER=admin
25-
- GF_SECURITY_ADMIN_PASSWORD=admin
25+
- GF_SECURITY_ADMIN_PASSWORD=Arm1833a
2626
volumes:
2727
- ./grafana/provisioning:/etc/grafana/provisioning
2828
- grafana_data:/var/lib/grafana
@@ -32,10 +32,54 @@ services:
3232
networks:
3333
- monitoring
3434

35+
promtail:
36+
image: grafana/promtail:latest
37+
container_name: promtail
38+
volumes:
39+
- ./logs:/var/log/app
40+
- ./promtail/promtail-config.yml:/etc/promtail/config.yml
41+
command: -config.file=/etc/promtail/config.yml
42+
restart: unless-stopped
43+
networks:
44+
- monitoring
45+
46+
# --- SERVICIOS DE ANÁLISIS DE CÓDIGO ---
47+
sonarqube:
48+
image: sonarqube:community
49+
container_name: sonarqube
50+
ports:
51+
- "9000:9000"
52+
environment:
53+
- SONAR_ES_BOOTSTRAP_CHECKS_DISABLE=true
54+
volumes:
55+
- sonarqube_data:/opt/sonarqube/data
56+
- sonarqube_extensions:/opt/sonarqube/extensions
57+
- sonarqube_logs:/opt/sonarqube/logs
58+
restart: unless-stopped
59+
networks:
60+
- monitoring
61+
62+
code-analyzer:
63+
build:
64+
context: .
65+
dockerfile: analysis/Dockerfile
66+
container_name: code-analyzer
67+
depends_on:
68+
- sonarqube
69+
volumes:
70+
- .:/usr/src
71+
networks:
72+
- monitoring
73+
environment:
74+
- SONAR_TOKEN=${SONAR_TOKEN}
75+
3576
volumes:
3677
loki_data:
3778
grafana_data:
79+
sonarqube_data:
80+
sonarqube_extensions:
81+
sonarqube_logs:
3882

3983
networks:
4084
monitoring:
41-
driver: bridge
85+
driver: bridge

0 commit comments

Comments
 (0)