refactor: 前后端目录结构模块化 + v2 优化移植与缺陷修复
前端: - src/srv/api → src/api,按域分文件夹(auth/cluster/host/storage/deployment/collector) - 新增 http.ts 引擎(http.get/post/put/delete),域模块改用语义化调用 - index.html 增加 favicon(匹配应用 logo 的 emerald + Activity 脉冲) 后端分层增强(保留包名): - 新增 repository/:从 models 拆出 JsonDB 持久化层(InitDB/GetDB/Shutdown/RequestSave) - 新增 dto/:从 controllers 抽出各域请求契约(带 binding 校验) - 新增 pkg/crypto、pkg/jwt:从 utils 拆出安全原语(外部 jwt 别名 jwtv5 避免冲突) - models 只留领域实体 + sanitizer;utils 只留 gin/应用相关(response/errors) v2 优化移植与缺陷修复: - 移植密钥分离/SSH TOFU/并发写安全/Loki 生产级配置/Docker 加固 - 修复 deployment.go 并发丢更新、Helm values 重复键、EncryptField 哨兵、loki-gateway 端点等审计缺陷 - 实现真正的优雅关停(main.go http.Server + signal + repository.Shutdown) - 修复登录契约:后端返回 accessToken,前端 auth.ts/Login.tsx 对齐 - 补 crypto/jwt/repository 单元测试(含并发写回归) 验证: go build/vet/test 全绿;npm run build 通过;登录→鉴权→优雅关停冒烟通过 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
1 parent
fb8d10231a
commit
327e282356
93 files changed
+8433
-3089
No files matched your search
@@ -1,6 +1,7 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"os"
|
||||
"regexp"
|
||||
@@ -16,7 +17,7 @@ func resolveKubeconfig(cluster *models.Cluster) (string, error) {
|
||||
if cluster.KubeConfigPath != "" {
|
||||
data, err := os.ReadFile(cluster.KubeConfigPath)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("读取 kubeconfig 文件失败: %v", err)
|
||||
return "", fmt.Errorf("读取 kubeconfig 文件失败: %w", err)
|
||||
}
|
||||
return string(data), nil
|
||||
}
|
||||
@@ -24,15 +25,43 @@ func resolveKubeconfig(cluster *models.Cluster) (string, error) {
|
||||
}
|
||||
|
||||
// BuildKubeconfigFromToken 用 API Server + Token 构造最小 kubeconfig
|
||||
// 采用 insecure-skip-tls-verify,便于内网/自签证书集群接入
|
||||
func BuildKubeconfigFromToken(apiServer, token string) string {
|
||||
return fmt.Sprintf(`apiVersion: v1
|
||||
kind: Config
|
||||
clusters:
|
||||
// 优先使用 CA 证书验证 TLS,仅在用户显式要求时跳过证书验证
|
||||
// Parameters:
|
||||
// - apiServer: Kubernetes API Server 地址,如 https://192.168.1.10:6443
|
||||
// - token: 认证 Token
|
||||
// - caCert: CA 证书 PEM 内容(可选)。若提供则嵌入证书数据进行 TLS 验证;
|
||||
// 若为空且 skipTLSVerify=true 则跳过 TLS 验证;
|
||||
// 若为空且 skipTLSVerify=false 则依赖系统 CA 池
|
||||
// - skipTLSVerify: 是否跳过 TLS 证书验证(不建议在生产环境使用)
|
||||
func BuildKubeconfigFromToken(apiServer, token, caCert string, skipTLSVerify bool) string {
|
||||
var clusterBlock string
|
||||
|
||||
if caCert != "" {
|
||||
// 嵌入 CA 证书进行安全的 TLS 验证
|
||||
encodedCA := base64.StdEncoding.EncodeToString([]byte(caCert))
|
||||
clusterBlock = fmt.Sprintf(`clusters:
|
||||
- cluster:
|
||||
certificate-authority-data: %s
|
||||
server: %s
|
||||
name: loki-cluster`, encodedCA, apiServer)
|
||||
} else if skipTLSVerify {
|
||||
// 用户显式要求跳过 TLS 验证(内网/自签证书场景)
|
||||
clusterBlock = fmt.Sprintf(`clusters:
|
||||
- cluster:
|
||||
insecure-skip-tls-verify: true
|
||||
server: %s
|
||||
name: loki-cluster
|
||||
name: loki-cluster`, apiServer)
|
||||
} else {
|
||||
// 依赖系统 CA 池(不嵌入证书也不跳过验证)
|
||||
clusterBlock = fmt.Sprintf(`clusters:
|
||||
- cluster:
|
||||
server: %s
|
||||
name: loki-cluster`, apiServer)
|
||||
}
|
||||
|
||||
return fmt.Sprintf(`apiVersion: v1
|
||||
kind: Config
|
||||
%s
|
||||
contexts:
|
||||
- context:
|
||||
cluster: loki-cluster
|
||||
@@ -43,7 +72,7 @@ users:
|
||||
- name: loki-user
|
||||
user:
|
||||
token: %s
|
||||
`, apiServer, token)
|
||||
`, clusterBlock, token)
|
||||
}
|
||||
|
||||
var apiServerRe = regexp.MustCompile(`(?m)^\s*server:\s*(\S+)`)
|
||||
|
||||
Reference in new issue
Block a user