mirror of
https://github.com/VaalaCat/frp-panel.git
synced 2025-10-31 18:52:51 +08:00
373276633f
refactor: change client manager structure [重构：更改客户端管理器结构适配影子客户端] feat: add proxy config table and dao [添加代理配置独立数据表和DAO层] feat: new proxy config entity [新建的代理配置实体] feat: update and delete proxy config [更新和删除代理配置接口] feat: get config api and beautify proxy item [更新获取配置API并美化代理项] feat: change proxy form style [美化修改代理的表单样式] fix: client edit [修复：编辑客户端的问题] fix: shadow copy status error [修复：影子客户端复制状态错误] fix: http proxy bug [修复：HTTP代理类型的错误] fix: cannot update client [修复：无法更新客户端] feat: record trigger refetch [自动重新获取表格内的数据] fix: filter string length [修复：过滤字符串长度] fix: add client error [修复：添加客户端错误] fix: do not notify client when stopped [修复：停止时不通知客户端] fix: delete when proxy duplicate [修复：代理重复时删除] feat: add http proxy location [添加HTTP代理路由路径] chore: edit style [编辑样式美化] fix: remove expired client [修复：自动移除过期客户端] feat: proxy status [新增代理状态提示] fix: build [修复：构建] fix: refetch trigger [修复：重新获取数据的问题] fix: remove all expired client [修复：移除所有过期客户端] feat: i18n for proxy [代理页面的国际化翻译]
115 lines
2.7 KiB
Go
115 lines
2.7 KiB
Go
package utils
|
|
|
|
import (
|
|
"github.com/fatedier/frp/pkg/config"
|
|
v1 "github.com/fatedier/frp/pkg/config/v1"
|
|
"github.com/samber/lo"
|
|
"k8s.io/apimachinery/pkg/util/sets"
|
|
)
|
|
|
|
func LoadContentWithTemplate(content []byte, values *config.Values) ([]byte, error) {
|
|
return config.RenderWithTemplate(content, values)
|
|
}
|
|
|
|
func LoadConfigureFromContent(content []byte, c any, strict bool) error {
|
|
ans, err := LoadContentWithTemplate(content, config.GetValues())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return config.LoadConfigure(ans, c, strict)
|
|
}
|
|
|
|
func LoadProxiesFromContent(content []byte) ([]v1.TypedProxyConfig, error) {
|
|
allCfg := &v1.ClientConfig{}
|
|
|
|
if err := LoadConfigureFromContent(content, allCfg, true); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return allCfg.Proxies, nil
|
|
}
|
|
|
|
func LoadVisitorsFromContent(content []byte) ([]v1.TypedVisitorConfig, error) {
|
|
allCfg := &v1.ClientConfig{}
|
|
|
|
if err := LoadConfigureFromContent(content, allCfg, true); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return allCfg.Visitors, nil
|
|
}
|
|
|
|
func LoadClientConfigNormal(content []byte, strict bool) (*v1.ClientConfig, error) {
|
|
var (
|
|
cliCfg *v1.ClientCommonConfig
|
|
)
|
|
|
|
allCfg := v1.ClientConfig{}
|
|
if err := LoadConfigureFromContent(content, &allCfg, strict); err != nil {
|
|
return nil, err
|
|
}
|
|
cliCfg = &allCfg.ClientCommonConfig
|
|
cliCfg.Complete()
|
|
allCfg.ClientCommonConfig = *cliCfg
|
|
return &allCfg, nil
|
|
}
|
|
|
|
func LoadClientConfig(content []byte, strict bool) (
|
|
*v1.ClientCommonConfig,
|
|
[]v1.ProxyConfigurer,
|
|
[]v1.VisitorConfigurer,
|
|
error,
|
|
) {
|
|
var (
|
|
cliCfg *v1.ClientCommonConfig
|
|
proxyCfgs = make([]v1.ProxyConfigurer, 0)
|
|
visitorCfgs = make([]v1.VisitorConfigurer, 0)
|
|
)
|
|
|
|
allCfg := v1.ClientConfig{}
|
|
if err := LoadConfigureFromContent(content, &allCfg, strict); err != nil {
|
|
return nil, nil, nil, err
|
|
}
|
|
cliCfg = &allCfg.ClientCommonConfig
|
|
for _, c := range allCfg.Proxies {
|
|
proxyCfgs = append(proxyCfgs, c.ProxyConfigurer)
|
|
}
|
|
for _, c := range allCfg.Visitors {
|
|
visitorCfgs = append(visitorCfgs, c.VisitorConfigurer)
|
|
}
|
|
|
|
// Filter by start
|
|
if len(cliCfg.Start) > 0 {
|
|
startSet := sets.New(cliCfg.Start...)
|
|
proxyCfgs = lo.Filter(proxyCfgs, func(c v1.ProxyConfigurer, _ int) bool {
|
|
return startSet.Has(c.GetBaseConfig().Name)
|
|
})
|
|
visitorCfgs = lo.Filter(visitorCfgs, func(c v1.VisitorConfigurer, _ int) bool {
|
|
return startSet.Has(c.GetBaseConfig().Name)
|
|
})
|
|
}
|
|
|
|
cliCfg.Complete()
|
|
|
|
for _, c := range proxyCfgs {
|
|
c.Complete(cliCfg.User)
|
|
}
|
|
for _, c := range visitorCfgs {
|
|
c.Complete(cliCfg)
|
|
}
|
|
return cliCfg, proxyCfgs, visitorCfgs, nil
|
|
}
|
|
|
|
func LoadServerConfig(content []byte, strict bool) (*v1.ServerConfig, error) {
|
|
var (
|
|
svrCfg = &v1.ServerConfig{}
|
|
)
|
|
if err := LoadConfigureFromContent(content, svrCfg, strict); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
svrCfg.Complete()
|
|
|
|
return svrCfg, nil
|
|
}
|