Merge "Handle erroneous URL decoding in project-based URLs"

2017-07-28 20:32:23 +00:00
parent 4929212b28 4a62271a3c
commit 1ff4c501f8
1 changed files with 5 additions and 0 deletions
--- a/polygerrit-ui/app/elements/core/gr-router/gr-router.js
+++ b/polygerrit-ui/app/elements/core/gr-router/gr-router.js
@@ -94,6 +94,11 @@
        if (data.hash[0] !== '/') {
          data.hash = '/' + data.hash;
        }
+        if (data.hash.includes('/ /') && data.canonicalPath.includes('/+/')) {
+          // Path decodes all '+' to ' ' -- this breaks project-based URLs.
+          // See Issue 6888.
+          data.hash = data.hash.replace('/ /', '/+/');
+        }
        const hash = data.hash;
        let newUrl = base + hash;
        if (hash.startsWith('/VE/')) {