Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(vue-app): sanitize path with trailing slash in getLocation (#6744) #6745

Merged
merged 11 commits into from Jun 30, 2020
+87 −1
Merged

fix(vue-app): sanitize path with trailing slash in getLocation (#6744) #6745

Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6b50fc2
fix(vue-app): sanitize path with trailing slash in `getLocation` (#6744)
crutch12 Nov 28, 2019
55279db
Merge branch 'dev' into dev
pi0 Nov 28, 2019
ae1dc37
fix(vue-app): fix sanitizing path (because double slash is valid for …
crutch12 Nov 28, 2019
0ee2b65
fix(vue-app): endsWith method instead of regexp test for sanitizing p…
crutch12 Nov 29, 2019
66a631b
Merge branch 'dev' into dev
pi0 Nov 30, 2019
91b7a99
fix(vue-app): don't mutate path when sanitizing in `getLocation` (#6744)
crutch12 Nov 30, 2019
ea9551e
Merge branch 'dev' into dev
pi0 Dec 2, 2019
6b933d2
Merge branch 'dev' into dev
pi0 Dec 17, 2019
d98e425
Merge branch 'dev' into dev
pi0 Jun 22, 2020
d261987
Merge remote-tracking branch 'dev' into dev
crutch12 Jun 30, 2020
7922557
fix(vue-app): e2e tests for router.base in spa mode (#6744)
crutch12 Jun 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/vue-app/template/utils.js
View file
Open in desktop
Expand Up @@ -264,7 +264,8 @@ export function getLocation (base, mode) {
if (mode === 'hash') {
return window.location.hash.replace(/^#\//, '')
}
if (base && path.indexOf(base) === 0) {
// To get matched with sanitized router.base add trailing slash
if (base && (path.endsWith('/') ? path : path + '/').startsWith(base)) {
pi0 marked this conversation as resolved.
Show resolved Hide resolved
path = path.slice(base.length)
}
return (path || '/') + window.location.search + window.location.hash
Expand Down