fix(bitbucket): prevent NPE when handling bitbucket payload (#1064)

echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWehbookEventHandler.java → echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/BitbucketWebhookEventHandler.java

@@ -30,11 +30,11 @@
 
 @Component
 @Slf4j
-public class BitbucketWehbookEventHandler implements GitWebhookHandler {
+public class BitbucketWebhookEventHandler implements GitWebhookHandler {
 
   private ObjectMapper objectMapper;
 
-  public BitbucketWehbookEventHandler() {
+  public BitbucketWebhookEventHandler() {
     this.objectMapper = EchoObjectMapper.getInstance();
   }
 
@@ -244,7 +244,7 @@ private void handleBitbucketServerEvent(Event event, Map postedEvent) {
   }
 
   private String emptyOrDefault(String test, String def) {
-    return !test.isEmpty() ? test : def;
+    return (test != null && !test.isEmpty()) ? test : def;
   }
 
   @Data

echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/GitlabWehbookEventHandler.java → echo-webhooks/src/main/groovy/com/netflix/spinnaker/echo/scm/GitlabWebhookEventHandler.java

@@ -25,11 +25,11 @@
 import org.springframework.stereotype.Component;
 
 @Component
-public class GitlabWehbookEventHandler implements GitWebhookHandler {
+public class GitlabWebhookEventHandler implements GitWebhookHandler {
 
   private ObjectMapper objectMapper;
 
-  public GitlabWehbookEventHandler() {
+  public GitlabWebhookEventHandler() {
     this.objectMapper = EchoObjectMapper.getInstance();
   }
 

echo-webhooks/src/test/groovy/com/netflix/spinnaker/echo/controllers/WebhooksControllerSpec.groovy

@@ -16,13 +16,13 @@
 
 package com.netflix.spinnaker.echo.controllers
 
-import com.fasterxml.jackson.databind.ObjectMapper
+
 import com.netflix.spinnaker.echo.artifacts.ArtifactExtractor
 import com.netflix.spinnaker.echo.events.EventPropagator
 import com.netflix.spinnaker.echo.jackson.EchoObjectMapper
-import com.netflix.spinnaker.echo.scm.BitbucketWehbookEventHandler
+import com.netflix.spinnaker.echo.scm.BitbucketWebhookEventHandler
 import com.netflix.spinnaker.echo.scm.GithubWebhookEventHandler
-import com.netflix.spinnaker.echo.scm.GitlabWehbookEventHandler
+import com.netflix.spinnaker.echo.scm.GitlabWebhookEventHandler
 import com.netflix.spinnaker.echo.scm.ScmWebhookHandler
 import com.netflix.spinnaker.echo.scm.StashWebhookEventHandler
 import org.springframework.http.HttpHeaders
@@ -32,8 +32,8 @@ class WebhooksControllerSpec extends Specification {
 
   ScmWebhookHandler scmWebhookHandler = new ScmWebhookHandler(
     [
-      new BitbucketWehbookEventHandler(),
-      new GitlabWehbookEventHandler(),
+      new BitbucketWebhookEventHandler(),
+      new GitlabWebhookEventHandler(),
       new GithubWebhookEventHandler(),
       new StashWebhookEventHandler()]
   )

echo-webhooks/src/test/java/com/netflix/spinnaker/echo/scm/BitbucketWebhookEventHandlerTest.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020 Armory, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.netflix.spinnaker.echo.scm;
+
+import static org.assertj.core.api.Assertions.assertThatCode;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.netflix.spinnaker.echo.api.events.Event;
+import com.netflix.spinnaker.echo.api.events.Metadata;
+import com.netflix.spinnaker.echo.jackson.EchoObjectMapper;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class BitbucketWebhookEventHandlerTest {
+
+  @Test
+  void canHandlePayload() throws IOException {
+    File file = new File(getClass().getResource("/bitbucket_payload.json").getFile());
+    String rawPayload = new String(Files.readAllBytes(file.toPath()));
+
+    ObjectMapper mapper = EchoObjectMapper.getInstance();
+    Map<String, Object> payload = mapper.readValue(rawPayload, new TypeReference<>() {});
+
+    Event event = new Event();
+    Metadata metadata = new Metadata();
+    metadata.setType("git");
+    metadata.setSource("bitbucket");
+    event.details = metadata;
+    event.rawContent = rawPayload;
+    event.payload = payload;
+    event.content = payload;
+    event.content.put("event_type", "repo:push");
+
+    BitbucketWebhookEventHandler handler = new BitbucketWebhookEventHandler();
+    assertThatCode(() -> handler.handle(event, payload)).doesNotThrowAnyException();
+  }
+}