File 0001-fix-XSS-vulnerabilities-in-dashboard-links... of Package grafana

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-fix-XSS-vulnerabilities-in-dashboard-links.patch of Package grafana (Revision 515d5411e095b9644924937395fe592a)

Currently displaying revision 515d5411e095b9644924937395fe592a , Show latest

From 2e037b8d15cb7dda9ab8924bb70724730981440f Mon Sep 17 00:00:00 2001
From: Jan Zerebecki <jan.foss@zerebecki.de>
Date: Wed, 13 Jun 2018 18:53:59 +0200
Subject: [PATCH] fix XSS vulnerabilities in dashboard links

Dropped the whitespace changes for public/test/specs/helpers.js while
manually applying the change.

Backport of https://github.com/grafana/grafana/pull/11813
(cherry picked from commit 00454b32f5db19f9dee4fa05b5cff5e24941548d)

from https://github.com/grafana/grafana/pull/12265 
---
 public/app/features/dashlinks/module.js | 17 ++++++++++++++---
 public/app/features/panel/panel_ctrl.ts |  4 +++-
 public/test/specs/helpers.js            |  2 ++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/public/app/features/dashlinks/module.js b/public/app/features/dashlinks/module.js
index 620ad421e..81ffcd374 100644
--- a/public/app/features/dashlinks/module.js
+++ b/public/app/features/dashlinks/module.js
@@ -39,7 +39,7 @@ function (angular, _) {
     };
   });
 
-  module.directive('dashLink', function($compile, linkSrv) {
+  module.directive('dashLink', function($compile, $sanitize, linkSrv) {
     return {
       restrict: 'E',
       link: function(scope, elem) {
@@ -68,10 +68,21 @@ function (angular, _) {
           var linkInfo = linkSrv.getAnchorInfo(link);
           span.text(linkInfo.title);
           anchor.attr("href", linkInfo.href);
+          sanitizeAnchor();
+
+          // tooltip
+          elem.find('a').tooltip({
+            title: $sanitize(scope.link.tooltip),
+            html: true,
+            container: 'body',
+          });
+        }
+
+        function sanitizeAnchor() {
+          var anchorSanitized = $sanitize(anchor.parent().html());
+          anchor.parent().html(anchorSanitized);
         }
 
-        // tooltip
-        elem.find('a').tooltip({ title: scope.link.tooltip, html: true, container: 'body' });
         icon.attr('class', 'fa fa-fw ' + scope.link.icon);
         anchor.attr('target', scope.link.target);
 
diff --git a/public/app/features/panel/panel_ctrl.ts b/public/app/features/panel/panel_ctrl.ts
index 34574bdb4..186a03391 100644
--- a/public/app/features/panel/panel_ctrl.ts
+++ b/public/app/features/panel/panel_ctrl.ts
@@ -253,6 +253,7 @@ export class PanelCtrl {
     }
 
     var linkSrv = this.$injector.get('linkSrv');
+    var sanitize = this.$injector.get('$sanitize');
     var templateSrv = this.$injector.get('templateSrv');
     var interpolatedMarkdown = templateSrv.replace(markdown, this.panel.scopedVars);
     var html = '<div class="markdown-html">';
@@ -268,7 +269,8 @@ export class PanelCtrl {
       html += '</ul>';
     }
 
-    return html + '</div>';
+    html += '</div>';
+    return sanitize(html);
   }
 
   openInspector() {
diff --git a/public/test/specs/helpers.js b/public/test/specs/helpers.js
index 40c4a7542..bb4ca08ad 100644
--- a/public/test/specs/helpers.js
+++ b/public/test/specs/helpers.js
@@ -10,6 +10,7 @@ define([
 
     this.datasource = {};
     this.$element = {};
+    this.$sanitize = {};
     this.annotationsSrv = {};
     this.timeSrv = new TimeSrvStub();
     this.templateSrv = new TemplateSrvStub();
@@ -31,6 +32,7 @@ define([
         $provide.value('timeSrv', self.timeSrv);
         $provide.value('templateSrv', self.templateSrv);
         $provide.value('$element', self.$element);
+        $provide.value('$sanitize', self.$sanitize);
         _.each(mocks, function(value, key) {
           $provide.value(key, value);
         });
-- 
2.16.4

Places

File 0001-fix-XSS-vulnerabilities-in-dashboard-links.patch of Package grafana (Revision 515d5411e095b9644924937395fe592a)

Places