Retrieve uid from gRPC peer data

cli/cli_set_notify.go

@@ -3,7 +3,6 @@ package cli
 import (
 	"context"
 	"fmt"
-	"os"
 
 	"github.com/NordSecurity/nordvpn-linux/daemon/pb"
 	filesharepb "github.com/NordSecurity/nordvpn-linux/fileshare/pb"
@@ -28,7 +27,6 @@ func (c *cmd) SetNotify(ctx *cli.Context) error {
 	}
 
 	daemonResp, err := c.client.SetNotify(context.Background(), &pb.SetNotifyRequest{
-		Uid:    int64(os.Getuid()),
 		Notify: flag,
 	})
 	if err != nil {

daemon/rpc_set_notify.go

@@ -7,10 +7,27 @@ import (
 	"github.com/NordSecurity/nordvpn-linux/config"
 	"github.com/NordSecurity/nordvpn-linux/daemon/pb"
 	"github.com/NordSecurity/nordvpn-linux/internal"
+	"google.golang.org/grpc/peer"
 )
 
 func (r *RPC) SetNotify(ctx context.Context, in *pb.SetNotifyRequest) (*pb.Payload, error) {
-	isInNordVPNGroup, err := internal.IsInAllowedGroup(uint32(in.Uid))
+	peer, ok := peer.FromContext(ctx)
+	if !ok {
+		log.Println(internal.ErrorPrefix, "failed to retrieve gRPC peer information from the context")
+		return &pb.Payload{
+			Type: internal.CodeInternalError,
+		}, nil
+	}
+
+	cred, ok := peer.AuthInfo.(internal.UcredAuth)
+	if !ok {
+		log.Println(internal.ErrorPrefix, "failed to extract ucred out of gRPC peer info")
+		return &pb.Payload{
+			Type: internal.CodeInternalError,
+		}, nil
+	}
+
+	isInNordVPNGroup, err := internal.IsInAllowedGroup(cred.Uid)
 	if err != nil {
 		return &pb.Payload{
 			Type: internal.CodeInternalError,
@@ -28,7 +45,7 @@ func (r *RPC) SetNotify(ctx context.Context, in *pb.SetNotifyRequest) (*pb.Paylo
 		log.Println(internal.ErrorPrefix, err)
 	}
 
-	notifyStatus := !cfg.UsersData.NotifyOff[in.GetUid()]
+	notifyStatus := !cfg.UsersData.NotifyOff[int64(cred.Uid)]
 
 	if in.GetNotify() == notifyStatus {
 		getBool := func(label bool) string {
@@ -45,7 +62,7 @@ func (r *RPC) SetNotify(ctx context.Context, in *pb.SetNotifyRequest) (*pb.Paylo
 
 	if !in.GetNotify() {
 		if err := r.cm.SaveWith(func(c config.Config) config.Config {
-			c.UsersData.NotifyOff[in.GetUid()] = true
+			c.UsersData.NotifyOff[int64(cred.Uid)] = true
 			return c
 		}); err != nil {
 			log.Println(internal.ErrorPrefix, err)
@@ -55,7 +72,7 @@ func (r *RPC) SetNotify(ctx context.Context, in *pb.SetNotifyRequest) (*pb.Paylo
 		}
 	} else {
 		if err := r.cm.SaveWith(func(c config.Config) config.Config {
-			delete(c.UsersData.NotifyOff, in.GetUid())
+			delete(c.UsersData.NotifyOff, int64(cred.Uid))
 			return c
 		}); err != nil {
 			log.Println(internal.ErrorPrefix, err)

protobuf/daemon/set.proto

@@ -66,7 +66,6 @@ message SetKillSwitchRequest {
 }
 
 message SetNotifyRequest {
-  int64 uid = 2;
   bool notify = 3;
 }
 

test/qa/lib/protobuf/daemon/set_pb2.pyi

@@ -108,12 +108,10 @@ class SetKillSwitchRequest(_message.Message):
     def __init__(self, kill_switch: bool = ...) -> None: ...
 
 class SetNotifyRequest(_message.Message):
-    __slots__ = ("uid", "notify")
-    UID_FIELD_NUMBER: _ClassVar[int]
+    __slots__ = ("notify",)
     NOTIFY_FIELD_NUMBER: _ClassVar[int]
-    uid: int
     notify: bool
-    def __init__(self, uid: _Optional[int] = ..., notify: bool = ...) -> None: ...
+    def __init__(self, notify: bool = ...) -> None: ...
 
 class SetTrayRequest(_message.Message):
     __slots__ = ("uid", "tray")

tray/actions.go

@@ -191,7 +191,6 @@ func (ti *Instance) setNotify(flag bool) bool {
 		flagText = "on"
 	}
 	resp, err := ti.client.SetNotify(context.Background(), &pb.SetNotifyRequest{
-		Uid:    int64(os.Getuid()),
 		Notify: flag,
 	})
 	if err != nil {