路由性能优化: - 修复 macOS route 命令语法错误(去掉 -net 参数) - 路由应用拆分为 Essential(ready前,4-6条命令<1s)+ Deferred(ready后,批量脚本) - 新增 CIDR 聚合算法(cidrmerge.go),合并相邻 CIDR 块减少路由数量(10826->7500) - 批量脚本执行:3平台各实现8个批量函数,临时脚本单次执行替代逐条进程创建 - 并行批量:拆为4个子shell并行执行,总时间降为1/4 连接步骤显示: - stats 新增 connectStep + cidrError 原子变量 - 连接生命周期中设置步骤(fetch_cidrs/connecting/load_routes),UI 实时显示 - after-proxy CIDR 获取期间显示加载状态,获取失败显示错误提示 CIDR 刷新按钮: - ipc 新增 CmdRefreshCIDR 命令 - daemon 处理刷新请求,session.RefreshCIDRs() 重新获取+添加路由 - UI 状态卡新增刷新按钮,proxy/bypass 模式已连接时显示 README: - 补充 URL 获取时机注意事项(bypass模式after-proxy可能失败) - 补充 CIDR 聚合与批量执行说明
231 lines
6.1 KiB
Go
231 lines
6.1 KiB
Go
// Package daemon implements the privileged daemon process that owns
|
|
// the WebSocket transport, TUN device, and routing. It receives
|
|
// commands from the GUI over an IPC unix socket and broadcasts
|
|
// state/stats events back.
|
|
//
|
|
// The daemon is launched (as root) by the GUI via osascript. It holds
|
|
// no persistent state — all configuration is provided by the GUI in
|
|
// the Start command.
|
|
//
|
|
// The daemon accepts --user-home, --uid, and --gid flags so it can:
|
|
// - Write logs to the user's ~/Library/Logs/ (not /var/root)
|
|
// - Chown the IPC socket so the user can connect
|
|
// - Chown log files so the user can read them
|
|
package daemon
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net"
|
|
"os"
|
|
"os/signal"
|
|
"sync"
|
|
"syscall"
|
|
|
|
"lmvpn/internal/ipc"
|
|
"lmvpn/internal/log"
|
|
"lmvpn/internal/model"
|
|
"lmvpn/internal/paths"
|
|
"lmvpn/internal/stats"
|
|
"lmvpn/internal/version"
|
|
"lmvpn/internal/vpn"
|
|
)
|
|
|
|
// Run starts the daemon and blocks until Shutdown is received or a
|
|
// signal (SIGINT/SIGTERM) is delivered.
|
|
//
|
|
// userHome, uid, gid are the invoking GUI user's home directory and
|
|
// IDs, used to place logs in the user's Library and chown the IPC
|
|
// socket so the non-root GUI can connect.
|
|
func Run(userHome string, uid, gid int) error {
|
|
// Override paths to use the user's home directory (not root's).
|
|
paths.SetUserHome(userHome)
|
|
if err := paths.EnsureDirs(); err != nil {
|
|
// Non-fatal: root can usually create these anyway.
|
|
fmt.Fprintf(os.Stderr, "ensure dirs: %v\n", err)
|
|
}
|
|
|
|
log.Init(log.RoleDaemon, paths.DaemonLogFile())
|
|
// Chown the daemon log file so the user can read it.
|
|
chownToUser(paths.DaemonLogFile(), uid, gid)
|
|
|
|
log.L().Info("lmvpn daemon starting",
|
|
"user_home", userHome, "uid", uid, "gid", gid)
|
|
|
|
server, err := ipc.NewServer()
|
|
if err != nil {
|
|
return fmt.Errorf("ipc server: %w", err)
|
|
}
|
|
defer server.Close()
|
|
|
|
// Chown the IPC socket so the non-root GUI process can connect.
|
|
// This is the critical fix: without it, the socket is owned by
|
|
// root:wheel with mode 0660, and the user cannot dial it.
|
|
chownToUser(paths.IPCAddress(), uid, gid)
|
|
log.L().Info("daemon listening", "socket", paths.IPCAddress())
|
|
|
|
d := &daemon{server: server}
|
|
|
|
// Signal handling for clean shutdown.
|
|
sigCh := make(chan os.Signal, 1)
|
|
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
|
go func() {
|
|
<-sigCh
|
|
log.L().Info("daemon received signal, shutting down")
|
|
d.stopSession()
|
|
server.Close()
|
|
os.Exit(0)
|
|
}()
|
|
|
|
return server.Accept(d.handle)
|
|
}
|
|
|
|
// chownToUser changes the ownership of a file to the given uid:gid.
|
|
// Errors are logged but not fatal (e.g. if uid is -1).
|
|
func chownToUser(path string, uid, gid int) {
|
|
if uid < 0 {
|
|
return
|
|
}
|
|
if err := os.Chown(path, uid, gid); err != nil {
|
|
log.L().Warn("chown failed", "path", path, "error", err)
|
|
}
|
|
}
|
|
|
|
type daemon struct {
|
|
server *ipc.Server
|
|
mu sync.Mutex
|
|
session *vpn.SessionManager
|
|
cancel context.CancelFunc
|
|
}
|
|
|
|
func (d *daemon) handle(conn net.Conn, req ipc.Request) {
|
|
switch req.Cmd {
|
|
case ipc.CmdStart:
|
|
d.startSession(conn, req)
|
|
case ipc.CmdStop:
|
|
d.stopSession()
|
|
_ = ipc.WriteOK(conn)
|
|
case ipc.CmdShutdown:
|
|
d.stopSession()
|
|
_ = ipc.WriteOK(conn)
|
|
d.server.Close()
|
|
os.Exit(0)
|
|
case ipc.CmdStats:
|
|
d.mu.Lock()
|
|
sess := d.session
|
|
d.mu.Unlock()
|
|
if sess != nil {
|
|
snap := sess.Stats().Snapshot()
|
|
d.server.Broadcast(ipc.Event{Event: ipc.EvStats, Stats: &snap})
|
|
}
|
|
_ = ipc.WriteOK(conn)
|
|
case ipc.CmdRefreshCIDR:
|
|
d.mu.Lock()
|
|
sess := d.session
|
|
d.mu.Unlock()
|
|
if sess != nil {
|
|
go sess.RefreshCIDRs()
|
|
_ = ipc.WriteOK(conn)
|
|
} else {
|
|
_ = ipc.WriteErr(conn, "no active session")
|
|
}
|
|
case ipc.CmdVersion:
|
|
_ = ipc.WriteVersion(conn, version.Version)
|
|
default:
|
|
_ = ipc.WriteErr(conn, "unknown command: "+req.Cmd)
|
|
}
|
|
}
|
|
|
|
func (d *daemon) startSession(conn net.Conn, req ipc.Request) {
|
|
d.mu.Lock()
|
|
if req.Config == nil {
|
|
d.mu.Unlock()
|
|
_ = ipc.WriteErr(conn, "missing config")
|
|
return
|
|
}
|
|
if d.session != nil {
|
|
d.stopSessionLocked()
|
|
}
|
|
|
|
cfg := vpn.SessionConfig{
|
|
ServerURL: req.Config.ServerURL,
|
|
SNIHost: req.Config.SNIHost,
|
|
ServerIPs: req.Config.ServerIPs,
|
|
Username: req.Config.Username,
|
|
Password: req.Config.Password,
|
|
Token: req.Config.Token,
|
|
AuthMode: model.AuthMode(req.Config.AuthMode),
|
|
RoutingMode: ipc.RoutingModeFromIPC(req.Config.RoutingMode),
|
|
CIDRV4: req.Config.CIDRV4,
|
|
CIDRV6: req.Config.CIDRV6,
|
|
CIDRV4URLs: convertIPCSources(req.Config.CIDRV4URLs),
|
|
CIDRV6URLs: convertIPCSources(req.Config.CIDRV6URLs),
|
|
MTUOverride: req.Config.MTUOverride,
|
|
TLSCACert: req.Config.TLSCACert,
|
|
TLSCAPath: req.Config.TLSCAPath,
|
|
TLSInsecure: req.Config.TLSInsecure,
|
|
TLSPinnedHash: req.Config.TLSPinnedHash,
|
|
}
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
d.cancel = cancel
|
|
d.session = vpn.New(
|
|
func(s stats.State) {
|
|
d.server.Broadcast(ipc.Event{Event: ipc.EvState, State: string(s), ConnectStep: d.session.Stats().ConnectStep()})
|
|
},
|
|
func(snap stats.Snapshot) {
|
|
s := snap
|
|
d.server.Broadcast(ipc.Event{Event: ipc.EvStats, Stats: &s})
|
|
},
|
|
func(code string, msg string) {
|
|
d.server.Broadcast(ipc.Event{Event: ipc.EvError, Code: code, Message: msg})
|
|
},
|
|
)
|
|
// Release the lock before Connect. Connect is non-blocking (it
|
|
// starts a goroutine), but holding the lock across it would
|
|
// serialize all IPC commands (CmdStats, CmdStop, etc.) behind the
|
|
// session startup.
|
|
d.mu.Unlock()
|
|
|
|
if err := d.session.Connect(ctx, cfg); err != nil {
|
|
_ = ipc.WriteErr(conn, "connect: "+err.Error())
|
|
d.mu.Lock()
|
|
d.session = nil
|
|
d.cancel = nil
|
|
d.mu.Unlock()
|
|
return
|
|
}
|
|
}
|
|
|
|
func (d *daemon) stopSession() {
|
|
d.mu.Lock()
|
|
defer d.mu.Unlock()
|
|
d.stopSessionLocked()
|
|
}
|
|
|
|
func (d *daemon) stopSessionLocked() {
|
|
if d.cancel != nil {
|
|
d.cancel()
|
|
d.cancel = nil
|
|
}
|
|
if d.session != nil {
|
|
d.session.Disconnect()
|
|
d.session = nil
|
|
}
|
|
}
|
|
|
|
// convertIPCSources converts IPC CIDRURLSource values to model.CIDRURLSource.
|
|
func convertIPCSources(srcs []ipc.CIDRURLSource) []model.CIDRURLSource {
|
|
if len(srcs) == 0 {
|
|
return nil
|
|
}
|
|
out := make([]model.CIDRURLSource, len(srcs))
|
|
for i, s := range srcs {
|
|
out[i] = model.CIDRURLSource{
|
|
URL: s.URL,
|
|
FetchTiming: model.FetchTiming(s.FetchTiming),
|
|
}
|
|
}
|
|
return out
|
|
}
|