You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/12/09 18:51:08 UTC

svn commit: r1644133 - in /lucene/dev/branches/lucene_solr_4_10: ./ solr/ solr/CHANGES.txt solr/webapp/ solr/webapp/web/js/scripts/plugins.js

Author: markrmiller
Date: Tue Dec  9 17:51:08 2014
New Revision: 1644133

URL: http://svn.apache.org/r1644133
Log:
SOLR-6738: Admin UI - Escape Data on Plugins-View

Modified:
    lucene/dev/branches/lucene_solr_4_10/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/lucene_solr_4_10/solr/webapp/   (props changed)
    lucene/dev/branches/lucene_solr_4_10/solr/webapp/web/js/scripts/plugins.js

Modified: lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt?rev=1644133&r1=1644132&r2=1644133&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt Tue Dec  9 17:51:08 2014
@@ -37,6 +37,8 @@ Bug Fixes
   scripts; remove -XX:+AggressiveOpts and only set -XX:-UseSuperWord for Java 1.7u40
   to u51. (Uwe Schindler, janhoy, hossman, Timothy Potter)
 
+* SOLR-6738: Admin UI - Escape Data on Plugins-View (steffkes)
+
 * SOLR-6085: Suggester crashes when prefixToken is longer than surface form (janhoy)
 
 * SOLR-6323: ReRankingQParserPlugin cleaner paging and fix bug with fuzzy, range and other queries

Modified: lucene/dev/branches/lucene_solr_4_10/solr/webapp/web/js/scripts/plugins.js
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/webapp/web/js/scripts/plugins.js?rev=1644133&r1=1644132&r2=1644133&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/webapp/web/js/scripts/plugins.js (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/webapp/web/js/scripts/plugins.js Tue Dec  9 17:51:08 2014
@@ -235,21 +235,21 @@ var render_plugin_data = function( plugi
           }
 
           content += '<li><dl class="clearfix">' + "\n";
-          content += '<dt>' + detail_key + ':</dt>' + "\n";
+          content += '<dt>' + detail_key.esc() + ':</dt>' + "\n";
           if($.isArray(detail_value)) {
             $.each(detail_value, function(index, value) { 
-              content += '<dd>' + value + '</dd>' + "\n";
+              content += '<dd>' + value.esc() + '</dd>' + "\n";
             });
           }
           else {
-            content += '<dd>' + detail_value + '</dd>' + "\n";
+            content += '<dd>' + new String( detail_value ).esc() + '</dd>' + "\n";
           }
           content += '</dl></li>' + "\n";
         }
         else if( 'stats' === detail_key && details[detail_key] )
         {
           content += '<li class="stats clearfix">' + "\n";
-          content += '<span>' + detail_key + ':</span>' + "\n";
+          content += '<span>' + detail_key.esc() + ':</span>' + "\n";
           content += '<ul>' + "\n";
 
           for( var stats_key in details[detail_key] )
@@ -258,8 +258,8 @@ var render_plugin_data = function( plugi
             stats_value = stats_value.replace( /([\(@])/g, '$1&#8203;' );
 
             content += '<li><dl class="clearfix">' + "\n";
-            content += '<dt>' + stats_key + ':</dt>' + "\n";
-            content += '<dd>' + stats_value + '</dd>' + "\n";
+            content += '<dt>' + stats_key.esc() + ':</dt>' + "\n";
+            content += '<dd>' + stats_value.esc() + '</dd>' + "\n";
             content += '</dl></li>' + "\n";
           }