Commit d10ce909 by Torkel Ödegaard

Fixed XSS issue with file based dashboards, was really casued by an issue with…

Fixed XSS issue with file based dashboards, was really casued by an issue with alertSrv accepting html in message alerts
parent 5175cf70
......@@ -76,7 +76,7 @@ function (angular, _, kbn, moment, $) {
}
return result.data;
},function() {
$scope.appEvent('alert-error', ["Dashboard load failed", "Could not load <i>dashboards/"+file+"</i>. Please make sure it exists"]);
$scope.appEvent('alert-error', ["Dashboard load failed", "Could not load "+file+". Please make sure it exists"]);
return false;
});
};
......
......@@ -29,7 +29,7 @@ function (angular, _) {
this.set = function(title,text,severity,timeout) {
var newAlert = {
title: title || '',
text: $sce.trustAsHtml(text || ''),
text: text || '',
severity: severity || 'info',
};
......
......@@ -35,7 +35,7 @@
<i class="fa fa-times-circle"></i>
</button>
<div class="alert-title">{{alert.title}}</div>
<div ng-bind-html='alert.text'></div>
<div ng-bind='alert.text'></div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment