fix the dropToSudo issue and update GoRelease accordingly

Author: samfrm

.goreleaser.yaml

@@ -1,3 +1,4 @@
+version: 2
 project_name: reflex
 
 builds:
@@ -18,12 +19,7 @@ builds:
 
 archives:
   - id: archive
-    builds:
-      - reflex
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
-    format_overrides:
-      - goos: windows
-        format: zip
     files:
       - README.md
 

internal/browser/browser.go

@@ -2,15 +2,11 @@ package browser
 
 import (
     "errors"
-    "fmt"
     "os"
     "os/exec"
-    "os/user"
     "path/filepath"
     "runtime"
-    "strconv"
     "strings"
-    "syscall"
 )
 
 // Open attempts to open the url in a browser cross-platform.
@@ -94,40 +90,7 @@ func appExists(path string) bool {
 // dropToSudoUser modifies cmd to run as the SUDO_USER if the current process
 // is running with uid 0. It also adjusts common environment variables so the
 // desktop session (DBus/XDG) can be discovered.
-func dropToSudoUser(cmd *exec.Cmd) {
-    if runtime.GOOS == "windows" {
-        return
-    }
-    if os.Geteuid() != 0 {
-        return
-    }
-    sudoUser := os.Getenv("SUDO_USER")
-    if sudoUser == "" {
-        return
-    }
-    u, err := user.Lookup(sudoUser)
-    if err != nil {
-        return
-    }
-    uid, _ := strconv.Atoi(u.Uid)
-    gid, _ := strconv.Atoi(u.Gid)
-    cmd.SysProcAttr = &syscall.SysProcAttr{Credential: &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)}}
-
-    env := os.Environ()
-    env = setEnv(env, "HOME", u.HomeDir)
-    env = setEnv(env, "USER", sudoUser)
-    env = setEnv(env, "LOGNAME", sudoUser)
-    if runtime.GOOS == "linux" {
-        xdg := fmt.Sprintf("/run/user/%d", uid)
-        if st, err := os.Stat(xdg); err == nil && st.IsDir() {
-            env = setEnv(env, "XDG_RUNTIME_DIR", xdg)
-            if !hasEnv(env, "DBUS_SESSION_BUS_ADDRESS") {
-                env = append(env, "DBUS_SESSION_BUS_ADDRESS=unix:path="+filepath.Join(xdg, "bus"))
-            }
-        }
-    }
-    cmd.Env = env
-}
+// dropToSudoUser is implemented per-OS in drop_*.go.
 
 func setEnv(env []string, key, value string) []string {
     prefix := key + "="
@@ -149,4 +112,3 @@ func hasEnv(env []string, key string) bool {
     }
     return false
 }
-

internal/browser/drop_darwin.go

@@ -0,0 +1,28 @@
+package browser
+
+import (
+	"os"
+	"os/exec"
+	"os/user"
+)
+
+// On macOS, adjust env to the sudo-invoking user so GUI apps attach
+// to the right session. Avoid SysProcAttr credential fields (not portable).
+func dropToSudoUser(cmd *exec.Cmd) {
+	if os.Geteuid() != 0 {
+		return
+	}
+	sudoUser := os.Getenv("SUDO_USER")
+	if sudoUser == "" {
+		return
+	}
+	u, err := user.Lookup(sudoUser)
+	if err != nil {
+		return
+	}
+	env := os.Environ()
+	env = setEnv(env, "HOME", u.HomeDir)
+	env = setEnv(env, "USER", sudoUser)
+	env = setEnv(env, "LOGNAME", sudoUser)
+	cmd.Env = env
+}

internal/browser/drop_linux.go

@@ -0,0 +1,44 @@
+package browser
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"os/user"
+	"path/filepath"
+	"strconv"
+	"syscall"
+)
+
+// On Linux, drop privileges to the invoking sudo user so the browser opens
+// in the user's desktop session. Also set XDG/DBus envs when possible.
+func dropToSudoUser(cmd *exec.Cmd) {
+	if os.Geteuid() != 0 {
+		return
+	}
+	sudoUser := os.Getenv("SUDO_USER")
+	if sudoUser == "" {
+		return
+	}
+	u, err := user.Lookup(sudoUser)
+	if err != nil {
+		return
+	}
+	uid, _ := strconv.Atoi(u.Uid)
+	gid, _ := strconv.Atoi(u.Gid)
+	cmd.SysProcAttr = &syscall.SysProcAttr{Credential: &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)}}
+
+	env := os.Environ()
+	env = setEnv(env, "HOME", u.HomeDir)
+	env = setEnv(env, "USER", sudoUser)
+	env = setEnv(env, "LOGNAME", sudoUser)
+
+	xdg := fmt.Sprintf("/run/user/%d", uid)
+	if st, err := os.Stat(xdg); err == nil && st.IsDir() {
+		env = setEnv(env, "XDG_RUNTIME_DIR", xdg)
+		if !hasEnv(env, "DBUS_SESSION_BUS_ADDRESS") {
+			env = append(env, "DBUS_SESSION_BUS_ADDRESS=unix:path="+filepath.Join(xdg, "bus"))
+		}
+	}
+	cmd.Env = env
+}

internal/browser/drop_windows.go

@@ -0,0 +1,6 @@
+package browser
+
+import "os/exec"
+
+// On Windows, do nothing special; the browser will open under the current user.
+func dropToSudoUser(cmd *exec.Cmd) { /* no-op */ }