logan
f9c6c1d826
基于 WEB-UI-Development-Guide 标准的整体升级,并更名 LokiDeploy → opsx-loki。 前端(Gin+React+shadcn/ui): - 按 02/07 章重构:页面域化拆分(无超 400 行文件)、PageContainer/ListQuery、 反馈分级(成功静默/失败 toast/危险确认)、401 单飞刷新+队列重放 - 暗色模式(next-themes)+ 语义 Token(--primary 品牌色/success/warning/info) - 部署向导(状态推导四步:环境→存储→Loki→采集,内嵌表单闭环) - 日志查询页:LogQL 标签构建器/拖拽直方图/日志上下文/Live Tail/查询历史 - 按用户+标签策略的查询授权(服务端强制合并策略) 后端(Go+Gin+JSON DB): - 简单用户管理(仅 admin,无 RBAC)+ TokenVersion 会话吊销 + 登录 IP 限流 - LDAP 接入:配置(AES 加密存储/hasPassword 脱敏)/测试连接/批量导入/登录 - 存储配置测试连接(SigV4 零依赖)+ 桶不存在自动创建 - Loki 三模式部署修复:SSH 密钥认证、3.x 配置模板、ruler 对象存储嵌套块、 凭证解密、孤儿 deploying 状态恢复、Grafana 部署(可选默认关)+面板导入 - DaemonSet 采集纯 YAML(去 helm 依赖)+ DNS 自愈回退 ClusterIP + 集群名标签 - 日志查询代理:cluster-svc 经 kube-apiserver proxy/url 直连 + cursor 翻页 - 统一 log 命名空间;部署就绪探活;Grafana 访问地址自动记录 修复:run.sh 增量编译检测、Sanitized 脱敏补全、LokiDeployment Update 白名单、 健康检查 CreatedAt 零值等 10+ 存量 bug。 数据兼容:DB 沿用旧 lokideploy.json(新名优先);localStorage 一次性迁移; HKDF 加密前缀保留(已加密凭证不受影响)。
98 lines
3.5 KiB
Bash
Executable File
98 lines
3.5 KiB
Bash
Executable File
#!/bin/bash
|
|
# ============================================================
|
|
# opsx-loki Secure Entrypoint
|
|
# ============================================================
|
|
# Enforces required secrets at container startup
|
|
# Supports Docker Secrets file-based injection
|
|
# ============================================================
|
|
set -e
|
|
|
|
# ---- Docker Secrets support ----
|
|
# If *_FILE is provided, read the secret from that file path
|
|
# (Docker Swarm / Docker Compose secrets)
|
|
if [ -n "${JWT_SECRET_FILE:-}" ] && [ -r "$JWT_SECRET_FILE" ]; then
|
|
JWT_SECRET=$(cat "$JWT_SECRET_FILE")
|
|
export JWT_SECRET
|
|
fi
|
|
|
|
if [ -n "${ENCRYPTION_KEY_FILE:-}" ] && [ -r "$ENCRYPTION_KEY_FILE" ]; then
|
|
ENCRYPTION_KEY=$(cat "$ENCRYPTION_KEY_FILE")
|
|
export ENCRYPTION_KEY
|
|
fi
|
|
|
|
# ---- Runtime security validation ----
|
|
MISSING_VARS=()
|
|
|
|
# P0: JWT_SECRET must be provided at runtime
|
|
if [ -z "${JWT_SECRET:-}" ]; then
|
|
MISSING_VARS+=("JWT_SECRET")
|
|
fi
|
|
|
|
# P0: ENCRYPTION_KEY must be provided at runtime for AES credential encryption
|
|
if [ -z "${ENCRYPTION_KEY:-}" ]; then
|
|
MISSING_VARS+=("ENCRYPTION_KEY")
|
|
fi
|
|
|
|
if [ ${#MISSING_VARS[@]} -ne 0 ]; then
|
|
echo "============================================================" >&2
|
|
echo "FATAL: Missing required security environment variables" >&2
|
|
echo "============================================================" >&2
|
|
for var in "${MISSING_VARS[@]}"; do
|
|
echo " - $var" >&2
|
|
done
|
|
echo "" >&2
|
|
echo "These MUST be provided at runtime. Examples:" >&2
|
|
echo "" >&2
|
|
echo ' docker run -e JWT_SECRET="$(openssl rand -hex 32)" -e ENCRYPTION_KEY="$(openssl rand -hex 32)" opsxloki' >&2
|
|
echo "" >&2
|
|
echo "Or via docker-compose secrets (recommended for production):" >&2
|
|
echo ' secrets:' >&2
|
|
echo ' - jwt_secret' >&2
|
|
echo ' - encryption_key' >&2
|
|
echo ' environment:' >&2
|
|
echo ' JWT_SECRET_FILE: /run/secrets/jwt_secret' >&2
|
|
echo ' ENCRYPTION_KEY_FILE: /run/secrets/encryption_key' >&2
|
|
echo "============================================================" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# ---- Validate JWT_SECRET strength ----
|
|
SECRET_LEN=${#JWT_SECRET}
|
|
if [ "$SECRET_LEN" -lt 32 ]; then
|
|
echo "WARNING: JWT_SECRET should be at least 32 characters long (current: $SECRET_LEN)" >&2
|
|
echo " Generate with: openssl rand -hex 32" >&2
|
|
fi
|
|
|
|
# ---- Validate ENCRYPTION_KEY strength ----
|
|
# config.go 在 ENCRYPTION_KEY < 32 字符时会 log.Fatal 拒绝启动；
|
|
# 此处前置硬校验，避免容器进入"entrypoint 通过但 Go 进程崩溃"的死循环。
|
|
KEY_LEN=${#ENCRYPTION_KEY}
|
|
if [ "$KEY_LEN" -lt 32 ]; then
|
|
echo "============================================================" >&2
|
|
echo "FATAL: ENCRYPTION_KEY must be at least 32 characters (current: $KEY_LEN)" >&2
|
|
echo " Generate with: openssl rand -hex 32" >&2
|
|
echo "============================================================" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# ---- Signal handling for graceful shutdown ----
|
|
# Forward signals to the application
|
|
shutdown() {
|
|
echo "Entrypoint received shutdown signal, forwarding to application..."
|
|
kill -TERM "$child" 2>/dev/null || true
|
|
wait "$child" 2>/dev/null || true
|
|
exit 0
|
|
}
|
|
trap shutdown SIGTERM SIGINT
|
|
|
|
echo "opsx-loki starting with security configuration OK"
|
|
echo "Data directory: ${DATA_DIR}"
|
|
echo "Server port: ${SERVER_PORT}"
|
|
|
|
# ---- Start the main application ----
|
|
# Use exec to properly forward signals, but wrap with background + wait
|
|
# so this script's trap handler can intercept signals
|
|
"$@" &
|
|
child=$!
|
|
wait "$child"
|