Skip to content

Commit 466d078

Browse files
committed
Changes handling of missing X-GitLab-Event header (#248).
1 parent 3eeb140 commit 466d078

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,19 @@ public SystemHookManager(String secretToken) {
5454
*/
5555
public void handleEvent(HttpServletRequest request) throws GitLabApiException {
5656

57+
String eventName = request.getHeader("X-Gitlab-Event");
58+
if (eventName == null || eventName.trim().isEmpty()) {
59+
String message = "X-Gitlab-Event header is missing!";
60+
LOGGER.warning(message);
61+
return;
62+
}
63+
5764
if (!isValidSecretToken(request)) {
5865
String message = "X-Gitlab-Token mismatch!";
5966
LOGGER.warning(message);
6067
throw new GitLabApiException(message);
6168
}
6269

63-
String eventName = request.getHeader("X-Gitlab-Event");
6470
LOGGER.info("handleEvent: X-Gitlab-Event=" + eventName);
6571
if (!SYSTEM_HOOK_EVENT.equals(eventName)) {
6672
String message = "Unsupported X-Gitlab-Event, event Name=" + eventName;

src/main/java/org/gitlab4j/api/webhook/WebHookManager.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,18 @@ public WebHookManager(String secretToken) {
5252
*/
5353
public void handleEvent(HttpServletRequest request) throws GitLabApiException {
5454

55+
String eventName = request.getHeader("X-Gitlab-Event");
56+
if (eventName == null || eventName.trim().isEmpty()) {
57+
LOGGER.warning("X-Gitlab-Event header is missing!");
58+
return;
59+
}
60+
5561
if (!isValidSecretToken(request)) {
5662
String message = "X-Gitlab-Token mismatch!";
5763
LOGGER.warning(message);
5864
throw new GitLabApiException(message);
5965
}
6066

61-
String eventName = request.getHeader("X-Gitlab-Event");
6267
LOGGER.info("handleEvent: X-Gitlab-Event=" + eventName);
6368
switch (eventName) {
6469

0 commit comments

Comments
 (0)