Merge pull request #14805 from SamuelToh/11503_prevent_end_of_regexpr

11503: escape measurement filter regex value

public/app/plugins/datasource/influxdb/query_builder.ts

 import _ from 'lodash';
 import _ from 'lodash';
+import kbn from 'app/core/utils/kbn';
 
 
 function renderTagCondition(tag, index) {
 function renderTagCondition(tag, index) {
   let str = '';
   let str = '';
@@ -43,7 +44,7 @@ export class InfluxQueryBuilder {
     } else if (type === 'MEASUREMENTS') {
     } else if (type === 'MEASUREMENTS') {
       query = 'SHOW MEASUREMENTS';
       query = 'SHOW MEASUREMENTS';
       if (withMeasurementFilter) {
       if (withMeasurementFilter) {
-        query += ' WITH MEASUREMENT =~ /' + withMeasurementFilter + '/';
+        query += ' WITH MEASUREMENT =~ /' + kbn.regexEscape(withMeasurementFilter) + '/';
       }
       }
     } else if (type === 'FIELDS') {
     } else if (type === 'FIELDS') {
       measurement = this.target.measurement;
       measurement = this.target.measurement;

public/app/plugins/datasource/influxdb/specs/query_builder.test.ts

@@ -50,6 +50,12 @@ describe('InfluxQueryBuilder', () => {
       expect(query).toBe('SHOW MEASUREMENTS WITH MEASUREMENT =~ /something/ LIMIT 100');
       expect(query).toBe('SHOW MEASUREMENTS WITH MEASUREMENT =~ /something/ LIMIT 100');
     });
     });
 
 
+    it('should escape the regex value in measurement query', () => {
+      const builder = new InfluxQueryBuilder({ measurement: '', tags: [] });
+      const query = builder.buildExploreQuery('MEASUREMENTS', undefined, 'abc/edf/');
+      expect(query).toBe('SHOW MEASUREMENTS WITH MEASUREMENT =~ /abc\\/edf\\// LIMIT 100');
+    });
+
     it('should have WITH MEASUREMENT WHERE in measurement query for non-empty query with tags', () => {
     it('should have WITH MEASUREMENT WHERE in measurement query for non-empty query with tags', () => {
       const builder = new InfluxQueryBuilder({
       const builder = new InfluxQueryBuilder({
         measurement: '',
         measurement: '',