Merge pull request #43 from hubba/master

[FIXED JENKINS-23661]
jenkinsci · Jul 14, 2014 · 18e9de4 · 18e9de4
2 parents bf6ed26 + 4cfd5ef
commit 18e9de4
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/com/cloudbees/jenkins/GitHubWebHook.java b/src/main/java/com/cloudbees/jenkins/GitHubWebHook.java
@@ -148,6 +148,7 @@ protected boolean filter(GitHub g) {
      */
     // XXX probably want (when available in baseline Stapler version): @RequirePOST
     public void doIndex(StaplerRequest req) {
+
         String eventType = req.getHeader("X-GitHub-Event");
         if ("push".equals(eventType)) {
             String payload = req.getParameter("payload");
@@ -156,9 +157,17 @@ public void doIndex(StaplerRequest req) {
                         "Make sure payload version is 'application/vnd.github+form'.");
             }
             processGitHubPayload(payload,GitHubPushTrigger.class);
-        } else {
+        } else if (eventType != null && !eventType.isEmpty()) {
             throw new IllegalArgumentException("Github Webhook event of type " + eventType + " is not supported. " +
                     "Only push events are current supported");
+        } else {
+            //Support github services that don't specify a header.
+            //Github webhook specifies a "X-Github-Event" header but services do not.
+            String payload = req.getParameter("payload");
+            if (payload == null) {
+                throw new IllegalArgumentException("Not intended to be browsed interactively (must specify payload parameter)");
+            }
+            processGitHubPayload(payload,GitHubPushTrigger.class);
         }
     }