Merge pull request #565 from mildavw/master

Treat request URL as CDATA so query string params don't result in invalid XML
errbit · Oct 3, 2013 · da0ccdb · da0ccdb
2 parents b4fc56c + 929e795
commit da0ccdb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/public/javascripts/notifier.js b/public/javascripts/notifier.js
@@ -506,7 +506,7 @@ printStackTrace.implementation.prototype = {
                 '<backtrace>{backtrace_lines}</backtrace>' +
             '</error>' +
             '<request>' +
-                '<url>{request_url}</url>' +
+                '<url><![CDATA[{request_url}]]></url>' +
                 '<component>{request_component}</component>' +
                 '<action>{request_action}</action>' +
                 '{request}' +

diff --git a/spec/fixtures/hoptoad_test_notice.xml b/spec/fixtures/hoptoad_test_notice.xml
@@ -87,7 +87,7 @@
     </backtrace>
   </error>
   <request>
-    <url>http://example.org/verify</url>
+    <url><![CDATA[http://example.org/verify/cupcake=fistfight&lovebird=doomsayer]]></url>
     <component>application</component>
     <action>verify</action>
     <params>

diff --git a/spec/models/error_report_spec.rb b/spec/models/error_report_spec.rb
@@ -85,7 +85,7 @@ def framework
         end
 
         it 'has request' do
-          subject.request['url'].should == 'http://example.org/verify'
+          subject.request['url'].should == 'http://example.org/verify/cupcake=fistfight&lovebird=doomsayer'
           subject.request['params']['controller'].should == 'application'
         end