Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-70931] Remove Prototype Ajax.Request usages from hudson-behavior.js #7951

Merged
merged 18 commits into from
May 11, 2023
Merged

[JENKINS-70931] Remove Prototype Ajax.Request usages from hudson-behavior.js #7951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b3384bb
JENKINS-70931 Remove Prototype Ajax.Request usages from hudson-behavi…
timja May 6, 2023
d8fd7f9
Remove hacky test that doesn't work with fetch
timja May 7, 2023
3c890bd
Remove unused checkMethod
timja May 7, 2023
0708202
Merge branch 'master' into JENKINS-70931-hudson-behavior
basil May 8, 2023
8187d47
Add deprecated method warning
timja May 8, 2023
76bb89c
Merge branch 'master' into JENKINS-70931-hudson-behavior
timja May 9, 2023
6ccbd66
Update war/src/main/webapp/scripts/hudson-behavior.js
timja May 9, 2023
138a799
Access status properly
timja May 9, 2023
82a6815
Restore function removed in other PR
timja May 9, 2023
2236c4e
debug
timja May 9, 2023
4d0e7a7
Fix compat with matrix auth plugin
timja May 9, 2023
fe4c9bd
Restore support for setting checkMethod
timja May 9, 2023
008c3d2
Revert checkMethod changes
timja May 9, 2023
f6f1438
Pass through method
timja May 10, 2023
b11e908
fix lint
basil May 10, 2023
c0cc3ca
Merge branch 'master' into JENKINS-70931-hudson-behavior
basil May 10, 2023
597aeb0
Fix matrix-auth plugin
timja May 10, 2023
4ab1b14
Merge branch 'master' into JENKINS-70931-hudson-behavior
basil May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 0 additions & 102 deletions test/src/test/java/hudson/tools/ZipExtractionInstallerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,16 @@

package hudson.tools;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;

import com.gargoylesoftware.htmlunit.HttpMethod;
import com.gargoylesoftware.htmlunit.WebRequest;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine;
import com.gargoylesoftware.htmlunit.javascript.host.xml.XMLHttpRequest;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import hudson.model.JDK;
import hudson.model.User;
import hudson.util.FormValidation;
import java.lang.reflect.Field;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import jenkins.model.Jenkins;
import net.sourceforge.htmlunit.corejs.javascript.Function;
import net.sourceforge.htmlunit.corejs.javascript.Scriptable;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
Expand Down Expand Up @@ -94,89 +77,4 @@ public void onlyAdminCanReachTheDoCheck() throws Exception {
userWc.login(USER);
assertEquals(HttpURLConnection.HTTP_FORBIDDEN, userWc.getPage(request).getWebResponse().getStatusCode());
}

@Test
@Issue("SECURITY-794")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this removed? Not relevant anymore?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was a very hacky test relying on internals of htmlunit which changed when switching to fetch I wasn’t able to replicate it and it didn’t seem like a critical test

public void roundtrip() throws Exception {
final String VALID_URL = "https://www.google.com";
final String INVALID_URL = "only-crappy-letters";

ZipExtractionInstaller installer = new ZipExtractionInstaller("", VALID_URL, "");

j.jenkins.getJDKs().add(new JDK("test", tmp.getRoot().getAbsolutePath(), List.of(
new InstallSourceProperty(List.of(installer)))));

JenkinsRule.WebClient wc = j.createWebClient();

SpyingJavaScriptEngine jsEngine = new SpyingJavaScriptEngine(wc, "ZipExtractionInstaller/checkUrl", HttpMethod.POST);
wc.setJavaScriptEngine(jsEngine);

HtmlPage page = wc.goTo("configureTools");

XMLHttpRequest lastRequest = jsEngine.getLastRequest();
String body = URLDecoder.decode(getPrivateWebRequestField(lastRequest).getRequestBody(), StandardCharsets.UTF_8);
assertThat(body, containsString(VALID_URL));
assertEquals(FormValidation.ok().renderHtml(), lastRequest.getResponseText());

HtmlTextInput urlInput = page.getDocumentElement().getOneHtmlElementByAttribute("input", "value", VALID_URL);
urlInput.setAttribute("value", INVALID_URL);
j.submit(page.getFormByName("config"));

JDK jdk = j.jenkins.getJDK("test");
InstallSourceProperty isp = jdk.getProperties().get(InstallSourceProperty.class);
assertEquals(1, isp.installers.size());
assertEquals(INVALID_URL, isp.installers.get(ZipExtractionInstaller.class).getUrl());

wc.goTo("configureTools");

lastRequest = jsEngine.getLastRequest();
body = URLDecoder.decode(getPrivateWebRequestField(lastRequest).getRequestBody(), StandardCharsets.UTF_8);
assertThat(body, containsString(INVALID_URL));
assertThat(lastRequest.getResponseText(), containsString(Messages.ZipExtractionInstaller_malformed_url()));
}

private static class SpyingJavaScriptEngine extends JavaScriptEngine {
private List<XMLHttpRequest> storedRequests = new ArrayList<>();
private String urlToMatch;
private HttpMethod method;

SpyingJavaScriptEngine(JenkinsRule.WebClient wc, @Nullable String urlToMatch, @Nullable HttpMethod method) {
super(wc);
this.urlToMatch = urlToMatch;
this.method = method;
}

@Override
public Object callFunction(HtmlPage page, Function function, Scriptable scope, Scriptable thisObject, Object[] args) {
if (thisObject instanceof XMLHttpRequest) {
try {
WebRequest request = getPrivateWebRequestField((XMLHttpRequest) thisObject);
boolean correctUrl = urlToMatch == null || request.getUrl().toString().contains(urlToMatch);
boolean correctMethod = method == null || request.getHttpMethod().equals(method);
if (correctUrl && correctMethod) {
if (((XMLHttpRequest) thisObject).getReadyState() == 4) {
storedRequests.add((XMLHttpRequest) thisObject);
}
}
} catch (NoSuchFieldException | IllegalAccessException e) {
throw new LinkageError(e.getMessage(), e);
}
}
return super.callFunction(page, function, scope, thisObject, args);
}

@NonNull
public XMLHttpRequest getLastRequest() {
if (storedRequests.isEmpty()) {
fail("There is no available requests for the proposed url/method");
}
return storedRequests.get(storedRequests.size() - 1);
}
}

private static WebRequest getPrivateWebRequestField(XMLHttpRequest xmlHttpRequest) throws NoSuchFieldException, IllegalAccessException {
Field webRequest_Field = XMLHttpRequest.class.getDeclaredField("webRequest_");
webRequest_Field.setAccessible(true);
return (WebRequest) webRequest_Field.get(xmlHttpRequest);
}
}
1 change: 1 addition & 0 deletions war/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ module.exports = {
makeButton: "readonly",
notificationBar: "readonly",
object: "readonly",
objectToUrlFormEncoded: "readonly",
onSetupWizardInitialized: "readonly",
Prototype: "readonly",
refillOnChange: "readonly",
Expand Down
Loading