fix(web): check trigger.getType() for null before invoking equals met…

…hod (#1277) in PipelineController.getTriggeredPipelines to avoid a NullPointerException
spinnaker · Jun 30, 2023 · 69141df · 69141df
1 parent 2a812ba
commit 69141df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/PipelineController.java b/front50-web/src/main/java/com/netflix/spinnaker/front50/controllers/PipelineController.java
@@ -154,7 +154,8 @@ public Collection<Pipeline> getTriggeredPipelines(
         trigger -> {
           boolean retval =
               trigger.getEnabled()
-                  && (trigger.getType().equals("pipeline"))
+                  && (trigger.getType() != null)
+                  && trigger.getType().equals("pipeline")
                   && id.equals(trigger.getPipeline())
                   && trigger.getStatus().contains(status);
           log.debug(

diff --git a/...eb/src/test/groovy/com/netflix/spinnaker/front50/controllers/PipelineControllerTck.groovy b/...eb/src/test/groovy/com/netflix/spinnaker/front50/controllers/PipelineControllerTck.groovy
@@ -557,6 +557,13 @@ abstract class PipelineControllerTck extends Specification {
         [enabled: null, type: "pipeline", pipeline: "triggering-pipeline", status: [ "successful" ] ]
       ]
     ]))
+    pipelineDAO.create(null, new Pipeline([
+      name       : "enabled trigger with null type",
+      application: "test",
+      triggers   : [
+        [enabled: true, type: null, pipeline: "triggering-pipeline", status: [ "successful" ] ]
+      ]
+    ]))
 
     when:
     def response = mockMvc.perform(get("/pipelines/triggeredBy/triggering-pipeline/${status}/"))