From commits-return-18516-archive-asf-public=cust-asf.ponee.io@struts.apache.org Sat Oct 19 16:21:13 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id E4BF7180654 for ; Sat, 19 Oct 2019 18:21:12 +0200 (CEST) Received: (qmail 24381 invoked by uid 500); 19 Oct 2019 16:21:11 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 24372 invoked by uid 99); 19 Oct 2019 16:21:11 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Oct 2019 16:21:11 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id A288B80936; Sat, 19 Oct 2019 16:21:11 +0000 (UTC) Date: Sat, 19 Oct 2019 16:21:11 +0000 To: "commits@struts.apache.org" Subject: [struts] branch master updated: Proposed fix for WW-5022 (escape html tag body control flag) - Added escapeHtmlBody parameter to s:a and s:submit tags. - No other tags appear to require this feature (but can be added to any component). - Added new unit tests for escapeHtmlBody (and usesBody for component). - Fixed broken s:a tags in ShowCase app. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157150207139.32001.12273723489817026115@gitbox.apache.org> From: lukaszlenart@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: struts X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: be262bce2925a52d5d3f35665b9d5e32c4235d18 X-Git-Newrev: 9592355960850108af0097c44ac49600cc062734 X-Git-Rev: 9592355960850108af0097c44ac49600cc062734 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/master by this push: new 9592355 Proposed fix for WW-5022 (escape html tag body control flag) - Added escapeHtmlBody parameter to s:a and s:submit tags. - No other tags appear to require this feature (but can be added to any component). - Added new unit tests for escapeHtmlBody (and usesBody for component). - Fixed broken s:a tags in ShowCase app. new 2d23357 Merge pull request #373 from JCgH4164838Gh792C124B5/local_26x_TagBodyEscapeCtrl 9592355 is described below commit 9592355960850108af0097c44ac49600cc062734 Author: JCgH4164838Gh792C124B5 <43964333+JCgH4164838Gh792C124B5@users.noreply.github.com> AuthorDate: Mon Oct 14 17:52:16 2019 -0400 Proposed fix for WW-5022 (escape html tag body control flag) - Added escapeHtmlBody parameter to s:a and s:submit tags. - No other tags appear to require this feature (but can be added to any component). - Added new unit tests for escapeHtmlBody (and usesBody for component). - Fixed broken s:a tags in ShowCase app. --- .../src/main/webapp/WEB-INF/decorators/main.jsp | 4 +- .../src/main/webapp/WEB-INF/filedownload/index.jsp | 4 +- .../iteratorTag/appendIteratorTagDemoResult.jsp | 2 +- .../iteratorTag/iteratorGeneratorTagDemoResult.jsp | 2 +- .../iteratorTag/mergeIteratorTagDemoResult.jsp | 2 +- .../iteratorTag/subsetIteratorTagDemoResult.jsp | 2 +- .../java/org/apache/struts2/components/Anchor.java | 18 +++++++ .../org/apache/struts2/components/Component.java | 11 ++++ .../java/org/apache/struts2/components/Submit.java | 17 ++++++ .../org/apache/struts2/views/jsp/ui/AnchorTag.java | 19 +++++-- .../org/apache/struts2/views/jsp/ui/SubmitTag.java | 13 +++++ .../src/main/resources/template/simple/a-close.ftl | 2 +- .../resources/template/simple/submit-close.ftl | 6 +-- .../apache/struts2/components/ComponentTest.java | 39 +++++++++++++- .../apache/struts2/views/jsp/ui/AnchorTest.java | 63 ++++++++++++++++++++++ .../apache/struts2/views/jsp/ui/SubmitTest.java | 52 ++++++++++++++++++ .../org/apache/struts2/views/jsp/ui/Submit-11.txt | 1 + .../org/apache/struts2/views/jsp/ui/Submit-12.txt | 1 + .../org/apache/struts2/views/jsp/ui/href-3.txt | 1 + .../org/apache/struts2/views/jsp/ui/href-4.txt | 1 + .../org/apache/struts2/views/jsp/ui/href-5.txt | 1 + 21 files changed, 245 insertions(+), 16 deletions(-) diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index eb74c97..1ae656a 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -107,7 +107,7 @@ - Download image file. + Download image file.
@@ -47,7 +47,7 @@
- Download ZIP file. + Download ZIP file.
diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp index c2c7ff3..c95de87 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp @@ -46,7 +46,7 @@ - Back To Input + Back To Input diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp index f4a31d8..fefb093 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp @@ -41,7 +41,7 @@ - Back To Input + Back To Input diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp index 1798da4..3ae67a5 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp @@ -45,7 +45,7 @@ - Back To Input + Back To Input diff --git a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp index e704e57..fc89d5e 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp @@ -42,7 +42,7 @@ - Back To Input + Back To Input diff --git a/core/src/main/java/org/apache/struts2/components/Anchor.java b/core/src/main/java/org/apache/struts2/components/Anchor.java index 5d960c5..153fdf8 100644 --- a/core/src/main/java/org/apache/struts2/components/Anchor.java +++ b/core/src/main/java/org/apache/struts2/components/Anchor.java @@ -69,6 +69,7 @@ public class Anchor extends ClosingUIBean { protected UrlProvider urlProvider; protected UrlRenderer urlRenderer; protected boolean processingTagBody = false; + protected boolean escapeHtmlBody = true; //these params are passed by the Param tag protected Map urlParameters = new LinkedHashMap(); @@ -95,6 +96,18 @@ public class Anchor extends ClosingUIBean { return true; } + /** + * Override to set if body content should be HTML-escaped. + * + * @return true if body should be HTML-escaped, false otherwise. + * + * @since 2.6 + */ + @Override + public boolean escapeHtmlBody() { + return escapeHtmlBody; + } + @Override protected void evaluateExtraParams() { super.evaluateExtraParams(); @@ -262,4 +275,9 @@ public class Anchor extends ClosingUIBean { public void setForceAddSchemeHostAndPort(boolean forceAddSchemeHostAndPort) { urlProvider.setForceAddSchemeHostAndPort(forceAddSchemeHostAndPort); } + + @StrutsTagAttribute(required = false, description = "Specifies whether to HTML-escape the tag body or not", type = "Boolean", defaultValue = "true") + public void setEscapeHtmlBody(boolean escapeHtmlBody) { + this.escapeHtmlBody = escapeHtmlBody; + } } diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java index d291f99..e6c13d3 100644 --- a/core/src/main/java/org/apache/struts2/components/Component.java +++ b/core/src/main/java/org/apache/struts2/components/Component.java @@ -522,6 +522,17 @@ public class Component { } /** + * Override to set if body content should be HTML-escaped. + * + * @return always true (default) for this component. + * + * @since 2.6 + */ + public boolean escapeHtmlBody() { + return true; + } + + /** * Checks if provided name is a valid tag's attribute * * @param attrName String name of attribute diff --git a/core/src/main/java/org/apache/struts2/components/Submit.java b/core/src/main/java/org/apache/struts2/components/Submit.java index 60b6aec..124526a 100644 --- a/core/src/main/java/org/apache/struts2/components/Submit.java +++ b/core/src/main/java/org/apache/struts2/components/Submit.java @@ -54,6 +54,7 @@ public class Submit extends FormButton { final public static String OPEN_TEMPLATE = "submit"; final public static String TEMPLATE = "submit-close"; protected String src; + protected boolean escapeHtmlBody = true; public Submit(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); @@ -100,6 +101,10 @@ public class Submit extends FormButton { this.src = src; } + @StrutsTagAttribute(required = false, description = "Specifies whether to HTML-escape the tag body or not", type = "Boolean", defaultValue = "true") + public void setEscapeHtmlBody(boolean escapeHtmlBody) { + this.escapeHtmlBody = escapeHtmlBody; + } @Override public boolean usesBody() { @@ -107,6 +112,18 @@ public class Submit extends FormButton { } /** + * Override to set if body content should be HTML-escaped. + * + * @return true if body should be HTML-escaped, false otherwise. + * + * @since 2.6 + */ + @Override + public boolean escapeHtmlBody() { + return escapeHtmlBody; + } + + /** * Overrides to be able to render body in a template rather than always before the template */ public boolean end(Writer writer, String body) { diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java index 956f63a..d3645c1 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/AnchorTag.java @@ -47,7 +47,8 @@ public class AnchorTag extends AbstractClosingTag { protected String portletUrlType; protected String anchor; protected String forceAddSchemeHostAndPort; - + protected boolean escapeHtmlBody = true; // Default - escape HTML body + public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new Anchor(stack, req, res); } @@ -77,11 +78,12 @@ public class AnchorTag extends AbstractClosingTag { if (escapeAmp != null) { tag.setEscapeAmp(BooleanUtils.toBoolean(escapeAmp)); } - if (forceAddSchemeHostAndPort != null) { + if (forceAddSchemeHostAndPort != null) { tag.setForceAddSchemeHostAndPort(BooleanUtils.toBoolean(forceAddSchemeHostAndPort)); } + tag.setEscapeHtmlBody(escapeHtmlBody); } - + public void setHref(String href) { this.href = href; } @@ -141,6 +143,17 @@ public class AnchorTag extends AbstractClosingTag { public void setForceAddSchemeHostAndPort(String forceAddSchemeHostAndPort) { this.forceAddSchemeHostAndPort = forceAddSchemeHostAndPort; } + + /** + * Set via parameter to control if body content should be HTML-escaped. + * + * @param escapeHtmlBody + * + * @since 2.6 + */ + public void setEscapeHtmlBody(boolean escapeHtmlBody) { + this.escapeHtmlBody = escapeHtmlBody; + } } diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java index 71425dc..a865710 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/SubmitTag.java @@ -37,6 +37,7 @@ public class SubmitTag extends AbstractClosingTag { protected String method; protected String type; protected String src; + protected boolean escapeHtmlBody = true; // Default - escape HTML body public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new Submit(stack, req, res); @@ -50,6 +51,7 @@ public class SubmitTag extends AbstractClosingTag { submit.setMethod(method); submit.setType(type); submit.setSrc(src); + submit.setEscapeHtmlBody(escapeHtmlBody); } public void setAction(String action) { @@ -71,4 +73,15 @@ public class SubmitTag extends AbstractClosingTag { public void setSrc(String src) { this.src = src; } + + /** + * Set via parameter to control if body content should be HTML-escaped. + * + * @param escapeHtmlBody + * + * @since 2.6 + */ + public void setEscapeHtmlBody(boolean escapeHtmlBody) { + this.escapeHtmlBody = escapeHtmlBody; + } } diff --git a/core/src/main/resources/template/simple/a-close.ftl b/core/src/main/resources/template/simple/a-close.ftl index fb532f4..4cacaf5 100644 --- a/core/src/main/resources/template/simple/a-close.ftl +++ b/core/src/main/resources/template/simple/a-close.ftl @@ -40,4 +40,4 @@ <#include "/${parameters.templateDir}/${parameters.expandTheme}/scripting-events.ftl" /> <#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /> <#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" /> ->${parameters.body} \ No newline at end of file +>${tag.escapeHtmlBody()?then(parameters.body, parameters.body?no_esc)} \ No newline at end of file diff --git a/core/src/main/resources/template/simple/submit-close.ftl b/core/src/main/resources/template/simple/submit-close.ftl index 8e81dd4..8cc5460 100644 --- a/core/src/main/resources/template/simple/submit-close.ftl +++ b/core/src/main/resources/template/simple/submit-close.ftl @@ -19,8 +19,8 @@ */ --> <#if parameters.type?? && parameters.type=="button"> -<#if parameters.body?length gt 0>${parameters.body}<#elseif parameters.label??><@s.property value="parameters.label"/><#rt/> +<#if parameters.body?length gt 0>${tag.escapeHtmlBody()?then(parameters.body, parameters.body?no_esc)}<#elseif parameters.label??><@s.property value="parameters.label"/><#rt/> <#else> -${parameters.body}<#rt/> - +${tag.escapeHtmlBody()?then(parameters.body, parameters.body?no_esc)}<#rt/> + \ No newline at end of file diff --git a/core/src/test/java/org/apache/struts2/components/ComponentTest.java b/core/src/test/java/org/apache/struts2/components/ComponentTest.java index d6f4789..70f9114 100644 --- a/core/src/test/java/org/apache/struts2/components/ComponentTest.java +++ b/core/src/test/java/org/apache/struts2/components/ComponentTest.java @@ -479,7 +479,6 @@ public class ComponentTest extends AbstractTagTest { } } - // updownselect public void testUpDownSelectDisposeItselfFromComponentStack() throws Exception { TextFieldTag t = new TextFieldTag(); @@ -505,4 +504,42 @@ public class ComponentTest extends AbstractTagTest { fail(e.toString()); } } + + /** + * Test the expected default behaviour for component body state methods. + */ + public void testComponentDefaultBodyStates() { + Component component = new Component(stack); + // Test expected default results for: usesBody(), escapeHtmlBody(). + assertFalse("Component default usesBody not false ?", component.usesBody()); + assertTrue("Component default htmlEscapeBody not true ?", component.escapeHtmlBody()); + } + + /** + * Test the behaviour for Anchor body state methods. + */ + public void testAnchorBodyStates() { + Anchor anchor = new Anchor(stack, request, response); + // Test expected default results for: usesBody(), escapeHtmlBody(). + assertTrue("Anchor default usesBody not true ?", anchor.usesBody()); + assertTrue("Anchor default htmlEscapeBody not true ?", anchor.escapeHtmlBody()); + anchor.setEscapeHtmlBody(false); + assertFalse("Anchor htmlEscapeBody not false after set false ?", anchor.escapeHtmlBody()); + anchor.setEscapeHtmlBody(true); + assertTrue("Anchor htmlEscapeBody not true after set true ?", anchor.escapeHtmlBody()); + } + + /** + * Test the behaviour for Submit body state methods. + */ + public void testAnchortBodyStates() { + Submit submit = new Submit(stack, request, response); + // Test expected default results for: usesBody(), escapeHtmlBody(). + assertTrue("Submit default usesBody not true ?", submit.usesBody()); + assertTrue("Submit default htmlEscapeBody not true ?", submit.escapeHtmlBody()); + submit.setEscapeHtmlBody(false); + assertFalse("Submit htmlEscapeBody not false after set false ?", submit.escapeHtmlBody()); + submit.setEscapeHtmlBody(true); + assertTrue("Submit htmlEscapeBody not true after set true ?", submit.escapeHtmlBody()); + } } diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java index c4f8da7..c031f39 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java @@ -101,4 +101,67 @@ public class AnchorTest extends AbstractUITagTest { return tag; } + /** + * Test anchor tag body supported + * + * @throws Exception + */ + public void testSimpleWithBody() throws Exception { + createAction(); + + AnchorTag tag = createTag(); + tag.setHref("a"); + + StrutsBodyContent body = new StrutsBodyContent(null); + body.print("normal body text with nothing to escape"); + tag.setBodyContent(body); + + tag.doStartTag(); + tag.doEndTag(); + + verifyResource("href-3.txt"); + } + + /** + * Test that by default anchor tag body is HTML-escaped. + * + * @throws Exception + */ + public void testSimpleWithBodyHTMLEscaped() throws Exception { + createAction(); + + AnchorTag tag = createTag(); + tag.setHref("a"); + + StrutsBodyContent body = new StrutsBodyContent(null); + body.print("should HTML escape: < & >"); + tag.setBodyContent(body); + + tag.doStartTag(); + tag.doEndTag(); + + verifyResource("href-4.txt"); + } + + /** + * Test that with htmlEscapeBody false anchor tag body is not HTML-escaped. + * + * @throws Exception + */ + public void testSimpleWithBodyNotHTMLEscaped() throws Exception { + createAction(); + + AnchorTag tag = createTag(); + tag.setHref("a"); + tag.setEscapeHtmlBody(false); + + StrutsBodyContent body = new StrutsBodyContent(null); + body.print("should not HTML escape: < & >"); + tag.setBodyContent(body); + + tag.doStartTag(); + tag.doEndTag(); + + verifyResource("href-5.txt"); + } } diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java index effcba9..b1c7da7 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitTest.java @@ -260,4 +260,56 @@ public class SubmitTest extends AbstractUITagTest { verifyGenericProperties(tag, "xhtml", null); } + /** + * Test that by default submit tag body is HTML-escaped. + * + * @throws Exception + */ + public void testSubmitWithBodyHTMLEscaped() throws Exception { + TestAction testAction = (TestAction) action; + testAction.setFoo("bar"); + + SubmitTag tag = new SubmitTag(); + tag.setTheme("simple"); + tag.setPageContext(pageContext); + tag.setType("button"); + tag.setName("myname"); + tag.setLabel("yoyoyoyoy"); + tag.setValue("%{foo}"); + + StrutsBodyContent body = new StrutsBodyContent(null); + body.print("should HTML escape: < & >"); + tag.setBodyContent(body); + tag.doStartTag(); + tag.doEndTag(); + + verify(TextFieldTag.class.getResource("Submit-11.txt")); + } + + /** + * Test that with htmlEscapeBody false submit tag body is not HTML-escaped. + * + * @throws Exception + */ + public void testSubmitWithBodyNotHTMLEscaped() throws Exception { + TestAction testAction = (TestAction) action; + testAction.setFoo("bar"); + + SubmitTag tag = new SubmitTag(); + tag.setTheme("simple"); + tag.setPageContext(pageContext); + tag.setType("button"); + tag.setName("myname"); + tag.setLabel("yoyoyoyoy"); + tag.setValue("%{foo}"); + tag.setEscapeHtmlBody(false); + + StrutsBodyContent body = new StrutsBodyContent(null); + body.print("should not HTML escape: < & >"); + tag.setBodyContent(body); + tag.doStartTag(); + tag.doEndTag(); + + verify(TextFieldTag.class.getResource("Submit-12.txt")); + } } diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-11.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-11.txt new file mode 100644 index 0000000..e5a8408 --- /dev/null +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-11.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-12.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-12.txt new file mode 100644 index 0000000..47d92c0 --- /dev/null +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-12.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-3.txt new file mode 100644 index 0000000..86a479c --- /dev/null +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-3.txt @@ -0,0 +1 @@ +normal body text with nothing to escape \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-4.txt new file mode 100644 index 0000000..073635d --- /dev/null +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-4.txt @@ -0,0 +1 @@ +should HTML escape: < & > \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-5.txt new file mode 100644 index 0000000..79c7230 --- /dev/null +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-5.txt @@ -0,0 +1 @@ +should not HTML escape: < & > \ No newline at end of file