data.coop/pinafore
8
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

fix: fix malformed URLs in statuses (#1385)

Browse source 
fixes #1384
This commit is contained in:
Nolan Lawson 2019-08-11 11:09:51 -07:00 committed by GitHub
parent c5e2eeee2d
commit ea58242b85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/routes/_components/status/StatusContent.html
View file

@ -87,6 +87,7 @@
import { store } from '../../_store/store' import { store } from '../../_store/store'
import { classname } from '../../_utils/classname' import { classname } from '../../_utils/classname'
import { massageUserText } from '../../_utils/massageUserText' import { massageUserText } from '../../_utils/massageUserText'
import { urlIsCrossOrigin } from '../../_utils/urlIsCrossOrigin'
export default { export default {
oncreate () { oncreate () {
@ -141,7 +142,7 @@
} }
// hydrate external links // hydrate external links
const href = anchor.getAttribute('href') const href = anchor.getAttribute('href')
if (new URL(href, location.href).origin !== location.origin) { if (urlIsCrossOrigin(href)) {
anchor.setAttribute('title', href) anchor.setAttribute('title', href)
anchor.setAttribute('target', '_blank') anchor.setAttribute('target', '_blank')
anchor.setAttribute('rel', 'nofollow noopener') anchor.setAttribute('rel', 'nofollow noopener')

8
src/routes/_utils/urlIsCrossOrigin.js Normal file
View file

@ -0,0 +1,8 @@
export function urlIsCrossOrigin (href) {
try {
return new URL(href, location.href).origin !== location.origin
} catch (e) {
console.error('Ignoring malformed URL', href)
return true
}
}