fix: 🐜 fix nested cdata in AdParameters

MailOnline · Jan 28, 2019 · 9b9c2d6 · 9b9c2d6
1 parent c18922a
commit 9b9c2d6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/fixtures/vast-vpaid-inline.xml b/fixtures/vast-vpaid-inline.xml
@@ -49,7 +49,7 @@
               <InteractiveCreativeFile apiFramework="VPAID" type="text/javascript">https://test.example.com/html5.js</InteractiveCreativeFile>
               <InteractiveCreativeFile apiFramework="VPAID" type="application/x-shockwave-flash">https://test.example.com/flash.swf</InteractiveCreativeFile>
             </MediaFiles>
-            <AdParameters xmlEncoded="false"><![CDATA[AD_PARAMETERS_DATA]]></AdParameters>
+            <AdParameters xmlEncoded="false"><![CDATA[AD_PARAMETERS_DATA <![CDATA[nested cdata]]]]><![CDATA[>]]></AdParameters>
             <Icons>
               <Icon program="MOL_STATIC" width="20px" height="20px" xPosition="right" yPosition="top" duration="00:00:30" offset="00:00:05" pxratio="1">
                 <StaticResource>https://test.example.com/icon/staticResource</StaticResource>

diff --git a/src/adUnit/helpers/vpaid/__tests__/initAd.spec.js b/src/adUnit/helpers/vpaid/__tests__/initAd.spec.js
@@ -39,7 +39,7 @@ describe('initAd', () => {
       'thumbnail',
       -1,
       {
-        AdParameters: 'AD_PARAMETERS_DATA',
+        AdParameters: 'AD_PARAMETERS_DATA <![CDATA[nested cdata]]>',
         xmlEncoded: false
       },
       {

diff --git a/src/vastSelectors/__tests__/index.spec.js b/src/vastSelectors/__tests__/index.spec.js
@@ -595,7 +595,7 @@ test('getCreativeData must return the adParameters', () => {
   });
 
   expect(getCreativeData(vastVpaidInlineXML)).toEqual({
-    AdParameters: 'AD_PARAMETERS_DATA',
+    AdParameters: 'AD_PARAMETERS_DATA <![CDATA[nested cdata]]>',
     xmlEncoded: false
   });
 });
diff --git a/src/vastSelectors/index.js b/src/vastSelectors/index.js
@@ -501,8 +501,11 @@ const getAdParametersContent = (xml) => {
   const paramsRegex = /<AdParameters[\s\w="]*>([\s\S]*)<\/AdParameters>/gm;
   const result = paramsRegex.exec(xml);
 
-  return result && result[1].replace('<![CDATA[', '')
-    .replace(']]>', '')
+  return result && result[1].replace(/[\n\s]*<!\[CDATA\[[\n\s]*/, '')
+    .replace(/[\n\s]*\]\]>[\n\s]*$/, '')
+
+    // unescape nested CDATA
+    .replace(/\]\]\]\]><!\[CDATA\[>/, ']]>')
     .trim();
 };