Fix double encoding of already encoded character

WebReflection · May 12, 2023 · 59e7165 · 59e7165
1 parent f806d0d
commit 59e7165
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/cjs/html/anchor-element.js b/cjs/html/anchor-element.js
@@ -15,10 +15,10 @@ class HTMLAnchorElement extends HTMLElement {
   }
 
   /* c8 ignore start */ // copy paste from img.src, already covered
-  get href() { return encodeURI(stringAttribute.get(this, 'href')); }
+  get href() { return encodeURI(decodeURI(stringAttribute.get(this, 'href'))); }
   set href(value) { stringAttribute.set(this, 'href', decodeURI(value)); }
 
-  get download() { return encodeURI(stringAttribute.get(this, 'download')); }
+  get download() { return encodeURI(decodeURI(stringAttribute.get(this, 'download'))); }
   set download(value) { stringAttribute.set(this, 'download', decodeURI(value)); }
 
   get target() { return stringAttribute.get(this, 'target'); }

diff --git a/esm/html/anchor-element.js b/esm/html/anchor-element.js
@@ -14,10 +14,10 @@ class HTMLAnchorElement extends HTMLElement {
   }
 
   /* c8 ignore start */ // copy paste from img.src, already covered
-  get href() { return encodeURI(stringAttribute.get(this, 'href')); }
+  get href() { return encodeURI(decodeURI(stringAttribute.get(this, 'href'))); }
   set href(value) { stringAttribute.set(this, 'href', decodeURI(value)); }
 
-  get download() { return encodeURI(stringAttribute.get(this, 'download')); }
+  get download() { return encodeURI(decodeURI(stringAttribute.get(this, 'download'))); }
   set download(value) { stringAttribute.set(this, 'download', decodeURI(value)); }
 
   get target() { return stringAttribute.get(this, 'target'); }

diff --git a/test/html/anchor-element.js b/test/html/anchor-element.js
@@ -11,4 +11,5 @@ a.setAttribute('href', 'https://google.com/?q=1&page=2&test="');
 assert(a.toString(), '<a href="https://google.com/?q=1&page=2&test=&quot;">click me</a>');
 a.setAttribute('href', 'https://google.com/?q=asd&lol=<2>"');
 assert(a.href, 'https://google.com/?q=asd&lol=%3C2%3E%22');
-
+a.setAttribute('href', 'https://google.com/path%20to%20some%20file.pdf');
+assert(a.href, 'https://google.com/path%20to%20some%20file.pdf');
diff --git a/worker.js b/worker.js
@@ -11043,10 +11043,10 @@ class HTMLAnchorElement extends HTMLElement {
   }
 
   /* c8 ignore start */ // copy paste from img.src, already covered
-  get href() { return encodeURI(stringAttribute.get(this, 'href')); }
+  get href() { return encodeURI(decodeURI(stringAttribute.get(this, 'href'))); }
   set href(value) { stringAttribute.set(this, 'href', decodeURI(value)); }
 
-  get download() { return encodeURI(stringAttribute.get(this, 'download')); }
+  get download() { return encodeURI(decodeURI(stringAttribute.get(this, 'download'))); }
   set download(value) { stringAttribute.set(this, 'download', decodeURI(value)); }
 
   get target() { return stringAttribute.get(this, 'target'); }