refactor(ssl): centralize SSL trust management, remove LLM_SSL_VERIFY
Centralized SSL via one contract: CERTS_PATH=/opt/certs mounted into all containers.
Backend:
- NEW: backend/src/core/ssl.py — system_ssl_context(), httpx_verify(),
cert_dir_inventory()
- LLMClient._get_ssl_verify() → delegates to core.ssl
- _llm_async_http._get_verify() → delegates to core.ssl
- Removed LLM_SSL_VERIFY env reading from all runtime code
Docker:
- NEW: docker/certs.sh — shared cert installer (PEM/DER/cer to .crt conversion,
update-ca-certificates, hash symlinks, NSS import)
- NEW: docker/agent.entrypoint.sh — agent entrypoint with cert installation
- backend.entrypoint.sh → uses certs.sh instead of install_llm_ca_certs
- Dockerfile.agent → adds ca-certificates, openssl, entrypoint
Compose:
- Removed LLM_CA_CERT_URLS and LLM_SSL_VERIFY from all compose files
- Added CERTS_PATH volume mount to agent (dev + enterprise)
- Added certs volume mount to backend/agent in dev compose
Env examples:
- Removed LLM_SSL_VERIFY, LLM_CA_CERT_URLS from .env.example,
.env.enterprise-clean.example, .env.current.example, .env.master.example,
backend/.env.example
- Enhanced CERTS_PATH comments with accepted formats
Diagnostics:
- diag_container.py: removed LLM_* checks, added CERTS_PATH inventory,
uses core.ssl for context creation
Tests:
- Updated test_llm_analysis_service, test_llm_async_http,
test_client_headers to verify centralized ssl context (no env disable)
- 4/4 SSL tests pass
This commit is contained in:
@@ -16,9 +16,9 @@ FROM python:3.11-slim
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
# Install system deps for pdfplumber + psycopg (v3 needs libpq)
|
||||
# Install system deps for pdfplumber + psycopg (v3 needs libpq) + certs
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
libgl1 libglib2.0-0 libpq5 && rm -rf /var/lib/apt/lists/*
|
||||
libgl1 libglib2.0-0 libpq5 ca-certificates openssl && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Python dependencies — agent runtime (gradio, langgraph, httpx, pdfplumber, ...)
|
||||
# Без sentence-transformers — embedding router безопасно отключается при ImportError.
|
||||
@@ -47,10 +47,15 @@ COPY backend/src/core/logger.py /app/backend/src/core/logger.py
|
||||
COPY backend/src/core/ws_log_handler.py /app/backend/src/core/ws_log_handler.py
|
||||
COPY backend/src/agent/ /app/backend/src/agent/
|
||||
|
||||
# Entrypoint for corporate CA cert installation
|
||||
COPY docker/certs.sh /app/docker/certs.sh
|
||||
COPY docker/agent.entrypoint.sh /app/docker/agent.entrypoint.sh
|
||||
RUN chmod +x /app/docker/agent.entrypoint.sh /app/docker/certs.sh
|
||||
|
||||
# Gradio server
|
||||
ENV GRADIO_SERVER_NAME=0.0.0.0
|
||||
ENV GRADIO_SERVER_PORT=7860
|
||||
|
||||
WORKDIR /app/backend
|
||||
CMD ["python", "-m", "src.agent.run"]
|
||||
ENTRYPOINT ["/app/docker/agent.entrypoint.sh"]
|
||||
# #endregion docker.agent.Dockerfile
|
||||
|
||||
Reference in New Issue
Block a user