Author: rgielen
Date: Sat Feb 18 17:44:04 2012
New Revision: 1290827
URL: http://svn.apache.org/viewvc?rev=1290827&view=rev
Log:
WW-3757
Show how to produce sanitized output of user inputted data
Modified:
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/options.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel1.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel2Submit.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel3Submit.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/chat/showRoom.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/chat/usersAvailable.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/continuations/guess.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/person/list-people.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/actionPrefix.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/methodPrefix.ftl
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
Modified:
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl?rev=1290827&r1=1290826&r2=1290827&view=diff
==
---
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl
(original)
+++
struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/view/freeMarkerExample.ftl
Sat Feb 18 17:44:04 2012
@@ -1,3 +1,3 @@
-Hello from FreeMarker, ${firstName} ${lastName}!
+Hello from FreeMarker, ${firstName?html} ${lastName?html}!
">Back to front page
Modified:
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp?rev=1290827&r1=1290826&r2=1290827&view=diff
==
---
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp
(original)
+++
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-index.jsp
Sat Feb 18 17:44:04 2012
@@ -20,8 +20,8 @@
${id}
-${clientName}
-${amount}
+
+
View |
Edit |
Delete
Modified:
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp?rev=1290827&r1=1290826&r2=1290827&view=diff
==
---
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp
(original)
+++
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/content/orders-show.jsp
Sat Feb 18 17:44:04 2012
@@ -1,7 +1,9 @@
http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-
+
+<%@taglib prefix="s" uri="/struts-tags" %>
+
http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
Order ${id}
@@ -14,11 +16,11 @@
Client
-${clientName}
+
Amount
-${amount}
+
Back to Orders
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/options.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/options.ftl?rev=1290827&r1=1290826&r2=1290827&view=diff
==
--- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/options.ftl
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/options.ftl Sat Feb
18 17:44:04 2012
@@ -1,5 +1,5 @@
[
<#list options as option>
- ["${option}"],
+ ["${option?html}"],
]
\ No newline at end of file
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel1.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/nodecorate/panel1.ftl?rev=1290827&r1=1290826&r2=1290827&view=diff
==
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/no
