refactor(app): 移除 naive-ui 依赖并优化配置结构
All checks were successful
Build Multi-Platform Binaries / build-frontend (push) Successful in 31s
Build Multi-Platform Binaries / build-binaries (amd64, linux, client, true) (push) Successful in 1m30s
Build Multi-Platform Binaries / build-binaries (amd64, darwin, server, false) (push) Successful in 1m39s
Build Multi-Platform Binaries / build-binaries (amd64, windows, client, true) (push) Successful in 1m19s
Build Multi-Platform Binaries / build-binaries (amd64, linux, server, true) (push) Successful in 1m43s
Build Multi-Platform Binaries / build-binaries (arm, 7, linux, client, true) (push) Successful in 1m18s
Build Multi-Platform Binaries / build-binaries (amd64, windows, server, true) (push) Successful in 1m38s
Build Multi-Platform Binaries / build-binaries (arm64, darwin, server, false) (push) Successful in 1m50s
Build Multi-Platform Binaries / build-binaries (arm, 7, linux, server, true) (push) Successful in 2m6s
Build Multi-Platform Binaries / build-binaries (arm64, linux, client, true) (push) Successful in 1m18s
Build Multi-Platform Binaries / build-binaries (arm64, linux, server, true) (push) Successful in 1m57s
Build Multi-Platform Binaries / build-binaries (arm64, windows, server, false) (push) Successful in 1m25s
All checks were successful
Build Multi-Platform Binaries / build-frontend (push) Successful in 31s
Build Multi-Platform Binaries / build-binaries (amd64, linux, client, true) (push) Successful in 1m30s
Build Multi-Platform Binaries / build-binaries (amd64, darwin, server, false) (push) Successful in 1m39s
Build Multi-Platform Binaries / build-binaries (amd64, windows, client, true) (push) Successful in 1m19s
Build Multi-Platform Binaries / build-binaries (amd64, linux, server, true) (push) Successful in 1m43s
Build Multi-Platform Binaries / build-binaries (arm, 7, linux, client, true) (push) Successful in 1m18s
Build Multi-Platform Binaries / build-binaries (amd64, windows, server, true) (push) Successful in 1m38s
Build Multi-Platform Binaries / build-binaries (arm64, darwin, server, false) (push) Successful in 1m50s
Build Multi-Platform Binaries / build-binaries (arm, 7, linux, server, true) (push) Successful in 2m6s
Build Multi-Platform Binaries / build-binaries (arm64, linux, client, true) (push) Successful in 1m18s
Build Multi-Platform Binaries / build-binaries (arm64, linux, server, true) (push) Successful in 1m57s
Build Multi-Platform Binaries / build-binaries (arm64, windows, server, false) (push) Successful in 1m25s
- 从 App.vue 中移除 naive-ui 组件及其主题配置 - 从组件声明中移除 NIcon 和 NTag 组件引用 - 将 JSPluginConfig 从 ServerConfig 中分离 - 在 ServerSettings 中整合 PluginStore 配置 - 更新配置 DTO 结构以支持 PluginStore 配置 - 移除 JS 插件加载和签名验证相关代码 - 从 main.ts 中移除 naive-ui 的引入和使用 - 从 package.json 中移除 naive-ui 和相关自动导入插件依赖 - 在设置页面添加插件商店 URL 配置字段 - 更新 StoreHandler 中插件商店 URL 的获取方式 - 移除 Vite 配置中的自动导入和组件解析插件
This commit is contained in:
@@ -27,7 +27,6 @@ import (
|
||||
"github.com/gotunnel/internal/server/tunnel"
|
||||
"github.com/gotunnel/pkg/crypto"
|
||||
"github.com/gotunnel/pkg/plugin"
|
||||
"github.com/gotunnel/pkg/plugin/sign"
|
||||
"github.com/gotunnel/pkg/version"
|
||||
)
|
||||
|
||||
@@ -83,12 +82,6 @@ func main() {
|
||||
server.SetPluginRegistry(registry)
|
||||
server.SetJSPluginStore(clientStore) // 设置 JS 插件存储,用于客户端重连时恢复插件
|
||||
|
||||
// 加载 JS 插件配置
|
||||
if len(cfg.JSPlugins) > 0 {
|
||||
jsPlugins := loadJSPlugins(cfg.JSPlugins)
|
||||
server.LoadJSPlugins(jsPlugins)
|
||||
}
|
||||
|
||||
// 启动 Web 控制台
|
||||
if cfg.Server.Web.Enabled {
|
||||
// 强制生成 Web 凭据(如果未配置)
|
||||
@@ -128,69 +121,3 @@ func main() {
|
||||
|
||||
log.Fatal(server.Run())
|
||||
}
|
||||
|
||||
// loadJSPlugins 加载 JS 插件文件
|
||||
func loadJSPlugins(configs []config.JSPluginConfig) []tunnel.JSPluginEntry {
|
||||
var plugins []tunnel.JSPluginEntry
|
||||
|
||||
for _, cfg := range configs {
|
||||
source, err := os.ReadFile(cfg.Path)
|
||||
if err != nil {
|
||||
log.Printf("[JSPlugin] Failed to load %s: %v", cfg.Path, err)
|
||||
continue
|
||||
}
|
||||
|
||||
// 加载签名文件
|
||||
sigPath := cfg.SigPath
|
||||
if sigPath == "" {
|
||||
sigPath = cfg.Path + ".sig"
|
||||
}
|
||||
signature, err := os.ReadFile(sigPath)
|
||||
if err != nil {
|
||||
log.Printf("[JSPlugin] Failed to load signature for %s: %v", cfg.Name, err)
|
||||
continue
|
||||
}
|
||||
|
||||
// 服务端也验证签名,防止配置文件被篡改
|
||||
if err := verifyPluginSignature(cfg.Name, string(source), string(signature)); err != nil {
|
||||
log.Printf("[JSPlugin] Signature verification failed for %s: %v", cfg.Name, err)
|
||||
continue
|
||||
}
|
||||
|
||||
plugins = append(plugins, tunnel.JSPluginEntry{
|
||||
Name: cfg.Name,
|
||||
Source: string(source),
|
||||
Signature: string(signature),
|
||||
AutoPush: cfg.AutoPush,
|
||||
Config: cfg.Config,
|
||||
AutoStart: cfg.AutoStart,
|
||||
})
|
||||
|
||||
log.Printf("[JSPlugin] Loaded: %s from %s (verified)", cfg.Name, cfg.Path)
|
||||
}
|
||||
|
||||
return plugins
|
||||
}
|
||||
|
||||
// verifyPluginSignature 验证插件签名
|
||||
func verifyPluginSignature(name, source, signature string) error {
|
||||
// 解码签名
|
||||
signed, err := sign.DecodeSignedPlugin(signature)
|
||||
if err != nil {
|
||||
return fmt.Errorf("decode signature: %w", err)
|
||||
}
|
||||
|
||||
// 获取公钥
|
||||
pubKey, err := sign.GetPublicKeyByID(signed.Payload.KeyID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 验证插件名称
|
||||
if signed.Payload.Name != name {
|
||||
return fmt.Errorf("name mismatch: %s vs %s", signed.Payload.Name, name)
|
||||
}
|
||||
|
||||
// 验证签名
|
||||
return sign.VerifyPlugin(pubKey, signed, source)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user