IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Prometheus: Fix escaping of quotation marks for variables" (#96038)

Browse Source 
Revert "Prometheus: Fix escaping of quotation marks for variables (#93415)"

This reverts commit 2bfdee73e3.
This commit is contained in:
ismail simsek 2024-11-07 16:38:05 +01:00 committed by GitHub
parent ff2f612412
commit 21ba507bcb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/grafana-prometheus/src/datasource.test.ts
View File

@ -289,16 +289,6 @@ describe('PrometheusDatasource', () => {
operator: '=~',
value: `v'.*`,
},
{
key: 'k3',
operator: '=~',
value: `v".*`,
},
{
key: 'k4',
operator: '=~',
value: `\\v.*`,
},
];
ds.query({
interval: '15s',
@ -308,7 +298,7 @@ describe('PrometheusDatasource', () => {
} as DataQueryRequest<PromQuery>);
const [result] = fetchMockCalledWith(fetchMock);
expect(result).toMatchObject({
expr: `metric{job="foo", k1=~"v.*", k2=~"v'.*", k3=~"v\\".*", k4=~"\\\\v.*"} - metric{k1=~"v.*", k2=~"v'.*", k3=~"v\\".*", k4=~"\\\\v.*"}`,
expr: `metric{job="foo", k1=~"v.*", k2=~"v\\\\'.*"} - metric{k1=~"v.*", k2=~"v\\\\'.*"}`,
});
});
});
@ -488,12 +478,8 @@ describe('PrometheusDatasource', () => {
expect(prometheusRegularEscape('cryptodepression')).toEqual('cryptodepression');
});
it("should not escape '", () => {
expect(prometheusRegularEscape("looking'glass")).toEqual("looking'glass");
});
it('should escape "', () => {
expect(prometheusRegularEscape('looking"glass')).toEqual('looking\\"glass');
it("should escape '", () => {
expect(prometheusRegularEscape("looking'glass")).toEqual("looking\\\\'glass");
});
it('should escape \\', () => {
@ -501,11 +487,11 @@ describe('PrometheusDatasource', () => {
});
it('should escape multiple characters', () => {
expect(prometheusRegularEscape('"looking"glass"')).toEqual('\\"looking\\"glass\\"');
expect(prometheusRegularEscape("'looking'glass'")).toEqual("\\\\'looking\\\\'glass\\\\'");
});
it('should escape multiple different characters', () => {
expect(prometheusRegularEscape('"loo\\king"glass"')).toEqual('\\"loo\\\\king\\"glass\\"');
expect(prometheusRegularEscape("'loo\\king'glass'")).toEqual("\\\\'loo\\\\king\\\\'glass\\\\'");
});
});
@ -514,9 +500,8 @@ describe('PrometheusDatasource', () => {
expect(prometheusSpecialRegexEscape('cryptodepression')).toEqual('cryptodepression');
});
it('should escape $^*+?.()|\\"', () => {
it('should escape $^*+?.()|\\', () => {
expect(prometheusSpecialRegexEscape("looking'glass")).toEqual("looking\\\\'glass");
expect(prometheusSpecialRegexEscape('looking"glass')).toEqual('looking\\\\\\"glass');
expect(prometheusSpecialRegexEscape('looking{glass')).toEqual('looking\\\\{glass');
expect(prometheusSpecialRegexEscape('looking}glass')).toEqual('looking\\\\}glass');
expect(prometheusSpecialRegexEscape('looking[glass')).toEqual('looking\\\\[glass');
@ -564,8 +549,8 @@ describe('PrometheusDatasource', () => {
});
describe('and value is a string', () => {
it('should only escape double quotes and backslashes', () => {
expect(ds.interpolateQueryExpr('abc\'"$^*{}[]+?.()|\\', customVariable)).toEqual('abc\'\\"$^*{}[]+?.()|\\\\');
it('should only escape single quotes', () => {
expect(ds.interpolateQueryExpr("abc'$^*{}[]+?.()|", customVariable)).toEqual("abc\\\\'$^*{}[]+?.()|");
});
});

13
packages/grafana-prometheus/src/datasource.ts
View File

@ -640,7 +640,7 @@ export class PrometheusDatasource
const labelFilters: QueryBuilderLabelFilter[] = options.filters.map((f) => ({
label: f.key,
value: prometheusRegularEscape(f.value),
value: f.value,
op: f.operator,
}));
const expr = promQueryModeller.renderLabels(labelFilters);
@ -672,7 +672,7 @@ export class PrometheusDatasource
const labelFilters: QueryBuilderLabelFilter[] = options.filters.map((f) => ({
label: f.key,
value: prometheusRegularEscape(f.value),
value: f.value,
op: f.operator,
}));
@ -1045,14 +1045,9 @@ export function extractRuleMappingFromGroups(groups: RawRecordingRules[]): RuleQ
// in language_utils.ts, but they are not exactly the same algorithm, and we found
// no way to reuse one in the another or vice versa.
export function prometheusRegularEscape<T>(value: T) {
return typeof value === 'string' ? value.replace(/\\/g, '\\\\').replace(/"/g, '\\"') : value;
return typeof value === 'string' ? value.replace(/\\/g, '\\\\').replace(/'/g, "\\\\'") : value;
}
export function prometheusSpecialRegexEscape<T>(value: T) {
return typeof value === 'string'
? value
.replace(/\\/g, '\\\\\\\\')
.replace(/"/g, '\\\\\\"')
.replace(/[$^*{}\[\]\'+?.()|]/g, '\\\\$&')
: value;
return typeof value === 'string' ? value.replace(/\\/g, '\\\\\\\\').replace(/[$^*{}\[\]\'+?.()|]/g, '\\\\$&') : value;
}