public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[release-11.6.4] InfluxDB: Fix regex for finding regexes in frontend code (#107233)

Browse Source 
InfluxDB: Fix regex for finding regexes in frontend code (#105194)

When interpolating variables in the frontend, we want to be sure to
escape special characters if the variable is used in a regex.

We used a regex to find regexes in raw queries, which contained a bug.
The regex treated any `/` character as the start of a regex. However,
InfluxQL (and most sql dialects) support using `/` as a division
operator.

This PR adds a check for `=~` or `!~` immediately preceding `/` as the
beginning of a regex, as per the InfluxQL spec for regexes:

https://docs.influxdata.com/influxdb/v2/reference/syntax/influxql/spec/#regular-expressions

Fixes https://github.com/grafana/support-escalations/issues/16219

(cherry picked from commit 8f4b2bbece)

Co-authored-by: beejeebus <justin.randell@grafana.com>
This commit is contained in:
Andreas Christou
2025-06-27 10:26:08 -04:00
committed by GitHub
co-authored by beejeebus
parent b2f9e132d8
commit e8503567d7
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/plugins/datasource/influxdb/datasource.test.ts
+16 -4
View File
@@ -284,7 +284,11 @@ describe('interpolateQueryExpr', () => {
it('should return the escaped value if the value wrapped in regex', () => {
const value = '/special/path';
const variableMock = queryBuilder().withId('tempVar').withName('tempVar').withMulti(false).build();
const result = ds.interpolateQueryExpr(value, variableMock, 'select that where path = /$tempVar/');
const result = ds.interpolateQueryExpr(
value,
variableMock,
'select atan(z/sqrt(3.14)), that where path =~ /$tempVar/'
);
const expectation = `\\/special\\/path`;
expect(result).toBe(expectation);
});
@@ -292,7 +296,11 @@ describe('interpolateQueryExpr', () => {
it('should return the escaped value if the value wrapped in regex 2', () => {
const value = '/special/path';
const variableMock = queryBuilder().withId('tempVar').withName('tempVar').withMulti(false).build();
const result = ds.interpolateQueryExpr(value, variableMock, 'select that where path = /^$tempVar$/');
const result = ds.interpolateQueryExpr(
value,
variableMock,
'select atan(z/sqrt(3.14)), that where path !~ /^$tempVar$/'
);
const expectation = `\\/special\\/path`;
expect(result).toBe(expectation);
});
@@ -305,7 +313,11 @@ describe('interpolateQueryExpr', () => {
.withMulti(false)
.withIncludeAll(true)
.build();
const result = ds.interpolateQueryExpr(value, variableMock, 'select from /^($tempVar)$/');
const result = ds.interpolateQueryExpr(
value,
variableMock,
'select atan(z/sqrt(3.14)), thing from path =~ /^($tempVar)$/'
);
const expectation = `(env|env2|env3)`;
expect(result).toBe(expectation);
});
@@ -358,7 +370,7 @@ describe('interpolateQueryExpr', () => {
)
.build();
const value = [`/special/path`, `/some/other/path`];
const result = ds.interpolateQueryExpr(value, variableMock, `select that where path = /$tempVar/`);
const result = ds.interpolateQueryExpr(value, variableMock, `select that where path =~ /$tempVar/`);
const expectation = `(\\/special\\/path|\\/some\\/other\\/path)`;
expect(result).toBe(expectation);
});
public/app/plugins/datasource/influxdb/datasource.ts
+1 -1
View File
@@ -346,7 +346,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
// we escape it. Otherwise, we return it directly.
// The regex below searches for regexes within the query string
const regexMatcher = new RegExp(
/\/((?![*+?])(?:[^\r\n\[/\\]|\\.|\[(?:[^\r\n\]\\]|\\.)*\])+)\/((?:g(?:im?|mi?)?|i(?:gm?|mg?)?|m(?:gi?|ig?)?)?)/,
/(\s*(=|!)~\s*)\/((?![*+?])(?:[^\r\n\[/\\]|\\.|\[(?:[^\r\n\]\\]|\\.)*\])+)\/((?:g(?:im?|mi?)?|i(?:gm?|mg?)?|m(?:gi?|ig?)?)?)/,
'gm'
);
// If matches are found this regex is evaluated to check if the variable is contained in the regex /^...$/ (^ and $ is optional)