Austin/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-16 16:42:21 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix set_system_proxy when using sudo

Browse Source
This commit is contained in:
世界 2022-07-15 18:22:09 +08:00
parent 8969a15858
commit a25db09aac
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/settings/command.go
View File

@ -3,13 +3,9 @@ package settings
import (
"os"
"os/exec"
"strings"
"github.com/sagernet/sing-box/log"
)
func runCommand(name string, args ...string) error {
log.Debug(name, " ", strings.Join(args, " "))
command := exec.Command(name, args...)
command.Env = os.Environ()
command.Stdin = os.Stdin

33
common/settings/proxy_linux.go
View File

@ -3,29 +3,48 @@
package settings
import (
"os"
"os/exec"
"strings"
"github.com/sagernet/sing-box/log"
"github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions"
F "github.com/sagernet/sing/common/format"
)
var hasGSettings bool
var (
hasGSettings bool
sudoUser string
)
func init() {
hasGSettings = common.Error(exec.LookPath("gsettings")) == nil
if os.Getuid() == 0 {
sudoUser = os.Getenv("SUDO_USER")
}
}
func runAsUser(name string, args ...string) error {
if os.Getuid() != 0 {
return runCommand(name, args...)
} else if sudoUser != "" {
return runCommand("su", "-", sudoUser, "-c", F.ToString(name, " ", strings.Join(args, " ")))
} else {
return E.New("set system proxy: unable to set as root")
}
}
func ClearSystemProxy() error {
if hasGSettings {
return runCommand("gsettings", "set", "org.gnome.system.proxy", "mode", "none")
return runAsUser("gsettings", "set", "org.gnome.system.proxy", "mode", "none")
}
return nil
}
func SetSystemProxy(port uint16, mixed bool) error {
if hasGSettings {
err := runCommand("gsettings", "set", "org.gnome.system.proxy.http", "enabled", "true")
err := runAsUser("gsettings", "set", "org.gnome.system.proxy.http", "enabled", "true")
if err != nil {
return err
}
@ -40,11 +59,11 @@ func SetSystemProxy(port uint16, mixed bool) error {
return err
}
}
err = runCommand("gsettings", "set", "org.gnome.system.proxy", "use-same-proxy", F.ToString(mixed))
err = runAsUser("gsettings", "set", "org.gnome.system.proxy", "use-same-proxy", F.ToString(mixed))
if err != nil {
return err
}
err = runCommand("gsettings", "set", "org.gnome.system.proxy", "mode", "manual")
err = runAsUser("gsettings", "set", "org.gnome.system.proxy", "mode", "manual")
if err != nil {
return err
}
@ -56,11 +75,11 @@ func SetSystemProxy(port uint16, mixed bool) error {
func setGnomeProxy(port uint16, proxyTypes ...string) error {
for _, proxyType := range proxyTypes {
err := runCommand("gsettings", "set", "org.gnome.system.proxy."+proxyType, "host", "127.0.0.1")
err := runAsUser("gsettings", "set", "org.gnome.system.proxy."+proxyType, "host", "127.0.0.1")
if err != nil {
return err
}
err = runCommand("gsettings", "set", "org.gnome.system.proxy."+proxyType, "port", F.ToString(port))
err = runAsUser("gsettings", "set", "org.gnome.system.proxy."+proxyType, "port", F.ToString(port))
if err != nil {
return err
}