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

Subpath: Add check for url being same as subpath on stripBaseFromUrl (#75670)

Browse Source 
* Subpath: Add check for url being same as subpath

* Better comment
This commit is contained in:
Joao Silva 2023-09-29 15:47:23 +01:00 committed by GitHub
parent 5ba37068c2
commit 59f0f9a93e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/grafana-data/src/utils/location.test.ts
View File

@ -54,6 +54,10 @@ describe('locationUtil', () => {
const urlWithoutMaster = locationUtil.stripBaseFromUrl('/subUrl-backup/thisShouldRemain/'); const urlWithoutMaster = locationUtil.stripBaseFromUrl('/subUrl-backup/thisShouldRemain/');
expect(urlWithoutMaster).toBe('/subUrl-backup/thisShouldRemain/'); expect(urlWithoutMaster).toBe('/subUrl-backup/thisShouldRemain/');
}); });
test('relative url with same url', () => {
const urlWithoutMaster = locationUtil.stripBaseFromUrl('/subUrl');
expect(urlWithoutMaster).toBe('');
});
test('absolute url', () => { test('absolute url', () => {
const urlWithoutMaster = locationUtil.stripBaseFromUrl('http://www.domain.com:9877/subUrl/thisShouldRemain/'); const urlWithoutMaster = locationUtil.stripBaseFromUrl('http://www.domain.com:9877/subUrl/thisShouldRemain/');
expect(urlWithoutMaster).toBe('/thisShouldRemain/'); expect(urlWithoutMaster).toBe('/thisShouldRemain/');
@ -74,6 +78,10 @@ describe('locationUtil', () => {
); );
expect(urlWithoutMaster).toBe('http://www.domain.com:9877/subUrl-backup/thisShouldRemain/'); expect(urlWithoutMaster).toBe('http://www.domain.com:9877/subUrl-backup/thisShouldRemain/');
}); });
test('absolute url with same url', () => {
const urlWithoutMaster = locationUtil.stripBaseFromUrl('http://www.domain.com:9877/subUrl');
expect(urlWithoutMaster).toBe('');
});
}); });
describe('when appSubUrl not configured', () => { describe('when appSubUrl not configured', () => {

5
packages/grafana-data/src/utils/location.ts
View File

@ -43,9 +43,10 @@ const stripBaseFromUrl = (urlOrPath: string): string => {
segmentToStrip = `${window.location.origin}${appSubUrl}`; segmentToStrip = `${window.location.origin}${appSubUrl}`;
} }
// Check if the segment is followed by a '/' so it does not replace incorrect similarly named segments // Check if the segment is either exactly the same as the url
// or followed by a '/' so it does not replace incorrect similarly named segments
// i.e. /grafana should not replace /grafanadashboards // i.e. /grafana should not replace /grafanadashboards
return urlOrPath.length > 0 && urlOrPath.indexOf(segmentToStrip + '/') === 0 return urlOrPath.length > 0 && (urlOrPath.indexOf(segmentToStrip + '/') === 0 || urlOrPath === segmentToStrip)
? urlOrPath.slice(segmentToStrip.length - stripExtraChars) ? urlOrPath.slice(segmentToStrip.length - stripExtraChars)
: urlOrPath; : urlOrPath;
}; };