Linux IPC hardening: lantern-group authorization

vpn/ipc/conn_nonwindows.go

@@ -84,10 +84,48 @@ func getConnPeer(conn net.Conn) (p usr, err error) {
 	}
 
 	uidStr := strconv.FormatUint(uint64(uid), 10)
+	peer, err := getPeerUser(uid, uidStr)
+	if err != nil {
+		return p, err
+	}
+	return peer, nil
+}
+
+func linuxUserInControlGroup(u *user.User) (bool, error) {
+	controlGroupGID, err := controlGroupGID()
+	if err != nil {
+		return false, err
+	}
+	gids, err := u.GroupIds()
+	if err != nil {
+		return false, fmt.Errorf("lookup groups for %s: %w", u.Username, err)
+	}
+	for _, gid := range gids {
+		if gid == controlGroupGID {
+			return true, nil
+		}
+	}
+	return false, nil
+}
+
+func getPeerUser(uid uint32, uidStr string) (usr, error) {
 	u, err := user.LookupId(uidStr)
 	if err != nil {
-		return p, fmt.Errorf("lookup user id %v: %w", uid, err)
+		return usr{}, fmt.Errorf("lookup user id %v: %w", uid, err)
+	}
+
+	if runtime.GOOS == "linux" {
+		inControlGroup, err := linuxUserInControlGroup(u)
+		if err != nil {
+			return usr{}, err
+		}
+		return usr{
+			uid:            uidStr,
+			uname:          u.Username,
+			inControlGroup: inControlGroup,
+		}, nil
 	}
+
 	return usr{
 		uid:     uidStr,
 		uname:   u.Username,

vpn/ipc/control_group_nonwindows.go

@@ -0,0 +1,38 @@
+//go:build !android && !ios && !windows
+
+package ipc
+
+import (
+	"fmt"
+	"os/user"
+	"strconv"
+)
+
+func controlGroupInfo() (*user.Group, error) {
+	group, err := user.LookupGroup(controlGroup)
+	if err != nil {
+		return nil, fmt.Errorf("lookup %s group: %w", controlGroup, err)
+	}
+	return group, nil
+}
+
+func controlGroupGID() (string, error) {
+	group, err := controlGroupInfo()
+	if err != nil {
+		return "", err
+	}
+	return group.Gid, nil
+}
+
+func controlGroupGIDInt() (int, error) {
+	gid, err := controlGroupGID()
+	if err != nil {
+		return 0, err
+	}
+	parsed, err := strconv.Atoi(gid)
+	if err != nil {
+		return 0, fmt.Errorf("convert %s gid %s: %w", controlGroup, gid, err)
+	}
+	return parsed, nil
+}
+

vpn/ipc/middlewares.go

@@ -61,5 +61,5 @@ func authPeer(next http.Handler) http.Handler {
 }
 
 func peerCanAccess(peer usr) bool {
-	return peer.isAdmin
+	return peer.isAdmin || peer.inControlGroup
 }

vpn/ipc/socket.go

@@ -10,6 +10,8 @@ import (
 	"strconv"
 )
 
+const controlGroup = "lantern"
+
 // use a var so it can be overridden in tests
 var _socketPath = "/var/run/lantern/lanternd.sock"
 
@@ -25,8 +27,24 @@ func socketPath() string {
 func setPermissions() error {
 	path := socketPath()
 	if runtime.GOOS == "linux" {
-		// we'll check if user is sudoer to restrict access
-		return os.Chmod(socketPath(), 0666)
+		if _testing || os.Geteuid() != 0 {
+			if err := os.Chmod(path, 0600); err != nil {
+				return fmt.Errorf("chmod %s: %w", path, err)
+			}
+			return nil
+		}
+
+		gid, err := controlGroupGIDInt()
+		if err != nil {
+			return err
+		}
+		if err := os.Chown(path, 0, gid); err != nil {
+			return fmt.Errorf("chown %s: %w", path, err)
+		}
+		if err := os.Chmod(path, 0660); err != nil {
+			return fmt.Errorf("chmod %s: %w", path, err)
+		}
+		return nil
 	}
 
 	// chown admin group and let the OS restrict access

vpn/ipc/usr.go

@@ -10,9 +10,10 @@ import (
 type usrKey struct{}
 
 type usr struct {
-	uid     string
-	uname   string
-	isAdmin bool
+	uid            string
+	uname          string
+	isAdmin        bool
+	inControlGroup bool
 }
 
 func contextWithUsr(ctx context.Context, u usr) context.Context {