orthanc: OrthancServer/OrthancExplorer/explorer.js comparison

comparison OrthancServer/OrthancExplorer/explorer.js @ 4910:92e84e9d2cca

Orthanc Explorer: sanitize DICOM tag display

author	Alain Mazy <am@osimis.io>
date	Mon, 21 Feb 2022 13:01:18 +0100
parents	6eff25f70121
children	0ea402b4d901

comparison

equal deleted inserted replaced

-:1cd1b8f58e56
+:92e84e9d2cca
 v = FormatFloatSequence(v);
 }
 target.append($('<p>')
 .text(tags[i].Name + ': ')
-.append($('<strong>').html(v)));
+.append($('<strong>').text(v)));
 }
 }
 }
 dataType: 'json',
 async: false,
 cache: false,
 success: function(s) {
 if (s.Name != "") {
-$('.orthanc-name').html($('<a>')
+$('.orthanc-name').empty();
+$('.orthanc-name').append($('<a>')
 .addClass('ui-link')
 .attr('href', 'explorer.html')
 .text(s.Name)
 .append(' &raquo; '));
 }
 });
 }
 }
-function EscapeHtml(value)
-{
-var ENTITY_MAP = {
-'&': '&amp;',
-'<': '&lt;',
-'>': '&gt;',
-'"': '&quot;',
-"'": '&#39;',
-'/': '&#x2F;',
-'`': '&#x60;',
-'=': '&#x3D;'
-};
-return String(value).replace(/[&<>"'`=\/]/g, function (s) {
-return ENTITY_MAP[s];
-});
-}
 function ConvertForTree(dicom)
 {
 var result = [];
 var label, c;
 for (var i in dicom) {
 if (dicom[i] != null) {
-label = (i + '<span class="tag-name"> (<i>' +
+var spanElement = $("<span>", {
-EscapeHtml(dicom[i]["Name"]) +
+class:"tag-name"
-'</i>)</span>: ');
+});
+var iElement = $("<i>", {
+text: dicom[i]["Name"]
+});
+spanElement.append(" (");
+spanElement.append(iElement);
+spanElement.append(")");
+label = (i + spanElement.prop('outerHTML') + ': ');
 if (dicom[i]["Type"] == 'String')
 {
+var strongElement = $('<strong>', {
+text: dicom[i]["Value"]
+});
 result.push({
-label: label + '<strong>' + EscapeHtml(dicom[i]["Value"]) + '</strong>',
+label: label + strongElement.prop('outerHTML'),
 children: []
 });
 }
 else if (dicom[i]["Type"] == 'TooLong')
 {
 {
 items.append('<li data-role="list-divider">DICOM modalities</li>');
 for (var i = 0; i < modalities.length; i++) {
 name = modalities[i];
-item = $('<li>')
-.html('<a href="#" rel="close">' + name + '</a>')
+var liElement = $('<li>', {
-.attr('name', name)
+name: name
+})
 .click(function() {
 clickedModality = $(this).attr('name');
 });
-items.append(item);
+var aElement = $('<a>', {
+href: '#',
+rel: 'close',
+text: name
+})
+liElement.append(aElement);
+items.append(liElement);
 }
 }
 // Retrieve the list of the known Orthanc peers
 $.ajax({
 {
 items.append('<li data-role="list-divider">Orthanc peers</li>');
 for (var i = 0; i < peers.length; i++) {
 name = peers[i];
-item = $('<li>')
-.html('<a href="#" rel="close">' + name + '</a>')
+var liElement = $('<li>', {
-.attr('name', name)
+name: name
+})
 .click(function() {
 clickedPeer = $(this).attr('name');
 });
-items.append(item);
+var aElement = $('<a>', {
+href: '#',
+rel: 'close',
+text: name
+})
+liElement.append(aElement);
+items.append(liElement);
 }
 }
 // Launch the dialog
 $('#dialog').simpledialog2({