mirror of
https://github.com/Syngnat/GoNavi.git
synced 2026-05-15 04:19:08 +08:00
* 🎨 style(DataGrid): 清理冗余代码与静态分析告警 - 类型重构:通过修正 React Context 的函数签名解决了 void 类型的链式调用错误 - 代码精简:利用 Nullish Coalescing (??) 优化组件配置项降级逻辑,剥离无意义的隐式 undefined 赋值 - 工具链适配:适配 IDE 拼写检查与 Promise strict rules,确保全文件零警 * 🔧 fix(db/kingbase_impl): 修复标识符无条件加双引号导致SQL语法报错 - quoteKingbaseIdent 改为条件引用,仅对大写字母、保留字、特殊字符的标识符添加双引号 - 新增 kingbaseIdentNeedsQuote 判断标识符是否需要引用 - 新增 isKingbaseReservedWord 检测常见SQL保留字 - 补充 TestQuoteKingbaseIdent、TestKingbaseIdentNeedsQuote 单测覆盖各场景 - refs #176 * 🔧 fix(release,db/kingbase_impl): 修复金仓默认 schema 并静默生成 DMG - Kingbase:在 current_schema() 为 public 时探测候选 schema,并通过 DSN search_path 重连,兼容未限定 schema 的查询 - 候选优先级:数据库名/用户名同名 schema(存在性校验),否则仅在“唯一用户 schema 有表”场景兜底 - 避免连接污染:每次 Connect 重置探测结果,重连成功后替换连接并关闭旧连接 - 打包脚本:create-dmg 增加 --sandbox-safe,避免构建时自动弹出/打开挂载窗口 - 产物格式:强制 --format UDZO,并将 rw.*.dmg/UDRW 中间产物转换为可分发 DMG - 校验门禁:增加 hdiutil verify,失败时保留 .app 便于排查,同时修正卷图标探测并补 ad-hoc 签名 * 🐛 fix(connection/redis): 修复 Redis URI 用户名处理导致认证失败 - Redis URI 解析回填 user 字段,兼容 redis://user:pass@... 与 redis://:pass@... - 生成 URI 时按需输出 user/password,避免丢失用户名信息 - Redis 类型默认用户名置空,并在构建配置时清理历史默认 root - 避免 go-redis 触发 ACL AUTH(user, pass) 导致 WRONGPASS - refs #212 * 🔧 fix(release,ssh): 修复 SSH 误判连接成功并纠正 DMG 打包结构 - SSH 缓存 key 纳入认证指纹(password/keyPath),避免改错凭证仍复用旧连接/端口转发 - MySQL/MariaDB/Doris:SSH 隧道建立失败直接返回错误,不再回退直连导致测试误判成功 - 新增最小单测覆盖 SSH cache key 与 UseSSH 异常路径 - build-release.sh:create-dmg 使用 staging 目录作为 source,避免 DMG 根目录变成 Contents - refs #213 * fix: KingBase 连接后自动设置 search_path,修复自定义 schema 下表查询报 relation does not exist 的问题 (#215) * 🔧 fix(driver/kingbase,mongodb): 修复外置驱动事务引用与连接测试链路问题 - 金仓外置驱动链路增加表名与变更字段归一化,修复 ApplyChanges 场景下双引号转义异常导致的 SQL 语法错误 - 新增金仓公共标识符工具并复用到 kingbase_impl 与 optional_driver_agent_impl,统一处理多重转义、schema.table 拆分与引用规范 - 金仓代理连接后自动探测并设置 search_path,降低查询时必须手写 schema 前缀的概率 - MongoDB 连接参数改为显式 host/hosts 优先,避免被 URI 中 localhost 覆盖;代理链路保留目标地址不再改写为本地地址 - 连接测试增加前后端超时收敛与日志增强,避免长时间转圈;连接错误文案在未启用 TLS 时移除误导性的“SSL”前缀 - 统一日志级别为 INFO/WARN/ERROR,默认日志目录收敛到 ~/.GoNavi/Logs,并补充驱动构建脚本 build-driver-agents.sh * 🔧 fix(release/sidebar): 统一跨平台UPX压缩并修复PG函数列表查询兼容性 - 构建脚本新增通用 UPX 压缩函数,覆盖 macOS、Linux、Windows 产物 - 本地打包改为强制压缩策略:未安装 upx、压缩失败或校验失败直接终止 - macOS 打包在签名前压缩 .app 主程序并执行 upx -t 校验 - Linux 打包在生成 tar.gz 前压缩可执行文件并执行 upx -t 校验 - GitHub Release 与测试构建流程补齐 macOS/Linux/Windows 的 upx 安装与压缩步骤 - PostgreSQL/PG-like 函数元数据查询增加多路兼容 SQL,修复函数列表不显示问题 - refs #221 - refs #222 --------- Co-authored-by: Syngnat <yangguofeng919@gmail.com> Co-authored-by: 凌封 <49424247+fengin@users.noreply.github.com>
234 lines
6.3 KiB
Go
234 lines
6.3 KiB
Go
package app
|
||
|
||
import (
|
||
"fmt"
|
||
"net"
|
||
"strconv"
|
||
"strings"
|
||
|
||
"GoNavi-Wails/internal/connection"
|
||
proxytunnel "GoNavi-Wails/internal/proxy"
|
||
)
|
||
|
||
func resolveDialConfigWithProxy(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
|
||
config := raw
|
||
if config.UseHTTPTunnel {
|
||
if config.UseProxy {
|
||
return connection.ConnectionConfig{}, fmt.Errorf("HTTP 隧道与普通代理不能同时启用")
|
||
}
|
||
tunnelHost := strings.TrimSpace(config.HTTPTunnel.Host)
|
||
if tunnelHost == "" {
|
||
return connection.ConnectionConfig{}, fmt.Errorf("HTTP 隧道主机不能为空")
|
||
}
|
||
tunnelPort := config.HTTPTunnel.Port
|
||
if tunnelPort <= 0 {
|
||
tunnelPort = 8080
|
||
}
|
||
if tunnelPort > 65535 {
|
||
return connection.ConnectionConfig{}, fmt.Errorf("HTTP 隧道端口无效:%d", config.HTTPTunnel.Port)
|
||
}
|
||
|
||
config.UseProxy = true
|
||
config.Proxy = connection.ProxyConfig{
|
||
Type: "http",
|
||
Host: tunnelHost,
|
||
Port: tunnelPort,
|
||
User: strings.TrimSpace(config.HTTPTunnel.User),
|
||
Password: config.HTTPTunnel.Password,
|
||
}
|
||
}
|
||
if !config.UseProxy {
|
||
config.Proxy = connection.ProxyConfig{}
|
||
config.UseHTTPTunnel = false
|
||
config.HTTPTunnel = connection.HTTPTunnelConfig{}
|
||
return config, nil
|
||
}
|
||
|
||
normalizedProxy, err := proxytunnel.NormalizeConfig(config.Proxy)
|
||
if err != nil {
|
||
return connection.ConnectionConfig{}, err
|
||
}
|
||
config.Proxy = normalizedProxy
|
||
config.UseHTTPTunnel = false
|
||
config.HTTPTunnel = connection.HTTPTunnelConfig{}
|
||
|
||
if config.UseSSH {
|
||
sshPort := config.SSH.Port
|
||
if sshPort <= 0 {
|
||
sshPort = 22
|
||
}
|
||
forwardedSSH, err := buildProxyForwardAddress(normalizedProxy, strings.TrimSpace(config.SSH.Host), sshPort)
|
||
if err != nil {
|
||
return connection.ConnectionConfig{}, fmt.Errorf("代理连接 SSH 网关失败:%w", err)
|
||
}
|
||
config.SSH.Host = forwardedSSH.host
|
||
config.SSH.Port = forwardedSSH.port
|
||
config.UseProxy = false
|
||
config.Proxy = connection.ProxyConfig{}
|
||
return config, nil
|
||
}
|
||
|
||
normalizedType := strings.ToLower(strings.TrimSpace(config.Type))
|
||
if normalizedType == "sqlite" || normalizedType == "duckdb" || normalizedType == "custom" {
|
||
// 文件型/自定义 DSN 类型不走标准 host:port,不在此层改写。
|
||
return config, nil
|
||
}
|
||
if normalizedType == "mongodb" {
|
||
// MongoDB 统一由驱动侧 Dialer 处理代理,保留原始目标地址,避免将连接目标改写为本地转发地址。
|
||
return config, nil
|
||
}
|
||
|
||
targetPort := config.Port
|
||
if targetPort <= 0 {
|
||
targetPort = defaultPortByType(normalizedType)
|
||
}
|
||
forwardedPrimary, err := buildProxyForwardAddress(normalizedProxy, strings.TrimSpace(config.Host), targetPort)
|
||
if err != nil {
|
||
return connection.ConnectionConfig{}, err
|
||
}
|
||
config.Host = forwardedPrimary.host
|
||
config.Port = forwardedPrimary.port
|
||
|
||
if len(config.Hosts) > 0 {
|
||
rewritten := make([]string, 0, len(config.Hosts))
|
||
seen := make(map[string]struct{}, len(config.Hosts))
|
||
for _, rawEntry := range config.Hosts {
|
||
targetHost, targetPort, ok := parseAddressWithDefaultPort(rawEntry, defaultPortByType(normalizedType))
|
||
if !ok {
|
||
continue
|
||
}
|
||
forwarded, forwardErr := buildProxyForwardAddress(normalizedProxy, targetHost, targetPort)
|
||
if forwardErr != nil {
|
||
return connection.ConnectionConfig{}, forwardErr
|
||
}
|
||
rewrittenAddress := formatHostPort(forwarded.host, forwarded.port)
|
||
if _, exists := seen[rewrittenAddress]; exists {
|
||
continue
|
||
}
|
||
seen[rewrittenAddress] = struct{}{}
|
||
rewritten = append(rewritten, rewrittenAddress)
|
||
}
|
||
config.Hosts = rewritten
|
||
}
|
||
|
||
config.UseProxy = false
|
||
config.Proxy = connection.ProxyConfig{}
|
||
return config, nil
|
||
}
|
||
|
||
type hostPort struct {
|
||
host string
|
||
port int
|
||
}
|
||
|
||
func buildProxyForwardAddress(proxyConfig connection.ProxyConfig, targetHost string, targetPort int) (hostPort, error) {
|
||
host := strings.TrimSpace(targetHost)
|
||
if host == "" {
|
||
host = "localhost"
|
||
}
|
||
port := targetPort
|
||
if port <= 0 {
|
||
return hostPort{}, fmt.Errorf("目标端口无效:%d", targetPort)
|
||
}
|
||
|
||
forwarder, err := proxytunnel.GetOrCreateLocalForwarder(proxyConfig, host, port)
|
||
if err != nil {
|
||
return hostPort{}, err
|
||
}
|
||
localHost, localPort, splitOK := parseAddressWithDefaultPort(forwarder.LocalAddr, 0)
|
||
if !splitOK || localPort <= 0 {
|
||
return hostPort{}, fmt.Errorf("解析代理本地转发地址失败:%s", forwarder.LocalAddr)
|
||
}
|
||
return hostPort{host: localHost, port: localPort}, nil
|
||
}
|
||
|
||
func parseAddressWithDefaultPort(raw string, defaultPort int) (string, int, bool) {
|
||
text := strings.TrimSpace(raw)
|
||
if text == "" {
|
||
return "", 0, false
|
||
}
|
||
|
||
if strings.HasPrefix(text, "[") {
|
||
if host, portText, err := net.SplitHostPort(text); err == nil {
|
||
if port, convErr := strconv.Atoi(portText); convErr == nil && port > 0 && port <= 65535 {
|
||
return strings.TrimSpace(host), port, true
|
||
}
|
||
return "", 0, false
|
||
}
|
||
trimmed := strings.Trim(strings.TrimPrefix(text, "["), "]")
|
||
if trimmed != "" && defaultPort > 0 {
|
||
return trimmed, defaultPort, true
|
||
}
|
||
return "", 0, false
|
||
}
|
||
|
||
if strings.Count(text, ":") == 0 {
|
||
if defaultPort <= 0 {
|
||
return "", 0, false
|
||
}
|
||
return text, defaultPort, true
|
||
}
|
||
|
||
if strings.Count(text, ":") == 1 {
|
||
host, portText, err := net.SplitHostPort(text)
|
||
if err == nil {
|
||
port, convErr := strconv.Atoi(portText)
|
||
if convErr == nil && port > 0 && port <= 65535 {
|
||
return strings.TrimSpace(host), port, true
|
||
}
|
||
return "", 0, false
|
||
}
|
||
if defaultPort > 0 {
|
||
return strings.TrimSpace(text), defaultPort, true
|
||
}
|
||
return "", 0, false
|
||
}
|
||
|
||
// IPv6 地址未带端口,使用默认端口。
|
||
if defaultPort > 0 {
|
||
return text, defaultPort, true
|
||
}
|
||
return "", 0, false
|
||
}
|
||
|
||
func formatHostPort(host string, port int) string {
|
||
h := strings.TrimSpace(host)
|
||
if strings.Contains(h, ":") && !strings.HasPrefix(h, "[") {
|
||
return fmt.Sprintf("[%s]:%d", h, port)
|
||
}
|
||
return fmt.Sprintf("%s:%d", h, port)
|
||
}
|
||
|
||
func defaultPortByType(driverType string) int {
|
||
switch strings.ToLower(strings.TrimSpace(driverType)) {
|
||
case "mysql", "mariadb":
|
||
return 3306
|
||
case "diros":
|
||
return 9030
|
||
case "sphinx":
|
||
return 9306
|
||
case "postgres", "vastbase":
|
||
return 5432
|
||
case "redis":
|
||
return 6379
|
||
case "tdengine":
|
||
return 6041
|
||
case "oracle":
|
||
return 1521
|
||
case "dameng":
|
||
return 5236
|
||
case "kingbase":
|
||
return 54321
|
||
case "sqlserver":
|
||
return 1433
|
||
case "mongodb":
|
||
return 27017
|
||
case "clickhouse":
|
||
return 9000
|
||
case "highgo":
|
||
return 5866
|
||
default:
|
||
return 0
|
||
}
|
||
}
|