feat: opsx-loki 全面升级 — 前端重构/用户与LDAP/部署向导/日志查询
基于 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 加密前缀保留(已加密凭证不受影响)。
This commit is contained in:
1 parent
327e282356
commit
f9c6c1d826
204 files changed
+14107
-9103
No files matched your search
@@ -0,0 +1,81 @@
|
||||
package controllers
|
||||
|
||||
import (
|
||||
"opsxloki/dto"
|
||||
"opsxloki/services"
|
||||
"opsxloki/utils"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
// LdapController LDAP 配置与用户导入(配置读写仅 admin)
|
||||
type LdapController struct{}
|
||||
|
||||
func NewLdapController() *LdapController {
|
||||
return &LdapController{}
|
||||
}
|
||||
|
||||
// GetConfig LDAP 配置(密码剔除,附 hasPassword/configured)
|
||||
func (ctrl *LdapController) GetConfig(c *gin.Context) {
|
||||
utils.Success(c, services.GetLDAPPublicConfig())
|
||||
}
|
||||
|
||||
// UpdateConfig 保存配置(bindPassword 空则保留旧值)
|
||||
func (ctrl *LdapController) UpdateConfig(c *gin.Context) {
|
||||
var req dto.LdapConfigRequest
|
||||
if !utils.BindAndValidate(c, &req) {
|
||||
return
|
||||
}
|
||||
cfg := &services.LDAPConfig{
|
||||
Enabled: req.Enabled, Host: req.Host, Port: req.Port, UseSSL: req.UseSSL,
|
||||
BindDN: req.BindDN, BindPassword: req.BindPassword, BaseDN: req.BaseDN,
|
||||
UserFilter: req.UserFilter, UsernameAttr: req.UsernameAttr,
|
||||
NameAttr: req.NameAttr, EmailAttr: req.EmailAttr,
|
||||
}
|
||||
if err := services.SaveLDAPConfig(cfg); err != nil {
|
||||
utils.Error(c, 400, err.Error())
|
||||
return
|
||||
}
|
||||
utils.Success(c, services.GetLDAPPublicConfig())
|
||||
}
|
||||
|
||||
// TestConnection 用表单参数测试(未保存也可测;密码空回退已存;可选用户级验证)
|
||||
func (ctrl *LdapController) TestConnection(c *gin.Context) {
|
||||
var req dto.LdapConfigRequest
|
||||
if !utils.BindAndValidate(c, &req) {
|
||||
return
|
||||
}
|
||||
cfg := &services.LDAPConfig{
|
||||
Enabled: req.Enabled, Host: req.Host, Port: req.Port, UseSSL: req.UseSSL,
|
||||
BindDN: req.BindDN, BindPassword: req.BindPassword, BaseDN: req.BaseDN,
|
||||
UserFilter: req.UserFilter, UsernameAttr: req.UsernameAttr,
|
||||
NameAttr: req.NameAttr, EmailAttr: req.EmailAttr,
|
||||
}
|
||||
if cfg.Port == 0 {
|
||||
cfg.Port = 389
|
||||
}
|
||||
result := services.TestLDAPConnection(cfg, req.TestUsername, req.TestPassword)
|
||||
utils.Success(c, result)
|
||||
}
|
||||
|
||||
// ListUsers 导入预览:按 ouDN(空用 baseDN)搜索用户
|
||||
func (ctrl *LdapController) ListUsers(c *gin.Context) {
|
||||
var req dto.LdapUsersRequest
|
||||
if !utils.BindAndValidate(c, &req) {
|
||||
return
|
||||
}
|
||||
cfg := services.GetLDAPConfig()
|
||||
if !cfg.Enabled || cfg.Host == "" {
|
||||
utils.Error(c, 400, "LDAP 未启用或未配置")
|
||||
return
|
||||
}
|
||||
if req.BindPassword != "" {
|
||||
cfg.BindPassword = req.BindPassword
|
||||
}
|
||||
users, err := services.SearchLDAPUsersForImport(cfg, req.OUDN)
|
||||
if err != nil {
|
||||
utils.Error(c, 400, err.Error())
|
||||
return
|
||||
}
|
||||
utils.Success(c, users)
|
||||
}
|
||||
Reference in new issue
Block a user