d7011163b8
安全修复（P0）： - 移除硬编码的 OAuth client_secret（Antigravity、Gemini CLI）， 改为通过环境变量注入（ANTIGRAVITY_OAUTH_CLIENT_SECRET、 GEMINI_CLI_OAUTH_CLIENT_SECRET） - 新增 logredact.RedactText() 对非结构化文本做敏感信息脱敏， 覆盖 GOCSPX-*/AIza* 令牌和常见 key=value 模式 - 日志中不再打印 org_uuid、account_uuid、email_address 等敏感值 安全修复（P1）： - URL 验证增强：新增 ValidateHTTPURL 统一入口，支持 allowlist 和 私网地址阻断（localhost/内网 IP） - 代理回退安全：代理初始化失败时默认阻止直连回退，防止 IP 泄露， 可通过 security.proxy_fallback.allow_direct_on_error 显式开启 - Gemini OAuth 配置校验：client_id 与 client_secret 必须同时 设置或同时留空 其他改进： - 新增 tools/secret_scan.py 密钥扫描工具和 Makefile secret-scan 目标 - 更新所有 docker-compose 和部署配置，传递 OAuth secret 环境变量 - google_one OAuth 类型使用固定 redirectURI，与 code_assist 对齐 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
239 lines
10 KiB
YAML
239 lines
10 KiB
YAML
# =============================================================================
|
||
# Sub2API Docker Compose Host Configuration (Local Build)
|
||
# =============================================================================
|
||
# Quick Start:
|
||
# 1. Copy .env.example to .env and configure
|
||
# 2. docker-compose -f docker-compose-host.yml up -d --build
|
||
# 3. Check logs: docker-compose -f docker-compose-host.yml logs -f sub2api
|
||
# 4. Access: http://localhost:8080
|
||
#
|
||
# This configuration builds the image from source (Dockerfile in project root).
|
||
# All configuration is done via environment variables.
|
||
# No Setup Wizard needed - the system auto-initializes on first run.
|
||
# =============================================================================
|
||
|
||
services:
|
||
# ===========================================================================
|
||
# Sub2API Application
|
||
# ===========================================================================
|
||
sub2api:
|
||
#image: weishaw/sub2api:latest
|
||
image: yangjianbo/aicodex2api:latest
|
||
build:
|
||
context: ..
|
||
dockerfile: Dockerfile
|
||
container_name: sub2api
|
||
restart: unless-stopped
|
||
network_mode: host
|
||
ulimits:
|
||
nofile:
|
||
soft: 800000
|
||
hard: 800000
|
||
volumes:
|
||
# Data persistence (config.yaml will be auto-generated here)
|
||
- sub2api_data:/app/data
|
||
# Mount custom config.yaml (optional, overrides auto-generated config)
|
||
#- ./config.yaml:/app/data/config.yaml:ro
|
||
environment:
|
||
# =======================================================================
|
||
# Auto Setup (REQUIRED for Docker deployment)
|
||
# =======================================================================
|
||
- AUTO_SETUP=true
|
||
|
||
# =======================================================================
|
||
# Server Configuration
|
||
# =======================================================================
|
||
- SERVER_HOST=0.0.0.0
|
||
- SERVER_PORT=8080
|
||
- SERVER_MODE=${SERVER_MODE:-release}
|
||
- RUN_MODE=${RUN_MODE:-standard}
|
||
|
||
# =======================================================================
|
||
# Database Configuration (PostgreSQL)
|
||
# =======================================================================
|
||
# Using host network: point to host/external DB by DATABASE_HOST/DATABASE_PORT
|
||
- DATABASE_HOST=${DATABASE_HOST:-127.0.0.1}
|
||
- DATABASE_PORT=${DATABASE_PORT:-5432}
|
||
- DATABASE_USER=${POSTGRES_USER:-sub2api}
|
||
- DATABASE_PASSWORD=${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required}
|
||
- DATABASE_DBNAME=${POSTGRES_DB:-sub2api}
|
||
- DATABASE_SSLMODE=disable
|
||
- DATABASE_MAX_OPEN_CONNS=${DATABASE_MAX_OPEN_CONNS:-50}
|
||
- DATABASE_MAX_IDLE_CONNS=${DATABASE_MAX_IDLE_CONNS:-10}
|
||
- DATABASE_CONN_MAX_LIFETIME_MINUTES=${DATABASE_CONN_MAX_LIFETIME_MINUTES:-30}
|
||
- DATABASE_CONN_MAX_IDLE_TIME_MINUTES=${DATABASE_CONN_MAX_IDLE_TIME_MINUTES:-5}
|
||
|
||
# =======================================================================
|
||
# Gateway Configuration
|
||
# =======================================================================
|
||
- GATEWAY_FORCE_CODEX_CLI=${GATEWAY_FORCE_CODEX_CLI:-false}
|
||
- GATEWAY_MAX_IDLE_CONNS=${GATEWAY_MAX_IDLE_CONNS:-2560}
|
||
- GATEWAY_MAX_IDLE_CONNS_PER_HOST=${GATEWAY_MAX_IDLE_CONNS_PER_HOST:-120}
|
||
- GATEWAY_MAX_CONNS_PER_HOST=${GATEWAY_MAX_CONNS_PER_HOST:-8192}
|
||
|
||
# =======================================================================
|
||
# Redis Configuration
|
||
# =======================================================================
|
||
# Using host network: point to host/external Redis by REDIS_HOST/REDIS_PORT
|
||
- REDIS_HOST=${REDIS_HOST:-127.0.0.1}
|
||
- REDIS_PORT=${REDIS_PORT:-6379}
|
||
- REDIS_PASSWORD=${REDIS_PASSWORD:-}
|
||
- REDIS_DB=${REDIS_DB:-0}
|
||
- REDIS_POOL_SIZE=${REDIS_POOL_SIZE:-1024}
|
||
- REDIS_MIN_IDLE_CONNS=${REDIS_MIN_IDLE_CONNS:-10}
|
||
- REDIS_ENABLE_TLS=${REDIS_ENABLE_TLS:-false}
|
||
|
||
# =======================================================================
|
||
# Admin Account (auto-created on first run)
|
||
# =======================================================================
|
||
- ADMIN_EMAIL=${ADMIN_EMAIL:-admin@sub2api.local}
|
||
- ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
|
||
|
||
# =======================================================================
|
||
# JWT Configuration
|
||
# =======================================================================
|
||
# Leave empty to auto-generate (recommended)
|
||
- JWT_SECRET=${JWT_SECRET:-}
|
||
- JWT_EXPIRE_HOUR=${JWT_EXPIRE_HOUR:-24}
|
||
|
||
# =======================================================================
|
||
# TOTP (2FA) Configuration
|
||
# =======================================================================
|
||
# IMPORTANT: Set a fixed encryption key for TOTP secrets. If left empty,
|
||
# a random key will be generated on each startup, causing all existing
|
||
# TOTP configurations to become invalid (users won't be able to login
|
||
# with 2FA).
|
||
# Generate a secure key: openssl rand -hex 32
|
||
- TOTP_ENCRYPTION_KEY=${TOTP_ENCRYPTION_KEY:-}
|
||
|
||
# =======================================================================
|
||
# Timezone Configuration
|
||
# This affects ALL time operations in the application:
|
||
# - Database timestamps
|
||
# - Usage statistics "today" boundary
|
||
# - Subscription expiry times
|
||
# - Log timestamps
|
||
# Common values: Asia/Shanghai, America/New_York, Europe/London, UTC
|
||
# =======================================================================
|
||
- TZ=${TZ:-Asia/Shanghai}
|
||
|
||
# =======================================================================
|
||
# Gemini OAuth Configuration (for Gemini accounts)
|
||
# =======================================================================
|
||
- GEMINI_OAUTH_CLIENT_ID=${GEMINI_OAUTH_CLIENT_ID:-}
|
||
- GEMINI_OAUTH_CLIENT_SECRET=${GEMINI_OAUTH_CLIENT_SECRET:-}
|
||
- GEMINI_OAUTH_SCOPES=${GEMINI_OAUTH_SCOPES:-}
|
||
- GEMINI_QUOTA_POLICY=${GEMINI_QUOTA_POLICY:-}
|
||
|
||
# Built-in OAuth client secrets (optional)
|
||
# SECURITY: This repo does not embed third-party client_secret.
|
||
- GEMINI_CLI_OAUTH_CLIENT_SECRET=${GEMINI_CLI_OAUTH_CLIENT_SECRET:-}
|
||
- ANTIGRAVITY_OAUTH_CLIENT_SECRET=${ANTIGRAVITY_OAUTH_CLIENT_SECRET:-}
|
||
|
||
# =======================================================================
|
||
# Security Configuration (URL Allowlist)
|
||
# =======================================================================
|
||
# Allow private IP addresses for CRS sync (for internal deployments)
|
||
- SECURITY_URL_ALLOWLIST_ALLOW_PRIVATE_HOSTS=${SECURITY_URL_ALLOWLIST_ALLOW_PRIVATE_HOSTS:-true}
|
||
depends_on:
|
||
postgres:
|
||
condition: service_healthy
|
||
redis:
|
||
condition: service_healthy
|
||
healthcheck:
|
||
test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
|
||
interval: 30s
|
||
timeout: 10s
|
||
retries: 3
|
||
start_period: 30s
|
||
|
||
# ===========================================================================
|
||
# PostgreSQL Database
|
||
# ===========================================================================
|
||
postgres:
|
||
image: postgres:18-alpine
|
||
container_name: sub2api-postgres
|
||
restart: unless-stopped
|
||
network_mode: host
|
||
ulimits:
|
||
nofile:
|
||
soft: 800000
|
||
hard: 800000
|
||
volumes:
|
||
- postgres_data:/var/lib/postgresql/data
|
||
environment:
|
||
- POSTGRES_USER=${POSTGRES_USER:-sub2api}
|
||
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required}
|
||
- POSTGRES_DB=${POSTGRES_DB:-sub2api}
|
||
- TZ=${TZ:-Asia/Shanghai}
|
||
command:
|
||
- "postgres"
|
||
- "-c"
|
||
- "listen_addresses=127.0.0.1"
|
||
# 监听端口：与应用侧 DATABASE_PORT 保持一致。
|
||
- "-c"
|
||
- "port=${DATABASE_PORT:-5432}"
|
||
# 连接数上限：需要结合应用侧 DATABASE_MAX_OPEN_CONNS 调整。
|
||
# 注意：max_connections 过大可能导致内存占用与上下文切换开销显著上升。
|
||
- "-c"
|
||
- "max_connections=${POSTGRES_MAX_CONNECTIONS:-1024}"
|
||
# 典型内存参数（建议结合机器内存调优；不确定就保持默认或小步调大）。
|
||
- "-c"
|
||
- "shared_buffers=${POSTGRES_SHARED_BUFFERS:-1GB}"
|
||
- "-c"
|
||
- "effective_cache_size=${POSTGRES_EFFECTIVE_CACHE_SIZE:-6GB}"
|
||
- "-c"
|
||
- "maintenance_work_mem=${POSTGRES_MAINTENANCE_WORK_MEM:-128MB}"
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-sub2api} -d ${POSTGRES_DB:-sub2api} -p ${DATABASE_PORT:-5432}"]
|
||
interval: 10s
|
||
timeout: 5s
|
||
retries: 5
|
||
start_period: 10s
|
||
# Note: bound to localhost only; not exposed to external network by default.
|
||
|
||
# ===========================================================================
|
||
# Redis Cache
|
||
# ===========================================================================
|
||
redis:
|
||
image: redis:8-alpine
|
||
container_name: sub2api-redis
|
||
restart: unless-stopped
|
||
network_mode: host
|
||
ulimits:
|
||
nofile:
|
||
soft: 100000
|
||
hard: 100000
|
||
volumes:
|
||
- redis_data:/data
|
||
command: >
|
||
redis-server
|
||
--bind 127.0.0.1
|
||
--port ${REDIS_PORT:-6379}
|
||
--maxclients ${REDIS_MAXCLIENTS:-50000}
|
||
--save 60 1
|
||
--appendonly yes
|
||
--appendfsync everysec
|
||
${REDIS_PASSWORD:+--requirepass ${REDIS_PASSWORD}}
|
||
environment:
|
||
- TZ=${TZ:-Asia/Shanghai}
|
||
# REDISCLI_AUTH is used by redis-cli for authentication (safer than -a flag)
|
||
- REDISCLI_AUTH=${REDIS_PASSWORD:-}
|
||
healthcheck:
|
||
test: ["CMD-SHELL", "redis-cli -p ${REDIS_PORT:-6379} -a \"$REDISCLI_AUTH\" ping | grep -q PONG || redis-cli -p ${REDIS_PORT:-6379} ping | grep -q PONG"]
|
||
interval: 10s
|
||
timeout: 5s
|
||
retries: 5
|
||
start_period: 5s
|
||
|
||
# =============================================================================
|
||
# Volumes
|
||
# =============================================================================
|
||
volumes:
|
||
sub2api_data:
|
||
driver: local
|
||
postgres_data:
|
||
driver: local
|
||
redis_data:
|
||
driver: local
|