Adding support for X-Gitlab-Token #186

pom.xml

@@ -11,7 +11,7 @@
 		<jenkins.version>2.7.4</jenkins.version>
 		<findbugs.failOnError>false</findbugs.failOnError>
 		<maven.javadoc.skip>true</maven.javadoc.skip>
-		<violations.version>1.40</violations.version>
+		<violations.version>1.42</violations.version>
 		<changelog>1.62</changelog>
 	</properties>
 

run.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 mvn versions:update-properties
-mvn hpi:run -Djava.util.logging.config.file=logging.properties -Djenkins.version=2.204.1 -Denforcer.skip=true
+mvn hpi:run -Djava.util.logging.config.file=logging.properties -Djenkins.version=2.249.2 -Denforcer.skip=true

src/main/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiver.java

@@ -50,7 +50,7 @@ public HttpResponse doInvoke(final StaplerRequest request) {
     Map<String, String[]> parameterMap = null;
     Map<String, List<String>> headers = null;
     try {
-      headers = getHeaders(request);
+      headers = this.getHeaders(request);
       parameterMap = request.getParameterMap();
       postContent = IOUtils.toString(request.getInputStream(), UTF_8.name());
     } catch (final IOException e) {
@@ -71,8 +71,8 @@ public HttpResponse doInvoke(final StaplerRequest request) {
               + e.getMessage());
     }
 
-    final String givenToken = getGivenToken(headers, parameterMap);
-    return doInvoke(headers, parameterMap, postContent, givenToken);
+    final String givenToken = this.getGivenToken(headers, parameterMap);
+    return this.doInvoke(headers, parameterMap, postContent, givenToken);
   }
 
   @VisibleForTesting
@@ -91,6 +91,9 @@ String getGivenToken(
         }
       }
     }
+    if (headers.containsKey("X-Gitlab-Token")) {
+      return headers.get("X-Gitlab-Token").get(0);
+    }
     return null;
   }
 
@@ -100,14 +103,14 @@ int getGivenQuietPeriod(
     if (parameterMap.containsKey("jobQuietPeriod")) {
       try {
         return Integer.parseInt(parameterMap.get("jobQuietPeriod")[0]);
-      } catch (Exception e) {
+      } catch (final Exception e) {
         return RESPECT_JOBS_QUIET_PERIOD;
       }
     }
     if (headers.containsKey("jobQuietPeriod")) {
       try {
         return Integer.parseInt(headers.get("jobQuietPeriod").get(0));
-      } catch (Exception e) {
+      } catch (final Exception e) {
         return RESPECT_JOBS_QUIET_PERIOD;
       }
     }
@@ -146,7 +149,7 @@ HttpResponse doInvoke(
 
         int quietPeriod = RESPECT_JOBS_QUIET_PERIOD;
         if (genericTrigger.getOverrideQuietPeriod()) {
-          quietPeriod = getGivenQuietPeriod(headers, parameterMap);
+          quietPeriod = this.getGivenQuietPeriod(headers, parameterMap);
         }
 
         final GenericTriggerResults triggerResults =
@@ -157,7 +160,7 @@ HttpResponse doInvoke(
         }
       } catch (final Throwable t) {
         LOGGER.log(SEVERE, foundJob.getFullName(), t);
-        final String msg = createMessageFromException(t);
+        final String msg = this.createMessageFromException(t);
         triggerResultsMap.put(foundJob.getFullName(), msg);
         errors = true;
       }

src/test/java/org/jenkinsci/plugins/gwt/GenericWebHookRequestReceiverTest.java

@@ -81,6 +81,20 @@ public void testThatHeaderTokenGivesThatToken() {
         .isEqualTo("tokenHeader");
   }
 
+  @Test
+  public void testThatGitLabTokenHeaderTokenGivesThatToken() {
+    final GenericWebHookRequestReceiver sut = new GenericWebHookRequestReceiver();
+    final Map<String, List<String>> headers =
+        of( //
+            "X-Gitlab-Token", (List<String>) newArrayList("gitlabtoken"));
+    final Map<String, String[]> parameterMap = newHashMap();
+
+    final String actual = sut.getGivenToken(headers, parameterMap);
+
+    assertThat(actual) //
+        .isEqualTo("gitlabtoken");
+  }
+
   @Test
   public void testThatHeaderQuietPeriodGivesThatQueitPeriod() {
     final GenericWebHookRequestReceiver sut = new GenericWebHookRequestReceiver();