Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
466d0780
Commit
466d0780
authored
Sep 12, 2018
by
Greg Messner
Browse files
Changes handling of missing X-GitLab-Event header (#248).
parent
3eeb140c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java
View file @
466d0780
...
...
@@ -54,13 +54,19 @@ public class SystemHookManager extends HookManager {
*/
public
void
handleEvent
(
HttpServletRequest
request
)
throws
GitLabApiException
{
String
eventName
=
request
.
getHeader
(
"X-Gitlab-Event"
);
if
(
eventName
==
null
||
eventName
.
trim
().
isEmpty
())
{
String
message
=
"X-Gitlab-Event header is missing!"
;
LOGGER
.
warning
(
message
);
return
;
}
if
(!
isValidSecretToken
(
request
))
{
String
message
=
"X-Gitlab-Token mismatch!"
;
LOGGER
.
warning
(
message
);
throw
new
GitLabApiException
(
message
);
}
String
eventName
=
request
.
getHeader
(
"X-Gitlab-Event"
);
LOGGER
.
info
(
"handleEvent: X-Gitlab-Event="
+
eventName
);
if
(!
SYSTEM_HOOK_EVENT
.
equals
(
eventName
))
{
String
message
=
"Unsupported X-Gitlab-Event, event Name="
+
eventName
;
...
...
src/main/java/org/gitlab4j/api/webhook/WebHookManager.java
View file @
466d0780
...
...
@@ -52,13 +52,18 @@ public class WebHookManager extends HookManager {
*/
public
void
handleEvent
(
HttpServletRequest
request
)
throws
GitLabApiException
{
String
eventName
=
request
.
getHeader
(
"X-Gitlab-Event"
);
if
(
eventName
==
null
||
eventName
.
trim
().
isEmpty
())
{
LOGGER
.
warning
(
"X-Gitlab-Event header is missing!"
);
return
;
}
if
(!
isValidSecretToken
(
request
))
{
String
message
=
"X-Gitlab-Token mismatch!"
;
LOGGER
.
warning
(
message
);
throw
new
GitLabApiException
(
message
);
}
String
eventName
=
request
.
getHeader
(
"X-Gitlab-Event"
);
LOGGER
.
info
(
"handleEvent: X-Gitlab-Event="
+
eventName
);
switch
(
eventName
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment