GRAILS-10985: Raw encoder should return a copy of a String that is ma…

…rked as "raw"
grails · Jan 14, 2014 · c00397b · c00397b
1 parent 630ed76
commit c00397b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/grails-plugin-codecs/src/main/groovy/org/codehaus/groovy/grails/plugins/codecs/RawCodec.java b/grails-plugin-codecs/src/main/groovy/org/codehaus/groovy/grails/plugins/codecs/RawCodec.java
@@ -56,7 +56,15 @@ public boolean isSafe() {
      * @see org.codehaus.groovy.grails.support.encoding.Encoder#encode(java.lang.Object)
      */
     public Object encode(Object o) {
-        return o;
+        if(o instanceof String) {
+            // create a new copy of the String instance            
+            return new String((String)o);
+        } else if(o instanceof CharSequence) {
+            // convert CharSequence to String so that we have a new instance
+            return String.valueOf(o);
+        } else {
+            return o;
+        }
     }
 
     /* (non-Javadoc)

diff --git a/...te-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/JavascriptTagLibTests.groovy b/...te-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/JavascriptTagLibTests.groovy
@@ -321,7 +321,16 @@ class TestUrlMappings {
         request.setAttribute("org.codehaus.grails.INCLUDED_JS_LIBRARIES", ['test'])
         assertOutputEquals('''<script type="text/javascript">\r\nvar value='<>';\r\n</script>\r\n''', template)
     }
-
+
+    // GRAILS-10985
+    void testJavascriptExpressionRawAndEscaped() {
+        withConfig("grails.views.default.codec='HTML'") {
+            def template = '''<g:javascript>var value='${raw('<>'.intern())}${'<>'.intern()}';</g:javascript>'''
+            request.setAttribute("org.codehaus.grails.INCLUDED_JS_LIBRARIES", ['test'])
+            assertOutputEquals('''<script type="text/javascript">\r\nvar value='<>\\u003c\\u003e';\r\n</script>\r\n''', template)
+        }
+    }
+
     void testJavascriptExpressionNoneDefaultCodecLegacySettings() {
         withConfig("grails.views.default.codec='none'") {
             def template = '''<g:javascript>var value='${'<>'}';</g:javascript>'''