Require Jenkins 2.479 or newer #1671
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,10 +19,10 @@ | |
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
| import java.util.regex.Pattern; | ||
| import jakarta.servlet.http.HttpServletRequest; | ||
|
|
||
| import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; | ||
| import static jakarta.servlet.http.HttpServletResponse.SC_OK; | ||
| import jenkins.model.Jenkins; | ||
| import jenkins.model.ParameterizedJobMixIn; | ||
| import jenkins.scm.api.SCMEvent; | ||
|
|
@@ -115,6 +115,75 @@ public String toString() { | |
| return s.toString(); | ||
| } | ||
|
|
||
| /** | ||
| * Copied from scm API plugin. | ||
|
||
| * Helper method to get the origin of an event from a {@link HttpServletRequest}. The current format is the | ||
| * list of hostname / ip addresses from the request (parsing {@code X-Forwarded-For} headers) separated by | ||
| * {@code} followed by a {@code} and finally the requested URL (omitting the query portion of the URL). | ||
| * | ||
| * @param req the {@link HttpServletRequest} or {@code null} (this is to allow passing | ||
| * {@link Stapler#getCurrentRequest()} without having to check for {@code null}) | ||
| * @return the origin of the event or {@code null} if the {@link HttpServletRequest} is null. | ||
| * @since 2.0.3 | ||
| */ | ||
| @CheckForNull | ||
| private String originOf(@CheckForNull HttpServletRequest req) { | ||
| if (req == null) { | ||
| return null; | ||
| } | ||
| String last = null; | ||
| StringBuilder result = new StringBuilder(); | ||
| // TODO RFC 7239 support once standard is approved | ||
| String header = req.getHeader("X-Forwarded-For"); | ||
| if (StringUtils.isNotBlank(header)) { | ||
| for (String remote : header.split("(,\\s*)")) { | ||
| if (StringUtils.isBlank(remote)) { | ||
| continue; | ||
| } | ||
| if (last != null) { | ||
| result.append(" → "); | ||
| } | ||
| last = StringUtils.trim(remote); | ||
| result.append(last); | ||
| } | ||
| } | ||
| String remoteHost = req.getRemoteHost(); | ||
| String remoteAddr = req.getRemoteAddr(); | ||
| if (last == null || (!(StringUtils.equals(last, remoteHost) || StringUtils.equals(last, remoteAddr)))) { | ||
| if (last != null) { | ||
| result.append(" → "); | ||
| } | ||
| if (!StringUtils.isBlank(remoteHost) && !remoteHost.equals(remoteAddr)) { | ||
| result.append(remoteHost); | ||
| result.append('/'); | ||
| } | ||
| result.append(remoteAddr); | ||
| } | ||
| result.append(" ⇒ "); | ||
| String scheme = StringUtils.defaultIfBlank(req.getHeader("X-Forwarded-Proto"), req.getScheme()); | ||
| result.append(scheme); | ||
| result.append("://"); | ||
| result.append(req.getServerName()); | ||
| String portStr = req.getHeader("X-Forwarded-Port"); | ||
| int port; | ||
| if (portStr != null) { | ||
| try { | ||
| port = Integer.parseInt(portStr); | ||
| } catch (NumberFormatException e) { | ||
| port = req.getLocalPort(); | ||
| } | ||
| } else { | ||
| port = req.getLocalPort(); | ||
| } | ||
| if (!("http".equals(scheme) && port == 80 || "https".equals(scheme) && port == 443)) { | ||
| result.append(':'); | ||
| result.append(port); | ||
| } | ||
| result.append(req.getRequestURI()); | ||
| // omit query as may contain "secrets" | ||
| return result.toString(); | ||
| } | ||
|
|
||
| public HttpResponse doNotifyCommit(HttpServletRequest request, @QueryParameter(required=true) String url, | ||
| @QueryParameter() String branches, @QueryParameter() String sha1, | ||
| @QueryParameter() String token) { | ||
|
|
@@ -173,14 +242,14 @@ public HttpResponse doNotifyCommit(HttpServletRequest request, @QueryParameter(r | |
|
|
||
| final List<ResponseContributor> contributors = new ArrayList<>(); | ||
| Jenkins jenkins = Jenkins.get(); | ||
| String origin = originOf(request); | ||
| for (Listener listener : jenkins.getExtensionList(Listener.class)) { | ||
| contributors.addAll(listener.onNotifyCommit(origin, uri, sha1, buildParameters, branchesArray)); | ||
| } | ||
|
|
||
| return new HttpResponse() { | ||
| @Override | ||
| public void generateResponse(StaplerRequest2 req, StaplerResponse2 rsp, Object node) throws IOException { | ||
| rsp.setStatus(SC_OK); | ||
| rsp.setContentType("text/plain"); | ||
| for (int i = 0; i < contributors.size(); i++) { | ||
|
|
@@ -232,7 +301,7 @@ public static class ResponseContributor { | |
| * @param rsp the response. | ||
| * @since 1.4.1 | ||
| */ | ||
| public void addHeaders(StaplerRequest2 req, StaplerResponse2 rsp) { | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -243,7 +312,7 @@ public void addHeaders(StaplerRequest req, StaplerResponse rsp) { | |
| * @param w the writer. | ||
| * @since 1.4.1 | ||
| */ | ||
| public void writeBody(StaplerRequest2 req, StaplerResponse2 rsp, PrintWriter w) { | ||
| writeBody(w); | ||
| } | ||
|
|
||
|
|
@@ -543,7 +612,7 @@ public PollingScheduledResponseContributor(Item project) { | |
| */ | ||
| @Override | ||
| @SuppressWarnings("deprecation") | ||
| public void addHeaders(StaplerRequest2 req, StaplerResponse2 rsp) { | ||
| // Calls a deprecated getAbsoluteUrl() method because this is a remote API case | ||
| // as described in the Javadoc of the deprecated getAbsoluteUrl() method. | ||
| rsp.addHeader("Triggered", project.getAbsoluteUrl()); | ||
|
|
@@ -578,7 +647,7 @@ public ScheduledResponseContributor(Item project) { | |
| */ | ||
| @Override | ||
| @SuppressWarnings("deprecation") | ||
| public void addHeaders(StaplerRequest2 req, StaplerResponse2 rsp) { | ||
| // Calls a deprecated getAbsoluteUrl() method because this is a remote API case | ||
| // as described in the Javadoc of the deprecated getAbsoluteUrl() method. | ||
| rsp.addHeader("Triggered", project.getAbsoluteUrl()); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This TODO can now be completed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Completed in: