Permalink
Show file tree
Hide file tree
3 changes: 2 additions & 1 deletion
3
omeroweb/webadmin/templates/webadmin/includes/drivespaceStats.js
1 change: 0 additions & 1 deletion
1
omeroweb/webclient/static/webclient/javascript/ome.right_panel_comments_pane.js
2 changes: 1 addition & 1 deletion
2
omeroweb/webclient/static/webclient/javascript/ome.right_panel_customanns_pane.js
1 change: 0 additions & 1 deletion
1
omeroweb/webclient/static/webclient/javascript/ome.right_panel_fileanns_pane.js
6 changes: 3 additions & 3 deletions
6
omeroweb/webclient/static/webclient/javascript/ome.right_panel_tags_pane.js
60 changes: 23 additions & 37 deletions
60
omeroweb/webclient/static/webclient/javascript/ome.tagging_form.js
4 changes: 2 additions & 2 deletions
4
omeroweb/webclient/static/webclient/javascript/ome.thumbnail_figure.js
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Fix issues with inconsistency in input sanitisation leading to XSS ve…
…ctors
- Loading branch information
1 parent
60bcdd9
commit 0168067
Showing
26 changed files
with
156 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 13 additions & 13 deletions
26
omeroweb/webclient/templates/webclient/annotations/comments_underscore.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 12 additions & 12 deletions
24
omeroweb/webclient/templates/webclient/annotations/customanns_underscore.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,31 @@ | ||
|
|
||
| <% _.each(anns, function(ann) { %> | ||
|
|
||
| <tr data-added-by="<% print (ann.addedBy.join(',')) %>"> | ||
| <th><%= ann.type %></th> | ||
| <tr data-added-by="<% print(_.escape(ann.addedBy.join(','))) %>"> | ||
| <th><%- ann.type %></th> | ||
| <td> | ||
| <div class="tooltip"> | ||
| <% if (ann.type === 'Xml') { %> | ||
| <div><% print((ann.value + "").slice(0, 20)) %>...</div> | ||
| <div><% print(_.escape((ann.value + "").slice(0, 20))) %>...</div> | ||
| <div class="show_xml">Open in new window</div> | ||
| <div style="display: none"><%= ann.value %></div> | ||
| <div style="display: none"><%- ann.value %></div> | ||
| <% } else { %> | ||
| <div><%= ann.value %></div> | ||
| <div><%- ann.value %></div> | ||
| <% } %> | ||
| </div> | ||
|
|
||
| <span class="tooltip_html" style='display:none'> | ||
| <b>ID:</b> <%= ann.id %><br /> | ||
| <% if (ann.ns) { %><b>Namespace:</b> <%= ann.ns %><br /><% } %> | ||
| <% if (ann.description) { %><b>Description:</b> <%= ann.description %><br /><% } %> | ||
| <b>Owner:</b> <%= ann.owner.firstName %> <%= ann.owner.lastName %><br /> | ||
| <b>ID:</b> <%- ann.id %><br /> | ||
| <% if (ann.ns) { %><b>Namespace:</b> <%- ann.ns %><br /><% } %> | ||
| <% if (ann.description) { %><b>Description:</b> <%- ann.description %><br /><% } %> | ||
| <b>Owner:</b> <%- ann.owner.firstName %> <%- ann.owner.lastName %><br /> | ||
| <b>Date:</b> <% print(OME.formatDate(ann.date)) %> | ||
|
|
||
| <% if (ann.parent) { %> | ||
| <br /> | ||
| <b>Linked to:</b> <%= ann.parent.class %> <%= ann.parent.id %> | ||
| <b>Linked to:</b> <%- ann.parent.class %> <%- ann.parent.id %> | ||
| <% } %> | ||
| </span> | ||
| </td> | ||
| </tr> | ||
| <% }) %> | ||
| <% }) %> |
Oops, something went wrong.