Skip to content

Commit

Permalink
Revert "fix: external link ignore mailto: & javascript: (hexojs#3812)"
Browse files Browse the repository at this point in the history
This reverts commit 91a4784.
  • Loading branch information
curbengh committed Nov 5, 2019
1 parent 77f3e21 commit de496cd
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 46 deletions.
17 changes: 4 additions & 13 deletions lib/plugins/filter/after_post_render/external_link.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
'use strict';

const { URL } = require('url');

const urlObj = (str) => {
try {
return new URL(str);
} catch (err) {
return str;
}
};
const { parse } = require('url');

const isExternal = (url, config) => {
const exclude = Array.isArray(config.external_link.exclude) ? config.external_link.exclude
: [config.external_link.exclude];
const data = urlObj(url);
const data = parse(url);
const host = data.hostname;
const sitehost = typeof urlObj(config.url) === 'object' ? urlObj(config.url).hostname : config.url;
const sitehost = parse(config.url).hostname || config.url;

if (!sitehost || typeof data === 'string') return false;
if (data.origin === 'null') return false;
if (!data.protocol || !sitehost) return false;

if (exclude && exclude.length) {
for (const i of exclude) {
Expand Down
17 changes: 4 additions & 13 deletions lib/plugins/filter/after_render/external_link.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
'use strict';

const { URL } = require('url');

const urlObj = (str) => {
try {
return new URL(str);
} catch (err) {
return str;
}
};
const { parse } = require('url');

/**
* Check whether the link is external
Expand All @@ -19,12 +11,11 @@ const urlObj = (str) => {
const isExternal = (url, config) => {
const exclude = Array.isArray(config.external_link.exclude) ? config.external_link.exclude
: [config.external_link.exclude];
const data = urlObj(url);
const data = parse(url);
const host = data.hostname;
const sitehost = typeof urlObj(config.url) === 'object' ? urlObj(config.url).hostname : config.url;
const sitehost = parse(config.url).hostname || config.url;

if (!sitehost || typeof data === 'string') return false;
if (data.origin === 'null') return false;
if (!data.protocol || !sitehost) return false;

if (exclude && exclude.length) {
for (const i of exclude) {
Expand Down
32 changes: 12 additions & 20 deletions test/scripts/filters/external_link.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,27 +206,23 @@ describe('External link - post', () => {
'# External link test',
'1. External link',
'<a href="https://hexo.io/">Hexo</a>',
'2. Link with hash (#), mailto: , javascript: shouldn\'t be processed',
'<a href="#top">Hexo</a>',
'<a href="mailto:[email protected]">Hexo</a>',
'<a href="javascript:alert(\'Hexo is awesome!\');">Hexo</a>',
'3. External link with "rel" Attribute',
'2. External link with "rel" Attribute',
'<a rel="external" href="https://hexo.io/">Hexo</a>',
'<a href="https://hexo.io/" rel="external">Hexo</a>',
'<a rel="noopenner" href="https://hexo.io/">Hexo</a>',
'<a href="https://hexo.io/" rel="noopenner">Hexo</a>',
'<a rel="external noopenner" href="https://hexo.io/">Hexo</a>',
'<a href="https://hexo.io/" rel="external noopenner">Hexo</a>',
'4. External link with Other Attributes',
'3. External link with Other Attributes',
'<a class="img" href="https://hexo.io/">Hexo</a>',
'<a href="https://hexo.io/" class="img">Hexo</a>',
'5. Internal link',
'4. Internal link',
'<a href="/archives/foo.html">Link</a>',
'6. Ignore links have "target" attribute',
'5. Ignore links have "target" attribute',
'<a href="https://hexo.io/" target="_blank">Hexo</a>',
'7. Ignore links don\'t have "href" attribute',
'6. Ignore links don\'t have "href" attribute',
'<a>Anchor</a>',
'8. Ignore links whose hostname is same as config',
'7. Ignore links whose hostname is same as config',
'<a href="https://example.com">Example Domain</a>'
].join('\n');

Expand All @@ -237,27 +233,23 @@ describe('External link - post', () => {
'# External link test',
'1. External link',
'<a href="https://hexo.io/" target="_blank" rel="noopener">Hexo</a>',
'2. Link with hash (#), mailto: , javascript: shouldn\'t be processed',
'<a href="#top">Hexo</a>',
'<a href="mailto:[email protected]">Hexo</a>',
'<a href="javascript:alert(\'Hexo is awesome!\');">Hexo</a>',
'3. External link with "rel" Attribute',
'2. External link with "rel" Attribute',
'<a rel="external noopener" href="https://hexo.io/" target="_blank">Hexo</a>',
'<a href="https://hexo.io/" target="_blank" rel="external noopener">Hexo</a>',
'<a rel="noopenner" href="https://hexo.io/" target="_blank">Hexo</a>',
'<a href="https://hexo.io/" target="_blank" rel="noopenner">Hexo</a>',
'<a rel="external noopenner" href="https://hexo.io/" target="_blank">Hexo</a>',
'<a href="https://hexo.io/" target="_blank" rel="external noopenner">Hexo</a>',
'4. External link with Other Attributes',
'3. External link with Other Attributes',
'<a class="img" href="https://hexo.io/" target="_blank" rel="noopener">Hexo</a>',
'<a href="https://hexo.io/" target="_blank" rel="noopener" class="img">Hexo</a>',
'5. Internal link',
'4. Internal link',
'<a href="/archives/foo.html">Link</a>',
'6. Ignore links have "target" attribute',
'5. Ignore links have "target" attribute',
'<a href="https://hexo.io/" target="_blank">Hexo</a>',
'7. Ignore links don\'t have "href" attribute',
'6. Ignore links don\'t have "href" attribute',
'<a>Anchor</a>',
'8. Ignore links whose hostname is same as config',
'7. Ignore links whose hostname is same as config',
'<a href="https://example.com">Example Domain</a>'
].join('\n'));
});
Expand Down

0 comments on commit de496cd

Please sign in to comment.