Update gnoi_system.go

sonic-net · Jan 10, 2025 · 1c175b9 · 1c175b9
1 parent e370d8a
commit 1c175b9
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/gnmi_server/gnoi_system.go b/gnmi_server/gnoi_system.go
@@ -82,9 +82,9 @@ func KillOrRestartProcess(restart bool, serviceName string) error {
 }
 
 func (srv *Server) KillProcess(ctx context.Context, req *syspb.KillProcessRequest) (*syspb.KillProcessResponse, error) {
-	_, err := authenticate(srv.config, ctx)
+	_, err := authenticate(srv.config, ctx, true)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	serviceName := req.GetName()
@@ -216,9 +216,9 @@ func sendRebootReqOnNotifCh(ctx context.Context, req proto.Message, sc *redis.Cl
 
 // Reboot implements the corresponding RPC.
 func (srv *Server) Reboot(ctx context.Context, req *syspb.RebootRequest) (*syspb.RebootResponse, error) {
-	_, err := authenticate(srv.config, ctx)
+	_, err := authenticate(srv.config, ctx, true)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	log.V(2).Info("gNOI: Reboot")
 	if err := ValidRebootReq(req); err != nil {
@@ -259,9 +259,9 @@ func (srv *Server) Reboot(ctx context.Context, req *syspb.RebootRequest) (*syspb
 
 // RebootStatus implements the corresponding RPC.
 func (srv *Server) RebootStatus(ctx context.Context, req *syspb.RebootStatusRequest) (*syspb.RebootStatusResponse, error) {
-	_, err := authenticate(srv.config, ctx)
+	_, err := authenticate(srv.config, ctx, true)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	log.V(1).Info("gNOI: RebootStatus")
 	resp := &syspb.RebootStatusResponse{}
@@ -288,9 +288,9 @@ func (srv *Server) RebootStatus(ctx context.Context, req *syspb.RebootStatusRequ
 
 // CancelReboot RPC implements the corresponding RPC.
 func (srv *Server) CancelReboot(ctx context.Context, req *syspb.CancelRebootRequest) (*syspb.CancelRebootResponse, error) {
-	_, err := authenticate(srv.config, ctx)
+	_, err := authenticate(srv.config, ctx, true)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	log.V(1).Info("gNOI: CancelReboot")
 	if req.GetMessage() == "" {
@@ -318,7 +318,7 @@ func (srv *Server) CancelReboot(ctx context.Context, req *syspb.CancelRebootRequ
 // Ping is unimplemented.
 func (srv *Server) Ping(req *syspb.PingRequest, stream syspb.System_PingServer) error {
 	ctx := stream.Context()
-	_, err := authenticate(srv.config, ctx)
+	_, err := authenticate(srv.config, ctx, true)
 	if err != nil {
 		return err
 	}
@@ -329,7 +329,7 @@ func (srv *Server) Ping(req *syspb.PingRequest, stream syspb.System_PingServer)
 // Traceroute is unimplemented.
 func (srv *Server) Traceroute(req *syspb.TracerouteRequest, stream syspb.System_TracerouteServer) error {
 	ctx := stream.Context()
-	_, err := authenticate(srv.config, ctx)
+	_, err := authenticate(srv.config, ctx, true)
 	if err != nil {
 		return err
 	}
@@ -340,7 +340,7 @@ func (srv *Server) Traceroute(req *syspb.TracerouteRequest, stream syspb.System_
 // SetPackage is unimplemented.
 func (srv *Server) SetPackage(stream syspb.System_SetPackageServer) error {
 	ctx := stream.Context()
-	_, err := authenticate(srv.config, ctx)
+	_, err := authenticate(srv.config, ctx, true)
 	if err != nil {
 		return err
 	}
@@ -350,19 +350,19 @@ func (srv *Server) SetPackage(stream syspb.System_SetPackageServer) error {
 
 // SwitchControlProcessor implements the corresponding RPC.
 func (srv *Server) SwitchControlProcessor(ctx context.Context, req *syspb.SwitchControlProcessorRequest) (*syspb.SwitchControlProcessorResponse, error) {
-	_, err := authenticate(srv.config, ctx)
+	_, err := authenticate(srv.config, ctx, true)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	log.V(1).Info("gNOI: SwitchControlProcessor")
 	return &syspb.SwitchControlProcessorResponse{}, nil
 }
 
 // Time implements the corresponding RPC.
 func (srv *Server) Time(ctx context.Context, req *syspb.TimeRequest) (*syspb.TimeResponse, error) {
-	_, err := authenticate(srv.config, ctx)
+	_, err := authenticate(srv.config, ctx, false)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	log.V(1).Info("gNOI: Time")
 	var tm syspb.TimeResponse