OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issue with falsey hrefs being sent in events (#8113)

pull/21833/head
Michael Telatynski 2022-03-23 13:38:57 +00:00 committed by GitHub
parent 81df4c0aeb
commit eb668538aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/HtmlUtils.tsx
View File

@ -182,7 +182,11 @@ const transformTags: IExtendedSanitizeOptions["transformTags"] = { // custom to
) {
delete attribs.target;
}
} else {
// Delete the href attrib if it is falsey
delete attribs.href;
}
attribs.rel = 'noreferrer noopener'; // https://mathiasbynens.github.io/rel-noopener/
return { tagName, attribs };
},

14
src/linkify-matrix.ts
View File

@ -156,21 +156,21 @@ export const options = {
// intercept local permalinks to users and show them like userids (in userinfo of current room)
try {
const permalink = parsePermalink(href);
if (permalink && permalink.userId) {
if (permalink?.userId) {
return {
// @ts-ignore see https://linkify.js.org/docs/options.html
click: function(e) {
click: function(e: MouseEvent) {
onUserClick(e, permalink.userId);
},
};
} else {
// for events, rooms etc. (anything other then users)
// for events, rooms etc. (anything other than users)
const localHref = tryTransformPermalinkToLocalHref(href);
if (localHref !== href) {
// it could be converted to a localHref -> therefore handle locally
return {
// @ts-ignore see https://linkify.js.org/docs/options.html
click: function(e) {
click: function(e: MouseEvent) {
e.preventDefault();
window.location.hash = localHref;
},
@ -185,7 +185,7 @@ export const options = {
case Type.UserId:
return {
// @ts-ignore see https://linkify.js.org/docs/options.html
click: function(e) {
click: function(e: MouseEvent) {
const userId = parsePermalink(href).userId;
onUserClick(e, userId);
},
@ -193,7 +193,7 @@ export const options = {
case Type.RoomAlias:
return {
// @ts-ignore see https://linkify.js.org/docs/options.html
click: function(e) {
click: function(e: MouseEvent) {
const alias = parsePermalink(href).roomIdOrAlias;
onAliasClick(e, alias);
},
@ -202,7 +202,7 @@ export const options = {
case Type.GroupId:
return {
// @ts-ignore see https://linkify.js.org/docs/options.html
click: function(e) {
click: function(e: MouseEvent) {
const groupId = parsePermalink(href).groupId;
onGroupClick(e, groupId);
},