Merge d56cd07 into 486f4a0

hexojs · Sep 22, 2019 · d975b42 · d975b42
2 parents 486f4a0 + d56cd07
commit d975b42
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/encode_url.js b/lib/encode_url.js
@@ -1,10 +1,11 @@
 'use strict';
 
 const { parse, format } = require('url');
+const regexNonUrl = /^(data|javascript|mailto|vbscript)/gi
 
 function encodeURL(str) {
   const parsed = parse(str);
-  if (parsed.protocol) {
+  if (parsed.slashes) {
     const obj = Object.assign({}, {
       auth: parsed.auth,
       protocol: parsed.protocol,
@@ -23,6 +24,8 @@ function encodeURL(str) {
     return format(obj);
   }
 
+  if (str.match(regexNonUrl)) return str;
+
   return encodeURI(safeDecodeURI(str));
 }
 

diff --git a/test/encode_url.spec.js b/test/encode_url.spec.js
@@ -94,4 +94,9 @@ describe('encodeURL', () => {
     const content = '#fóo-bár';
     encodeURL(content).should.eql('#f%C3%B3o-b%C3%A1r');
   });
+
+  it('data URLs', () => {
+    const content = 'data:,Hello%2C%20World!';
+    encodeURL(content).should.eql(content);
+  });
 });