chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve http proxy

Browse Source
This commit is contained in:
Hiddify 2023-08-24 20:58:23 +00:00
parent e124dc4c6a
commit 1f00545b5c
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
common/settings/proxy_linux.go
View File

@ -16,12 +16,12 @@ import (
var ( var (
hasGSettings bool hasGSettings bool
isKDE bool isKDE5 bool
sudoUser string sudoUser string
) )
func init() { func init() {
isKDE = common.Error(exec.LookPath("kwriteconfig5")) == nil isKDE5 = common.Error(exec.LookPath("kwriteconfig5")) == nil
hasGSettings = common.Error(exec.LookPath("gsettings")) == nil hasGSettings = common.Error(exec.LookPath("gsettings")) == nil
if os.Getuid() == 0 { if os.Getuid() == 0 {
sudoUser = os.Getenv("SUDO_USER") sudoUser = os.Getenv("SUDO_USER")
@ -64,7 +64,7 @@ func SetSystemProxy(router adapter.Router, port uint16, isMixed bool) (func() er
return runAsUser("gsettings", "set", "org.gnome.system.proxy", "mode", "none") return runAsUser("gsettings", "set", "org.gnome.system.proxy", "mode", "none")
}, nil }, nil
} }
if isKDE { if isKDE5 {
err := runAsUser("kwriteconfig5", "--file", "kioslaverc", "--group", "'Proxy Settings'", "--key", "ProxyType", "1") err := runAsUser("kwriteconfig5", "--file", "kioslaverc", "--group", "'Proxy Settings'", "--key", "ProxyType", "1")
if err != nil { if err != nil {
return nil, err return nil, err
@ -81,8 +81,16 @@ func SetSystemProxy(router adapter.Router, port uint16, isMixed bool) (func() er
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = runAsUser("dbus-send", "--type=signal", "/KIO/Scheduler", "org.kde.KIO.Scheduler.reparseSlaveConfiguration", "string:''")
if err != nil {
return nil, err
}
return func() error { return func() error {
return runAsUser("kwriteconfig5", "--file","kioslaverc", "--group", "'Proxy Settings'", "--key", "ProxyType", "0") err = runAsUser("kwriteconfig5", "--file", "kioslaverc", "--group", "'Proxy Settings'", "--key", "ProxyType", "0")
if err != nil {
return err
}
return runAsUser("dbus-send", "--type=signal", "/KIO/Scheduler", "org.kde.KIO.Scheduler.reparseSlaveConfiguration", "string:''")
}, nil }, nil
} }
return nil, E.New("unsupported desktop environment") return nil, E.New("unsupported desktop environment")
@ -104,7 +112,21 @@ func setGnomeProxy(port uint16, proxyTypes ...string) error {
func setKDEProxy(port uint16, proxyTypes ...string) error { func setKDEProxy(port uint16, proxyTypes ...string) error {
for _, proxyType := range proxyTypes { for _, proxyType := range proxyTypes {
err := runAsUser("kwriteconfig5", "--file","kioslaverc", "--group", "'Proxy Settings'", "--key", proxyType+"Proxy", proxyType+"://127.0.0.1:"+F.ToString(port)) var proxy_url string
if proxyType == "socks" {
proxy_url = "socks://127.0.0.1:" + F.ToString(port)
} else {
proxy_url = "http://127.0.0.1:" + F.ToString(port)
}
err := runAsUser(
"kwriteconfig5",
"--file",
"kioslaverc",
"--group",
"'Proxy Settings'",
"--key", proxyType+"Proxy",
proxy_url,
)
if err != nil { if err != nil {
return err return err
} }