路由模式与CIDR配置重构: - 路由模式从 full/split/custom 改为 full/proxy/bypass,移除 split 和 custom - CIDR 按 IPv4/IPv6 分开配置,支持静态 CIDR + URL 动态获取 - URL 支持"代理前获取"(直连)和"代理后获取"(走隧道)两种时机 - 数据库迁移 v5 自动转换旧数据(custom_cidrs 拆分为 cidr_v4/v6,custom->proxy,split->full) CIDR命中统计: - 状态栏显示当前路由模式及 IPv4/IPv6 CIDR 命中数 - 代理模式: 显示命中/总数; 绕过模式: 显示已配置数 + 未命中目的地址数 - cidrTracker 在 pumpPackets 中逐包检查出站目的IP 连接稳定性修复(多轮): - transport.Connect 添加 ctx 监听 goroutine,取消时关闭WS中断阻塞的ReadMessage - auth.Login 加 context.Context 参数,可被 cancel 中断 - Disconnect() 先删路由再关TUN,避免断网窗口 - startSession 在 Connect 前释放 d.mu,避免锁持有过久 - onConnect 移除 SendStop 消除竞态 - before-proxy CIDR 获取移到 run 循环前,并行获取+5s超时,重连复用 - cidrTracker 加 RWMutex 防数据竞争 UI修复: - CIDR URL 输入框改为水平滚动+纵向布局,防止撑宽窗口 - 路由模式为full时隐藏CIDR配置区域
135 lines
4.3 KiB
Go
135 lines
4.3 KiB
Go
package db
|
|
|
|
import (
|
|
"database/sql"
|
|
"fmt"
|
|
"time"
|
|
|
|
"lmvpn/internal/model"
|
|
)
|
|
|
|
// CreateProfile inserts a new server profile and returns its ID.
|
|
func (s *Store) CreateProfile(p *model.ServerProfile) (int64, error) {
|
|
res, err := s.db.Exec(
|
|
`INSERT INTO server_profiles
|
|
(name, protocol, host, server_ips, port, path,
|
|
username, auth_mode, routing_mode,
|
|
cidr_v4, cidr_v6, cidr_v4_urls, cidr_v6_urls,
|
|
mtu_override, auto_connect,
|
|
tls_ca_cert, tls_ca_path, tls_insecure, tls_pinned_hash)
|
|
VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`,
|
|
p.Name, p.Protocol, p.Host, p.ServerIPs, p.Port, p.Path,
|
|
p.Username, p.AuthMode, p.RoutingMode,
|
|
p.CIDRV4, p.CIDRV6, p.CIDRV4URLs, p.CIDRV6URLs,
|
|
p.MTUOverride, p.AutoConnect,
|
|
p.TLSCACert, p.TLSCAPath, p.TLSInsecure, p.TLSPinnedHash,
|
|
)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("insert profile: %w", err)
|
|
}
|
|
id, _ := res.LastInsertId()
|
|
p.ID = id
|
|
p.CreatedAt = time.Now()
|
|
return id, nil
|
|
}
|
|
|
|
// GetProfile returns a single profile by ID.
|
|
func (s *Store) GetProfile(id int64) (*model.ServerProfile, error) {
|
|
p := &model.ServerProfile{}
|
|
var last sql.NullTime
|
|
err := s.db.QueryRow(
|
|
`SELECT id, name, protocol, host, server_ips, port, path,
|
|
username, auth_mode, routing_mode,
|
|
cidr_v4, cidr_v6, cidr_v4_urls, cidr_v6_urls,
|
|
mtu_override, auto_connect,
|
|
tls_ca_cert, tls_ca_path, tls_insecure, tls_pinned_hash,
|
|
created_at, last_connected_at
|
|
FROM server_profiles WHERE id = ?`, id,
|
|
).Scan(&p.ID, &p.Name, &p.Protocol, &p.Host, &p.ServerIPs, &p.Port, &p.Path,
|
|
&p.Username, &p.AuthMode, &p.RoutingMode,
|
|
&p.CIDRV4, &p.CIDRV6, &p.CIDRV4URLs, &p.CIDRV6URLs,
|
|
&p.MTUOverride, &p.AutoConnect,
|
|
&p.TLSCACert, &p.TLSCAPath, &p.TLSInsecure, &p.TLSPinnedHash,
|
|
&p.CreatedAt, &last)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("get profile %d: %w", id, err)
|
|
}
|
|
if last.Valid {
|
|
p.LastConnectedAt = &last.Time
|
|
}
|
|
return p, nil
|
|
}
|
|
|
|
// ListProfiles returns all saved profiles ordered by name.
|
|
func (s *Store) ListProfiles() ([]model.ServerProfile, error) {
|
|
rows, err := s.db.Query(
|
|
`SELECT id, name, protocol, host, server_ips, port, path,
|
|
username, auth_mode, routing_mode,
|
|
cidr_v4, cidr_v6, cidr_v4_urls, cidr_v6_urls,
|
|
mtu_override, auto_connect,
|
|
tls_ca_cert, tls_ca_path, tls_insecure, tls_pinned_hash,
|
|
created_at, last_connected_at
|
|
FROM server_profiles ORDER BY name`)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("list profiles: %w", err)
|
|
}
|
|
defer rows.Close()
|
|
|
|
var out []model.ServerProfile
|
|
for rows.Next() {
|
|
var p model.ServerProfile
|
|
var last sql.NullTime
|
|
if err := rows.Scan(&p.ID, &p.Name, &p.Protocol, &p.Host, &p.ServerIPs,
|
|
&p.Port, &p.Path, &p.Username, &p.AuthMode, &p.RoutingMode,
|
|
&p.CIDRV4, &p.CIDRV6, &p.CIDRV4URLs, &p.CIDRV6URLs,
|
|
&p.MTUOverride, &p.AutoConnect,
|
|
&p.TLSCACert, &p.TLSCAPath, &p.TLSInsecure, &p.TLSPinnedHash,
|
|
&p.CreatedAt, &last); err != nil {
|
|
return nil, err
|
|
}
|
|
if last.Valid {
|
|
p.LastConnectedAt = &last.Time
|
|
}
|
|
out = append(out, p)
|
|
}
|
|
return out, rows.Err()
|
|
}
|
|
|
|
// UpdateProfile updates an existing profile.
|
|
func (s *Store) UpdateProfile(p *model.ServerProfile) error {
|
|
_, err := s.db.Exec(
|
|
`UPDATE server_profiles SET
|
|
name = ?, protocol = ?, host = ?, server_ips = ?, port = ?, path = ?,
|
|
username = ?, auth_mode = ?, routing_mode = ?,
|
|
cidr_v4 = ?, cidr_v6 = ?, cidr_v4_urls = ?, cidr_v6_urls = ?,
|
|
mtu_override = ?, auto_connect = ?,
|
|
tls_ca_cert = ?, tls_ca_path = ?, tls_insecure = ?, tls_pinned_hash = ?
|
|
WHERE id = ?`,
|
|
p.Name, p.Protocol, p.Host, p.ServerIPs, p.Port, p.Path,
|
|
p.Username, p.AuthMode, p.RoutingMode,
|
|
p.CIDRV4, p.CIDRV6, p.CIDRV4URLs, p.CIDRV6URLs,
|
|
p.MTUOverride, p.AutoConnect,
|
|
p.TLSCACert, p.TLSCAPath, p.TLSInsecure, p.TLSPinnedHash, p.ID)
|
|
if err != nil {
|
|
return fmt.Errorf("update profile %d: %w", p.ID, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// DeleteProfile removes a profile by ID.
|
|
func (s *Store) DeleteProfile(id int64) error {
|
|
_, err := s.db.Exec(`DELETE FROM server_profiles WHERE id = ?`, id)
|
|
if err != nil {
|
|
return fmt.Errorf("delete profile %d: %w", id, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// TouchLastConnected records the connection timestamp for a profile.
|
|
func (s *Store) TouchLastConnected(id int64) error {
|
|
_, err := s.db.Exec(
|
|
`UPDATE server_profiles SET last_connected_at = ? WHERE id = ?`,
|
|
time.Now(), id)
|
|
return err
|
|
}
|