mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-06 21:24:10 +00:00
d97ce19f30
Three Windows-specific issues addressed: 1. Orphaned xray-windows-amd64 after VS Code debugger stop. Delve's "Stop" sends TerminateProcess to the Go binary, which is uncatchable — our signal handlers never run, so xrayService.StopXray() is skipped and xray is left dangling. Spawn xray as a child of a Job Object with JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE so the OS kills xray when our handle to the job is closed (which happens even on TerminateProcess). Also trap os.Interrupt in main so Ctrl+C in the terminal runs the graceful path. 2. /panel/setting/restartPanel logged "failed to send SIGHUP signal: not supported by windows" because Windows can't deliver arbitrary signals. Add a restart hook in web/global; main registers it to push SIGHUP into its own signal channel, and RestartPanel calls the hook before falling back to the (Unix-only) signal path. Same restart-loop code runs in both cases. 3. util/sys/sys_windows.go now uses windows.NewLazySystemDLL so the kernel32.dll resolve is pinned to %SystemRoot%\System32 (prevents DLL hijacking by a planted DLL next to the binary). Local filetime type replaced with windows.Filetime, and the unreliable syscall.GetLastError() fallback replaced with a type assertion on the errno captured at call time. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
66 lines
1.5 KiB
Go
66 lines
1.5 KiB
Go
//go:build windows
|
|
|
|
package xray
|
|
|
|
import (
|
|
"os/exec"
|
|
"sync"
|
|
"unsafe"
|
|
|
|
"github.com/mhsanaei/3x-ui/v3/logger"
|
|
"golang.org/x/sys/windows"
|
|
)
|
|
|
|
var (
|
|
killOnExitJobOnce sync.Once
|
|
killOnExitJob windows.Handle
|
|
killOnExitJobErr error
|
|
)
|
|
|
|
func ensureKillOnExitJob() (windows.Handle, error) {
|
|
killOnExitJobOnce.Do(func() {
|
|
h, err := windows.CreateJobObject(nil, nil)
|
|
if err != nil {
|
|
killOnExitJobErr = err
|
|
return
|
|
}
|
|
info := windows.JOBOBJECT_EXTENDED_LIMIT_INFORMATION{
|
|
BasicLimitInformation: windows.JOBOBJECT_BASIC_LIMIT_INFORMATION{
|
|
LimitFlags: windows.JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE,
|
|
},
|
|
}
|
|
_, err = windows.SetInformationJobObject(
|
|
h,
|
|
windows.JobObjectExtendedLimitInformation,
|
|
uintptr(unsafe.Pointer(&info)),
|
|
uint32(unsafe.Sizeof(info)),
|
|
)
|
|
if err != nil {
|
|
windows.CloseHandle(h)
|
|
killOnExitJobErr = err
|
|
return
|
|
}
|
|
killOnExitJob = h
|
|
})
|
|
return killOnExitJob, killOnExitJobErr
|
|
}
|
|
|
|
func attachChildLifetime(cmd *exec.Cmd) {
|
|
if cmd == nil || cmd.Process == nil {
|
|
return
|
|
}
|
|
job, err := ensureKillOnExitJob()
|
|
if err != nil {
|
|
logger.Warning("xray: kill-on-exit job unavailable:", err)
|
|
return
|
|
}
|
|
h, err := windows.OpenProcess(windows.PROCESS_SET_QUOTA|windows.PROCESS_TERMINATE, false, uint32(cmd.Process.Pid))
|
|
if err != nil {
|
|
logger.Warning("xray: OpenProcess for job attach failed:", err)
|
|
return
|
|
}
|
|
defer windows.CloseHandle(h)
|
|
if err := windows.AssignProcessToJobObject(job, h); err != nil {
|
|
logger.Warning("xray: AssignProcessToJobObject failed:", err)
|
|
}
|
|
}
|