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
c561c753
Commit
c561c753
authored
Jul 01, 2019
by
Greg Messner
Browse files
Now includes received secret token in event.
parent
4c1a40d5
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/systemhooks/AbstractSystemHookEvent.java
View file @
c561c753
...
...
@@ -6,6 +6,7 @@ public abstract class AbstractSystemHookEvent implements SystemHookEvent {
private
String
requestUrl
;
private
String
requestQuesryString
;
private
String
requestSecretToken
;
@Override
public
void
setRequestUrl
(
String
requestUrl
)
{
...
...
@@ -28,4 +29,15 @@ public abstract class AbstractSystemHookEvent implements SystemHookEvent {
public
String
getRequestQueryString
()
{
return
(
requestQuesryString
);
}
@Override
public
void
setRequestSecretToken
(
String
requestSecretToken
)
{
this
.
requestSecretToken
=
requestSecretToken
;
}
@Override
@JsonIgnore
public
String
getRequestSecretToken
()
{
return
(
requestSecretToken
);
}
}
src/main/java/org/gitlab4j/api/systemhooks/SystemHookEvent.java
View file @
c561c753
...
...
@@ -40,6 +40,9 @@ public interface SystemHookEvent {
void
setRequestQueryString
(
String
requestQuesryString
);
@JsonIgnore
String
getRequestQueryString
();
void
setRequestSecretToken
(
String
requestSecretToken
);
@JsonIgnore
String
getRequestSecretToken
();
}
// All of the following class definitions are needed to make the above work.
...
...
src/main/java/org/gitlab4j/api/systemhooks/SystemHookManager.java
View file @
c561c753
...
...
@@ -158,6 +158,9 @@ public class SystemHookManager implements HookManager {
event
.
setRequestUrl
(
requestUrl
!=
null
?
requestUrl
.
toString
()
:
null
);
event
.
setRequestQueryString
(
request
.
getQueryString
());
String
secretToken
=
request
.
getHeader
(
"X-Gitlab-Token"
);
event
.
setRequestSecretToken
(
secretToken
);
}
catch
(
Exception
e
)
{
LOGGER
.
warning
(
String
.
format
(
"Error processing JSON data, exception=%s, error=%s"
,
e
.
getClass
().
getSimpleName
(),
e
.
getMessage
()));
...
...
src/main/java/org/gitlab4j/api/webhook/AbstractEvent.java
View file @
c561c753
...
...
@@ -6,6 +6,7 @@ public abstract class AbstractEvent implements Event {
private
String
requestUrl
;
private
String
requestQuesryString
;
private
String
secretToken
;
@Override
public
void
setRequestUrl
(
String
requestUrl
)
{
...
...
@@ -28,4 +29,15 @@ public abstract class AbstractEvent implements Event {
public
String
getRequestQueryString
()
{
return
(
requestQuesryString
);
}
@Override
public
void
setRequestSecretToken
(
String
secretToken
)
{
this
.
secretToken
=
secretToken
;
}
@Override
@JsonIgnore
public
String
getRequestSecretToken
()
{
return
(
secretToken
);
}
}
src/main/java/org/gitlab4j/api/webhook/AbstractPushEvent.java
View file @
c561c753
...
...
@@ -26,6 +26,7 @@ public abstract class AbstractPushEvent {
private
String
requestUrl
;
private
String
requestQuesryString
;
private
String
requestSecretToken
;
public
String
getEventName
()
{
return
(
eventName
);
...
...
@@ -157,6 +158,16 @@ public abstract class AbstractPushEvent {
return
(
requestQuesryString
);
}
public
void
setRequestSecretToken
(
String
secretToken
)
{
this
.
requestSecretToken
=
secretToken
;
}
@JsonIgnore
public
String
getRequestSecretToken
()
{
return
(
requestSecretToken
);
}
/**
* Gets the branch name from the ref. Will return null if the ref does not start with "refs/heads/".
*
...
...
src/main/java/org/gitlab4j/api/webhook/Event.java
View file @
c561c753
...
...
@@ -31,4 +31,9 @@ public interface Event {
@JsonIgnore
String
getRequestQueryString
();
void
setRequestSecretToken
(
String
secretToken
);
@JsonIgnore
String
getRequestSecretToken
();
}
src/main/java/org/gitlab4j/api/webhook/WebHookManager.java
View file @
c561c753
...
...
@@ -138,6 +138,10 @@ public class WebHookManager implements HookManager {
event
.
setRequestUrl
(
request
.
getRequestURL
().
toString
());
event
.
setRequestQueryString
(
request
.
getQueryString
());
String
secretToken
=
request
.
getHeader
(
"X-Gitlab-Token"
);
event
.
setRequestSecretToken
(
secretToken
);
fireEvent
(
event
);
return
(
event
);
...
...
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