Merge pull request #2868 from CrowleyRajapakse/2025main3

Adding null checks for metadata
wso2 · Feb 22, 2025 · b15e00d · b15e00d
2 parents a5458a5 + 456eccc
commit b15e00d
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/gateway/enforcer/internal/extproc/ext_proc.go b/gateway/enforcer/internal/extproc/ext_proc.go
@@ -310,6 +310,10 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
 				// return status.Errorf(codes.Unknown, "cannot extract metadata: %v", err)
 				break
 			}
+			if metadata == nil {
+				s.log.Error(err, "metadata is nil")
+				break
+			}
 			requestConfigHolder.ExternalProcessingEnvoyMetadata = metadata
 
 			// s.log.Info(fmt.Sprintf("Matched api bjc: %v", requestConfigHolder.MatchedAPI.BackendJwtConfiguration))
@@ -438,6 +442,10 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
 				s.log.Error(err, "failed to extract context metadata")
 				break
 			}
+			if metadata == nil {
+				s.log.Error(err, "metadata is nil")
+				break
+			}
 			s.cfg.Logger.Sugar().Debug(fmt.Sprintf("metadata: %v", metadata))
 			matchedAPI := s.apiStore.GetMatchedAPI(metadata.MatchedAPIIdentifier)
 			if matchedAPI == nil {
@@ -683,6 +691,10 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
 				s.log.Error(err, "failed to extract context metadata")
 				break
 			}
+			if metadata == nil {
+				s.log.Error(err, "metadata is nil")
+				break
+			}
 			s.cfg.Logger.Sugar().Debug(fmt.Sprintf("metadata: %+v", metadata))
 			matchedAPI := s.apiStore.GetMatchedAPI(metadata.MatchedAPIIdentifier)
 			if matchedAPI == nil {
@@ -839,6 +851,10 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
 				s.log.Error(err, "failed to extract context metadata")
 				break
 			}
+			if metadata == nil {
+				s.log.Error(err, "metadata is nil")
+				break
+			}
 			s.cfg.Logger.Sugar().Debug(fmt.Sprintf("metadata: %v", metadata))
 			matchedAPI := s.apiStore.GetMatchedAPI(metadata.MatchedAPIIdentifier)
 			if matchedAPI == nil {
@@ -887,6 +903,7 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
 				matchedAPI.AiProvider.SupportedModels != nil &&
 				matchedAPI.AIModelBasedRoundRobin != nil &&
 				matchedAPI.AIModelBasedRoundRobin.Enabled &&
+				matchedResource.RouteMetadataAttributes != nil &&
 				matchedResource.RouteMetadataAttributes.SuspendAIModel == "true" {
 				s.cfg.Logger.Sugar().Debug("API Level Model Based Round Robin enabled")
 				httpBody := req.GetResponseBody().Body
@@ -914,6 +931,7 @@ func (s *ExternalProcessingServer) Process(srv envoy_service_proc_v3.ExternalPro
 				matchedAPI.AIModelBasedRoundRobin == nil &&
 				matchedResource.AIModelBasedRoundRobin != nil &&
 				matchedResource.AIModelBasedRoundRobin.Enabled &&
+				matchedResource.RouteMetadataAttributes != nil &&
 				matchedResource.RouteMetadataAttributes.SuspendAIModel == "true" {
 				s.cfg.Logger.Sugar().Debug("Resource Level Model Based Round Robin enabled")
 				httpBody := req.GetResponseBody().Body