|
@@ -3,29 +3,48 @@
|
|
package settings
|
|
package settings
|
|
|
|
|
|
import (
|
|
import (
|
|
|
|
+ "os"
|
|
"os/exec"
|
|
"os/exec"
|
|
|
|
+ "strings"
|
|
|
|
|
|
"github.com/sagernet/sing-box/log"
|
|
"github.com/sagernet/sing-box/log"
|
|
"github.com/sagernet/sing/common"
|
|
"github.com/sagernet/sing/common"
|
|
|
|
+ E "github.com/sagernet/sing/common/exceptions"
|
|
F "github.com/sagernet/sing/common/format"
|
|
F "github.com/sagernet/sing/common/format"
|
|
)
|
|
)
|
|
|
|
|
|
-var hasGSettings bool
|
|
|
|
|
|
+var (
|
|
|
|
+ hasGSettings bool
|
|
|
|
+ sudoUser string
|
|
|
|
+)
|
|
|
|
|
|
func init() {
|
|
func init() {
|
|
hasGSettings = common.Error(exec.LookPath("gsettings")) == nil
|
|
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 {
|
|
func ClearSystemProxy() error {
|
|
if hasGSettings {
|
|
if hasGSettings {
|
|
- return runCommand("gsettings", "set", "org.gnome.system.proxy", "mode", "none")
|
|
|
|
|
|
+ return runAsUser("gsettings", "set", "org.gnome.system.proxy", "mode", "none")
|
|
}
|
|
}
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
func SetSystemProxy(port uint16, mixed bool) error {
|
|
func SetSystemProxy(port uint16, mixed bool) error {
|
|
if hasGSettings {
|
|
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 {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
@@ -40,11 +59,11 @@ func SetSystemProxy(port uint16, mixed bool) error {
|
|
return err
|
|
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 {
|
|
if err != nil {
|
|
return err
|
|
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 {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
@@ -56,11 +75,11 @@ func SetSystemProxy(port uint16, mixed bool) error {
|
|
|
|
|
|
func setGnomeProxy(port uint16, proxyTypes ...string) error {
|
|
func setGnomeProxy(port uint16, proxyTypes ...string) error {
|
|
for _, proxyType := range proxyTypes {
|
|
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 {
|
|
if err != nil {
|
|
return err
|
|
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 {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|