IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-26 16:27:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

InfluxDB: Fixes single quotes are not escaped (#17398)

Browse Source 
Fixes #17397
This commit is contained in:
Matthias Steffen 2019-06-03 11:25:46 +02:00 committed by Torkel Ödegaard
parent 76e5657b47
commit 936308366e
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/influxdb/influx_query.ts
View File

@ -146,7 +146,7 @@ export default class InfluxQuery {
value = this.templateSrv.replace(value, this.scopedVars);
}
if (operator !== '>' && operator !== '<') {
value = "'" + value.replace(/\\/g, '\\\\') + "'";
value = "'" + value.replace(/\\/g, '\\\\').replace(/\'/g, "\\'") + "'";
}
} else if (interpolate) {
value = this.templateSrv.replace(value, this.scopedVars, 'regex');

20
public/app/plugins/datasource/influxdb/specs/influx_query.test.ts
View File

@ -139,6 +139,26 @@ describe('InfluxQuery', () => {
});
});
describe('field name with single quote should be escaped and', () => {
it('should generate correct query', () => {
const query = new InfluxQuery(
{
measurement: 'cpu',
groupBy: [{ type: 'time', params: ['auto'] }],
tags: [{ key: 'name', value: "Let's encrypt." }, { key: 'hostname', value: 'server2', condition: 'OR' }],
},
templateSrv,
{}
);
const queryText = query.render();
expect(queryText).toBe(
'SELECT mean("value") FROM "cpu" WHERE ("name" = \'Let\\\'s encrypt.\' OR "hostname" = \'server2\') AND ' +
'$timeFilter GROUP BY time($__interval)'
);
});
});
describe('query with value condition', () => {
it('should not quote value', () => {
const query = new InfluxQuery(