Browse Source

[ui] Contents in <pre> tags need to be html-escaped

bc Wong 13 years ago
parent
commit
06c59edf1f

+ 1 - 1
apps/beeswax/src/beeswax/templates/execute.mako

@@ -266,7 +266,7 @@ ${layout.menubar(section='query')}
 					% if error_message or log:
 						<div class="tab-pane" id="errorPane">
 						% if log:
-							<pre>${log}</pre>
+							<pre>${log | h}</pre>
 						% endif
 						</div>
 					% endif

+ 2 - 2
apps/beeswax/src/beeswax/templates/explain.mako

@@ -32,10 +32,10 @@ ${layout.menubar(section='saved queries')}
     
 	<div class="tab-content">
 		<div class="active tab-pane" id="explanation">
-			<pre>${explanation}</pre>
+			<pre>${explanation | h}</pre>
 		</div>
 		<div class="tab-pane" id="query">
-			<pre>${query}</pre>
+			<pre>${query | h}</pre>
 		</div>
 	</div>
 	

+ 1 - 1
apps/beeswax/src/beeswax/templates/report_gen.mako

@@ -114,7 +114,7 @@ Error: <b>${error_message}</b>
 <br/>
 <a name="log"><h3>Server Log</h3></a>
 <pre>
-${log}
+${log | h}
 </pre>
 % endif
 </div>

+ 3 - 3
apps/beeswax/src/beeswax/templates/watch_results.mako

@@ -97,7 +97,7 @@ ${layout.menubar(section='query')}
 					% if error:
 		            <div class="alert alert-error">
 		              <h3>Error!</h3>
-		              <pre>${error_message}</pre>
+		              <pre>${error_message | h}</pre>
 		            </div>
           			% else:
 		            % if expected_first_row != start_row:
@@ -139,11 +139,11 @@ ${layout.menubar(section='query')}
 				</div>
 				<div class="tab-pane" id="query">
 
-						<pre>${query.query}</pre>
+						<pre>${query.query | h}</pre>
 
 				</div>
 				<div class="tab-pane" id="log">
-					<pre>${log}</pre>
+					<pre>${log | h}</pre>
 				</div>
 			</div>
 

+ 2 - 2
apps/beeswax/src/beeswax/templates/watch_wait.mako

@@ -60,10 +60,10 @@ ${layout.menubar(section='query')}
 
 		   	<div class="tab-content">
 				<div class="active tab-pane" id="log">
-					<pre>${log}</pre>
+					<pre>${log | h}</pre>
 				</div>
 				<div class="tab-pane" id="query">
-					<pre>${query.query}</pre>
+					<pre>${query.query | h}</pre>
 				</div>
 			</div>
 		</div>

+ 2 - 8
desktop/core/src/desktop/templates/logs.mako

@@ -21,12 +21,6 @@ import re
 <%namespace name="layout" file="about_layout.mako" />
 ${commonheader("About", "about", "100px")}
 ${layout.menubar(section='log_view')}
-	<%
-		def remove_html_tags(data):
-		    p = re.compile(r'<.*?>')
-		    return p.sub('', data)
-	%>
-
 	<div class="container-fluid">
 		<h1>Log entries (most recent first)</h1>
 
@@ -35,10 +29,10 @@ ${layout.menubar(section='log_view')}
 		<% log.reverse() %>
 		<pre>
 		% for l in log:
-${remove_html_tags(l)}
+${l | h}
 		% endfor
 		</pre>
 
 	</div>
 
-${commonfooter()}
+${commonfooter()}