Commit c561c753 authored by Greg Messner's avatar Greg Messner
Browse files

Now includes received secret token in event.

parent 4c1a40d5
...@@ -6,6 +6,7 @@ public abstract class AbstractSystemHookEvent implements SystemHookEvent { ...@@ -6,6 +6,7 @@ public abstract class AbstractSystemHookEvent implements SystemHookEvent {
private String requestUrl; private String requestUrl;
private String requestQuesryString; private String requestQuesryString;
private String requestSecretToken;
@Override @Override
public void setRequestUrl(String requestUrl) { public void setRequestUrl(String requestUrl) {
...@@ -28,4 +29,15 @@ public abstract class AbstractSystemHookEvent implements SystemHookEvent { ...@@ -28,4 +29,15 @@ public abstract class AbstractSystemHookEvent implements SystemHookEvent {
public String getRequestQueryString() { public String getRequestQueryString() {
return (requestQuesryString); return (requestQuesryString);
} }
@Override
public void setRequestSecretToken(String requestSecretToken) {
this.requestSecretToken = requestSecretToken;
}
@Override
@JsonIgnore
public String getRequestSecretToken() {
return (requestSecretToken);
}
} }
...@@ -40,6 +40,9 @@ public interface SystemHookEvent { ...@@ -40,6 +40,9 @@ public interface SystemHookEvent {
void setRequestQueryString(String requestQuesryString); void setRequestQueryString(String requestQuesryString);
@JsonIgnore String getRequestQueryString(); @JsonIgnore String getRequestQueryString();
void setRequestSecretToken(String requestSecretToken);
@JsonIgnore String getRequestSecretToken();
} }
// All of the following class definitions are needed to make the above work. // All of the following class definitions are needed to make the above work.
......
...@@ -158,6 +158,9 @@ public class SystemHookManager implements HookManager { ...@@ -158,6 +158,9 @@ public class SystemHookManager implements HookManager {
event.setRequestUrl(requestUrl != null ? requestUrl.toString() : null); event.setRequestUrl(requestUrl != null ? requestUrl.toString() : null);
event.setRequestQueryString(request.getQueryString()); event.setRequestQueryString(request.getQueryString());
String secretToken = request.getHeader("X-Gitlab-Token");
event.setRequestSecretToken(secretToken);
} catch (Exception e) { } catch (Exception e) {
LOGGER.warning(String.format("Error processing JSON data, exception=%s, error=%s", LOGGER.warning(String.format("Error processing JSON data, exception=%s, error=%s",
e.getClass().getSimpleName(), e.getMessage())); e.getClass().getSimpleName(), e.getMessage()));
......
...@@ -6,6 +6,7 @@ public abstract class AbstractEvent implements Event { ...@@ -6,6 +6,7 @@ public abstract class AbstractEvent implements Event {
private String requestUrl; private String requestUrl;
private String requestQuesryString; private String requestQuesryString;
private String secretToken;
@Override @Override
public void setRequestUrl(String requestUrl) { public void setRequestUrl(String requestUrl) {
...@@ -28,4 +29,15 @@ public abstract class AbstractEvent implements Event { ...@@ -28,4 +29,15 @@ public abstract class AbstractEvent implements Event {
public String getRequestQueryString() { public String getRequestQueryString() {
return (requestQuesryString); return (requestQuesryString);
} }
@Override
public void setRequestSecretToken(String secretToken) {
this.secretToken = secretToken;
}
@Override
@JsonIgnore
public String getRequestSecretToken() {
return (secretToken);
}
} }
...@@ -26,6 +26,7 @@ public abstract class AbstractPushEvent { ...@@ -26,6 +26,7 @@ public abstract class AbstractPushEvent {
private String requestUrl; private String requestUrl;
private String requestQuesryString; private String requestQuesryString;
private String requestSecretToken;
public String getEventName() { public String getEventName() {
return (eventName); return (eventName);
...@@ -157,6 +158,16 @@ public abstract class AbstractPushEvent { ...@@ -157,6 +158,16 @@ public abstract class AbstractPushEvent {
return (requestQuesryString); 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/". * Gets the branch name from the ref. Will return null if the ref does not start with "refs/heads/".
* *
......
...@@ -31,4 +31,9 @@ public interface Event { ...@@ -31,4 +31,9 @@ public interface Event {
@JsonIgnore @JsonIgnore
String getRequestQueryString(); String getRequestQueryString();
void setRequestSecretToken(String secretToken);
@JsonIgnore
String getRequestSecretToken();
} }
...@@ -138,6 +138,10 @@ public class WebHookManager implements HookManager { ...@@ -138,6 +138,10 @@ public class WebHookManager implements HookManager {
event.setRequestUrl(request.getRequestURL().toString()); event.setRequestUrl(request.getRequestURL().toString());
event.setRequestQueryString(request.getQueryString()); event.setRequestQueryString(request.getQueryString());
String secretToken = request.getHeader("X-Gitlab-Token");
event.setRequestSecretToken(secretToken);
fireEvent(event); fireEvent(event);
return (event); return (event);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment