IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-12 08:35:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Navigation: Sanitize homeUrl (#65293)

Browse Source 
sanitize homeUrl
This commit is contained in:
Ashley Harrison 2023-03-27 15:27:52 +01:00 committed by GitHub
parent f3da91f53f
commit f948482386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/components/AppChrome/TopSearchBar.tsx
View File

@ -2,7 +2,7 @@ import { css } from '@emotion/css';
import React from 'react';
import { useLocation } from 'react-router-dom';
import { GrafanaTheme2, locationUtil } from '@grafana/data';
import { GrafanaTheme2, locationUtil, textUtil } from '@grafana/data';
import { Dropdown, ToolbarButton, useStyles2 } from '@grafana/ui';
import { config } from 'app/core/config';
import { contextSrv } from 'app/core/core';
@ -29,7 +29,7 @@ export const TopSearchBar = React.memo(function TopSearchBar() {
let homeUrl = config.appSubUrl || '/';
if (!config.bootData.user.isSignedIn && !config.anonymousEnabled) {
homeUrl = locationUtil.getUrlForPartial(location, { forceLogin: 'true' });
homeUrl = textUtil.sanitizeUrl(locationUtil.getUrlForPartial(location, { forceLogin: 'true' }));
}
return (

4
public/app/core/components/NavBar/NavBar.tsx
View File

@ -5,7 +5,7 @@ import { cloneDeep } from 'lodash';
import React, { useState } from 'react';
import { useLocation } from 'react-router-dom';
import { GrafanaTheme2, locationUtil, NavModelItem, NavSection } from '@grafana/data';
import { GrafanaTheme2, locationUtil, NavModelItem, NavSection, textUtil } from '@grafana/data';
import { config, locationSearchToObject, locationService, reportInteraction } from '@grafana/runtime';
import { useTheme2, CustomScrollbar, IconButton } from '@grafana/ui';
import { getKioskMode } from 'app/core/navigation/kiosk';
@ -53,7 +53,7 @@ export const NavBar = React.memo(() => {
let homeUrl = config.appSubUrl || '/';
if (!config.bootData.user.isSignedIn && !config.anonymousEnabled) {
homeUrl = locationUtil.getUrlForPartial(location, { forceLogin: 'true' });
homeUrl = textUtil.sanitizeUrl(locationUtil.getUrlForPartial(location, { forceLogin: 'true' }));
}
const homeItem: NavModelItem = enrichWithInteractionTracking(