diff --git a/packages/grafana-data/src/text/index.ts b/packages/grafana-data/src/text/index.ts index bece68920ac..be85edccaf9 100644 --- a/packages/grafana-data/src/text/index.ts +++ b/packages/grafana-data/src/text/index.ts @@ -1,11 +1,12 @@ export * from './string'; export * from './markdown'; export * from './text'; -import { escapeHtml, hasAnsiCodes, sanitize, sanitizeUrl } from './sanitize'; +import { escapeHtml, hasAnsiCodes, sanitize, sanitizeUrl, sanitizeAngularInterpolation } from './sanitize'; export const textUtil = { escapeHtml, hasAnsiCodes, sanitize, sanitizeUrl, + sanitizeAngularInterpolation, }; diff --git a/packages/grafana-data/src/text/sanitize.ts b/packages/grafana-data/src/text/sanitize.ts index d32c4a96178..6313d0db138 100644 --- a/packages/grafana-data/src/text/sanitize.ts +++ b/packages/grafana-data/src/text/sanitize.ts @@ -38,3 +38,7 @@ export function hasAnsiCodes(input: string): boolean { export function escapeHtml(str: string): string { return String(str).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); } + +export function sanitizeAngularInterpolation(url: string): string { + return url.replace('{{', '%7B%7B').replace('}}', '%7D%7D'); +} diff --git a/public/app/core/components/NavBar/NavBarItem.tsx b/public/app/core/components/NavBar/NavBarItem.tsx index d9ebd84b2f5..27e7ee78b3f 100644 --- a/public/app/core/components/NavBar/NavBarItem.tsx +++ b/public/app/core/components/NavBar/NavBarItem.tsx @@ -1,6 +1,6 @@ import React, { ReactNode } from 'react'; import { css, cx } from '@emotion/css'; -import { GrafanaTheme2, NavModelItem } from '@grafana/data'; +import { GrafanaTheme2, NavModelItem, textUtil } from '@grafana/data'; import { Link, useTheme2 } from '@grafana/ui'; import NavBarDropdown from './NavBarDropdown'; @@ -38,13 +38,14 @@ const NavBarItem = ({ {children} ); + const sanitizedUrl = textUtil.sanitizeAngularInterpolation(url ?? ''); if (url) { element = - !target && url.startsWith('/') ? ( + !target && sanitizedUrl.startsWith('/') ? ( {children} ) : ( - + {children} ); @@ -66,7 +67,7 @@ const NavBarItem = ({