From 3326c3ab7b57008c9e52275bfbafc65b071daece Mon Sep 17 00:00:00 2001 From: Shirley <4163034+fridgepoet@users.noreply.github.com> Date: Thu, 23 Dec 2021 15:10:35 +0100 Subject: [PATCH] AzureMonitor: Exclude ( in second capturing group for CodeQL ReDoS vulnerability (#43494) --- .../log_analytics/querystring_builder.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts index e20011f5481..8e5226dbe6b 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/log_analytics/querystring_builder.ts @@ -5,7 +5,7 @@ export default class LogAnalyticsQuerystringBuilder { generate() { let queryString = this.rawQueryString; - const macroRegexp = /\$__([_a-zA-Z0-9]+)\(([^\)]*)\)/gi; + const macroRegexp = /\$__([_a-zA-Z0-9]+)\(([^()]*)\)/gi; queryString = queryString.replace(macroRegexp, (match, p1, p2) => { if (p1 === 'contains') { return this.getMultiContains(p2);