Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Linkifier RegExp to RFC3986 based one #611

Closed
wants to merge 2 commits into from
Closed

Replace Linkifier RegExp to RFC3986 based one #611

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f78c65
Linkfier rewrite based with RFC 3986
tmyt Mar 15, 2017
b2a4e9e
Fix IPv4/v6 matcher
tmyt Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 62 additions & 19 deletions src/Linkifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,67 @@ import { LinkMatcher, LinkMatcherHandler, LinkMatcherValidationCallback } from '

const INVALID_LINK_CLASS = 'xterm-invalid-link';

const protocolClause = '(https?:\\/\\/)';
const domainCharacterSet = '[\\da-z\\.-]+';
const negatedDomainCharacterSet = '[^\\da-z\\.-]+';
const domainBodyClause = '(' + domainCharacterSet + ')';
const tldClause = '([a-z\\.]{2,6})';
const ipClause = '((\\d{1,3}\\.){3}\\d{1,3})';
const localHostClause = '(localhost)';
const portClause = '(:\\d{1,5})';
const hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + '|' + localHostClause + ')' + portClause + '?';
const pathClause = '(\\/[\\/\\w\\.\\-%~]*)*';
const queryStringHashFragmentCharacterSet = '[0-9\\w\\[\\]\\(\\)\\/\\?\\!#@$%&\'*+,:;~\\=\\.\\-]*';
const queryStringClause = '(\\?' + queryStringHashFragmentCharacterSet + ')?';
const hashFragmentClause = '(#' + queryStringHashFragmentCharacterSet + ')?';
const negatedPathCharacterSet = '[^\\/\\w\\.\\-%]+';
const bodyClause = hostClause + pathClause + queryStringClause + hashFragmentClause;
const start = '(?:^|' + negatedDomainCharacterSet + ')(';
const end = ')($|' + negatedPathCharacterSet + ')';
const strictUrlRegex = new RegExp(start + protocolClause + bodyClause + end);
const cAlpha = 'a-z';
const cDigit = '0-9';
const cHexDig = '0-9a-f';

const cGenDelims = ':\\/?#\\[\\]@';
const cSubDelims = '~$%\'()*+,;=';
const cUnreserved = cAlpha + cDigit + '._~\\-';

const ALPHA = '[' + cAlpha + ']';
const DIGIT = '[' + cDigit + ']';
const HEXDIG = '[' + cHexDig + ']';

const pctEncoded = '(?:%' + HEXDIG + HEXDIG + ')';

const pchar = '(?:' + pctEncoded + '|[' + cUnreserved + cSubDelims + ':@])';

const queryOrFragment = '(?:' + pctEncoded + '|[' + cUnreserved + cSubDelims + ':@\\/?])*';
const queryPart = '(?:\\?' + queryOrFragment + ')?';
const fragmentPart = '(?:#' + queryOrFragment + ')?';

const segment = '(?:' + pchar + '*)';
const segmentNz = '(?:' + pchar + '+)';

const pathAbempty = '(?:\\/' + segment + ')*';
const pathAbsolute = '(?:\\/(?:' + segmentNz + '(?:\\/' + segment + ')*)?)';
const pathRootless = '(?:' + segmentNz + '(?:\\/' + segment + ')*)';
const pathEmpty = '(?:)';

const regName = '(?:[' + cUnreserved + cSubDelims + ']|' + pctEncoded + ')*';

const decOctet = '(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])';
const ipv4Address = '(?:' + decOctet + '\\.' + decOctet + '\\.' + decOctet + '\\.' + decOctet + ')';
const h16 = '(?:' + HEXDIG + '{1,4})';
const ls32 = '(?:(?:' + h16 + ':' + h16 + ')|' + ipv4Address + ')';

const ipvFuture = '(?:v' + HEXDIG + '\\.[' + cUnreserved + cSubDelims + ':' + ']+)';
const ipv6Address = '(?:'
+ '(?:' + '(?:' + h16 + ':){6}' + ls32 + ')'
+ '|' + '(?:' + '::' + '(?:' + h16 + ':){5}' + ls32 + ')'
+ '|' + '(?:' + '(?:' + h16 + ')?' + '::' + '(?:' + h16 + ':){4}' + ls32 + ')'
+ '|' + '(?:' + '(?:(?:' + h16 + ':)?' + h16 + ')?' + '::' + '(?:' + h16 + ':){3}' + ls32 + ')'
+ '|' + '(?:' + '(?:(?:' + h16 + ':){0,2}' + h16 + ')?' + '::' + '(?:' + h16 + ':){2}' + ls32 + ')'
+ '|' + '(?:' + '(?:(?:' + h16 + ':){0,3}' + h16 + ')?' + '::' + '(?:' + h16 + ':)' + ls32 + ')'
+ '|' + '(?:' + '(?:(?:' + h16 + ':){0,4}' + h16 + ')?' + '::' + ls32 + ')'
+ '|' + '(?:' + '(?:(?:' + h16 + ':){0,5}' + h16 + ')?' + '::' + h16 + ')'
+ '|' + '(?:' + '(?:(?:' + h16 + ':){0,6}' + h16 + ')?::)'
+ ')';

const ipLiteral = '\\[(?:' + ipv6Address + '|' + ipvFuture + ')\\]';

const userinfo = '(?:[' + cUnreserved + cSubDelims + ']|' + pctEncoded + ')*';
const host = '(?:' + ipLiteral + '|' + ipv4Address + '|' + regName + ')';
const port = '(?:' + DIGIT + '*)';
const authority = '(?:' + userinfo + '@)?' + host + '(?::' + port + ')?';

const scheme = ALPHA + '(?:[' + cAlpha + cDigit + '+\\-.])*';

const hierPart = '(?:(?:\\/\\/' + authority + pathAbempty + ')|' + pathAbsolute + '|' + pathRootless + '|' + pathEmpty + ')';

const URI = scheme + ':' + hierPart + queryPart + fragmentPart;
const uriRegex = new RegExp('(' + URI + ')', 'i');

/**
* The ID of the built in http(s) link matcher.
Expand Down Expand Up @@ -54,7 +97,7 @@ export class Linkifier {
this._rows = rows;
this._rowTimeoutIds = [];
this._linkMatchers = [];
this.registerLinkMatcher(strictUrlRegex, null, { matchIndex: 1 });
this.registerLinkMatcher(uriRegex, null, { matchIndex: 1 });
}

/**
Expand Down