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

[GEOS-11370] Refactor inline JavaScript in the TestWfsPost Page #7554

Merged
merged 3 commits into from
May 17, 2024
Merged

[GEOS-11370] Refactor inline JavaScript in the TestWfsPost Page #7554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dd26ea
[GEOS-11370] Refactor inline JavaScript in the TestWfsPost Page
sikeoka Apr 18, 2024
7b06532
Update TestWfsPost.js
petersmythe Apr 23, 2024
2499319
Merge branch 'main' into GEOS-11370
petersmythe May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/src/main/java/applicationContext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@
<property name="mappings">
<props>
<prop key="/schemas/**">classpathPublisher</prop>
<prop key="/webresources/**">classpathPublisher</prop>
<prop key="/j_acegi_security_check">classpathPublisher</prop>
<prop key="/j_spring_security_check">classpathPublisher</prop>
<prop key="/login">classpathPublisher</prop>
Expand Down
38 changes: 8 additions & 30 deletions src/wfs/src/main/java/org/vfny/geoserver/wfs/servlets/TestWfsPost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.text.StringEscapeUtils;
import org.geoserver.config.GeoServer;
import org.geoserver.ows.util.ResponseUtils;
import org.geoserver.platform.GeoServerExtensions;
Expand Down Expand Up @@ -114,38 +115,17 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
out.println("<head>");
out.println("<title>TestWfsPost</title>");
out.println("</head>");
out.println("<script language=\"JavaScript\">");
out.println("function doNothing() {");
out.println("}");
out.println("function sendRequest() {");
out.println(" if (checkURL()==true) {");
out.print(" document.frm.action = \"");
out.print(urlInfo.toString());
out.print("\";\n");
out.println(" document.frm.target = \"_blank\";");
out.println(" document.frm.submit();");
out.println(" }");
out.println("}");
out.println("function checkURL() {");
out.println(" if (document.frm.url.value==\"\") {");
out.println(" alert(\"Please give URL before you sumbit this form!\");");
out.println(" return false;");
out.println(" } else {");
out.println(" return true;");
out.println(" }");
out.println("}");
out.println("function clearRequest() {");
out.println("document.frm.body.value = \"\";");
out.println("}");
out.println("</script>");
out.println("<script src=\"webresources/wfs/TestWfsPost.js\"></script>");
out.println("<body>");
out.println("<form name=\"frm\" action=\"JavaScript:doNothing()\" method=\"POST\">");
out.print("<form name=\"frm\" action=\"");
out.print(StringEscapeUtils.escapeHtml4(urlInfo.toString()));
out.println("\" method=\"POST\" target=\"_blank\">");
out.println(
"<table align=\"center\" cellspacing=\"2\" cellpadding=\"2\" border=\"0\">");
out.println("<tr>");
out.println("<td><b>URL:</b></td>");
out.print("<td><input name=\"url\" value=\"");
out.print(geoserverUrl);
out.print(StringEscapeUtils.escapeHtml4(geoserverUrl));
out.print("/wfs/GetFeature\" size=\"70\" MAXLENGTH=\"100\"/></td>\n");
out.println("</tr>");
out.println("<tr>");
Expand All @@ -155,10 +135,8 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
out.println("</table>");
out.println("<table align=\"center\">");
out.println("<tr>");
out.println(
"<td><input type=\"button\" value=\"Clear\" onclick=\"clearRequest()\"></td>");
out.println(
"<td><input type=\"button\" value=\"Submit\" onclick=\"sendRequest()\"></td>");
out.println("<td><input id=\"clearButton\" type=\"button\" value=\"Clear\"></td>");
out.println("<td><input id=\"submitButton\" type=\"button\" value=\"Submit\"></td>");
out.println("<td></td>");
out.println("</tr>");
out.println("</table>");
Expand Down
13 changes: 13 additions & 0 deletions src/wfs/src/main/resources/webresources/wfs/TestWfsPost.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

window.onload = function() {
document.getElementById('submitButton').onclick = function() {
if (document.frm.url.value == '') {
alert('Please provide a URL before you submit this form!');
} else {
document.frm.submit();
}
};
document.getElementById('clearButton').onclick = function() {
document.frm.body.value = '';
};
};
19 changes: 18 additions & 1 deletion src/wfs/src/test/java/org/vfny/geoserver/wfs/servlets/TestWfsPostTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
*/
package org.vfny.geoserver.wfs.servlets;

import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
Expand Down Expand Up @@ -281,6 +282,22 @@ protected GeoServer getGeoServer() {
System.clearProperty("PROXY_BASE_URL");
}

@Test
public void testRemovedInlineJavaScript() throws Exception {
TestWfsPost servlet = buildMockServlet();
MockHttpServletRequest request = buildMockRequest();
request.setMethod("GET");
MockHttpServletResponse response = new MockHttpServletResponse();
servlet.service(request, response);
String result = response.getContentAsString();
assertThat(
result,
containsString("<script src=\"webresources/wfs/TestWfsPost.js\"></script>"));
assertThat(result, not(containsString("<script language=\"JavaScript\">")));
assertThat(result, not(containsString("action=\"JavaScript:")));
assertThat(result, not(containsString(" onclick=")));
}

@SuppressWarnings("PMD.AvoidUsingHardCodedIP")
protected static MockHttpServletRequest buildMockRequest() {
MockHttpServletRequest request = new MockHttpServletRequest();
Expand Down