Skip to content

Commit c561c75

Browse files
committed
Now includes received secret token in event.
1 parent 4c1a40d commit c561c75

File tree

7 files changed

+50
-0
lines changed

7 files changed

+50
-0
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public abstract class AbstractSystemHookEvent implements SystemHookEvent {
66

77
private String requestUrl;
88
private String requestQuesryString;
9+
private String requestSecretToken;
910

1011
@Override
1112
public void setRequestUrl(String requestUrl) {
@@ -28,4 +29,15 @@ public void setRequestQueryString(String requestQuesryString) {
2829
public String getRequestQueryString() {
2930
return (requestQuesryString);
3031
}
32+
33+
@Override
34+
public void setRequestSecretToken(String requestSecretToken) {
35+
this.requestSecretToken = requestSecretToken;
36+
}
37+
38+
@Override
39+
@JsonIgnore
40+
public String getRequestSecretToken() {
41+
return (requestSecretToken);
42+
}
3143
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ public interface SystemHookEvent {
4040

4141
void setRequestQueryString(String requestQuesryString);
4242
@JsonIgnore String getRequestQueryString();
43+
44+
void setRequestSecretToken(String requestSecretToken);
45+
@JsonIgnore String getRequestSecretToken();
4346
}
4447

4548
// All of the following class definitions are needed to make the above work.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ public SystemHookEvent handleRequest(HttpServletRequest request) throws GitLabAp
158158
event.setRequestUrl(requestUrl != null ? requestUrl.toString() : null);
159159
event.setRequestQueryString(request.getQueryString());
160160

161+
String secretToken = request.getHeader("X-Gitlab-Token");
162+
event.setRequestSecretToken(secretToken);
163+
161164
} catch (Exception e) {
162165
LOGGER.warning(String.format("Error processing JSON data, exception=%s, error=%s",
163166
e.getClass().getSimpleName(), e.getMessage()));

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public abstract class AbstractEvent implements Event {
66

77
private String requestUrl;
88
private String requestQuesryString;
9+
private String secretToken;
910

1011
@Override
1112
public void setRequestUrl(String requestUrl) {
@@ -28,4 +29,15 @@ public void setRequestQueryString(String requestQuesryString) {
2829
public String getRequestQueryString() {
2930
return (requestQuesryString);
3031
}
32+
33+
@Override
34+
public void setRequestSecretToken(String secretToken) {
35+
this.secretToken = secretToken;
36+
}
37+
38+
@Override
39+
@JsonIgnore
40+
public String getRequestSecretToken() {
41+
return (secretToken);
42+
}
3143
}

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public abstract class AbstractPushEvent {
2626

2727
private String requestUrl;
2828
private String requestQuesryString;
29+
private String requestSecretToken;
2930

3031
public String getEventName() {
3132
return (eventName);
@@ -157,6 +158,16 @@ public String getRequestQueryString() {
157158
return (requestQuesryString);
158159
}
159160

161+
162+
public void setRequestSecretToken(String secretToken) {
163+
this.requestSecretToken = secretToken;
164+
}
165+
166+
@JsonIgnore
167+
public String getRequestSecretToken() {
168+
return (requestSecretToken);
169+
}
170+
160171
/**
161172
* Gets the branch name from the ref. Will return null if the ref does not start with "refs/heads/".
162173
*

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,9 @@ public interface Event {
3131

3232
@JsonIgnore
3333
String getRequestQueryString();
34+
35+
void setRequestSecretToken(String secretToken);
36+
37+
@JsonIgnore
38+
String getRequestSecretToken();
3439
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ public Event handleRequest(HttpServletRequest request) throws GitLabApiException
138138

139139
event.setRequestUrl(request.getRequestURL().toString());
140140
event.setRequestQueryString(request.getQueryString());
141+
142+
String secretToken = request.getHeader("X-Gitlab-Token");
143+
event.setRequestSecretToken(secretToken);
144+
141145
fireEvent(event);
142146
return (event);
143147

0 commit comments

Comments
 (0)