Improved handling of JSData in Templates.

OTRS · Sep 18, 2018 · 40bbcc2 · 40bbcc2
1 parent bd083b5
commit 40bbcc2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,4 +1,5 @@
 #6.0.12 2018-??-??
+ - 2018-09-18 Improved handling of JSData in Templates.
 
 #6.0.11 2018-09-21
  - 2018-09-13 Updated translations, thanks to all translators.

diff --git a/Kernel/Output/Template/Document.pm b/Kernel/Output/Template/Document.pm
@@ -234,6 +234,11 @@ sub _InstallOTRSExtensions {
                     Data     => \%Data,
                     SortKeys => 1,
                 );
+
+                # Escape closing script tags in the JSON content as they will confuse the
+                #   browser's parser.
+                $JSONString =~ s{</script}{<\\/script}smxg;
+
                 $output .= "Core.Config.AddConfig($JSONString);\n";
             }
             delete $context->{LayoutObject}->{_JSData};

diff --git a/scripts/test/Layout/Template/Render.t b/scripts/test/Layout/Template/Render.t
@@ -361,12 +361,21 @@ console.log(22);
         },
         Result => '',
     },
+    {
+        Name      => 'JSData 3 with AddJSData()',
+        Template  => '',
+        AddJSData => {
+            Key   => 'JS.String',
+            Value => { String => '</script></script>' }
+        },
+        Result => '',
+    },
     {
         Name     => 'JSDataInsert',
         Template => '
 [% PROCESS "JSDataInsert" -%]',
         Result => '
-Core.Config.AddConfig({"Config.Test":123,"Config.Test2":[1,2,{"test":"test"}],"Perl.Code":{"Perl":"Data"}});
+Core.Config.AddConfig({"Config.Test":123,"Config.Test2":[1,2,{"test":"test"}],"JS.String":{"String":"<\/script><\/script>"},"Perl.Code":{"Perl":"Data"}});
 ',
     },
     {