Ignore payload processing for diagnostics:ping

Jenkinsfile

@@ -0,0 +1 @@
+buildPlugin()

findbugs-exclude.xml

@@ -0,0 +1,5 @@
+<FindBugsFilter>
+     <Match>
+       <Class name="~.+\.Messages" />
+     </Match>
+</FindBugsFilter>

pom.xml

@@ -8,7 +8,7 @@
     </parent>
 
     <artifactId>bitbucket</artifactId>
-    <version>1.1.6-SNAPSHOT</version>
+    <version>1.1.11-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <name>Jenkins Bitbucket Plugin</name>
     <description>integrate Jenkins with BitBucket.</description>
@@ -66,6 +66,7 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
                 <configuration>
+                    <skip>true</skip>
                     <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
                 </configuration>
             </plugin>
@@ -92,7 +93,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>job-dsl</artifactId>
-            <version>1.40</version>
+            <version>1.66</version>
             <optional>true</optional>
         </dependency>
 
@@ -150,4 +151,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>

src/main/java/com/cloudbees/jenkins/plugins/BitbucketJobProbe.java

@@ -88,6 +88,11 @@ private boolean match(SCM scm, URIish url) {
         if (scm instanceof GitSCM) {
             for (RemoteConfig remoteConfig : ((GitSCM) scm).getRepositories()) {
                 for (URIish urIish : remoteConfig.getURIs()) {
+                    // needed cause the ssh and https URI differs in Bitbucket Server.
+                    if(urIish.getPath().startsWith("/scm")){
+                        urIish = urIish.setPath(urIish.getPath().substring(4));
+                    }
+                    LOGGER.log(Level.FINE, "Trying to match {0} ", urIish.toString() + "<-->" + url.toString());
                     if (GitStatus.looselyMatches(urIish, url)) {
                         return true;
                     }

src/main/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessor.java

@@ -1,10 +1,13 @@
 package com.cloudbees.jenkins.plugins;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.servlet.http.HttpServletRequest;
 
+import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
 
 public class BitbucketPayloadProcessor {
@@ -25,7 +28,18 @@ public void processPayload(JSONObject payload, HttpServletRequest request) {
                 LOGGER.log(Level.INFO, "Processing new Webhooks payload");
                 processWebhookPayload(payload);
             }
+        } else if (payload.has("actor") && payload.has("repository")) {
+            if ("repo:push".equals(request.getHeader("x-event-key"))) {
+                LOGGER.log(Level.INFO, "Processing new Webhooks payload");
+                processWebhookPayloadBitBucketServer(payload);
+            }
         } else {
+            if ("diagnostics:ping".equals(request.getHeader("x-event-key"))) {
+                if (payload.has("test") && payload.getBoolean("test") == true) {
+                    LOGGER.log(Level.INFO, "Bitbucket test connection payload");
+                    return;
+                }
+            }
             LOGGER.log(Level.INFO, "Processing old POST service payload");
             processPostServicePayload(payload);
         }
@@ -36,14 +50,14 @@ private void processWebhookPayload(JSONObject payload) {
             JSONObject repo = payload.getJSONObject("repository");
             LOGGER.log(Level.INFO, "Received commit hook notification for {0}", repo);
 
-            String user = payload.getJSONObject("actor").getString("username");
+            String user = getUser(payload, "actor");
             String url = repo.getJSONObject("links").getJSONObject("html").getString("href");
             String scm = repo.has("scm") ? repo.getString("scm") : "git";
 
             probe.triggerMatchingJobs(user, url, scm, payload.toString());
         } else if (payload.has("scm")) {
             LOGGER.log(Level.INFO, "Received commit hook notification for hg: {0}", payload);
-            String user = payload.getJSONObject("owner").getString("username");
+            String user = getUser(payload, "owner");
             String url = payload.getJSONObject("links").getJSONObject("html").getString("href");
             String scm = payload.has("scm") ? payload.getString("scm") : "hg";
 
@@ -52,6 +66,43 @@ private void processWebhookPayload(JSONObject payload) {
 
     }
 
+    private String getUser(JSONObject payload, String jsonObject) {
+        String user;
+        try {
+            user = payload.getJSONObject(jsonObject).getString("username");
+        } catch (JSONException e1) {
+            try {
+                user = payload.getJSONObject(jsonObject).getString("nickname");
+            } catch (JSONException e2) {
+                user = payload.getJSONObject(jsonObject).getString("display_name");
+            }
+        }
+        return user;
+    }
+
+    /**
+     * Payload processor for BitBucket server. The plugin Post Webhooks for Bitbucket
+     * https://marketplace.atlassian.com/plugins/nl.topicus.bitbucket.bitbucket-webhooks/server/overview
+     * should be installed and configured
+     *
+     * @param payload
+     */
+    private void processWebhookPayloadBitBucketServer(JSONObject payload) {
+        JSONObject repo = payload.getJSONObject("repository");
+        String user = getUser(payload, "actor");
+        String url = "";
+        if (repo.getJSONObject("links").getJSONArray("self").size() != 0) {
+            try {
+                URL pushHref = new URL(repo.getJSONObject("links").getJSONArray("self").getJSONObject(0).getString("href"));
+                url = pushHref.toString().replaceFirst(new String("projects.*"), new String(repo.getString("fullName").toLowerCase()));
+                String scm = repo.has("scmId") ? repo.getString("scmId") : "git";
+                probe.triggerMatchingJobs(user, url, scm, payload.toString());
+            } catch (MalformedURLException e) {
+                LOGGER.log(Level.WARNING, String.format("URL %s is malformed", url), e);
+            }
+        }
+    }
+
 /*
 {
     "canon_url": "https://bitbucket.org",

src/test/java/com/cloudbees/jenkins/plugins/BitbucketPayloadProcessorTest.java

@@ -5,6 +5,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 import org.junit.Before;
@@ -37,7 +38,7 @@ public void testProcessWebhookPayload() {
 
         JSONObject payload = new JSONObject()
             .element("actor", new JSONObject()
-                .element("username", user))
+                .element("nickname", user))
             .element("repository", new JSONObject()
                 .element("links", new JSONObject()
                     .element("html", new JSONObject()
@@ -60,6 +61,32 @@ public void testProcessWebhookPayload() {
         verify(probe).triggerMatchingJobs(user, url, "hg", hgLoad.toString());
     }
 
+    @Test
+    public void processWebhookPayloadBitBucketServer() {
+        when(request.getHeader("user-agent")).thenReturn("Apache-HttpClient/4.5.1 (Java/1.8.0_102)");
+        when(request.getHeader("x-event-key")).thenReturn("repo:push");
+
+        String user = "test_user";
+        String url = "https://bitbucket.org/ce/test_repo";
+
+        JSONObject href = new JSONObject();
+        href.element("href", "https://bitbucket.org/projects/CE/repos/test_repo/browse");
+
+        // Set actor and repository so that payload processor will parse as Bitbucket Server Post Webhook payload
+        JSONObject payload = new JSONObject()
+                .element("actor", new JSONObject()
+                        .element("nickname", user))
+                .element("repository", new JSONObject()
+                        .element("links", new JSONObject()
+                                .element("self", new JSONArray()
+                                    .element(href)))
+                        .element("fullName",  "CE/test_repo"));
+
+        payloadProcessor.processPayload(payload, request);
+
+        verify(probe).triggerMatchingJobs(user, url, "git", payload.toString());
+    }
+
     @Test
     public void testProcessPostServicePayload() {
         // Ensure header isn't set so that payload processor will parse as old POST service payload
@@ -77,4 +104,38 @@ public void testProcessPostServicePayload() {
         verify(probe).triggerMatchingJobs("old_user", "https://staging.bitbucket.org/old_user/old_repo", "git", payload.toString());
     }
 
+
+    @Test
+    public void testProcessWebhookPayload_inCaseOwnerUsernameFieldIsReplacedByNickName() {
+        // Set headers so that payload processor will parse as new Webhook payload
+        when(request.getHeader("user-agent")).thenReturn("Bitbucket-Webhooks/2.0");
+        when(request.getHeader("x-event-key")).thenReturn("repo:push");
+
+        String user = "test_user";
+        String url = "https://bitbucket.org/test_user/test_repo";
+
+        JSONObject payload = new JSONObject()
+                .element("actor", new JSONObject()
+                        .element("nickname", user))
+                .element("repository", new JSONObject()
+                        .element("links", new JSONObject()
+                                .element("html", new JSONObject()
+                                        .element("href", url))));
+
+        JSONObject hgLoad = new JSONObject()
+                .element("scm", "hg")
+                .element("owner", new JSONObject()
+                        .element("nickname", user))
+                .element("links", new JSONObject()
+                        .element("html", new JSONObject()
+                                .element("href", url)));
+
+        payloadProcessor.processPayload(payload, request);
+
+        verify(probe).triggerMatchingJobs(user, url, "git", payload.toString());
+
+        payloadProcessor.processPayload(hgLoad, request);
+
+        verify(probe).triggerMatchingJobs(user, url, "hg", hgLoad.toString());
+    }
 }