From 09b09846cfe20b1fc1e83956397003d199fff100 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 26 Jun 2018 23:33:35 +0100 Subject: [PATCH 1/3] allow `:port` specifiers in roomalias,groupid and userid as per spec Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/linkify-matrix.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js index 132695b9de..4cfd7382e5 100644 --- a/src/linkify-matrix.js +++ b/src/linkify-matrix.js @@ -41,6 +41,7 @@ function matrixLinkify(linkify) { const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State(); const S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); const S_ROOMALIAS = new linkify.parser.State(ROOMALIAS); + const S_ROOMALIAS_COLON = new linkify.parser.State(); const roomname_tokens = [ TT.DOT, @@ -72,6 +73,8 @@ function matrixLinkify(linkify) { S_HASH_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_ROOMALIAS); S_ROOMALIAS.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk) + S_ROOMALIAS.on(TT.COLON, S_ROOMALIAS_COLON); // do not accept trailing `:` + S_ROOMALIAS_COLON.on(TT.NUM, S_ROOMALIAS); // but do accept :NUM (port specifier) const USERID = function(value) { @@ -87,6 +90,7 @@ function matrixLinkify(linkify) { const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State(); const S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); const S_USERID = new linkify.parser.State(USERID); + const S_USERID_COLON = new linkify.parser.State(); const username_tokens = [ TT.DOT, @@ -116,6 +120,8 @@ function matrixLinkify(linkify) { S_AT_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_USERID); S_USERID.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk) + S_USERID.on(TT.COLON, S_USERID_COLON); // do not accept trailing `:` + S_USERID_COLON.on(TT.NUM, S_USERID); // but do accept :NUM (port specifier) const GROUPID = function(value) { @@ -131,6 +137,7 @@ function matrixLinkify(linkify) { const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State(); const S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); const S_GROUPID = new linkify.parser.State(GROUPID); + const S_GROUPID_COLON = new linkify.parser.State(); const groupid_tokens = [ TT.DOT, @@ -160,6 +167,8 @@ function matrixLinkify(linkify) { S_PLUS_NAME_COLON_DOMAIN_DOT.on(TT.TLD, S_GROUPID); S_GROUPID.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk) + S_GROUPID.on(TT.COLON, S_GROUPID_COLON); // do not accept trailing `:` + S_GROUPID_COLON.on(TT.NUM, S_GROUPID); // but do accept :NUM (port specifier) } // stubs, overwritten in MatrixChat's componentDidMount From 9f3a121abca1b2a40ceb9feb46489c8095a3f1cc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 26 Jun 2018 23:36:01 +0100 Subject: [PATCH 2/3] optimize linkify-matrix by skipping an intermediary state Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/linkify-matrix.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js index 4cfd7382e5..637b5869ef 100644 --- a/src/linkify-matrix.js +++ b/src/linkify-matrix.js @@ -35,7 +35,7 @@ function matrixLinkify(linkify) { }; ROOMALIAS.prototype = new MultiToken(); - const S_HASH = new linkify.parser.State(); + const S_HASH = S_START.jump(TT.POUND); const S_HASH_NAME = new linkify.parser.State(); const S_HASH_NAME_COLON = new linkify.parser.State(); const S_HASH_NAME_COLON_DOMAIN = new linkify.parser.State(); @@ -57,8 +57,6 @@ function matrixLinkify(linkify) { TT.LOCALHOST, ]; - S_START.on(TT.POUND, S_HASH); - S_HASH.on(roomname_tokens, S_HASH_NAME); S_HASH_NAME.on(roomname_tokens, S_HASH_NAME); S_HASH_NAME.on(TT.DOMAIN, S_HASH_NAME); @@ -84,7 +82,7 @@ function matrixLinkify(linkify) { }; USERID.prototype = new MultiToken(); - const S_AT = new linkify.parser.State(); + const S_AT = S_START.jump(TT.AT); const S_AT_NAME = new linkify.parser.State(); const S_AT_NAME_COLON = new linkify.parser.State(); const S_AT_NAME_COLON_DOMAIN = new linkify.parser.State(); @@ -104,8 +102,6 @@ function matrixLinkify(linkify) { TT.LOCALHOST, ]; - S_START.on(TT.AT, S_AT); - S_AT.on(username_tokens, S_AT_NAME); S_AT_NAME.on(username_tokens, S_AT_NAME); S_AT_NAME.on(TT.DOMAIN, S_AT_NAME); @@ -131,7 +127,7 @@ function matrixLinkify(linkify) { }; GROUPID.prototype = new MultiToken(); - const S_PLUS = new linkify.parser.State(); + const S_PLUS = S_START.jump(TT.PLUS); const S_PLUS_NAME = new linkify.parser.State(); const S_PLUS_NAME_COLON = new linkify.parser.State(); const S_PLUS_NAME_COLON_DOMAIN = new linkify.parser.State(); @@ -151,8 +147,6 @@ function matrixLinkify(linkify) { TT.LOCALHOST, ]; - S_START.on(TT.PLUS, S_PLUS); - S_PLUS.on(groupid_tokens, S_PLUS_NAME); S_PLUS_NAME.on(groupid_tokens, S_PLUS_NAME); S_PLUS_NAME.on(TT.DOMAIN, S_PLUS_NAME); From 96163d14025ed9cc3707ba52b255c31bc1bbe9c4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 26 Jun 2018 23:41:46 +0100 Subject: [PATCH 3/3] prevent multiple ports (:1234:1234:1234) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/linkify-matrix.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js index 637b5869ef..50d50f219a 100644 --- a/src/linkify-matrix.js +++ b/src/linkify-matrix.js @@ -42,6 +42,7 @@ function matrixLinkify(linkify) { const S_HASH_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); const S_ROOMALIAS = new linkify.parser.State(ROOMALIAS); const S_ROOMALIAS_COLON = new linkify.parser.State(); + const S_ROOMALIAS_COLON_NUM = new linkify.parser.State(ROOMALIAS); const roomname_tokens = [ TT.DOT, @@ -72,7 +73,7 @@ function matrixLinkify(linkify) { S_ROOMALIAS.on(TT.DOT, S_HASH_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk) S_ROOMALIAS.on(TT.COLON, S_ROOMALIAS_COLON); // do not accept trailing `:` - S_ROOMALIAS_COLON.on(TT.NUM, S_ROOMALIAS); // but do accept :NUM (port specifier) + S_ROOMALIAS_COLON.on(TT.NUM, S_ROOMALIAS_COLON_NUM); // but do accept :NUM (port specifier) const USERID = function(value) { @@ -89,6 +90,7 @@ function matrixLinkify(linkify) { const S_AT_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); const S_USERID = new linkify.parser.State(USERID); const S_USERID_COLON = new linkify.parser.State(); + const S_USERID_COLON_NUM = new linkify.parser.State(USERID); const username_tokens = [ TT.DOT, @@ -117,7 +119,7 @@ function matrixLinkify(linkify) { S_USERID.on(TT.DOT, S_AT_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk) S_USERID.on(TT.COLON, S_USERID_COLON); // do not accept trailing `:` - S_USERID_COLON.on(TT.NUM, S_USERID); // but do accept :NUM (port specifier) + S_USERID_COLON.on(TT.NUM, S_USERID_COLON_NUM); // but do accept :NUM (port specifier) const GROUPID = function(value) { @@ -134,6 +136,7 @@ function matrixLinkify(linkify) { const S_PLUS_NAME_COLON_DOMAIN_DOT = new linkify.parser.State(); const S_GROUPID = new linkify.parser.State(GROUPID); const S_GROUPID_COLON = new linkify.parser.State(); + const S_GROUPID_COLON_NUM = new linkify.parser.State(GROUPID); const groupid_tokens = [ TT.DOT, @@ -162,7 +165,7 @@ function matrixLinkify(linkify) { S_GROUPID.on(TT.DOT, S_PLUS_NAME_COLON_DOMAIN_DOT); // accept repeated TLDs (e.g .org.uk) S_GROUPID.on(TT.COLON, S_GROUPID_COLON); // do not accept trailing `:` - S_GROUPID_COLON.on(TT.NUM, S_GROUPID); // but do accept :NUM (port specifier) + S_GROUPID_COLON.on(TT.NUM, S_GROUPID_COLON_NUM); // but do accept :NUM (port specifier) } // stubs, overwritten in MatrixChat's componentDidMount