IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the query tool displays but does not render HTML returned by the server in the results grid. Fixes #2330.

Browse Source
This commit is contained in:
Murtuza Zabuawala
2017-04-10 14:07:48 +01:00
committed by Dave Page
parent b86fa15dbc
commit a2a2b8b888
7 changed files with 405 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
web/pgadmin/tools/debugger/__init__.py
View File

@@ -1425,10 +1425,10 @@ def poll_end_execution_result(trans_id):
status = 'Success'
additional_msgs = conn.messages()
if len(additional_msgs) > 0:
additional_msgs = [msg.strip("<br>") for msg in additional_msgs]
additional_msgs = "<br>".join(additional_msgs)
additional_msgs = [msg.strip("\n") for msg in additional_msgs]
additional_msgs = "\n".join(additional_msgs)
if statusmsg:
statusmsg = additional_msgs + "<br>" + statusmsg
statusmsg = additional_msgs + "\n" + statusmsg
else:
statusmsg = additional_msgs
@@ -1443,10 +1443,10 @@ def poll_end_execution_result(trans_id):
status = 'Success'
additional_msgs = conn.messages()
if len(additional_msgs) > 0:
additional_msgs = [msg.strip("<br>") for msg in additional_msgs]
additional_msgs = "<br>".join(additional_msgs)
additional_msgs = [msg.strip("\n") for msg in additional_msgs]
additional_msgs = "\n".join(additional_msgs)
if statusmsg:
statusmsg = additional_msgs + "<br>" + statusmsg
statusmsg = additional_msgs + "\n" + statusmsg
else:
statusmsg = additional_msgs
@@ -1460,9 +1460,9 @@ def poll_end_execution_result(trans_id):
additional_msgs = conn.messages()
if len(additional_msgs) > 0:
additional_msgs = [msg.strip("\n") for msg in additional_msgs]
additional_msgs = "<br>".join(additional_msgs)
additional_msgs = "\n".join(additional_msgs)
if statusmsg:
statusmsg = additional_msgs + "<br>" + statusmsg
statusmsg = additional_msgs + "\n" + statusmsg
else:
statusmsg = additional_msgs
return make_json_response(data={

3
web/pgadmin/tools/debugger/templates/debugger/js/direct.js
View File

@@ -383,6 +383,9 @@ define(
// This function will update messages tab
update_messages: function(msg) {
// To prevent xss
msg = _.escape(msg);
var old_msgs='', new_msgs='';
old_msgs = pgTools.DirectDebug.messages_panel.$container.find('.messages').html();
if(old_msgs) {